Merge branch 'staging-next' into staging

This commit is contained in:
Vladimír Čunát 2019-09-22 10:06:45 +02:00
commit 6c567ed797
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
61 changed files with 889 additions and 534 deletions

View file

@ -938,6 +938,7 @@
./virtualisation/anbox.nix
./virtualisation/container-config.nix
./virtualisation/containers.nix
./virtualisation/cri-o.nix
./virtualisation/docker.nix
./virtualisation/docker-containers.nix
./virtualisation/ecs-agent.nix

View file

@ -28,7 +28,7 @@ in
after = [ "network-online.target" "sound.target" ];
description = "spotifyd, a Spotify playing daemon";
serviceConfig = {
ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache_path /var/cache/spotifyd --config ${spotifydConf}";
ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
Restart = "always";
RestartSec = 12;
DynamicUser = true;

View file

@ -322,6 +322,7 @@ in
"d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -"
"d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -"
"d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -"
"d '${cfg.stateDir}/log' - ${cfg.user} gitea - -"
"d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
"Z '${cfg.stateDir}' - ${cfg.user} gitea - -"

View file

@ -0,0 +1,106 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.virtualisation.cri-o;
in
{
options.virtualisation.cri-o = {
enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)";
storageDriver = mkOption {
type = types.enum ["btrfs" "overlay" "vfs"];
default = "overlay";
description = "Storage driver to be used";
};
logLevel = mkOption {
type = types.enum ["trace" "debug" "info" "warn" "error" "fatal"];
default = "info";
description = "Log level to be used";
};
pauseImage = mkOption {
type = types.str;
default = "k8s.gcr.io/pause:3.1";
description = "Pause image for pod sandboxes to be used";
};
pauseCommand = mkOption {
type = types.str;
default = "/pause";
description = "Pause command to be executed";
};
registries = mkOption {
type = types.listOf types.str;
default = [ "docker.io" "quay.io" ];
description = "Registries to be configured for unqualified image pull";
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs;
[ cri-o cri-tools conmon cni-plugins iptables runc utillinux ];
environment.etc."crictl.yaml".text = ''
runtime-endpoint: unix:///var/run/crio/crio.sock
'';
environment.etc."crio/crio.conf".text = ''
[crio]
storage_driver = "${cfg.storageDriver}"
[crio.image]
pause_image = "${cfg.pauseImage}"
pause_command = "${cfg.pauseCommand}"
registries = [
${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries}
]
[crio.runtime]
conmon = "${pkgs.conmon}/bin/conmon"
log_level = "${cfg.logLevel}"
manage_network_ns_lifecycle = true
'';
environment.etc."containers/policy.json".text = ''
{"default": [{"type": "insecureAcceptAnything"}]}
'';
environment.etc."cni/net.d/20-cri-o-bridge.conf".text = ''
{
"cniVersion": "0.3.1",
"name": "crio-bridge",
"type": "bridge",
"bridge": "cni0",
"isGateway": true,
"ipMasq": true,
"ipam": {
"type": "host-local",
"subnet": "10.88.0.0/16",
"routes": [
{ "dst": "0.0.0.0/0" }
]
}
}
'';
systemd.services.crio = {
description = "Container Runtime Interface for OCI (CRI-O)";
documentation = [ "https://github.com/cri-o/cri-o" ];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ pkgs.utillinux pkgs.runc pkgs.iptables ];
serviceConfig = {
Type = "notify";
ExecStart = "${pkgs.cri-o}/bin/crio";
ExecReload = "/bin/kill -s HUP $MAINPID";
TasksMax = "infinity";
LimitNOFILE = "1048576";
LimitNPROC = "1048576";
LimitCORE = "infinity";
OOMScoreAdjust = "-999";
TimeoutStartSec = "0";
Restart = "on-abnormal";
};
};
};
}

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "spotifyd";
version = "0.2.11";
version = "0.2.14";
src = fetchFromGitHub {
owner = "Spotifyd";
repo = "spotifyd";
rev = version;
sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
rev = "v${version}";
sha256 = "1hbcyc5rdrvdnvvsgaykqamq4i0yq8wqq5qjp6zjf4jlaxxif4nz";
};
cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3";
cargoSha256 = "15gd8shg0mn4vsma2hckj6w8gkwr58iniyfw1vjrh4clw4x7ibb4";
cargoBuildFlags = [
"--no-default-features"
@ -30,6 +30,8 @@ rustPlatform.buildRustPackage rec {
++ stdenv.lib.optional withPulseAudio libpulseaudio
++ stdenv.lib.optional withPortAudio portaudio;
doCheck = false;
meta = with stdenv.lib; {
description = "An open source Spotify client running as a UNIX daemon";
homepage = "https://github.com/Spotifyd/spotifyd";

View file

@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
install -d $out/bin $out/templates
install -m755 target/*/release/jormungandr $out/bin/
install -m755 target/*/release/jcli $out/bin/
install -m755 target/*/release/jormungandr-scenario-tests $out/bin/
install -m755 scripts/send-transaction $out/templates
install -m755 scripts/jcli-helpers $out/bin/
install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap

View file

@ -14,9 +14,9 @@ let
};
betaVersion = stableVersion;
latestVersion = { # canary & dev
version = "3.6.0.11"; # "Android Studio 3.6 Canary 11"
build = "192.5863777";
sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8";
version = "3.6.0.12"; # "Android Studio 3.6 Canary 12"
build = "192.5871855";
sha256Hash = "0pxvpxqdxv37sl72p7gml70k6kl717k6avw9p0l00cys0zbvb3zq";
};
in {
# Attributes are named by their corresponding release channels

View file

@ -1,4 +1,16 @@
{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
{ stdenv
, lib
, fetchurl
, makeWrapper
, electron_5
, dpkg
, gtk3
, glib
, gsettings-desktop-schemas
, wrapGAppsHook
, withPandoc ? false
, pandoc
}:
stdenv.mkDerivation rec {
pname = "typora";
@ -42,10 +54,11 @@ stdenv.mkDerivation rec {
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
--add-flags $out/share/typora \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A minimal Markdown reading & writing app";
homepage = https://typora.io;
license = licenses.unfree;

View file

@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec {
sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy";
};
propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ];
doCheck = false;

View file

@ -17,10 +17,10 @@ rec {
firefox = common rec {
pname = "firefox";
ffversion = "69.0";
ffversion = "69.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43";
sha512 = "0zvjwn17accmp9m55a9s12mw3cflsplysizfrpa3hy02na20w39g974d42fmxpk4zq4zqy4m17v2rpibibb0g7giy9rywndhaw3xrl9";
};
patches = [

View file

@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
# Dropbox client to bootstrap installation.
# The client is self-updating, so the actual version may be newer.
let
version = "73.4.118";
version = "81.4.195";
arch = {
x86_64-linux = "x86_64";

View file

@ -1,9 +1,7 @@
{ stdenv, fetchpatch, python36Packages }:
{ stdenv, fetchpatch, python3Packages }:
with stdenv.lib;
# Needs Python <3.7 for now, see https://github.com/louipc/turses/issues/4
with python36Packages;
with python3Packages;
buildPythonPackage rec {
pname = "turses";
@ -14,8 +12,6 @@ buildPythonPackage rec {
sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
};
disabled = ! python36Packages.pythonOlder "3.7";
checkInputs = [ mock pytest coverage tox ];
propagatedBuildInputs = [ urwid tweepy future ];
@ -24,6 +20,11 @@ buildPythonPackage rec {
url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";
sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3";
})
# python 3.7+ support
(fetchpatch {
url = "https://github.com/booxter/turses/commit/e6e285eae50fc3d2042a476185fe60daef1e758e.patch";
sha256 = "0g2zsrny955viwgs2l6gpiiz8m67b5sgdcxkjmfimfvvih5sg79f";
})
];
checkPhase = ''

View file

@ -0,0 +1,35 @@
{ stdenv
, fetchFromGitHub
, dmd
, pkgconfig
, curl
, sqlite
}:
stdenv.mkDerivation rec {
pname = "onedrive";
version = "2.3.9";
src = fetchFromGitHub {
owner = "abraunegg";
repo = "onedrive";
rev = "v${version}";
sha256 = "0fg2zzhhd1wl8z416px432xynx6whnzdamzdckc8rmm1cvghgb0f";
};
nativeBuildInputs = [
dmd
pkgconfig
];
buildInputs = [
curl
sqlite
];
meta = with stdenv.lib; {
description = "A complete tool to interact with OneDrive on Linux";
homepage = "https://github.com/abraunegg/onedrive";
license = licenses.gpl3;
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.linux;
};
}

View file

@ -1,5 +1,5 @@
{
mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools,
mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools,
boost, qttools, qtwebkit,
breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
@ -28,6 +28,17 @@ mkDerivation rec {
propagatedUserEnvPkgs = [ kproperty ];
patches = [
# Changes in Qt 5.13 mean that QDate isn't exported from certain places,
# which the build was relying on. This patch explicitly imports QDate where
# needed.
# Should be unnecessary with kexi >= 3.3
(fetchpatch {
url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53";
sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj";
})
];
meta = with lib; {
description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker";
longDescription = ''

View file

@ -1,7 +1,7 @@
{ fetchurl, stdenv }:
let
version = "0.15.2";
version = "0.18.0";
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
fetchbin = name: sha256: fetchurl {
@ -9,8 +9,8 @@ let
inherit sha256;
};
firecracker-bin = fetchbin "firecracker" "11g0iz1krsm6gzhvf0fb4101c6qyk6bl8j3kjidbb52x9i4aqsxk";
jailer-bin = fetchbin "jailer" "0j1gc1cdsfsi82fkvvxla25791lcvk6vmp46i82f0ms9xm7xhswz";
firecracker-bin = fetchbin "firecracker" "140g93z0k8yd9lr049ps4dj0psb9ac1v7g5zs7lzpws9rj8shmgh";
jailer-bin = fetchbin "jailer" "0sk1zm1fx0zdy5il8vyygzads72ni2lcil42wv59j8b2bg8p7fwd";
in
stdenv.mkDerivation {
name = "firecracker-${version}";

View file

@ -0,0 +1,27 @@
{ lib, fetchurl }:
let
pname = "cascadia-code";
version = "1909.16";
in
fetchurl {
name = "${pname}-${version}";
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf";
downloadToTemp = true;
recursiveHash = true;
postFetch = ''
install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
'';
sha256 = "0nckczvak3pd1h3fiz0j827pm87px9swx60q07lc2jnjlxcghgl2";
meta = with lib; {
description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
homepage = "https://github.com/microsoft/cascadia-code";
license = licenses.ofl;
maintainers = [ maintainers.marsam ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja,
python3, gtk3, gnome3, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "yaru";
version = "19.10.2";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
sha256 = "1azyn8pr0kpbq4wlz91f5amqyxqq0x2mxkglzl488sf39fl0gnbj";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
buildInputs = [ gtk3 gnome3.gnome-themes-extra ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
postPatch = "patchShebangs .";
meta = with stdenv.lib; {
description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10";
homepage = https://github.com/ubuntu/yaru;
license = with licenses; [ cc-by-sa-40 gpl3 ];
platforms = platforms.linux;
maintainers = [ maintainers.jD91mZM2 ];
};
}

View file

@ -186,7 +186,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
else "");
else "")
+ stdenv.lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'LIMITS_H_TEST=false'
)
'';
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;

View file

@ -185,7 +185,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
else "");
else "")
+ stdenv.lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'LIMITS_H_TEST=false'
)
'';
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;

View file

@ -219,6 +219,8 @@ let
ln -s $jre/lib/openjdk/jre $out/jre
'';
propagatedBuildInputs = [ setJavaClassPath ];
preFixup = ''
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up

View file

@ -1,9 +1,5 @@
{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
let
# workaround https://github.com/NixOS/nixpkgs/issues/37364
jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
in
{
jogl_2_3_2 =
let
@ -32,7 +28,8 @@ in
-exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
'';
buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
nativeBuildInputs = [ jdk ant git ];
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
buildPhase = ''
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen

View file

@ -2,33 +2,19 @@
, libtiff, giflib, libjpeg, libpng
, libXrender, libexif, autoreconfHook, fetchpatch }:
stdenv.mkDerivation {
name = "libgdiplus-5.6.1";
stdenv.mkDerivation rec {
pname = "libgdiplus";
version = "6.0.2";
src = fetchFromGitHub {
owner = "mono";
repo = "libgdiplus";
rev = "5.6.1";
sha256 = "023xf3l2s0mxcdbl2viglzrkhx3lwcrpm66fiq7cfdqz80d4vsj2";
rev = version;
sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg";
};
NIX_LDFLAGS = "-lgif";
patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
(fetchpatch {
url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
})
(fetchpatch {
url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
})
(fetchpatch {
url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
})
];
hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];

View file

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
})
];
postFixup = ''
postFixup = stdenv.lib.optionalString stdenv.isLinux ''
# config_gnome3 uses the helper to find GNOME proxy settings
wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
'';

View file

@ -80,7 +80,7 @@ wrapQtAppsHook() {
do
[ -d "$targetDir" ] || continue
find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file
find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
do
patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue

View file

@ -0,0 +1,28 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }:
buildPythonPackage rec {
pname = "algebraic-data-types";
version = "0.1.1";
src = fetchFromGitHub {
owner = "jspahrsummers";
repo = "adt";
rev = "v" + version;
sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi";
};
disabled = pythonOlder "3.6";
checkInputs = [
hypothesis
mypy
];
meta = with lib; {
description = "Algebraic data types for Python";
homepage = https://github.com/jspahrsummers/adt;
license = licenses.mit;
maintainers = with maintainers; [ uri-canva ];
platforms = platforms.unix;
};
}

View file

@ -2,12 +2,12 @@
, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
buildPythonPackage rec {
version = "1.12.3";
pname = "aws-adfs";
version = "1.17.0";
src = fetchPypi {
inherit pname version;
sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831";
sha256 = "0wnsmwjpfhxilmvrqvwilcf3h9p5m5ixi5gn9bgkr3gwd2laxf54";
};
# Relax version constraint
@ -24,10 +24,10 @@ buildPythonPackage rec {
checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
propagatedBuildInputs = [ lxml boto3 requests click configparser ];
meta = {
meta = with lib; {
description = "Command line tool to ease aws cli authentication against ADFS";
homepage = https://github.com/venth/aws-adfs;
license = lib.licenses.psfl;
maintainers = [ lib.maintainers.bhipple ];
license = licenses.psfl;
maintainers = [ maintainers.bhipple ];
};
}

View file

@ -1,18 +1,19 @@
{ stdenv, fetchPypi, buildPythonPackage, hidapi
, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
, websocket_client
}:
buildPythonPackage rec {
pname = "ledgerblue";
version = "0.1.24";
version = "0.1.28";
src = fetchPypi {
inherit pname version;
sha256 = "fc111ed5db8da93f280928d966f9d87416b464f5f09cec80b60e88c4c1265026";
sha256 = "1jfh4gb3f16ga1ircwiyg7dldldmhn0a5slbpqsqr2g6mlqihpmd";
};
propagatedBuildInputs = [
hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex
hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client
];
# No tests

View file

@ -15,7 +15,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ libxml2.dev libxslt.dev ];
buildInputs = [ libxml2 libxslt ];
propagatedBuildInputs = [ libxml2 libxslt ];
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";

View file

@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "mypy";
version = "0.701";
version = "0.711";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
sha256 = "05479r3gbq17r22hyhxjg49smx5q864pgx8ayy23rsdj4w6z2r2p";
sha256 = "0s1kwi1dhrv55v0c9w7c1g6mq5d2dpw7x1jj5mcnniw77mclmvdv";
};
disabled = !isPy3k;

View file

@ -4,8 +4,6 @@
, paramiko
, selectors2
, lxml
, libxml2
, libxslt
, nose
, rednose
}:
@ -22,7 +20,7 @@ buildPythonPackage rec {
checkInputs = [ nose rednose ];
propagatedBuildInputs = [
paramiko lxml libxml2 libxslt selectors2
paramiko lxml selectors2
];
checkPhase = ''

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchFromGitLab
, numpy
, cvxopt
, python
}:
buildPythonPackage rec {
pname = "picos";
version = "1.2.0";
src = fetchFromGitLab {
owner = "picos-api";
repo = "picos";
rev = "v${version}";
sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z";
};
propagatedBuildInputs = [
numpy
cvxopt
];
checkPhase = ''
${python.interpreter} test.py
'';
meta = with lib; {
description = "A Python interface to conic optimization solvers";
homepage = https://gitlab.com/picos-api/picos;
license = licenses.gpl3;
maintainers = with maintainers; [ tobiasBora ];
};
}

View file

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
, pytest, mock, pytestcov, coverage
, pytest, mock, pytestcov, coverage, setuptools
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
providers ? ["*"]
# The following packages are optional and
@ -44,7 +44,7 @@ buildPythonPackage rec {
HOME=$TEMPDIR pytest
'';
propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ]
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ]
++ stdenv.lib.optional (withProvider "autopep8") autopep8
++ stdenv.lib.optional (withProvider "mccabe") mccabe
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle

View file

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi }:
{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi, django, flask, tornado, sanic, aiohttp, bottle, rq, falcon, pyramid, celery }:
buildPythonPackage rec {
pname = "sentry-sdk";
@ -9,6 +9,8 @@ buildPythonPackage rec {
sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965";
};
checkInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ];
propagatedBuildInputs = [ urllib3 certifi ];
meta = with stdenv.lib; {

View file

@ -1,10 +1,12 @@
{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }:
buildPythonPackage rec {
pname = "typed-ast";
version = "1.3.5";
src = fetchPypi{
inherit pname version;
sha256 = "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak";
version = "1.4.0";
src = fetchFromGitHub{
owner = "python";
repo = "typed_ast";
rev = version;
sha256 = "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb";
};
# Only works with Python 3.3 and newer;
disabled = pythonOlder "3.3";

View file

@ -1,30 +1,27 @@
{ stdenv, lib, fetchurl, makeWrapper, jre, gnused
{ stdenv, fetchurl, jre
, disableRemoteLogging ? true
}:
with stdenv.lib;
let
common = { scalaVersion, sha256 }:
stdenv.mkDerivation rec {
pname = "ammonite";
version = "1.7.1";
scalaVersion = "2.12";
src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0";
inherit sha256;
};
propagatedBuildInputs = [ jre ] ;
buildInputs = [ makeWrapper gnused ] ;
phases = "installPhase";
installPhase = ''
mkdir -p $out/bin
cp ${src} $out/bin/amm
chmod +x $out/bin/amm
${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
install -Dm755 ${src} $out/bin/amm
sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
'' + optionalString (disableRemoteLogging) ''
${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
'';
meta = {
@ -36,8 +33,12 @@ stdenv.mkDerivation rec {
that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
'';
homepage = http://www.lihaoyi.com/Ammonite/;
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.nequissimus ];
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.nequissimus ];
};
};
in {
ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; };
ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "01dyc6bilhcr1mwrpmhjc8nhzfqgjh44bx36gd3gk9mkvlbys5mp"; };
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.107.0";
version = "0.108.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b";
sha256 = "13irr1hkv7mxvq57pywmjmqdf5fv359vl5d19w3sra3rqg7vi3ws";
};
installPhase = ''

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "wata727";
repo = pname;
rev = "v${version}";
sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a";
sha256 = "1lhg81bsmzxs46329rlayf8k2y7fbjlmxj09rqbygr9f0693rzgy";
};
modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh";
modSha256 = "10za02363yglhj0pbsd2591rflrrcq12gxx9d53pg9hb7lrxj9ij";
subPackages = [ "." ];

View file

@ -0,0 +1,31 @@
{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec {
pname = "hydra-cli";
version = "0.2.0";
src = fetchFromGitHub {
owner = "nlewo";
repo = pname;
rev = "v${version}";
sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
};
cargoSha256 = "0dqj2pdqfbgg8r3h2s07p3m9zgl9xl4vislbqs6a0f1ahrczlda5";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [
pkgconfig
openssl
];
meta = with stdenv.lib; {
description = "A client for the Hydra CI";
homepage = "https://github.com/nlewo/hydra-cli";
license = with licenses; [ mit ];
maintainers = with maintainers; [ gilligan lewo ];
platforms = platforms.all;
};
}

View file

@ -1,27 +1,16 @@
{ stdenv, fetchurl, autoreconfHook }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "patchelf-${version}";
version = "0.10";
name = "patchelf-0.9";
src = fetchurl {
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
};
# Drop test that fails on musl (?)
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace tests/Makefile.am \
--replace "set-rpath-library.sh" ""
'';
setupHook = [ ./setup-hook.sh ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
# if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6
doCheck = stdenv.hostPlatform.isMusl;
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terraform-lsp";
version = "0.0.6";
version = "0.0.9";
src = fetchFromGitHub {
owner = "juliosueiras";
repo = pname;
rev = "v${version}";
sha256 = "1nalypaw64kdv5zmmb0xgkajhs2gf71ivbxvgwpgvlv2lyidawx5";
sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk";
};
modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2";

View file

@ -1,18 +1,19 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
, gocode ? null
, godef ? null
, gotools ? null
, rustracerd ? null
, fixDarwinDylibNames, Cocoa ? null
}:
stdenv.mkDerivation {
pname = "ycmd";
version = "2018-09-20";
version = "2019-09-19";
src = fetchgit {
url = "https://github.com/Valloric/ycmd.git";
rev = "bf658fd78722c517674c0aaf2381e199bca8f163";
sha256 = "1lwa8xr76vapfpncvp81cn3m9219yw14fl7fzk5gnly60zkphbbl";
rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702";
sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd";
};
nativeBuildInputs = [ cmake ];
@ -49,18 +50,28 @@ stdenv.mkDerivation {
mkdir -p $out/bin
ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
for p in jedi waitress frozendict bottle parso python-future requests; do
cp -r third_party/$p $out/lib/ycmd/third_party
done
# Copy everything: the structure of third_party has been known to change.
# When linking our own libraries below, do so with '-f'
# to clobber anything we may have copied here.
mkdir -p $out/lib/ycmd/third_party
cp -r third_party/* $out/lib/ycmd/third_party/
'' + lib.optionalString (gocode != null) ''
ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
TARGET=$out/lib/ycmd/third_party/gocode
mkdir -p $TARGET
ln -sf ${gocode}/bin/gocode $TARGET
'' + lib.optionalString (godef != null) ''
ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef
TARGET=$out/lib/ycmd/third_party/godef
mkdir -p $TARGET
ln -sf ${godef}/bin/godef $TARGET
'' + lib.optionalString (gotools != null) ''
TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls
mkdir -p $TARGET
ln -sf ${gotools}/bin/gopls $TARGET
'' + lib.optionalString (rustracerd != null) ''
ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
TARGET=$out/lib/ycmd/third_party/racerd/target/release
mkdir -p $TARGET
ln -sf ${rustracerd}/bin/racerd $TARGET
'';
# fixup the argv[0] and replace __file__ with the corresponding path so

View file

@ -2,13 +2,13 @@
perlPackages.buildPerlPackage rec {
pname = "pgformatter";
version = "4.0";
version = "4.1";
src = fetchFromGitHub {
owner = "darold";
repo = "pgFormatter";
rev = "v${version}";
sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2";
sha256 = "1xp26p70zn7mh4qg4w74a690ww43b1csgl92ak9fg8kidgwcbprd";
};
outputs = [ "out" ];

View file

@ -3466,6 +3466,17 @@ let
};
};
vim-gui-position = buildVimPluginFrom2Nix {
pname = "vim-gui-position";
version = "2019-06-06";
src = fetchFromGitHub {
owner = "brennanfee";
repo = "vim-gui-position";
rev = "065d0dcf96c28cfc0003d72c1b3c49203632f62a";
sha256 = "11kv9kkya9sybslg7lfhhcn2fi3n735zvprg8ch6kd58m82xr4n3";
};
};
vim-gutentags = buildVimPluginFrom2Nix {
pname = "vim-gutentags";
version = "2019-05-06";

View file

@ -23,6 +23,7 @@ bitc/vim-hdevtools
bkad/camelcasemotion
bling/vim-bufferline
bogado/file-line
brennanfee/vim-gui-position
bronson/vim-trailing-whitespace
brooth/far.vim
carlitux/deoplete-ternjs

View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.145";
version = "4.14.146";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0aa9b7ni6wadm43260vidqy4ngvws25027psbdnkl9hkcy0ba1gb";
sha256 = "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.74";
version = "4.19.75";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "10pfg5sijw9sx66ybrb06nlmlvj0sxxa1yjhg6qwdhi9sgm2yp29";
sha256 = "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx";
};
} // (args.argsOverride or {}))

View file

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.193";
version = "4.4.194";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a";
sha256 = "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz";
};
} // (args.argsOverride or {}))

View file

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.193";
version = "4.9.194";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "00gx2sg0zc1xz6gs1kdkkd35gn7kjq1bjp1ydc774szsq0f0ircv";
sha256 = "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.2.16";
version = "5.2.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c";
sha256 = "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.3";
version = "5.3.1";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq";
sha256 = "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q";
};
} // (args.argsOverride or {}))

View file

@ -151,7 +151,7 @@ in {
# to be adapted
zfsStable = common {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = "5.3";
# incompatibleKernelVersion = "4.20";
# this package should point to the latest release.
version = "0.8.1";
@ -165,7 +165,7 @@ in {
zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = "5.3";
# incompatibleKernelVersion = "4.19";
# this package should point to a version / git revision compatible with the latest kernel release
version = "0.8.1";

View file

@ -41,6 +41,9 @@ common = rec { # attributes common to both builds
prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
'' + optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/build_configurations/mysql_release.cmake \
--replace "SET(PLUGIN_AUTH_PAM YES)" ""
'';
patches = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-completions";
version = "0.30.0";
version = "0.31.0";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-completions";
repo = pname;
rev = version;
sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
sha256 = "0rw23m8cqxhcb4yjhbzb9lir60zn1xjy7hn3zv1fzz700f0i6fyk";
};
installPhase= ''

View file

@ -1,10 +1,10 @@
{ stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
versionMajor = "6.7";
versionMinor = "6";
versionBuild_x86_64 = "11";
versionBuild_i686 = "11";
versionMajor = "6.8";
versionMinor = "1";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
in
stdenv.mkDerivation rec {
pname = "nomachine-client";
@ -14,12 +14,12 @@ in
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
sha256 = "1mka0a7p03y53zsf0srrcj4f7sigda5vndrwqhr0vncc2qws03k0";
sha256 = "07330sxqjmzdn8kwxn9r49j28lsbp7mmrsxcyl8r32c3g355wskl";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
sha256 = "1g94s65bp99nfmzvwv1wasvjhgjbfg9jkc089qimi0lvr8ajabkx";
sha256 = "03b2648nzmc2amgrqflsxihx5yjp7rz906g655az4j2hl7y0b0bs";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";

View file

@ -5,7 +5,7 @@
assert par2Support -> par2cmdline != null;
let version = "0.29.2"; in
let version = "0.29.3"; in
with stdenv.lib;
@ -17,7 +17,7 @@ stdenv.mkDerivation {
repo = "bup";
owner = "bup";
rev = version;
sha256 = "17lpbyhf43gcln5s43m2zzgichcx7jq6ragcawfklw6svg1vnj89";
sha256 = "1b5ynljd9gs1vzbsa0kggw32s3r4zhbprc2clvjm5qmvnx23hxh8";
};
buildInputs = [

View file

@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
qtx11extras
];
# Disable assertions which include -dev QtBase file paths.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
configureFlags = [
"--without-python"
] ++ (if enableDbus then [

View file

@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, libiconv, darwin }:
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libiconv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "starship";
repo = "starship";
rev = "v${version}";
sha256 = "0vlpvacay25dzb5wix9jd91j0j1nrwz4k8zglj7210mhabfpnxvb";
sha256 = "1xin821lgrdxb50i9p9ya3yfi64l4byf9il4jiijgsjckinxyflj";
};
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
cargoSha256 = "0p16pa9psbj9126b4p61l0skmmasp2ms6c6r5rh3dfr8gg77qzpa";
cargoSha256 = "12yswvhgcmqz0nyarva27pjc4xqqqn3m31y04r3l7ldbzgikn8k6";
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
meta = with stdenv.lib; {

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "croc";
version = "6.1.1";
version = "6.1.3";
goPackagePath = "github.com/schollz/croc";
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "schollz";
repo = pname;
rev = "v${version}";
sha256 = "08gkwllk3m5hpkr1iwabvs739rvl6rzdnra2v040dzdj6zgyd12r";
sha256 = "1qc655y1vvz0bk4rk78fl33s3dqz196zn08aczrb4ipbbj7hp8x8";
};
modSha256 = "026m3hc2imna7bf4jpqm7yq6mr4l5is2crsx1vxdpr4h0n6z0v3i";
modSha256 = "00bnf4dc3i41s9wjpbc59nn7jwlhvp2zhdrjhjn5fwbc95pm4gm0";
subPackages = [ "." ];
meta = with stdenv.lib; {

View file

@ -576,7 +576,10 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
ammonite = callPackage ../development/tools/ammonite {};
inherit (callPackages ../development/tools/ammonite {})
ammonite_2_12
ammonite_2_13;
ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13;
amp = callPackage ../applications/editors/amp {};
@ -9146,6 +9149,8 @@ in
awf = callPackage ../development/tools/misc/awf { };
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
electron_6 = callPackage ../development/tools/electron/6.x.nix { };
electron_5 = callPackage ../development/tools/electron/5.x.nix { };
@ -11322,6 +11327,8 @@ in
hydra = callPackage ../development/tools/misc/hydra { };
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
hyena = callPackage ../development/libraries/hyena { };
@ -12847,6 +12854,8 @@ in
one_gadget = callPackage ../development/tools/misc/one_gadget { };
onedrive = callPackage ../applications/networking/sync/onedrive { };
oneko = callPackage ../applications/misc/oneko { };
oniguruma = callPackage ../development/libraries/oniguruma { };
@ -16603,6 +16612,8 @@ in
carlito = callPackage ../data/fonts/carlito {};
cascadia-code = callPackage ../data/fonts/cascadia-code { };
charis-sil = callPackage ../data/fonts/charis-sil { };
cherry = callPackage ../data/fonts/cherry { };
@ -17220,6 +17231,8 @@ in
yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {};
yaru-theme = callPackage ../data/themes/yaru {};
zafiro-icons = callPackage ../data/icons/zafiro-icons { };
zeal = libsForQt5.callPackage ../data/documentation/zeal { };
@ -18732,7 +18745,7 @@ in
spotifyd = callPackage ../applications/audio/spotifyd {
withALSA = stdenv.isLinux;
withPulseAudio = config.pulseaudio or true;
withPulseAudio = config.pulseaudio or stdenv.isLinux;
withPortAudio = stdenv.isDarwin;
};

View file

@ -1277,6 +1277,8 @@ in {
addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { };
algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
altair = callPackage ../development/python-modules/altair { };
vega = callPackage ../development/python-modules/vega { };
@ -4196,6 +4198,8 @@ in {
pickleshare = callPackage ../development/python-modules/pickleshare { };
picos = callPackage ../development/python-modules/picos { };
piep = callPackage ../development/python-modules/piep { };
piexif = callPackage ../development/python-modules/piexif { };