From 87cbb862148fac257c991949f6cebd9ce6c51a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giumo=20X=2E=20Clanjor=20=28=E5=93=86=E5=95=A6=E6=AF=94?= =?UTF-8?q?=E7=8C=AB/=E5=85=B0=E5=A8=81=E4=B8=BE=29?= Date: Tue, 4 Jul 2017 21:12:47 +0800 Subject: [PATCH 001/538] systemd.nspawn: fix missing suffix Fix files placed in `/etc/systemd/nspawn/` missing `.nspawn` suffix --- nixos/modules/system/boot/systemd-nspawn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index 8fa9f8b795e5..64b3b8b584e3 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -110,7 +110,7 @@ in { config = let - units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg; + units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg; in mkIf (cfg != {}) { environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; From 3fc83370e0cdae7cebf73d74d71fa71b68e3d790 Mon Sep 17 00:00:00 2001 From: hectorj Date: Sun, 9 Jul 2017 12:44:34 +0200 Subject: [PATCH 002/538] zipkin-server: init at 1.28.1 --- pkgs/servers/monitoring/zipkin/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/monitoring/zipkin/default.nix diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix new file mode 100644 index 000000000000..2925a8f2dc53 --- /dev/null +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, makeWrapper, jre}: +stdenv.mkDerivation rec { + version = "1.28.1"; + name = "zipkin-server-${version}"; + src = fetchurl { + url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; + sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; + }; + buildInputs = [ makeWrapper ]; + + buildCommand = + '' + mkdir -p $out/share/java + cp ${src} $out/share/java/zipkin-server-${version}-exec.jar + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/zipkin-server \ + --add-flags "-cp $out/share/java/zipkin-server-${version}-exec.jar org.springframework.boot.loader.JarLauncher" + ''; + meta = with stdenv.lib; { + description = "Zipkin distributed tracing system"; + homepage = "http://zipkin.io/"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.hectorj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b62908e2798b..d839dd8f7fc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11560,6 +11560,8 @@ with pkgs; zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; + zipkin-server = callPackage ../servers/monitoring/zipkin { }; + ### OS-SPECIFIC From 6e9f0f6dede257ab7ac6aa6ef2fc7bc40f8583d8 Mon Sep 17 00:00:00 2001 From: hectorj Date: Sun, 9 Jul 2017 18:19:20 +0200 Subject: [PATCH 003/538] remove extra-line --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d839dd8f7fc8..360dcba7a464 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11562,7 +11562,6 @@ with pkgs; zipkin-server = callPackage ../servers/monitoring/zipkin { }; - ### OS-SPECIFIC afuse = callPackage ../os-specific/linux/afuse { }; From 8317144e43965d3d6b2e3aa74d8440322e39e202 Mon Sep 17 00:00:00 2001 From: hectorj Date: Sun, 9 Jul 2017 18:26:09 +0200 Subject: [PATCH 004/538] zipkin-server => zipkin in all-packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 360dcba7a464..ca483059c161 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11560,7 +11560,7 @@ with pkgs; zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; - zipkin-server = callPackage ../servers/monitoring/zipkin { }; + zipkin = callPackage ../servers/monitoring/zipkin { }; ### OS-SPECIFIC From da3658f1bf26a6720d7958f588c553766e283151 Mon Sep 17 00:00:00 2001 From: Ilya Kolpakov Date: Mon, 6 Nov 2017 15:13:35 +0100 Subject: [PATCH 005/538] docs: multiple outputs: now mentions glibc as not having executables in the first output contrary to the convention --- doc/multiple-output.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index a2acc91e55a2..dc389c6757af 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -36,10 +36,16 @@ Here you find how to write a derivation that produces multiple outputs. In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; it's relatively well-readable. The whole machinery is triggered by defining the outputs attribute to contain the list of desired output names (strings). outputs = [ "bin" "dev" "out" "doc" ]; - Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should contain the executable programs provided by the package as that output is used by Nix in string conversions, allowing references to binaries like ${pkgs.perl}/bin/perl to always work. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere. - + Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere. There is a special handling of the debug output, described at . +
+ <quote>Binaries first</quote> + A commonly adopted convention in nixpkgs is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the perl package contains a perl executable it can be referenced as ${pkgs.perl}/bin/perl within a Nix derivation that needs to execute a Perl script. + The glibc package is a deliberate single exception to the binaries first convention. The glibc has libs as its first output allowing the libraries provided by glibc to be referenced directly (e.g. ${stdenv.glibc}/lib/ld-linux-x86-64.so.2). The executables provided by glibc can be accessed via its bin attribute (e.g. ${stdenv.glibc.bin}/bin/ldd). + The reason for why glibc deviates from the convention is because referencing a library provided by glibc is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of glibc libraries from Nix packages (please see the documentation on patchelf for more details). +
+
File type groups The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. From e4afe8fc6c19ca62baa6e7c2c1bb64d7b09f3440 Mon Sep 17 00:00:00 2001 From: Ilya Kolpakov Date: Mon, 6 Nov 2017 16:47:30 +0100 Subject: [PATCH 006/538] glibc: comments on bin not being the first output The glibc package does not respect a standard convention to put the executables in the first output which should be as clear as possible to anyone seeking to use such executables (e.g. `ldd`). This commit adds a detailed comment a the top of `common.nix` explaining the deviation from the convention and how to reference the binaries. --- pkgs/development/libraries/glibc/common.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5c7bbb32c330..f0a7e5703e95 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -1,5 +1,21 @@ /* Build configuration used to build glibc, Info files, and locale - information. */ + information. + + Note that this derivation has multiple outputs and does not respect the + standard convention of putting the executables into the first output. The + first output is `lib` so that the libraries provided by this derivation + can be accessed directly, e.g. + + "${pkgs.glibc}/lib/ld-linux-x86_64.so.2" + + The executables are put into `bin` output and need to be referenced via + the `bin` attribute of the main package, e.g. + + "${pkgs.glibc.bin}/bin/ldd". + + The executables provided by glibc typically include `ldd`, `locale`, `iconv` + but the exact set depends on the library version and the configuration. +*/ { stdenv, lib , buildPlatform, hostPlatform From 9826f5cc3cd9d1c2e31d8110952018bdf8f1a956 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 15 Nov 2017 15:33:30 +0100 Subject: [PATCH 007/538] nixos/nsd: automatic DNSSEC using BIND toolset --- nixos/modules/services/networking/nsd.nix | 137 +++++++++++++++++++++- pkgs/servers/dns/bind/default.nix | 11 +- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 142 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index c8b8ed547ebb..636af4bbc31b 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -248,6 +248,46 @@ let Use imports or pkgs.lib.readFile if you don't want this data in your config file. ''; }; + + dnssec = mkEnableOption "DNSSEC"; + + dnssecPolicy = { + algorithm = mkOption { + type = types.str; + default = "RSASHA256"; + description = "Which algorithm to use for DNSSEC"; + }; + keyttl = mkOption { + type = types.str; + default = "1h"; + description = "TTL for dnssec records"; + }; + coverage = mkOption { + type = types.str; + default = "1y"; + description = '' + The length of time to ensure that keys will be correct; no action will be taken to create new keys to be activated after this time. + ''; + }; + zsk = mkOption { + type = keyPolicy; + default = { keySize = 2048; + prePublish = "1w"; + postPublish = "1w"; + rollPeriod = "1mo"; + }; + description = "Key policy for zone signing keys"; + }; + ksk = mkOption { + type = keyPolicy; + default = { keySize = 4096; + prePublish = "1mo"; + postPublish = "1mo"; + rollPeriod = "0"; + }; + description = "Key policy for key signing keys"; + }; + }; maxRefreshSecs = mkOption { type = types.nullOr types.int; @@ -365,10 +405,61 @@ let and stats_noreset. ''; }; - }; }; + keyPolicy = types.submodule { + options = { + keySize = mkOption { + type = types.int; + description = "Key size in bits"; + }; + prePublish = mkOption { + type = types.str; + description = "How long in advance to publish new keys"; + }; + postPublish = mkOption { + type = types.str; + description = "How long after deactivation to keep a key in the zone"; + }; + rollPeriod = mkOption { + type = types.str; + description = "How frequently to change keys"; + }; + }; + }; + + dnssecZones = (filterAttrs (n: v: if v ? dnssec then v.dnssec else false) zoneConfigs); + + dnssec = length (attrNames dnssecZones) != 0; + + signZones = optionalString dnssec '' + mkdir -p ${stateDir}/dnssec + chown ${username}:${username} ${stateDir}/dnssec + chmod 0600 ${stateDir}/dnssec + + ${concatStrings (mapAttrsToList signZone dnssecZones)} + ''; + signZone = name: zone: '' + ${pkgs.bind}/bin/dnssec-keymgr -g ${pkgs.bind}/bin/dnssec-keygen -s ${pkgs.bind}/bin/dnssec-settime -K ${stateDir}/dnssec -c ${policyFile name zone.dnssecPolicy} ${name} + ${pkgs.bind}/bin/dnssec-signzone -S -K ${stateDir}/dnssec -o ${name} -O full -N date ${stateDir}/zones/${name} + ${nsdPkg}/sbin/nsd-checkzone ${name} ${stateDir}/zones/${name}.signed && mv -v ${stateDir}/zones/${name}.signed ${stateDir}/zones/${name} + ''; + policyFile = name: policy: pkgs.writeText "${name}.policy" '' + zone ${name} { + algorithm ${policy.algorithm}; + key-size zsk ${toString policy.zsk.keySize}; + key-size ksk ${toString policy.ksk.keySize}; + keyttl ${policy.keyttl}; + pre-publish zsk ${policy.zsk.prePublish}; + pre-publish ksk ${policy.ksk.prePublish}; + post-publish zsk ${policy.zsk.postPublish}; + post-publish ksk ${policy.ksk.postPublish}; + roll-period zsk ${policy.zsk.rollPeriod}; + roll-period ksk ${policy.ksk.rollPeriod}; + coverage ${policy.coverage}; + }; + ''; in { # options are ordered alphanumerically @@ -378,6 +469,14 @@ in bind8Stats = mkEnableOption "BIND8 like statistics"; + dnssecInterval = mkOption { + type = types.str; + default = "1h"; + description = '' + How often to check whether dnssec key rollover is required + ''; + }; + extraConfig = mkOption { type = types.str; default = ""; @@ -739,7 +838,6 @@ in }; - zones = mkOption { type = types.attrsOf zoneOptions; default = {}; @@ -783,7 +881,6 @@ in serverGroup1. ''; }; - }; config = mkIf cfg.enable { @@ -828,9 +925,9 @@ in mkdir -m 0700 -p "${stateDir}/var" cat > "${stateDir}/don't touch anything in here" << EOF - Everything in this directory except NSD's state in var is - automatically generated and will be purged and redeployed - by the nsd.service pre-start script. + Everything in this directory except NSD's state in var and dnssec + is automatically generated and will be purged and redeployed by + the nsd.service pre-start script. EOF chown ${username}:${username} -R "${stateDir}/private" @@ -844,5 +941,33 @@ in ''; }; + nixpkgs.config = mkIf dnssec { + bind.enablePython = true; + }; + + systemd.timers."nsd-dnssec" = mkIf dnssec { + description = "Automatic DNSSEC key rollover"; + + wantedBy = [ "nsd.service" ]; + + timerConfig = { + OnActiveSec = cfg.dnssecInterval; + OnUnitActiveSec = cfg.dnssecInterval; + }; + }; + + systemd.services."nsd-dnssec" = mkIf dnssec { + description = "DNSSEC key rollover"; + + wantedBy = [ "nsd.service" ]; + before = [ "nsd.service" ]; + + script = signZones; + + postStop = '' + ${pkgs.systemd}/bin/systemctl kill -s SIGHUP nsd.service + ''; + }; + }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index bf7a7266022e..c52761e66b6f 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,7 +1,9 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 -, enableSeccomp ? false, libseccomp ? null }: +, enableSeccomp ? false, libseccomp ? null +, enablePython ? false, python ? null }: assert enableSeccomp -> libseccomp != null; +assert enablePython -> python != null; let version = "9.11.2"; in @@ -18,8 +20,9 @@ stdenv.mkDerivation rec { patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; - buildInputs = [ openssl libtool perl libxml2 ] ++ - stdenv.lib.optional enableSeccomp libseccomp; + buildInputs = [ openssl libtool perl libxml2 ] + ++ lib.optional enableSeccomp libseccomp + ++ lib.optional enablePython python; STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase @@ -28,6 +31,7 @@ stdenv.mkDerivation rec { "--with-libtool" "--with-libxml2=${libxml2.dev}" "--with-openssl=${openssl.dev}" + (if enablePython then "--with-python" else "--without-python") "--without-atf" "--without-dlopen" "--without-docbook-xsl" @@ -36,7 +40,6 @@ stdenv.mkDerivation rec { "--without-idnlib" "--without-pkcs11" "--without-purify" - "--without-python" ] ++ lib.optional enableSeccomp "--enable-seccomp"; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46a1976adc1c..35bf5e73d1c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11462,7 +11462,10 @@ with pkgs; bftpd = callPackage ../servers/ftp/bftpd {}; - bind = callPackage ../servers/dns/bind { }; + bind = callPackage ../servers/dns/bind { + enablePython = config.bind.enablePython or false; + python = python.withPackages (ps: with ps; [ ply ]); + }; dnsutils = bind.dnsutils; bird = callPackage ../servers/bird { }; From a2e40f72547a888066698a41fa54ca4c675aaad0 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 17 Nov 2017 14:03:30 +0100 Subject: [PATCH 008/538] nixpkgs/bind: use python3 --- pkgs/servers/dns/bind/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index c52761e66b6f..427497bff0f9 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 , enableSeccomp ? false, libseccomp ? null -, enablePython ? false, python ? null }: +, enablePython ? false, python3 ? null }: assert enableSeccomp -> libseccomp != null; -assert enablePython -> python != null; +assert enablePython -> python3 != null; let version = "9.11.2"; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libtool perl libxml2 ] ++ lib.optional enableSeccomp libseccomp - ++ lib.optional enablePython python; + ++ lib.optional enablePython python3; STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35bf5e73d1c4..3ff006b36caa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11464,7 +11464,7 @@ with pkgs; bind = callPackage ../servers/dns/bind { enablePython = config.bind.enablePython or false; - python = python.withPackages (ps: with ps; [ ply ]); + python3 = python3.withPackages (ps: with ps; [ ply ]); }; dnsutils = bind.dnsutils; From de67f50351b4e35155b40c341452abbd078ede9a Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Wed, 22 Nov 2017 18:07:04 +0100 Subject: [PATCH 009/538] Update sssd integration with pam as documented by RedHat --- nixos/modules/security/pam.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 2d6713311a45..e3bbcad12026 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -222,6 +222,11 @@ let password, KDE will prompt separately after login. ''; }; + sssdStrictAccess = mkOption { + default = false; + type = types.bool; + description = "enforce sssd access control"; + }; text = mkOption { type = types.nullOr types.lines; @@ -241,11 +246,13 @@ let text = mkDefault ('' # Account management. - account sufficient pam_unix.so + account ${if cfg.sssdStrictAccess then "required" else "sufficient"} pam_unix.so ${optionalString use_ldap "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.services.sssd.enable + ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) "account sufficient ${pkgs.sssd}/lib/security/pam_sss.so"} + ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) + "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"} ${optionalString config.krb5.enable "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} From 9fad70f1de9918ad6a280fe8ac243173b0329789 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Sat, 28 Oct 2017 22:29:53 +0100 Subject: [PATCH 010/538] boinc service: use an FHS environment While BOINC itself is open source, many of the project applications it runs are not. Additionally, these project applications are checksummed before they are run, so they can't be patched. This means we can't make the project applications find required binaries/libraries on a NixOS system. The solution is therefore to make said binaries and libraries appear in the expected locations, by wrapping BOINC in an FHS-compatible environment [1]. An `extraEnvPackages` is also added to allow more packages to be added into this environment. The documentation for this option describes some practical use cases for it. [1] https://nixos.org/nixpkgs/manual/#sec-fhs-environments Version 2: fixed Docbook list formatting, minor rewording Version 3: rebase onto master (9c048f4fb66adc33c6b379f2edefcb615fd53de6) Version 4: fix usage of targetPkgs argument to buildFHSUserEnv --- .../services/computing/boinc/client.nix | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index e43b6bbb2536..8abe3c5b8c9b 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -6,6 +6,13 @@ let cfg = config.services.boinc; allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc"; + fhsEnv = pkgs.buildFHSUserEnv { + name = "boinc-fhs-env"; + targetPkgs = pkgs': [ cfg.package ] ++ cfg.extraEnvPackages; + runScript = "/bin/boinc_client"; + }; + fhsEnvExecutable = "${fhsEnv}/bin/${fhsEnv.name}"; + in { options.services.boinc = { @@ -49,6 +56,43 @@ in See also: ''; }; + + extraEnvPackages = mkOption { + type = types.listOf types.package; + default = []; + example = "[ pkgs.virtualbox ]"; + description = '' + Additional packages to make available in the environment in which + BOINC will run. Common choices are: + + + pkgs.virtualbox + + The VirtualBox virtual machine framework. Required by some BOINC + projects, such as ATLAS@home. + + + + pkgs.ocl-icd + + OpenCL infrastructure library. Required by BOINC projects that + use OpenCL, in addition to a device-specific OpenCL driver. + + + + pkgs.linuxPackages.nvidia_x11 + + Provides CUDA libraries. Required by BOINC projects that use + CUDA. Note that this requires an NVIDIA graphics device to be + present on the system. + + Also provides OpenCL drivers for NVIDIA GPUs; + pkgs.ocl-icd is also needed in this case. + + + + ''; + }; }; config = mkIf cfg.enable { @@ -70,7 +114,7 @@ in chown boinc ${cfg.dataDir} ''; script = '' - ${cfg.package}/bin/boinc_client --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} + ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} ''; serviceConfig = { PermissionsStartOnly = true; # preStart must be run as root From 5027f3f9f9c2352bfbac3a97a83673c97ee0d8fa Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 4 Dec 2017 15:52:38 +0100 Subject: [PATCH 011/538] Add bash to jira PATH: required by health checks. --- nixos/modules/services/web-apps/atlassian/jira.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 81ee8154326c..13c5951524d9 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -155,7 +155,7 @@ in requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; - path = [ cfg.jrePackage ]; + path = [ cfg.jrePackage pkgs.bash ]; environment = { JIRA_USER = cfg.user; From 6bf1232a52f52e57a792379e0b5c7ead3337ce9b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 8 Jan 2018 03:26:30 +0000 Subject: [PATCH 012/538] wineStaging: rename to wine-staging --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a93350f52f46..7d8798694b44 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -163,6 +163,7 @@ mapAliases (rec { vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 + wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3008f2975eaf..7bedd5b71256 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19975,7 +19975,7 @@ with pkgs; wine = winePackages.base; - wineStaging = lowPrio (winePackages.full.override { + wine-staging = lowPrio (winePackages.full.override { wineRelease = "staging"; }); From afaa1adf1aa2373d56140e620b81b63bf3e7ac60 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 8 Jan 2018 03:27:43 +0000 Subject: [PATCH 013/538] wine: build full instead of base Build type should not depend on version being used. It is very confusing that e.g. Morrowind doesn't work on wine but works on wineStaging, and that depends on whether it was built with mpg123 or not. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bedd5b71256..1a6fcf1e18a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19973,7 +19973,7 @@ with pkgs; staging = base.override { wineRelease = "staging"; }; }; - wine = winePackages.base; + wine = winePackages.full; wine-staging = lowPrio (winePackages.full.override { wineRelease = "staging"; From 9cdb7fe72285db3369039017c5aa935cccba305d Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 20 Feb 2018 16:40:39 +0000 Subject: [PATCH 014/538] monit: cross-compile, and make openssl optional Upstream Monit optionally uses OpenSSL to provide TLS support in its builtin admin web server. Being able to turn off SSL in Nixpkgs' monit derivation makes it much easier to build Monit on embedded systems. Security implication: if you choose not to build in openssl then you should probably configure Monit to allow access only from localhost. --- pkgs/tools/system/monit/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 71a4db63c84f..12a0a6f1b99e 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,5 +1,7 @@ -{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }: - +{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux + , buildPlatform, hostPlatform }: +let useSSL = (openssl != null); + isCross = ( buildPlatform != hostPlatform ) ; in stdenv.mkDerivation rec { name = "monit-5.23.0"; @@ -9,12 +11,19 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex ]; - buildInputs = [ openssl zlib.dev ] ++ stdenv.lib.optionals usePAM [ pam ]; + buildInputs = [ zlib.dev ] ++ + stdenv.lib.optionals useSSL [ openssl ] ++ + stdenv.lib.optionals usePAM [ pam ]; - configureFlags = [ - "--with-ssl-incl-dir=${openssl.dev}/include" - "--with-ssl-lib-dir=${openssl.out}/lib" - ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ]; + configureFlags = + if useSSL then [ + "--with-ssl-incl-dir=${openssl.dev}/include" + "--with-ssl-lib-dir=${openssl.out}/lib" + ] else [ "--without-ssl" ] ++ + stdenv.lib.optionals (! usePAM) [ "--without-pam" ] ++ + # will need to check both these are true for musl + stdenv.lib.optionals isCross [ "libmonit_cv_setjmp_available=yes" + "libmonit_cv_vsnprintf_c99_conformant=yes"]; meta = { homepage = http://mmonit.com/monit/; From ee01a291a00b17f14dfdc6b912accd49f1fa5e31 Mon Sep 17 00:00:00 2001 From: Robert Danitz Date: Wed, 21 Feb 2018 12:29:04 +0100 Subject: [PATCH 015/538] perl-iCal-Parser: init at 1.21 Add iCal::Parser module from CPAN. --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee87a49185fd..361319b9ecf9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7043,6 +7043,18 @@ let self = _self // overrides; _self = with self; { }; }; + iCalParser = buildPerlPackage rec { + name = "iCal-Parser-1.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RI/RIXED/${name}.tar.gz"; + sha256 = "0d7939a644a8e67017ec7239d3d9604f3986bb9a4ff80be68fe7299ebfd2270c"; + }; + propagatedBuildInputs = [ DateTimeFormatICal FreezeThaw IOString TextvFileasData ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + "if" = null; # For backwards compatibility. From bd24b3addd46ff660d8ad6cc32a58aecd4715374 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 5 Aug 2017 14:01:52 +0200 Subject: [PATCH 016/538] nixos: add the strongswan-swanctl service The strongswan-swanctl systemd service starts charon-systemd. This implements a IKE daemon very similar to charon, but it's specifically designed for use with systemd. It uses the systemd libraries for a native integration. Instead of using starter and an ipsec.conf based configuration, the daemon is directly managed by systemd and configured with the swanctl configuration backend. See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd Note that the strongswan.conf and swantctl.conf configuration files are automatically generated based on NixOS options under services.strongswan-swanctl.strongswan and services.strongswan-swanctl.swanctl respectively. --- nixos/modules/module-list.nix | 1 + .../networking/strongswan-swanctl/module.nix | 80 ++ .../strongswan-swanctl/param-constructors.nix | 162 +++ .../strongswan-swanctl/param-lib.nix | 82 ++ .../strongswan-charon-params.nix | 568 ++++++++ .../strongswan-charon-plugins-params.nix | 1070 +++++++++++++++ .../strongswan-libimcv-params.nix | 291 +++++ .../strongswan-loglevel-params.nix | 29 + .../strongswan-swanctl/strongswan-params.nix | 228 ++++ .../strongswan-swanctl/swanctl-params.nix | 1145 +++++++++++++++++ nixos/release.nix | 1 + nixos/tests/strongswan-swanctl.nix | 154 +++ 12 files changed, 3811 insertions(+) create mode 100644 nixos/modules/services/networking/strongswan-swanctl/module.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/param-lib.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix create mode 100644 nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix create mode 100644 nixos/tests/strongswan-swanctl.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 13a32b968dcb..f9545740adef 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -560,6 +560,7 @@ ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix ./services/networking/strongswan.nix + ./services/networking/strongswan-swanctl/module.nix ./services/networking/stunnel.nix ./services/networking/supplicant.nix ./services/networking/supybot.nix diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix new file mode 100644 index 000000000000..8bfb62e6b031 --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; +with (import ./param-lib.nix lib); + +let + cfg = config.services.strongswan-swanctl; + + # TODO: auto-generate these files using: + # https://github.com/strongswan/strongswan/tree/master/conf + # IDEA: extend the format-options.py script to output these Nix files. + strongswanParams = import ./strongswan-params.nix lib; + swanctlParams = import ./swanctl-params.nix lib; +in { + options.services.strongswan-swanctl = { + enable = mkEnableOption "strongswan-swanctl service"; + + package = mkOption { + type = types.package; + default = pkgs.strongswan; + defaultText = "pkgs.strongswan"; + description = '' + The strongswan derivation to use. + ''; + }; + + strongswan = paramsToOptions strongswanParams; + swanctl = paramsToOptions swanctlParams; + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = !config.services.strongswan.enable; + message = "cannot enable both services.strongswan and services.strongswan-swanctl. Choose either one."; + } + ]; + + environment.etc."swanctl/swanctl.conf".text = + paramsToConf cfg.swanctl swanctlParams; + + # The swanctl command complains when the following directories don't exist: + # See: https://wiki.strongswan.org/projects/strongswan/wiki/Swanctldirectory + system.activationScripts.strongswan-swanctl-etc = stringAfter ["etc"] '' + mkdir -p '/etc/swanctl/x509' # Trusted X.509 end entity certificates + mkdir -p '/etc/swanctl/x509ca' # Trusted X.509 Certificate Authority certificates + mkdir -p '/etc/swanctl/x509ocsp' + mkdir -p '/etc/swanctl/x509aa' # Trusted X.509 Attribute Authority certificates + mkdir -p '/etc/swanctl/x509ac' # Attribute Certificates + mkdir -p '/etc/swanctl/x509crl' # Certificate Revocation Lists + mkdir -p '/etc/swanctl/pubkey' # Raw public keys + mkdir -p '/etc/swanctl/private' # Private keys in any format + mkdir -p '/etc/swanctl/rsa' # PKCS#1 encoded RSA private keys + mkdir -p '/etc/swanctl/ecdsa' # Plain ECDSA private keys + mkdir -p '/etc/swanctl/bliss' + mkdir -p '/etc/swanctl/pkcs8' # PKCS#8 encoded private keys of any type + mkdir -p '/etc/swanctl/pkcs12' # PKCS#12 containers + ''; + + systemd.services.strongswan-swanctl = { + description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" "keys.target" ]; + wants = [ "keys.target" ]; + path = with pkgs; [ kmod iproute iptables utillinux ]; + environment.STRONGSWAN_CONF = pkgs.writeTextFile { + name = "strongswan.conf"; + text = paramsToConf cfg.strongswan strongswanParams; + }; + restartTriggers = [ config.environment.etc."swanctl/swanctl.conf".source ]; + serviceConfig = { + ExecStart = "${cfg.package}/sbin/charon-systemd"; + Type = "notify"; + ExecStartPost = "${cfg.package}/sbin/swanctl --load-all --noprompt"; + ExecReload = "${cfg.package}/sbin/swanctl --reload"; + Restart = "on-abnormal"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix new file mode 100644 index 000000000000..5e74a96664f0 --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -0,0 +1,162 @@ +# In the following context a parameter is an attribute set that +# contains a NixOS option and a render function. It also contains the +# attribute: '_type = "param"' so we can distinguish it from other +# sets. +# +# The render function is used to convert the value of the option to a +# snippet of strongswan.conf. Most parameters simply render their +# value to a string. For example, take the following parameter: +# +# threads = mkIntParam 10 "Threads to use for request handling."; +# +# When a users defines the corresponding option as for example: +# +# services.strongswan-swanctl.strongswan.threads = 32; +# +# It will get rendered to the following snippet in strongswan.conf: +# +# threads = 32 +# +# Some parameters however need to be able to change the attribute +# name. For example, take the following parameter: +# +# id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") "..."; +# +# A user can define the corresponding option as for example: +# +# id = { +# "foo" = "bar"; +# "baz" = "qux"; +# }; +# +# This will get rendered to the following snippet: +# +# foo-id = bar +# baz-id = qux +# +# For this reason the render function is not simply a function from +# value -> string but a function from a value to an attribute set: +# { "${name}" = string }. This allows parameters to change the attribute +# name like in the previous example. + +lib : + +with lib; +with (import ./param-lib.nix lib); + +rec { + mkParamOfType = type : strongswanDefault : description : { + _type = "param"; + option = mkOption { + type = types.nullOr type; + default = null; + description = documentDefault description strongswanDefault; + }; + render = single toString; + }; + + documentDefault = description : strongswanDefault : + if isNull strongswanDefault + then description + else description + '' + + StrongSwan default: + ''; + + single = f: name: value: { "${name}" = f value; }; + + mkStrParam = mkParamOfType types.str; + mkOptionalStrParam = mkStrParam null; + + mkEnumParam = values : mkParamOfType (types.enum values); + + mkIntParam = mkParamOfType types.int; + mkOptionalIntParam = mkIntParam null; + + # We should have floats in Nix... + mkFloatParam = mkStrParam; + + # TODO: Check for hex format: + mkHexParam = mkStrParam; + mkOptionalHexParam = mkOptionalStrParam; + + # TODO: Check for duration format: + mkDurationParam = mkStrParam; + mkOptionalDurationParam = mkOptionalStrParam; + + mkYesNoParam = strongswanDefault : description : { + _type = "param"; + option = mkOption { + type = types.nullOr types.bool; + default = null; + description = documentDefault description strongswanDefault; + }; + render = single (b: if b then "yes" else "no"); + }; + yes = true; + no = false; + + mkSpaceSepListParam = mkSepListParam " "; + mkCommaSepListParam = mkSepListParam ","; + + mkSepListParam = sep : strongswanDefault : description : { + _type = "param"; + option = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + description = documentDefault description strongswanDefault; + }; + render = single (value: concatStringsSep sep value); + }; + + mkAttrsOfParams = params : + mkAttrsOf params (types.submodule {options = paramsToOptions params;}); + + mkAttrsOfParam = param : + mkAttrsOf param param.option.type; + + mkAttrsOf = param : option : description : { + _type = "param"; + option = mkOption { + type = types.attrsOf option; + default = {}; + inherit description; + }; + render = single (attrs: + (paramsToRenderedStrings attrs + (mapAttrs (_n: _v: param) attrs))); + }; + + mkPrefixedAttrsOfParams = params : + mkPrefixedAttrsOf params (types.submodule {options = paramsToOptions params;}); + + mkPrefixedAttrsOfParam = param : + mkPrefixedAttrsOf param param.option.type; + + mkPrefixedAttrsOf = p : option : description : { + _type = "param"; + option = mkOption { + type = types.attrsOf option; + default = {}; + inherit description; + }; + render = prefix: attrs: + let prefixedAttrs = mapAttrs' (name: nameValuePair "${prefix}-${name}") attrs; + in paramsToRenderedStrings prefixedAttrs + (mapAttrs (_n: _v: p) prefixedAttrs); + }; + + mkPostfixedAttrsOfParams = params : description : { + _type = "param"; + option = mkOption { + type = types.attrsOf (types.submodule {options = paramsToOptions params;}); + default = {}; + inherit description; + }; + render = postfix: attrs: + let postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs; + in paramsToRenderedStrings postfixedAttrs + (mapAttrs (_n: _v: params) postfixedAttrs); + }; + +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix new file mode 100644 index 000000000000..fb87e81f3215 --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/param-lib.nix @@ -0,0 +1,82 @@ +lib : + +with lib; + +rec { + paramsToConf = cfg : ps : mkConf 0 (paramsToRenderedStrings cfg ps); + + # mkConf takes an indentation level (which usually starts at 0) and a nested + # attribute set of strings and will render that set to a strongswan.conf style + # configuration format. For example: + # + # mkConf 0 {a = "1"; b = { c = { "foo" = "2"; "bar" = "3"; }; d = "4";};} => '' + # a = 1 + # b { + # c { + # foo = 2 + # bar = 3 + # } + # d = 4 + # }'' + mkConf = indent : ps : + concatMapStringsSep "\n" + (name: + let value = ps."${name}"; + indentation = replicate indent " "; + in + indentation + ( + if isAttrs value + then "${name} {\n" + + mkConf (indent + 2) value + "\n" + + indentation + "}" + else "${name} = ${value}" + ) + ) + (attrNames ps); + + replicate = n : c : concatStrings (builtins.genList (_x : c) n); + + # `paramsToRenderedStrings cfg ps` converts the NixOS configuration `cfg` + # (typically the "config" argument of a NixOS module) and the set of + # parameters `ps` (an attribute set where the values are constructed using the + # parameter constructors in ./param-constructors.nix) to a nested attribute + # set of strings (rendered parameters). + paramsToRenderedStrings = cfg : ps : + filterEmptySets ( + (mapParamsRecursive (path: name: param: + let value = attrByPath path null cfg; + in optionalAttrs (!isNull value) (param.render name value) + ) ps)); + + filterEmptySets = set : filterAttrs (n: v: !(isNull v)) (mapAttrs (name: value: + if isAttrs value + then let value' = filterEmptySets value; + in if value' == {} + then null + else value' + else value + ) set); + + # Recursively map over every parameter in the given attribute set. + mapParamsRecursive = mapAttrsRecursiveCond' (as: (!(as ? "_type" && as._type == "param"))); + + mapAttrsRecursiveCond' = cond: f: set: + let + recurse = path: set: + let + g = + name: value: + if isAttrs value && cond value + then { "${name}" = recurse (path ++ [name]) value; } + else f (path ++ [name]) name value; + in mapAttrs'' g set; + in recurse [] set; + + mapAttrs'' = f: set: + foldl' (a: b: a // b) {} (map (attr: f attr set.${attr}) (attrNames set)); + + # Extract the options from the given set of parameters. + paramsToOptions = ps : + mapParamsRecursive (_path: name: param: { "${name}" = param.option; }) ps; + +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix new file mode 100644 index 000000000000..3eec9886811e --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix @@ -0,0 +1,568 @@ +lib: with (import ./param-constructors.nix lib); + +let loglevelParams = import ./strongswan-loglevel-params.nix lib; +in { + accept_unencrypted_mainmode_messages = mkYesNoParam no '' + Accept unencrypted ID and HASH payloads in IKEv1 Main Mode. Some + implementations send the third Main Mode message unencrypted, probably + to find the PSKs for the specified ID for authentication. This is very + similar to Aggressive Mode, and has the same security implications: A + passive attacker can sniff the negotiated Identity, and start brute + forcing the PSK using the HASH payload. It is recommended to keep this + option to no, unless you know exactly what the implications are and + require compatibility to such devices (for example, some SonicWall + boxes). + ''; + + block_threshold = mkIntParam 5 '' + Maximum number of half-open IKE_SAs for a single peer IP. + ''; + + cache_crls = mkYesNoParam no '' + Whether Certicate Revocation Lists (CRLs) fetched via HTTP or LDAP + should be saved under a unique file name derived from the public + key of the Certification Authority (CA) to + /etc/ipsec.d/crls (stroke) or + /etc/swanctl/x509crl (vici), respectively. + ''; + + cert_cache = mkYesNoParam yes '' + Whether relations in validated certificate chains should be cached in memory. + ''; + + cisco_unity = mkYesNoParam no '' + Send Cisco Unity vendor ID payload (IKEv1 only), see unity plugin. + ''; + + close_ike_on_child_failure = mkYesNoParam no '' + Close the IKE_SA if setup of the CHILD_SA along with IKE_AUTH failed. + ''; + + cookie_threshold = mkIntParam 10 '' + Number of half-open IKE_SAs that activate the cookie mechanism. + ''; + + crypto_test.bench = mkYesNoParam no '' + Benchmark crypto algorithms and order them by efficiency. + ''; + + crypto_test.bench_size = mkIntParam 1024 '' + Buffer size used for crypto benchmark. + ''; + + crypto_test.bench_time = mkIntParam 50 '' + Number of iterations to test each algorithm. + ''; + + crypto_test.on_add = mkYesNoParam no '' + Test crypto algorithms during registration + (requires test vectors provided by the test-vectors plugin). + ''; + + crypto_test.on_create = mkYesNoParam no '' + Test crypto algorithms on each crypto primitive instantiation. + ''; + + crypto_test.required = mkYesNoParam no '' + Strictly require at least one test vector to enable an algorithm. + ''; + + crypto_test.rng_true = mkYesNoParam no '' + Whether to test RNG with TRUE quality; requires a lot of entropy. + ''; + + delete_rekeyed = mkYesNoParam no '' + Delete CHILD_SAs right after they got successfully rekeyed (IKEv1 only). + Reduces the number of stale CHILD_SAs in scenarios with a lot of rekeyings. + However, this might cause problems with implementations that continue + to use rekeyed SAs until they expire. + ''; + + delete_rekeyed_delay = mkIntParam 5 '' + Delay in seconds until inbound IPsec SAs are deleted after rekeyings + (IKEv2 only). + + To process delayed packets the inbound part of a CHILD_SA is kept + installed up to the configured number of seconds after it got replaced + during a rekeying. If set to 0 the CHILD_SA will be kept installed until + it expires (if no lifetime is set it will be destroyed immediately). + ''; + + dh_exponent_ansi_x9_42 = mkYesNoParam yes '' + Use ANSI X9.42 DH exponent size or optimum size matched to + cryptographical strength. + ''; + + dlopen_use_rtld_now = mkYesNoParam no '' + Use RTLD_NOW with dlopen() when loading plugins and IMV/IMCs to reveal + missing symbols immediately. Useful during development of custom plugins. + ''; + + dns1 = mkOptionalStrParam '' + DNS server assigned to peer via configuration payload (CP), see attr plugin. + ''; + + dns2 = mkOptionalStrParam '' + DNS server assigned to peer via configuration payload (CP). + ''; + + dos_protection = mkYesNoParam yes '' + Enable Denial of Service protection using cookies and aggressiveness checks. + ''; + + ecp_x_coordinate_only = mkYesNoParam yes '' + Compliance with the errata for RFC 4753. + ''; + + filelog = mkAttrsOfParams ({ + append = mkYesNoParam yes '' + If this option is enabled log entries are appended to the existing file. + ''; + + flush_line = mkYesNoParam no '' + Enabling this option disables block buffering and enables line + buffering. That is, a flush to disk is enforced for each logged line. + ''; + + ike_name = mkYesNoParam no '' + Prefix each log entry with the connection name and a unique numerical + identifier for each IKE_SA. + ''; + + time_format = mkOptionalStrParam '' + Prefix each log entry with a timestamp. The option accepts a format string + as passed to strftime(3). + ''; + + time_add_ms = mkYesNoParam no '' + Adds the milliseconds within the current second after the timestamp + (separated by a dot, so time_format should end with %S or %T) + ''; + } // loglevelParams) ''Section to define file loggers, see LoggerConfiguration.''; + + flush_auth_cfg = mkYesNoParam no '' + If enabled objects used during authentication (certificates, identities + etc.) are released to free memory once an IKE_SA is + established. Enabling this might conflict with plugins that later need + access to e.g. the used certificates. + ''; + + follow_redirects = mkYesNoParam yes '' + Whether to follow IKEv2 redirects (RFC 5685). + ''; + + fragment_size = mkIntParam 1280 '' + Maximum size (complete IP datagram size in bytes) of a sent IKE fragment + when using proprietary IKEv1 or standardized IKEv2 fragmentation, + defaults to 1280 (use 0 for address family specific default values, + which uses a lower value for IPv4). If specified this limit is used for + both IPv4 and IPv6. + ''; + + group = mkOptionalStrParam '' + Name of the group the daemon changes to after startup. + ''; + + half_open_timeout = mkIntParam 30 '' + Timeout in seconds for connecting IKE_SAs, also see IKE_SA_INIT dropping. + ''; + + hash_and_url = mkYesNoParam no '' + Enable hash and URL support. + ''; + + host_resolver.max_threads = mkIntParam 3 '' + Maximum number of concurrent resolver threads (they are terminated if unused). + ''; + + host_resolver.min_threads = mkIntParam 0 '' + Minimum number of resolver threads to keep around. + ''; + + i_dont_care_about_security_and_use_aggressive_mode_psk = mkYesNoParam no '' + If enabled responders are allowed to use IKEv1 Aggressive Mode with + pre-shared keys, which is discouraged due to security concerns (offline + attacks on the openly transmitted hash of the PSK). + ''; + + ignore_acquire_ts = mkYesNoParam no '' + If this is disabled the traffic selectors from the kernel's acquire + events, which are derived from the triggering packet, are prepended to + the traffic selectors from the configuration for IKEv2 connection. By + enabling this, such specific traffic selectors will be ignored and only + the ones in the config will be sent. This always happens for IKEv1 + connections as the protocol only supports one set of traffic selectors + per CHILD_SA. + ''; + + ignore_routing_tables = mkSpaceSepListParam [] '' + A space-separated list of routing tables to be excluded from route lookup. + ''; + + ikesa_limit = mkIntParam 0 '' + Maximum number of IKE_SAs that can be established at the same time + before new connection attempts are blocked. + ''; + + ikesa_table_segments = mkIntParam 1 '' + Number of exclusively locked segments in the hash table, see IKE_SA + lookup tuning. + ''; + + ikesa_table_size = mkIntParam 1 '' + Size of the IKE_SA hash table, see IKE_SA lookup tuning. + ''; + + inactivity_close_ike = mkYesNoParam no '' + Whether to close IKE_SA if the only CHILD_SA closed due to inactivity. + ''; + + init_limit_half_open = mkIntParam 0 '' + Limit new connections based on the current number of half open IKE_SAs, + see IKE_SA_INIT dropping. + ''; + + init_limit_job_load = mkIntParam 0 '' + Limit new connections based on the number of jobs currently queued for + processing, see IKE_SA_INIT dropping. + ''; + + initiator_only = mkYesNoParam no '' + Causes charon daemon to ignore IKE initiation requests. + ''; + + install_routes = mkYesNoParam yes '' + Install routes into a separate routing table for established IPsec + tunnels. If disabled a more efficient lookup for source and next-hop + addresses is used since 5.5.2. + ''; + + install_virtual_ip = mkYesNoParam yes '' + Install virtual IP addresses. + ''; + + install_virtual_ip_on = mkOptionalStrParam '' + The name of the interface on which virtual IP addresses should be + installed. If not specified the addresses will be installed on the + outbound interface. + ''; + + integrity_test = mkYesNoParam no '' + Check daemon, libstrongswan and plugin integrity at startup. + ''; + + interfaces_ignore = mkCommaSepListParam [] '' + List of network interfaces that should be ignored, if + is specified this option has no effect. + ''; + + interfaces_use = mkCommaSepListParam [] '' + List of network interfaces that should be used by + charon. All other interfaces are ignored. + ''; + + keep_alive = mkIntParam 20 '' + NAT keep alive interval in seconds. + ''; + + leak_detective.detailed = mkYesNoParam yes '' + Includes source file names and line numbers in leak detective output. + ''; + + leak_detective.usage_threshold = mkIntParam 10240 '' + Threshold in bytes for leaks to be reported (0 to report all). + ''; + + leak_detective.usage_threshold_count = mkIntParam 0 '' + Threshold in number of allocations for leaks to be reported (0 to report + all). + ''; + + load = mkSpaceSepListParam [] '' + Plugins to load in IKEv2 charon daemon, see PluginLoad. + ''; + + load_modular = mkYesNoParam no '' + If enabled the list of plugins to load is determined by individual load + settings for each plugin, see PluginLoad. + ''; + + make_before_break = mkYesNoParam no '' + Initiate IKEv2 reauthentication with a make-before-break instead of a + break-before-make scheme. Make-before-break uses overlapping IKE and + CHILD_SA during reauthentication by first recreating all new SAs before + deleting the old ones. This behavior can be beneficial to avoid + connectivity gaps during reauthentication, but requires support for + overlapping SAs by the peer. strongSwan can handle such overlapping SAs + since 5.3.0. + ''; + + max_ikev1_exchanges = mkIntParam 3 '' + Maximum number of IKEv1 phase 2 exchanges per IKE_SA to keep state about + and track concurrently. + ''; + + max_packet = mkIntParam 10000 '' + Maximum packet size accepted by charon. + ''; + + multiple_authentication = mkYesNoParam yes '' + Enable multiple authentication exchanges (RFC 4739). + ''; + + nbns1 = mkOptionalStrParam '' + WINS server assigned to peer via configuration payload (CP), see attr + plugin. + ''; + + nbns2 = mkOptionalStrParam '' + WINS server assigned to peer via configuration payload (CP). + ''; + + port = mkIntParam 500 '' + UDP port used locally. If set to 0 a random port will be allocated. + ''; + + port_nat_t = mkIntParam 4500 '' + UDP port used locally in case of NAT-T. If set to 0 a random port will + be allocated. Has to be different from charon.port, otherwise a random + port will be allocated. + ''; + + prefer_best_path = mkYesNoParam no '' + By default, charon keeps SAs on the routing path with addresses it + previously used if that path is still usable. By enabling this option, + it tries more aggressively to update SAs with MOBIKE on routing priority + changes using the cheapest path. This adds more noise, but allows to + dynamically adapt SAs to routing priority changes. This option has no + effect if MOBIKE is not supported or disabled. + ''; + + prefer_configured_proposals = mkYesNoParam yes '' + Prefer locally configured proposals for IKE/IPsec over supplied ones as + responder (disabling this can avoid keying retries due to + INVALID_KE_PAYLOAD notifies). + ''; + + prefer_temporary_addrs = mkYesNoParam no '' + By default public IPv6 addresses are preferred over temporary ones + (according to RFC 4941), to make connections more stable. Enable this + option to reverse this. + ''; + + process_route = mkYesNoParam yes '' + Process RTM_NEWROUTE and RTM_DELROUTE events. + ''; + + processor.priority_threads = { + critical = mkIntParam 0 '' + Threads reserved for CRITICAL priority class jobs. + ''; + + high = mkIntParam 0 '' + Threads reserved for HIGH priority class jobs. + ''; + + medium = mkIntParam 0 '' + Threads reserved for MEDIUM priority class jobs. + ''; + + low = mkIntParam 0 '' + Threads reserved for LOW priority class jobs. + ''; + }; + + receive_delay = mkIntParam 0 '' + Delay in ms for receiving packets, to simulate larger RTT. + ''; + + receive_delay_response = mkYesNoParam yes '' + Delay response messages. + ''; + + receive_delay_request = mkYesNoParam yes '' + Delay request messages. + ''; + + receive_delay_type = mkIntParam 0 '' + Specific IKEv2 message type to delay, 0 for any. + ''; + + replay_window = mkIntParam 32 '' + Size of the AH/ESP replay window, in packets. + ''; + + retransmit_base = mkFloatParam "1.8" '' + Base to use for calculating exponential back off, see Retransmission. + ''; + + retransmit_jitter = mkIntParam 0 '' + Maximum jitter in percent to apply randomly to calculated retransmission + timeout (0 to disable). + ''; + + retransmit_limit = mkIntParam 0 '' + Upper limit in seconds for calculated retransmission timeout (0 to + disable). + ''; + + retransmit_timeout = mkFloatParam "4.0" '' + Timeout in seconds before sending first retransmit. + ''; + + retransmit_tries = mkIntParam 5 '' + Number of times to retransmit a packet before giving up. + ''; + + retry_initiate_interval = mkIntParam 0 '' + Interval in seconds to use when retrying to initiate an IKE_SA (e.g. if + DNS resolution failed), 0 to disable retries. + ''; + + reuse_ikesa = mkYesNoParam yes '' + Initiate CHILD_SA within existing IKE_SAs (always enabled for IKEv1). + ''; + + routing_table = mkIntParam 220 '' + Numerical routing table to install routes to. + ''; + + routing_table_prio = mkIntParam 220 '' + Priority of the routing table. + ''; + + send_delay = mkIntParam 0 '' + Delay in ms for sending packets, to simulate larger RTT. + ''; + + send_delay_request = mkYesNoParam yes '' + Delay request messages. + ''; + + send_delay_response = mkYesNoParam yes '' + Delay response messages. + ''; + + send_delay_type = mkIntParam 0 '' + Specific IKEv2 message type to delay, 0 for any. + ''; + + send_vendor_id = mkYesNoParam no '' + Send strongSwan vendor ID payload. + ''; + + signature_authentication = mkYesNoParam yes '' + Whether to enable Signature Authentication as per RFC 7427. + ''; + + signature_authentication_constraints = mkYesNoParam yes '' + If enabled, signature schemes configured in rightauth, in addition to + getting used as constraints against signature schemes employed in the + certificate chain, are also used as constraints against the signature + scheme used by peers during IKEv2. + ''; + + spi_min = mkHexParam "0xc0000000" '' + The lower limit for SPIs requested from the kernel for IPsec SAs. Should + not be set lower than 0x00000100 (256), as SPIs between 1 and 255 are + reserved by IANA. + ''; + + spi_max = mkHexParam "0xcfffffff" '' + The upper limit for SPIs requested from the kernel for IPsec SAs. + ''; + + start-scripts = mkAttrsOfParam (mkStrParam "" "") '' + Section containing a list of scripts (name = path) that are executed + when the daemon is started. + ''; + + stop-scripts = mkAttrsOfParam (mkStrParam "" "") '' + Section containing a list of scripts (name = path) that are executed + when the daemon is terminated. + ''; + + syslog = loglevelParams // { + identifier = mkOptionalStrParam '' + Identifier for use with openlog(3). + + Global identifier used for an openlog(3) call, prepended to each log + message by syslog. If not configured, openlog(3) is not called, so + the value will depend on system defaults (often the program name). + ''; + + ike_name = mkYesNoParam no '' + Prefix each log entry with the connection name and a unique numerical + identifier for each IKE_SA. + ''; + }; + + threads = mkIntParam 16 '' + Number of worker threads in charon. Several of these are reserved for + long running tasks in internal modules and plugins. Therefore, make sure + you don't set this value too low. The number of idle worker threads + listed in ipsec statusall might be used as indicator on the number of + reserved threads (JobPriority has more on this). + ''; + + user = mkOptionalStrParam '' + Name of the user the daemon changes to after startup. + ''; + + x509.enforce_critical = mkYesNoParam yes '' + Discard certificates with unsupported or unknown critical extensions. + ''; + + plugins = import ./strongswan-charon-plugins-params.nix lib; + + imcv = { + assessment_result = mkYesNoParam yes '' + Whether IMVs send a standard IETF Assessment Result attribute. + ''; + + database = mkOptionalStrParam '' + Global IMV policy database URI. If it contains a password, make sure to + adjust the permissions of the config file accordingly. + ''; + + os_info.default_password_enabled = mkYesNoParam no '' + Manually set whether a default password is enabled. + ''; + + os_info.name = mkOptionalStrParam '' + Manually set the name of the client OS (e.g. NixOS). + ''; + + os_info.version = mkOptionalStrParam '' + Manually set the version of the client OS (e.g. 17.09). + ''; + + policy_script = mkStrParam "ipsec _imv_policy" '' + Script called for each TNC connection to generate IMV policies. + ''; + }; + + tls = { + cipher = mkSpaceSepListParam [] '' + List of TLS encryption ciphers. + ''; + + key_exchange = mkSpaceSepListParam [] '' + List of TLS key exchange methods. + ''; + + mac = mkSpaceSepListParam [] '' + List of TLS MAC algorithms. + ''; + + suites = mkSpaceSepListParam [] '' + List of TLS cipher suites. + ''; + }; + + tnc = { + libtnccs.tnc_config = mkStrParam "/etc/tnc_config" '' + TNC IMC/IMV configuration file. + ''; + }; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix new file mode 100644 index 000000000000..56a253d85d39 --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix @@ -0,0 +1,1070 @@ +lib : with (import ./param-constructors.nix lib); { + addrblock.strict = mkYesNoParam yes '' + If enabled, a subject certificate without an RFC 3779 address block + extension is rejected if the issuer certificate has such an addrblock + extension. If disabled, subject certificates issued without addrblock + extension are accepted without any traffic selector checks and no policy + is enforced by the plugin. + ''; + + android_log.loglevel = mkIntParam 1 '' + Loglevel for logging to Android specific logger. + ''; + + attr = mkAttrsOfParam (mkCommaSepListParam [] "") '' + Section to specify arbitrary attributes that are assigned to a peer + via configuration payload, see attr plugin. + + The attribute can be either + address, + netmask, + dns, + nbns, + dhcp, + subnet, + split-include, + split-exclude + or the numeric identifier of the attribute type. The assigned value can be + an IPv4/IPv6 address, a subnet in CIDR notation or an arbitrary value + depending on the attribute type. Since some attribute types accept multiple + values all values must be specified as a list. + ''; + + attr-sql.crash_recovery = mkYesNoParam yes '' + Release all online leases during startup. Disable this to share the DB + between multiple VPN gateways. + ''; + + attr-sql.database = mkOptionalStrParam '' + Database URI for attr-sql plugin used by charon. If it contains a + password, make sure to adjust the permissions of the config file + accordingly. + ''; + + attr-sql.lease_history = mkYesNoParam yes '' + Enable logging of SQL IP pool leases. + ''; + + bliss.use_bliss_b = mkYesNoParam yes '' + Use the enhanced BLISS-B key generation and signature algorithm. + ''; + + bypass-lan.interfaces_ignore = mkCommaSepListParam [] '' + List of network interfaces for which connected subnets + should be ignored, if interfaces_use is specified this option has no + effect. + ''; + + bypass-lan.interfaces_use = mkCommaSepListParam [] '' + List of network interfaces for which connected subnets + should be considered. All other interfaces are ignored. + ''; + + certexpire.csv.cron = mkOptionalStrParam '' + Cron style string specifying CSV export times, see certexpire for + details. + ''; + + certexpire.csv.empty_string = mkOptionalStrParam '' + String to use in empty intermediate CA fields. + ''; + + certexpire.csv.fixed_fields = mkYesNoParam yes '' + Use a fixed intermediate CA field count. + ''; + + certexpire.csv.force = mkYesNoParam yes '' + Force export of all trustchains we have a private key for. + ''; + + certexpire.csv.format = mkStrParam "%d:%m:%Y" '' + strftime(3) format string to export expiration dates as. + ''; + + certexpire.csv.local = mkOptionalStrParam '' + strftime(3) format string for the CSV file name to export local + certificates to. + ''; + + certexpire.csv.remote = mkOptionalStrParam '' + strftime(3) format string for the CSV file name to export remote + certificates to. + ''; + + certexpire.csv.separator = mkStrParam "," '' + CSV field separator. + ''; + + coupling.file = mkOptionalStrParam '' + File to store coupling list to, see certcoupling plugin for details. + ''; + + coupling.hash = mkStrParam "sha1" '' + Hashing algorithm to fingerprint coupled certificates. + ''; + + coupling.max = mkIntParam 1 '' + Maximum number of coupling entries to create. + ''; + + curl.redir = mkIntParam (-1) '' + Maximum number of redirects followed by the plugin, set to 0 to disable + following redirects, set to -1 for no limit. + ''; + + dhcp.force_server_address = mkYesNoParam no '' + Always use the configured server address, see DHCP plugin for details. + ''; + + dhcp.identity_lease = mkYesNoParam no '' + Derive user-defined MAC address from hash of IKEv2 identity. + ''; + + dhcp.interface = mkOptionalStrParam '' + Interface name the plugin uses for address allocation. The default is to + bind to any and let the system decide which way to route the packets to + the DHCP server. + ''; + + dhcp.server = mkStrParam "255.255.255.255" '' + DHCP server unicast or broadcast IP address. + ''; + + dnscert.enable = mkYesNoParam no '' + Enable fetching of CERT RRs via DNS. + ''; + + duplicheck.enable = mkYesNoParam yes '' + Enable duplicheck plugin (if loaded). + ''; + + duplicheck.socket = mkStrParam "unix://\${piddir}/charon.dck" '' + Socket provided by the duplicheck plugin. + ''; + + eap-aka.request_identity = mkYesNoParam yes ""; + + eap-aka-3ggp2.seq_check = mkOptionalStrParam '' + Enable to activate sequence check of the AKA SQN values in order to trigger + resync cycles. + ''; + + eap-dynamic.prefer_user = mkYesNoParam no '' + If enabled, the eap-dynamic plugin will prefer the order of the EAP + methods in an EAP-Nak message sent by a client over the one configured + locally. + ''; + + eap-dynamic.preferred = mkCommaSepListParam [] '' + The preferred EAP method(s) to be used by the eap-dynamic plugin. If it is + not set, the first registered method will be used initially. The methods + are tried in the given order before trying the rest of the registered + methods. + ''; + + eap-gtc.backend = mkStrParam "pam" '' + XAuth backend to be used for credential verification, see EAP-GTC. + ''; + + eap-peap.fragment_size = mkIntParam 1024 '' + Maximum size of an EAP-PEAP packet. + ''; + + eap-peap.max_message_count = mkIntParam 32 '' + Maximum number of processed EAP-PEAP packets. + ''; + + eap-peap.include_length = mkYesNoParam no '' + Include length in non-fragmented EAP-PEAP packets. + ''; + + eap-peap.phase2_method = mkStrParam "mschapv2" '' + Phase2 EAP client authentication method. + ''; + + eap-peap.phase2_piggyback = mkYesNoParam no '' + Phase2 EAP Identity request piggybacked by server onto TLS Finished + message. + ''; + + eap-peap.phase2_tnc = mkYesNoParam no '' + Start phase2 EAP-TNC protocol after successful client authentication. + ''; + + eap-peap.request_peer_auth = mkYesNoParam no '' + Request peer authentication based on a client certificate. + ''; + + eap-radius.accounting = mkYesNoParam no '' + Enable EAP-RADIUS accounting. + ''; + + eap-radius.accounting_close_on_timeout = mkYesNoParam yes '' + Close the IKE_SA if there is a timeout during interim RADIUS accounting + updates. + ''; + + eap-radius.accounting_interval = mkIntParam 0 '' + Interval in seconds for interim RADIUS accounting updates, if not + specified by the RADIUS server in the Access-Accept message. + ''; + + eap-radius.accounting_requires_vip = mkYesNoParam no '' + If enabled, accounting is disabled unless an IKE_SA has at least one + virtual IP. + ''; + + eap-radius.class_group = mkYesNoParam no '' + Use the class attribute sent in the Access-Accept message as group + membership information, see EapRadius. + ''; + + eap-radius.close_all_on_timeout = mkYesNoParam no '' + Closes all IKE_SAs if communication with the RADIUS server times out. If + it is not set only the current IKE_SA is closed. + ''; + + eap-radius.dae.enable = mkYesNoParam no '' + Enables support for the Dynamic Authorization Extension (RFC 5176). + ''; + + eap-radius.dae.listen = mkStrParam "0.0.0.0" '' + Address to listen for DAE messages from the RADIUS server. + ''; + + eap-radius.dae.port = mkIntParam 3799 '' + Port to listen for DAE requests. + ''; + + eap-radius.dae.secret = mkOptionalStrParam '' + Shared secret used to verify/sign DAE messages.If set, make sure to + adjust the permissions of the config file accordingly. + ''; + + eap-radius.eap_start = mkYesNoParam no '' + Send EAP-Start instead of EAP-Identity to start RADIUS conversation. + ''; + + eap-radius.filter_id = mkYesNoParam no '' + Use the filter_id attribute sent in the RADIUS-Accept message as group + membership if the RADIUS tunnel_type attribute is set to ESP. + ''; + + eap-radius.forward.ike_to_radius = mkOptionalStrParam '' + RADIUS attributes to be forwarded from IKEv2 to RADIUS (can be defined + by name or attribute number, a colon can be used to specify + vendor-specific attributes, e.g. Reply-Message, or 11, or 36906:12). + ''; + + eap-radius.forward.radius_to_ike = mkOptionalStrParam '' + Same as above but from RADIUS to IKEv2, a strongSwan specific private + notify (40969) is used to transmit the attributes. + ''; + + eap-radius.id_prefix = mkOptionalStrParam '' + Prefix to EAP-Identity, some AAA servers use a IMSI prefix to select the + EAP method. + ''; + + eap-radius.nas_identifier = mkStrParam "strongSwan" '' + NAS-Identifier to include in RADIUS messages. + ''; + + eap-radius.port = mkIntParam 1812 '' + Port of RADIUS server (authentication). + ''; + + eap-radius.retransmit_base = mkFloatParam "1.4" '' + Base to use for calculating exponential back off. + ''; + + eap-radius.retransmit_timeout = mkFloatParam "2.0" '' + Timeout in seconds before sending first retransmit. + ''; + + eap-radius.retransmit_tries = mkIntParam 4 '' + Number of times to retransmit a packet before giving up. + ''; + + eap-radius.secret = mkOptionalStrParam '' + Shared secret between RADIUS and NAS. If set, make sure to adjust the + permissions of the config file accordingly. + ''; + + eap-radius.server = mkOptionalStrParam '' + IP/Hostname of RADIUS server. + ''; + + eap-radius.servers = mkAttrsOfParams { + nas_identifier = mkStrParam "strongSwan" '' + The nas_identifer (default: strongSwan) identifies the gateway against the + RADIUS server and allows it to enforce a policy, for example. + ''; + + secret = mkOptionalStrParam ""; + + sockets = mkIntParam 1 '' + The number of pre-allocated sockets to use. A value of 5 allows the + gateway to authentication 5 clients simultaneously over RADIUS. + ''; + + auth_port = mkIntParam 1812 '' + RADIUS UDP port + ''; + + address = mkOptionalStrParam '' + The server's IP/Hostname. + ''; + + acct_port = mkIntParam 1813 '' + Accounting port. + ''; + + preference = mkIntParam 0 '' + With the preference paramter of a server, priorities for specific servers + can be defined. This allows to use a secondary RADIUS server only if the + first gets unresponsive, or if it is overloaded. + ''; + } ''Section to specify multiple RADIUS servers, see EapRadius.''; + + eap-radius.sockets = mkIntParam 1 '' + Number of sockets (ports) to use, increase for high load. + ''; + + eap-radius.xauth = mkAttrsOfParams { + nextpin = mkOptionalStrParam ""; + password = mkOptionalStrParam ""; + passcode = mkOptionalStrParam ""; + answer = mkOptionalStrParam ""; + } '' + Section to configure multiple XAuth authentication rounds via RADIUS. + ''; + + eap-sim.request_identity = mkYesNoParam yes ""; + + eap-simaka-sql.database = mkOptionalStrParam ""; + + eap-simaka-sql.remove_used = mkOptionalStrParam ""; + + eap-tls.fragment_size = mkIntParam 1024 '' + Maximum size of an EAP-TLS packet. + ''; + + eap-tls.include_length = mkYesNoParam yes '' + Include length in non-fragmented EAP-TLS packets. + ''; + + eap-tls.max_message_count = mkIntParam 32 '' + Maximum number of processed EAP-TLS packets (0 = no limit). + ''; + + eap-tnc.max_message_count = mkIntParam 10 '' + Maximum number of processed EAP-TNC packets (0 = no limit). + ''; + + eap-tnc.protocol = mkStrParam "tnccs-2.0" '' + IF-TNCCS protocol version to be used (tnccs-1.1, tnccs-2.0, + tnccs-dynamic). + ''; + + eap-ttls.fragment_size = mkIntParam 1024 '' + Maximum size of an EAP-TTLS packet. + ''; + + eap-ttls.include_length = mkYesNoParam yes '' + Include length in non-fragmented EAP-TTLS packets. + ''; + + eap-ttls.max_message_count = mkIntParam 32 '' + Maximum number of processed EAP-TTLS packets (0 = no limit). + ''; + + eap-ttls.phase2_method = mkStrParam "md5" '' + Phase2 EAP client authentication method. + ''; + + eap-ttls.phase2_piggyback = mkYesNoParam no '' + Phase2 EAP Identity request piggybacked by server onto TLS Finished + message. + ''; + + eap-ttls.phase2_tnc = mkYesNoParam no '' + Start phase2 EAP TNC protocol after successful client authentication. + ''; + + eap-ttls-phase2_tnc_method = mkEnumParam ["pt" "legacy"] "pt" '' + Phase2 EAP TNC transport protocol (pt as IETF standard or legacy tnc) + ''; + + eap-ttls.request_peer_auth = mkYesNoParam no '' + Request peer authentication based on a client certificate. + ''; + + error-notify.socket = mkStrParam "unix://\${piddir}/charon.enfy" '' + Socket provided by the error-notify plugin. + ''; + + ext-auth.script = mkOptionalStrParam '' + Shell script to invoke for peer authorization (see ext-auth). + ''; + + gcrypt.quick_random = mkYesNoParam no '' + Use faster random numbers in gcrypt. For testing only, produces weak + keys! + ''; + + ha.autobalance = mkIntParam 0 '' + Interval in seconds to automatically balance handled segments between + nodes. Set to 0 to disable. + ''; + + ha.fifo_interface = mkYesNoParam yes ""; + + ha.heartbeat_delay = mkIntParam 1000 ""; + + ha.heartbeat_timeout = mkIntParam 2100 ""; + + ha.local = mkOptionalIntParam ""; + + ha.monitor = mkYesNoParam yes ""; + + ha.pools = mkOptionalStrParam ""; + + ha.remote = mkOptionalStrParam ""; + + ha.resync = mkYesNoParam yes ""; + + ha.secret = mkOptionalStrParam ""; + + ha.segment_count = mkIntParam 1 ""; + + ipseckey.enable = mkYesNoParam no '' + Enable fetching of IPSECKEY RRs via DNS. + ''; + + kernel-libipsec.allow_peer_ts = mkYesNoParam no '' + Allow that the remote traffic selector equals the IKE peer (see + kernel-libipsec for details). + ''; + + kernel-netlink.buflen = mkOptionalIntParam '' + Buffer size for received Netlink messages. Defaults to + min(PAGE_SIZE, 8192). + ''; + + kernel-netlink.force_receive_buffer_size = mkYesNoParam no '' + If the maximum Netlink socket receive buffer in bytes set by + receive_buffer_size exceeds the system-wide maximum from + /proc/sys/net/core/rmem_max, this option can be used to + override the limit. Enabling this option requires special priviliges + (CAP_NET_ADMIN). + ''; + + kernel-netlink.fwmark = mkOptionalStrParam '' + Firewall mark to set on the routing rule that directs traffic to our own + routing table. The format is [!]mark[/mask], where the + optional exclamation mark inverts the meaning (i.e. the rule only applies to + packets that don't match the mark). A possible use case are host-to-host + tunnels with kernel-libipsec. When set to !<mark> a more efficient + lookup for source and next-hop addresses may also be used since 5.3.3. + ''; + + kernel-netlink.mss = mkIntParam 0 '' + MSS to set on installed routes, 0 to disable. + ''; + + kernel-netlink.mtu = mkIntParam 0 '' + MTU to set on installed routes, 0 to disable. + ''; + + kernel-netlink.receive_buffer_size = mkIntParam 0 '' + Maximum Netlink socket receive buffer in bytes. This value controls how many + bytes of Netlink messages can be received on a Netlink socket. The default + value is set by /proc/sys/net/core/rmem_default. The + specified value cannot exceed the system-wide maximum from + /proc/sys/net/core/rmem_max, unless + is enabled. + ''; + + kernel-netlink.roam_events = mkYesNoParam yes '' + Whether to trigger roam events when interfaces, addresses or routes + change. + ''; + + kernel-netlink.set_proto_port_transport_sa = mkYesNoParam no '' + Whether to set protocol and ports in the selector installed on transport + mode IPsec SAs in the kernel. While doing so enforces policies for + inbound traffic, it also prevents the use of a single IPsec SA by more + than one traffic selector. + ''; + + kernel-netlink.spdh_thresh.ipv4.lbits = mkIntParam 32 '' + Local subnet XFRM policy hashing threshold for IPv4. + ''; + + kernel-netlink.spdh_thresh.ipv4.rbits = mkIntParam 32 '' + Remote subnet XFRM policy hashing threshold for IPv4. + ''; + + kernel-netlink.spdh_thresh.ipv6.lbits = mkIntParam 128 '' + Local subnet XFRM policy hashing threshold for IPv6. + ''; + + kernel-netlink.spdh_thresh.ipv6.rbits = mkIntParam 128 '' + Remote subnet XFRM policy hashing threshold for IPv6. + ''; + + kernel-netlink.xfrm_acq_expires = mkIntParam 165 '' + Lifetime of XFRM acquire state created by the kernel when traffic matches a + trap policy. The value gets written to + /proc/sys/net/core/xfrm_acq_expires. Indirectly controls + the delay between XFRM acquire messages triggered by the kernel for a trap + policy. The same value is used as timeout for SPIs allocated by the + kernel. The default value equals the default total retransmission timeout + for IKE messages (since 5.5.3 this value is determined dynamically based on + the configuration). + ''; + + kernel-pfkey.events_buffer_size = mkIntParam 0 '' + Size of the receive buffer for the event socket (0 for default + size). Because events are received asynchronously installing e.g. lots + of policies may require a larger buffer than the default on certain + platforms in order to receive all messages. + ''; + + kernel-pfroute.vip_wait = mkIntParam 1000 '' + Time in ms to wait until virtual IP addresses appear/disappear before + failing. + ''; + + led.activity_led = mkOptionalStrParam ""; + + led.blink_time = mkIntParam 50 ""; + + load-tester = { + addrs = mkAttrsOfParam (mkOptionalStrParam "") '' + Section that contains key/value pairs with address pools (in CIDR + notation) to use for a specific network interface e.g. + eth0 = 10.10.0.0/16. + ''; + + addrs_keep = mkYesNoParam no '' + Whether to keep dynamic addresses even after the associated SA got + terminated. + ''; + + addrs_prefix = mkIntParam 16 '' + Network prefix length to use when installing dynamic addresses. + If set to -1 the full address is used (i.e. 32 or 128). + ''; + + ca_dir = mkOptionalStrParam '' + Directory to load (intermediate) CA certificates from. + ''; + + child_rekey = mkIntParam 600 '' + Seconds to start CHILD_SA rekeying after setup. + ''; + + crl = mkOptionalStrParam '' + URI to a CRL to include as certificate distribution point in generated + certificates. + ''; + + delay = mkIntParam 0 '' + Delay between initiatons for each thread. + ''; + + delete_after_established = mkYesNoParam no '' + Delete an IKE_SA as soon as it has been established. + ''; + + digest = mkStrParam "sha1" '' + Digest algorithm used when issuing certificates. + ''; + + dpd_delay = mkIntParam 0 '' + DPD delay to use in load test. + ''; + + dynamic_port = mkIntParam 0 '' + Base port to be used for requests (each client uses a different port). + ''; + + eap_password = mkStrParam "default-pwd" '' + EAP secret to use in load test. + ''; + + enable = mkYesNoParam no '' + Enable the load testing plugin. **WARNING**: Never enable this plugin on + productive systems. It provides preconfigured credentials and allows an + attacker to authenticate as any user. + ''; + + esp = mkStrParam "aes128-sha1" '' + CHILD_SA proposal to use for load tests. + ''; + + fake_kernel = mkYesNoParam no '' + Fake the kernel interface to allow load-testing against self. + ''; + + ike_rekey = mkIntParam 0 '' + Seconds to start IKE_SA rekeying after setup. + ''; + + init_limit = mkIntParam 0 '' + Global limit of concurrently established SAs during load test. + ''; + + initiator = mkStrParam "0.0.0.0" '' + Address to initiate from. + ''; + + initiators = mkIntParam 0 '' + Number of concurrent initiator threads to use in load test. + ''; + + initiator_auth = mkStrParam "pubkey" '' + Authentication method(s) the intiator uses. + ''; + + initiator_id = mkOptionalStrParam '' + Initiator ID used in load test. + ''; + + initiator_match = mkOptionalStrParam '' + Initiator ID to match against as responder. + ''; + + initiator_tsi = mkOptionalStrParam '' + Traffic selector on initiator side, as proposed by initiator. + ''; + + initiator_tsr = mkOptionalStrParam '' + Traffic selector on responder side, as proposed by initiator. + ''; + + iterations = mkIntParam 1 '' + Number of IKE_SAs to initiate by each initiator in load test. + ''; + + issuer_cert = mkOptionalStrParam '' + Path to the issuer certificate (if not configured a hard-coded default + value is used). + ''; + + issuer_key = mkOptionalStrParam '' + Path to private key that is used to issue certificates (if not configured + a hard-coded default value is used). + ''; + + mode = mkEnumParam ["tunnel" "transport" "beet"] "tunnel" '' + IPsec mode to use. + ''; + + pool = mkOptionalStrParam '' + Provide INTERNAL_IPV4_ADDRs from a named pool. + ''; + + preshared_key = mkStrParam "" '' + Preshared key to use in load test. + ''; + + proposal = mkStrParam "aes128-sha1-modp768" '' + IKE proposal to use in load test. + ''; + + responder = mkStrParam "127.0.0.1" '' + Address to initiation connections to. + ''; + + responder_auth = mkStrParam "pubkey" '' + Authentication method(s) the responder uses. + ''; + + responder_id = mkOptionalStrParam '' + Responder ID used in load test. + ''; + + responder_tsi = mkStrParam "initiator_tsi" '' + Traffic selector on initiator side, as narrowed by responder. + ''; + + responder_tsr = mkStrParam "initiator_tsr" '' + Traffic selector on responder side, as narrowed by responder. + ''; + + request_virtual_ip = mkYesNoParam no '' + Request an INTERNAL_IPV4_ADDR from the server. + ''; + + shutdown_when_complete = mkYesNoParam no '' + Shutdown the daemon after all IKE_SAs have been established. + ''; + + socket = mkStrParam "unix://\\\${piddir}/charon.ldt" '' + Socket provided by the load-tester plugin. + ''; + + version = mkIntParam 0 '' + IKE version to use (0 means use IKEv2 as initiator and accept any version + as responder). + ''; + }; + + lookip.socket = mkStrParam "unix://\\\${piddir}/charon.lkp" '' + Socket provided by the lookip plugin. + ''; + + ntru.max_drbg_requests = mkIntParam 4294967294 '' + Number of pseudo-random bit requests from the DRBG before an automatic + reseeding occurs. + ''; + + ntru.parameter_set = + mkEnumParam ["x9_98_speed" "x9_98_bandwidth" "x9_98_balance" "optimum"] "optimum" '' + The following parameter sets are available: + x9_98_speed, x9_98_bandwidth, + x9_98_balance and optimum, the last + set not being part of the X9.98 standard but having the best performance. + ''; + + openssl.engine_id = mkStrParam "pkcs11" '' + ENGINE ID to use in the OpenSSL plugin. + ''; + + openssl.fips_mode = mkIntParam 0 '' + Set OpenSSL FIPS mode: + + disabled (0), + enabled (1), + Suite B enabled (2). + + Defaults to the value configured with the + --with-fips-mode option. + + ''; + + osx-attr.append = mkYesNoParam yes '' + Whether DNS servers are appended to existing entries, instead of + replacing them. + ''; + + pkcs11.load_certs = mkYesNoParam yes '' + Whether to load certificates from tokens. + ''; + + pkcs11.modules = mkAttrsOfParams { + path = mkOptionalStrParam '' + Full path to the shared object file of this PKCS#11 module + ''; + + os_locking = mkYesNoParam no '' + Whether OS locking should be enabled for this module + ''; + + load_certs = mkYesNoParam no '' + Whether the PKCS#11 modules should load certificates from tokens (since 5.0.2) + ''; + } '' + List of available PKCS#11 modules, see SmartCardsIKEv2. + ''; + + pkcs11.reload_certs = mkYesNoParam no '' + Reload certificates from all tokens if charon receives a SIGHUP. + ''; + + pkcs11.use_dh = mkYesNoParam no '' + Whether the PKCS#11 modules should be used for DH and ECDH. + ''; + + pkcs11.use_ecc = mkYesNoParam no '' + Whether the PKCS#11 modules should be used for ECDH and ECDSA public key + operations. ECDSA private keys are used regardless of this option. + ''; + + pkcs11.use_hasher = mkYesNoParam no '' + Whether the PKCS#11 modules should be used to hash data. + ''; + + pkcs11.use_pubkey = mkYesNoParam no '' + Whether the PKCS#11 modules should be used for public key operations, + even for keys not stored on tokens. + ''; + + pkcs11.use_rng = mkYesNoParam no '' + Whether the PKCS#11 modules should be used as RNG. + ''; + + radattr.dir = mkOptionalStrParam '' + Directory where RADIUS attributes are stored in client-ID specific + files, see radattr. + ''; + + radattr.message_id = mkIntParam (-1) '' + RADIUS attributes are added to all IKE_AUTH messages by default (-1), or + only to the IKE_AUTH message with the given IKEv2 message ID. + ''; + + random.random = mkStrParam "/dev/random" '' + File to read random bytes from. + ''; + + random.urandom = mkStrParam "/dev/urandom" '' + File to read pseudo random bytes from. + ''; + + random.strong_equals_true = mkYesNoParam no '' + If enabled the RNG_STRONG class reads random bytes from the same source + as the RNG_TRUE class. + ''; + + resolve.file = mkStrParam "/etc/resolv.conf" '' + File used by the resolve plugin to write DNS server entries to. + ''; + + resolve.resolvconf.iface_prefix = mkStrParam "lo.inet.ipsec." '' + Prefix used by the resolve plugin for interface names sent to + resolvconf(8). The name server address is appended to this prefix to + make it unique. The result has to be a valid interface name according to + the rules defined by resolvconf. Also, it should have a high priority + according to the order defined in interface-order(5). + ''; + + revocation.enable_crl = mkYesNoParam yes '' + Whether CRL validation should be enabled. + ''; + + revocation.enable_ocsp = mkYesNoParam yes '' + Whether OCSP validation should be enabled. + ''; + + socket-default.fwmark = mkOptionalStrParam '' + Firewall mark to set on outbound packets (a possible use case are + host-to-host tunnels with kernel-libipsec). + ''; + + socket-default.set_source = mkYesNoParam yes '' + Set source address on outbound packets, if possible. + ''; + + socket-default.set_sourceif = mkYesNoParam no '' + Force sending interface on outbound packets, if possible. This allows + using IPv6 link-local addresses as tunnel endpoints. + ''; + + socket-default.use_ipv4 = mkYesNoParam yes '' + Listen on IPv4, if possible. + ''; + + socket-default.use_ipv6 = mkYesNoParam yes '' + Listen on IPv6, if possible. + ''; + + sql.database = mkOptionalStrParam '' + Database URI for charon's SQL plugin. If it contains a password, make + sure to adjust the permissions of the config file accordingly. + ''; + + sql.loglevel = mkIntParam (-1) '' + Loglevel for logging to SQL database. + ''; + + stroke.allow_swap = mkYesNoParam yes '' + Analyze addresses/hostnames in left/right to detect which side is local + and swap configuration options if necessary. If disabled left is always + local. + ''; + + stroke.ignore_missing_ca_basic_constraint = mkYesNoParam no '' + Treat certificates in ipsec.d/cacerts and ipsec.conf ca sections as CA + certificates even if they don't contain a CA basic constraint. + ''; + + stroke.max_concurrent = mkIntParam 4 '' + Maximum number of stroke messages handled concurrently. + ''; + + stroke.secrets_file = mkStrParam "\${sysconfdir}/ipsec.secrets" '' + Location of the ipsec.secrets file. + ''; + + stroke.socket = mkStrParam "unix://\${piddir}/charon.ctl" '' + Socket provided by the stroke plugin. + ''; + + stroke.timeout = mkIntParam 0 '' + Timeout in ms for any stroke command. Use 0 to disable the timeout. + ''; + + systime-fix.interval = mkIntParam 0 '' + Interval in seconds to check system time for validity. 0 disables the + check. See systime-fix plugin. + ''; + + systime-fix.reauth = mkYesNoParam no '' + Whether to use reauth or delete if an invalid cert lifetime is detected. + ''; + + systime-fix.threshold = mkOptionalStrParam '' + Threshold date where system time is considered valid. Disabled if not + specified. + ''; + + systime-fix.threshold_format = mkStrParam "%Y" '' + strptime(3) format used to parse threshold option. + ''; + + tnc-ifmap.client_cert = mkOptionalStrParam '' + Path to X.509 certificate file of IF-MAP client. + ''; + + tnc-ifmap.client_key = mkOptionalStrParam '' + Path to private key file of IF-MAP client. + ''; + + tnc-ifmap.device_name = mkOptionalStrParam '' + Unique name of strongSwan server as a PEP and/or PDP device. + ''; + + tnc-ifmap.renew_session_interval = mkIntParam 150 '' + Interval in seconds between periodic IF-MAP RenewSession requests. + ''; + + tnc-ifmap.server_cert = mkOptionalStrParam '' + Path to X.509 certificate file of IF-MAP server. + ''; + + tnc-ifmap.server_uri = mkStrParam "https://localhost:8444/imap" '' + URI of the form [https://]servername[:port][/path]. + ''; + + tnc-ifmap.username_password = mkOptionalStrParam '' + Credentials of IF-MAP client of the form + username:password. If set, make sure to adjust the + permissions of the config file accordingly. + ''; + + tnc-imc.dlcose = mkYesNoParam yes '' + Unload IMC after use. + ''; + + tnc-imc.preferred_language = mkStrParam "en" '' + Preferred language for TNC recommendations. + ''; + + tnc-imv.dlcose = mkYesNoParam yes '' + Unload IMV after use. + ''; + + tnc-imv.recommendation_policy = mkEnumParam ["default" "any" "all"] "default" '' + default TNC recommendation policy. + ''; + + tnc-pdp.pt_tls.enable = mkYesNoParam yes '' + Enable PT-TLS protocol on the strongSwan PDP. + ''; + + tnc-pdp.pt_tls.port = mkIntParam 271 '' + PT-TLS server port the strongSwan PDP is listening on. + ''; + + tnc-pdp.radius.enable = mkYesNoParam yes '' + Enable RADIUS protocol on the strongSwan PDP. + ''; + + tnc-pdp.radius.method = mkStrParam "ttls" '' + EAP tunnel method to be used. + ''; + + tnc-pdp.radius.port = mkIntParam 1812 '' + RADIUS server port the strongSwan PDP is listening on. + ''; + + tnc-pdp.radius.secret = mkOptionalStrParam '' + Shared RADIUS secret between strongSwan PDP and NAS. If set, make sure + to adjust the permissions of the config file accordingly. + ''; + + tnc-pdp.server = mkOptionalStrParam '' + Name of the strongSwan PDP as contained in the AAA certificate. + ''; + + tnc-pdp.timeout = mkOptionalIntParam '' + Timeout in seconds before closing incomplete connections. + ''; + + tnccs-11.max_message_size = mkIntParam 45000 '' + Maximum size of a PA-TNC message (XML & Base64 encoding). + ''; + + tnccs-20.max_batch_size = mkIntParam 65522 '' + Maximum size of a PB-TNC batch (upper limit via PT-EAP = 65529). + ''; + + tnccs-20.max_message_size = mkIntParam 65490 '' + Maximum size of a PA-TNC message (upper limit via PT-EAP = 65497). + ''; + + tnccs-20.mutual = mkYesNoParam no '' + Enable PB-TNC mutual protocol. + ''; + + tpm.use_rng = mkYesNoParam no '' + Whether the TPM should be used as RNG. + ''; + + unbound.dlv_anchors = mkOptionalStrParam '' + File to read trusted keys for DLV from. It uses the same format as + . Only one DLV can be configured, which is + then used as a root trusted DLV, this means that it is a lookaside for the + root. + ''; + + unbound.resolv_conf = mkStrParam "/etc/resolv.conf" '' + File to read DNS resolver configuration from. + ''; + + unbound.trust_anchors = mkStrParam "/etc/ipsec.d/dnssec.keys" '' + File to read DNSSEC trust anchors from (usually root zone KSK). The + format of the file is the standard DNS Zone file format, anchors can be + stored as DS or DNSKEY entries in the file. + ''; + + updown.dns_handler = mkYesNoParam no '' + Whether the updown script should handle DNS servers assigned via IKEv1 + Mode Config or IKEv2 Config Payloads (if enabled they can't be handled + by other plugins, like resolve). + ''; + + vici.socket = mkStrParam "unix://\${piddir}/charon.vici" '' + Socket the vici plugin serves clients. + ''; + + whitelist.enable = mkYesNoParam yes '' + Enable loaded whitelist plugin. + ''; + + whitelist.socket = mkStrParam "unix://\${piddir}/charon.wlst" '' + Socket provided by the whitelist plugin. + ''; + + xauth-eap.backend = mkStrParam "radius" '' + EAP plugin to be used as backend for XAuth credential verification, see + XAuthEAP. + ''; + + xauth-pam.pam_service = mkStrParam "login" '' + PAM service to be used for authentication, see XAuthPAM. + ''; + + xauth-pam.session = mkYesNoParam no '' + Open/close a PAM session for each active IKE_SA. + ''; + + xauth-pam.trim_email = mkYesNoParam yes '' + If an email address is given as an XAuth username, trim it to just the + username part. + ''; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix new file mode 100644 index 000000000000..2ca2c9c396e3 --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix @@ -0,0 +1,291 @@ +lib : with (import ./param-constructors.nix lib); { + debug_level = mkIntParam 1 '' + Debug level for a stand-alone libimcv library. + ''; + + load = mkSpaceSepListParam ["random" "nonce" "gmp" "pubkey" "x509"] '' + Plugins to load in IMC/IMVs with stand-alone libimcv library. + ''; + + stderr_quiet = mkYesNoParam no '' + Disable the output to stderr with a stand-alone libimcv library. + ''; + + swid_gen = { + command = mkStrParam "/usr/local/bin/swid_generator" '' + SWID generator command to be executed. + ''; + + tag_creator = { + name = mkStrParam "strongSwan Project" '' + Name of the tagCreator entity. + ''; + + regid = mkStrParam "strongswan.org" '' + regid of the tagCreator entity. + ''; + }; + }; + + plugins = { + + imc-attestation = { + aik_blob = mkOptionalStrParam '' + AIK encrypted private key blob file. + ''; + + aik_cert = mkOptionalStrParam '' + AIK certificate file. + ''; + + aik_handle = mkOptionalStrParam '' + AIK object handle, e.g. 0x81010003. + ''; + + aik_pubkey = mkOptionalStrParam '' + AIK public key file. + ''; + + mandatory_dh_groups = mkYesNoParam yes '' + Enforce mandatory Diffie-Hellman groups + ''; + + nonce_len = mkIntParam 20 '' + DH nonce length. + ''; + + pcr_info = mkYesNoParam no '' + Whether to send pcr_before and pcr_after info. + ''; + + use_quote2 = mkYesNoParam yes '' + Use Quote2 AIK signature instead of Quote signature. + ''; + + use_version_info = mkYesNoParam no '' + Version Info is included in Quote2 signature. + ''; + }; + + imc-hcd.push_info = mkYesNoParam yes '' + Send quadruple info without being prompted. + ''; + + imc-hcd.subtypes = let + imcHcdSubtypeParams = let + softwareParams = mkAttrsOfParams { + name = mkOptionalStrParam '' + Name of the software installed on the hardcopy device. + ''; + + patches = mkOptionalStrParam '' + String describing all patches applied to the given software on this + hardcopy device. The individual patches are separated by a newline + character '\\n'. + ''; + + string_version = mkOptionalStrParam '' + String describing the version of the given software on this hardcopy device. + ''; + + version = mkOptionalStrParam '' + Hex-encoded version string with a length of 16 octets consisting of + the fields major version number (4 octets), minor version number (4 + octets), build number (4 octets), service pack major number (2 + octets) and service pack minor number (2 octets). + ''; + } '' + Defines a software section having an arbitrary name. + ''; + in { + firmware = softwareParams; + resident_application = softwareParams; + user_application = softwareParams; + attributes_natural_language = mkStrParam "en" '' + Variable length natural language tag conforming to RFC 5646 specifies + the language to be used in the health assessment message of a given + subtype. + ''; + }; + in { + system = imcHcdSubtypeParams // { + certification_state = mkOptionalStrParam '' + Hex-encoded certification state. + ''; + + configuration_state = mkOptionalStrParam '' + Hex-encoded configuration state. + ''; + + machine_type_model = mkOptionalStrParam '' + String specifying the machine type and model of the hardcopy device. + ''; + + pstn_fax_enabled = mkYesNoParam no '' + Specifies if a PSTN facsimile interface is installed and enabled on the + hardcopy device. + ''; + + time_source = mkOptionalStrParam '' + String specifying the hostname of the network time server used by the + hardcopy device. + ''; + + user_application_enabled = mkYesNoParam no '' + Specifies if users can dynamically download and execute applications on + the hardcopy device. + ''; + + user_application_persistence_enabled = mkYesNoParam no '' + Specifies if user dynamically downloaded applications can persist outside + the boundaries of a single job on the hardcopy device. + ''; + + vendor_name = mkOptionalStrParam '' + String specifying the manufacturer of the hardcopy device. + ''; + + vendor_smi_code = mkOptionalIntParam '' + Integer specifying the globally unique 24-bit SMI code assigned to the + manufacturer of the hardcopy device. + ''; + }; + control = imcHcdSubtypeParams; + marker = imcHcdSubtypeParams; + finisher = imcHcdSubtypeParams; + interface = imcHcdSubtypeParams; + scanner = imcHcdSubtypeParams; + }; + + imc-os = { + device_cert = mkOptionalStrParam '' + Manually set the path to the client device certificate + (e.g. /etc/pts/aikCert.der) + ''; + + device_id = mkOptionalStrParam '' + Manually set the client device ID in hexadecimal format + (e.g. 1083f03988c9762703b1c1080c2e46f72b99cc31) + ''; + + device_pubkey = mkOptionalStrParam '' + Manually set the path to the client device public key + (e.g. /etc/pts/aikPub.der) + ''; + + push_info = mkYesNoParam yes '' + Send operating system info without being prompted. + ''; + }; + + imc-scanner.push_info = mkYesNoParam yes '' + Send open listening ports without being prompted. + ''; + + imc-swid = { + swid_full = mkYesNoParam no '' + Include file information in the XML-encoded SWID tags. + ''; + + swid_pretty = mkYesNoParam no '' + Generate XML-encoded SWID tags with pretty indentation. + ''; + + swid_directory = mkStrParam "\${prefix}/share" '' + Directory where SWID tags are located. + ''; + }; + + imc-swima = { + eid_epoch = mkHexParam "0x11223344" '' + Set 32 bit epoch value for event IDs manually if software collector + database is not available. + ''; + + swid_database = mkOptionalStrParam '' + URI to software collector database containing event timestamps, software + creation and deletion events and collected software identifiers. If it + contains a password, make sure to adjust the permissions of the config + file accordingly. + ''; + + swid_directory = mkStrParam "\${prefix}/share" '' + Directory where SWID tags are located. + ''; + + swid_pretty = mkYesNoParam no '' + Generate XML-encoded SWID tags with pretty indentation. + ''; + + swid_full = mkYesNoParam no '' + Include file information in the XML-encoded SWID tags. + ''; + }; + + imc-test = { + additional_ids = mkIntParam 0 '' + Number of additional IMC IDs. + ''; + + command = mkStrParam "none" '' + Command to be sent to the Test IMV. + ''; + + dummy_size = mkIntParam 0 '' + Size of dummy attribute to be sent to the Test IMV (0 = disabled). + ''; + + retry = mkYesNoParam no '' + Do a handshake retry. + ''; + + retry_command = mkOptionalStrParam '' + Command to be sent to the IMV Test in the handshake retry. + ''; + }; + + imv-attestation = { + cadir = mkOptionalStrParam '' + Path to directory with AIK cacerts. + ''; + + dh_group = mkStrParam "ecp256" '' + Preferred Diffie-Hellman group. + ''; + + hash_algorithm = mkStrParam "sha256" '' + Preferred measurement hash algorithm. + ''; + + min_nonce_len = mkIntParam 0 '' + DH minimum nonce length. + ''; + + remediation_uri = mkOptionalStrParam '' + URI pointing to attestation remediation instructions. + ''; + }; + + imv-os.remediation_uri = mkOptionalStrParam '' + URI pointing to operating system remediation instructions. + ''; + + imv-scanner.remediation_uri = mkOptionalStrParam '' + URI pointing to scanner remediation instructions. + ''; + + imv-swima.rest_api = { + uri = mkOptionalStrParam '' + HTTP URI of the SWID REST API. + ''; + + timeout = mkIntParam 120 '' + Timeout of SWID REST API HTTP POST transaction. + ''; + }; + + imv-test.rounds = mkIntParam 0 '' + Number of IMC-IMV retry rounds. + ''; + }; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix new file mode 100644 index 000000000000..0f517d8ead4e --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix @@ -0,0 +1,29 @@ +lib : with (import ./param-constructors.nix lib); + +let mkJournalParam = description : + mkEnumParam [(-1) 0 1 2 3 4] 0 "Logging level for ${description}"; +in { + default = mkIntParam 1 '' + Specifies the default loglevel to be used for subsystems for which no + specific loglevel is defined. + ''; + + app = mkJournalParam "applications other than daemons."; + asn = mkJournalParam "low-level encoding/decoding (ASN.1, X.509 etc.)"; + cfg = mkJournalParam "configuration management and plugins."; + chd = mkJournalParam "CHILD_SA/IPsec SA."; + dmn = mkJournalParam "main daemon setup/cleanup/signal handling."; + enc = mkJournalParam "packet encoding/decoding encryption/decryption operations."; + esp = mkJournalParam "libipsec library messages."; + ike = mkJournalParam "IKE_SA/ISAKMP SA."; + imc = mkJournalParam "integrity Measurement Collector."; + imv = mkJournalParam "integrity Measurement Verifier."; + job = mkJournalParam "jobs queuing/processing and thread pool management."; + knl = mkJournalParam "IPsec/Networking kernel interface."; + lib = mkJournalParam "libstrongwan library messages."; + mgr = mkJournalParam "IKE_SA manager, handling synchronization for IKE_SA access."; + net = mkJournalParam "IKE network communication."; + pts = mkJournalParam "platform Trust Service."; + tls = mkJournalParam "libtls library messages."; + tnc = mkJournalParam "trusted Network Connect."; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix new file mode 100644 index 000000000000..ad8053053701 --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix @@ -0,0 +1,228 @@ +# See: https://wiki.strongswan.org/projects/strongswan/wiki/StrongswanConf +# +# When strongSwan is upgraded please update the parameters in this file. You can +# see which parameters should be deleted, changed or added by diffing +# the strongswan conf directory: +# +# git clone https://github.com/strongswan/strongswan.git +# cd strongswan +# git diff 5.5.3..5.6.0 conf/ + +lib: with (import ./param-constructors.nix lib); + +let charonParams = import ./strongswan-charon-params.nix lib; +in { + aikgen = { + load = mkSpaceSepListParam [] '' + Plugins to load in ipsec aikgen tool. + ''; + }; + attest = { + database = mkOptionalStrParam '' + File measurement information database URI. If it contains a password, + make sure to adjust the permissions of the config file accordingly. + ''; + + load = mkSpaceSepListParam [] '' + Plugins to load in ipsec attest tool. + ''; + }; + + charon = charonParams; + + charon-nm = { + ca_dir = mkStrParam "" '' + Directory from which to load CA certificates if no certificate is + configured. + ''; + }; + + charon-systemd = charonParams // { + journal = import ./strongswan-loglevel-params.nix lib; + }; + + imv_policy_manager = { + command_allow = mkOptionalStrParam '' + Shell command to be executed with recommendation allow. + ''; + + command_block = mkOptionalStrParam '' + Shell command to be executed with all other recommendations. + ''; + + database = mkOptionalStrParam '' + Database URI for the database that stores the package information. If it + contains a password, make sure to adjust permissions of the config file + accordingly. + ''; + + load = mkSpaceSepListParam ["sqlite"] '' + Plugins to load in IMV policy manager. + ''; + }; + + libimcv = import ./strongswan-libimcv-params.nix lib; + + manager = { + database = mkOptionalStrParam '' + Credential database URI for manager. If it contains a password, make + sure to adjust the permissions of the config file accordingly. + ''; + + debug = mkYesNoParam no '' + Enable debugging in manager. + ''; + + load = mkSpaceSepListParam [] '' + Plugins to load in manager. + ''; + + socket = mkOptionalStrParam '' + FastCGI socket of manager, to run it statically. + ''; + + threads = mkIntParam 10 '' + Threads to use for request handling. + ''; + + timeout = mkDurationParam "15m" '' + Session timeout for manager. + ''; + }; + + medcli = { + database = mkOptionalStrParam '' + Mediation client database URI. If it contains a password, make sure to + adjust the permissions of the config file accordingly. + ''; + + dpd = mkDurationParam "5m" '' + DPD timeout to use in mediation client plugin. + ''; + + rekey = mkDurationParam "20m" '' + Rekeying time on mediation connections in mediation client plugin. + ''; + }; + + medsrv = { + database = mkOptionalStrParam '' + Mediation server database URI. If it contains a password, make sure to + adjust the permissions of the config file accordingly. + ''; + + debug = mkYesNoParam no '' + Debugging in mediation server web application. + ''; + + dpd = mkDurationParam "5m" '' + DPD timeout to use in mediation server plugin. + ''; + + load = mkSpaceSepListParam [] '' + Plugins to load in mediation server plugin. + ''; + + password_length = mkIntParam 6 '' + Minimum password length required for mediation server user accounts. + ''; + + rekey = mkDurationParam "20m" '' + Rekeying time on mediation connections in mediation server plugin. + ''; + + socket = mkOptionalStrParam '' + Run Mediation server web application statically on socket. + ''; + + threads = mkIntParam 5 '' + Number of thread for mediation service web application. + ''; + + timeout = mkDurationParam "15m" '' + Session timeout for mediation service. + ''; + }; + + pacman.database = mkOptionalStrParam '' + Database URI for the database that stores the package information. If it + contains a password, make sure to adjust the permissions of the config + file accordingly. + ''; + + pki.load = mkSpaceSepListParam [] '' + Plugins to load in ipsec pki tool. + ''; + + pool = { + database = mkOptionalStrParam '' + Database URI for the database that stores IP pools and configuration + attributes. If it contains a password, make sure to adjust the + permissions of the config file accordingly. + ''; + + load = mkSpaceSepListParam [] '' + Plugins to load in ipsec pool tool. + ''; + }; + + pt-tls-client.load = mkSpaceSepListParam [] '' + Plugins to load in ipsec pt-tls-client tool. + ''; + + scepclient.load = mkSpaceSepListParam [] '' + Plugins to load in ipsec scepclient tool. + ''; + + starter = { + config_file = mkStrParam "\${sysconfdir}/ipsec.conf" '' + Location of the ipsec.conf file. + ''; + + load_warning = mkYesNoParam yes '' + Show charon.load setting warning, see + https://wiki.strongswan.org/projects/strongswan/wiki/PluginLoad + ''; + }; + + sw-collector = { + database = mkOptionalStrParam '' + URI to software collector database containing event timestamps, + software creation and deletion events and collected software + identifiers. If it contains a password, make sure to adjust the + permissions of the config file accordingly. + ''; + + first_file = mkStrParam "/var/log/bootstrap.log" '' + Path pointing to file created when the Linux OS was installed. + ''; + + first_time = mkStrParam "0000-00-00T00:00:00Z" '' + Time in UTC when the Linux OS was installed. + ''; + + history = mkOptionalStrParam '' + Path pointing to apt history.log file. + ''; + + rest_api = { + uri = mkOptionalStrParam '' + HTTP URI of the central collector's REST API. + ''; + + timeout = mkIntParam 120 '' + Timeout of REST API HTTP POST transaction. + ''; + }; + + load = mkSpaceSepListParam [] "Plugins to load in sw-collector tool."; + }; + + swanctl = { + load = mkSpaceSepListParam [] "Plugins to load in swanctl."; + + socket = mkStrParam "unix://\${piddir}/charon.vici" '' + VICI socket to connect to by default. + ''; + }; +} diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix new file mode 100644 index 000000000000..095ae549730e --- /dev/null +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -0,0 +1,1145 @@ +# See: https://wiki.strongswan.org/projects/strongswan/wiki/Swanctlconf +# +# When strongSwan is upgraded please update the parameters in this file. You can +# see which parameters should be deleted, changed or added by diffing +# swanctl.opt: +# +# git clone https://github.com/strongswan/strongswan.git +# cd strongswan +# git diff 5.5.3..5.6.0 src/swanctl/swanctl.opt + +lib: with (import ./param-constructors.nix lib); + +let + certParams = { + file = mkOptionalStrParam '' + Absolute path to the certificate to load. Passed as-is to the daemon, so + it must be readable by it. + + Configure either this or , but not both, in one section. + ''; + + handle = mkOptionalHexParam '' + Hex-encoded CKA_ID or handle of the certificate on a token or TPM, + respectively. + + Configure either this or , but not both, in one section. + ''; + + slot = mkOptionalIntParam '' + Optional slot number of the token that stores the certificate. + ''; + + module = mkOptionalStrParam '' + Optional PKCS#11 module name. + ''; + }; +in { + authorities = mkAttrsOfParams ({ + + cacert = mkOptionalStrParam '' + The certificates may use a relative path from the swanctl + x509ca directory or an absolute path. + + Configure one of , + , or + per section. + ''; + + cert_uri_base = mkOptionalStrParam '' + Defines the base URI for the Hash and URL feature supported by + IKEv2. Instead of exchanging complete certificates, IKEv2 allows one to + send an URI that resolves to the DER encoded certificate. The certificate + URIs are built by appending the SHA1 hash of the DER encoded certificates + to this base URI. + ''; + + crl_uris = mkCommaSepListParam [] '' + List of CRL distribution points (ldap, http, or file URI). + ''; + + ocsp_uris = mkCommaSepListParam [] '' + List of OCSP URIs. + ''; + + } // certParams) '' + Section defining complementary attributes of certification authorities, each + in its own subsection with an arbitrary yet unique name + ''; + + connections = mkAttrsOfParams { + + version = mkIntParam 0 '' + IKE major version to use for connection. + + 1 uses IKEv1 aka ISAKMP, + 2 uses IKEv2. + A connection using the default of 0 accepts both IKEv1 and IKEv2 as + responder, and initiates the connection actively with IKEv2. + + ''; + + local_addrs = mkCommaSepListParam [] '' + Local address(es) to use for IKE communication. Takes + single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. + + As initiator, the first non-range/non-subnet is used to initiate the + connection from. As responder, the local destination address must match at + least to one of the specified addresses, subnets or ranges. + + If FQDNs are assigned they are resolved every time a configuration lookup + is done. If DNS resolution times out, the lookup is delayed for that time. + ''; + + remote_addrs = mkCommaSepListParam [] '' + Remote address(es) to use for IKE communication. Takes + single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. + + As initiator, the first non-range/non-subnet is used to initiate the + connection to. As responder, the initiator source address must match at + least to one of the specified addresses, subnets or ranges. + + If FQDNs are assigned they are resolved every time a configuration lookup + is done. If DNS resolution times out, the lookup is delayed for that time. + To initiate a connection, at least one specific address or DNS name must + be specified. + ''; + + local_port = mkIntParam 500 '' + Local UDP port for IKE communication. By default the port of the socket + backend is used, which is usually 500. If port + 500 is used, automatic IKE port floating to port + 4500 is used to work around NAT issues. + + Using a non-default local IKE port requires support from the socket + backend in use (socket-dynamic). + ''; + + remote_port = mkIntParam 500 '' + Remote UDP port for IKE communication. If the default of port + 500 is used, automatic IKE port floating to port + 4500 is used to work around NAT issues. + ''; + + proposals = mkCommaSepListParam ["default"] '' + A proposal is a set of algorithms. For non-AEAD algorithms, this includes + for IKE an encryption algorithm, an integrity algorithm, a pseudo random + function and a Diffie-Hellman group. For AEAD algorithms, instead of + encryption and integrity algorithms, a combined algorithm is used. + + In IKEv2, multiple algorithms of the same kind can be specified in a + single proposal, from which one gets selected. In IKEv1, only one + algorithm per kind is allowed per proposal, more algorithms get implicitly + stripped. Use multiple proposals to offer different algorithms + combinations in IKEv1. + + Algorithm keywords get separated using dashes. Multiple proposals may be + specified in a list. The special value default forms a + default proposal of supported algorithms considered safe, and is usually a + good choice for interoperability. + ''; + + vips = mkCommaSepListParam [] '' + List of virtual IPs to request in IKEv2 configuration payloads or IKEv1 + Mode Config. The wildcard addresses 0.0.0.0 and + :: request an arbitrary address, specific addresses may + be defined. The responder may return a different address, though, or none + at all. + ''; + + aggressive = mkYesNoParam no '' + Enables Aggressive Mode instead of Main Mode with Identity + Protection. Aggressive Mode is considered less secure, because the ID and + HASH payloads are exchanged unprotected. This allows a passive attacker to + snoop peer identities, and even worse, start dictionary attacks on the + Preshared Key. + ''; + + pull = mkYesNoParam yes '' + If the default of yes is used, Mode Config works in pull mode, where the + initiator actively requests a virtual IP. With no, push mode is used, + where the responder pushes down a virtual IP to the initiating peer. + + Push mode is currently supported for IKEv1, but not in IKEv2. It is used + by a few implementations only, pull mode is recommended. + ''; + + dscp = mkStrParam "000000" '' + Differentiated Services Field Codepoint to set on outgoing IKE packets for + this connection. The value is a six digit binary encoded string specifying + the Codepoint to set, as defined in RFC 2474. + ''; + + encap = mkYesNoParam no '' + To enforce UDP encapsulation of ESP packets, the IKE daemon can fake the + NAT detection payloads. This makes the peer believe that NAT takes place + on the path, forcing it to encapsulate ESP packets in UDP. + + Usually this is not required, but it can help to work around connectivity + issues with too restrictive intermediary firewalls. + ''; + + mobike = mkYesNoParam yes '' + Enables MOBIKE on IKEv2 connections. MOBIKE is enabled by default on IKEv2 + connections, and allows mobility of clients and multi-homing on servers by + migrating active IPsec tunnels. + + Usually keeping MOBIKE enabled is unproblematic, as it is not used if the + peer does not indicate support for it. However, due to the design of + MOBIKE, IKEv2 always floats to port 4500 starting from the second + exchange. Some implementations don't like this behavior, hence it can be + disabled. + ''; + + dpd_delay = mkDurationParam "0s" '' + Interval to check the liveness of a peer actively using IKEv2 + INFORMATIONAL exchanges or IKEv1 R_U_THERE messages. Active DPD checking + is only enforced if no IKE or ESP/AH packet has been received for the + configured DPD delay. + ''; + + dpd_timeout = mkDurationParam "0s" '' + Charon by default uses the normal retransmission mechanism and timeouts to + check the liveness of a peer, as all messages are used for liveness + checking. For compatibility reasons, with IKEv1 a custom interval may be + specified; this option has no effect on connections using IKEv2. + ''; + + fragmentation = mkEnumParam ["yes" "accept" "force" "no"] "yes" '' + Use IKE fragmentation (proprietary IKEv1 extension or RFC 7383 IKEv2 + fragmentation). Acceptable values are yes (the default + since 5.5.1), accept (since versions:5.5.3), + force and no. + + If set to yes, and the peer + supports it, oversized IKE messages will be sent in fragments. + If set to + accept, support for fragmentation is announced to the peer but the daemon + does not send its own messages in fragments. + If set to force (only + supported for IKEv1) the initial IKE message will already be fragmented if + required. + Finally, setting the option to no will disable announcing + support for this feature. + + + Note that fragmented IKE messages sent by a peer are always processed + irrespective of the value of this option (even when set to no). + ''; + + send_certreq = mkYesNoParam yes '' + Send certificate request payloads to offer trusted root CA certificates to + the peer. Certificate requests help the peer to choose an appropriate + certificate/private key for authentication and are enabled by default. + Disabling certificate requests can be useful if too many trusted root CA + certificates are installed, as each certificate request increases the size + of the initial IKE packets. + ''; + + send_cert = mkEnumParam ["always" "never" "ifasked" ] "ifasked" '' + Send certificate payloads when using certificate authentication. + + With the default of ifasked the daemon sends + certificate payloads only if certificate requests have been received. + never disables sending of certificate payloads + altogether, + always causes certificate payloads to be sent + unconditionally whenever certificate authentication is used. + + ''; + + keyingtries = mkIntParam 1 '' + Number of retransmission sequences to perform during initial + connect. Instead of giving up initiation after the first retransmission + sequence with the default value of 1, additional + sequences may be started according to the configured value. A value of + 0 initiates a new sequence until the connection + establishes or fails with a permanent error. + ''; + + unique = mkEnumParam ["no" "never" "keep" "replace"] "no" '' + Connection uniqueness policy to enforce. To avoid multiple connections + from the same user, a uniqueness policy can be enforced. + + + + The value never does never enforce such a policy, even + if a peer included INITIAL_CONTACT notification messages, + + + whereas no replaces existing connections for the same + identity if a new one has the INITIAL_CONTACT notify. + + + keep rejects new connection attempts if the same user + already has an active connection, + + + replace deletes any existing connection if a new one + for the same user gets established. + + + To compare connections for uniqueness, the remote IKE identity is used. If + EAP or XAuth authentication is involved, the EAP-Identity or XAuth + username is used to enforce the uniqueness policy instead. + + On initiators this setting specifies whether an INITIAL_CONTACT notify is + sent during IKE_AUTH if no existing connection is found with the remote + peer (determined by the identities of the first authentication + round). Only if set to keep or replace will the client send a notify. + ''; + + reauth_time = mkDurationParam "0s" '' + Time to schedule IKE reauthentication. IKE reauthentication recreates the + IKE/ISAKMP SA from scratch and re-evaluates the credentials. In asymmetric + configurations (with EAP or configuration payloads) it might not be + possible to actively reauthenticate as responder. The IKEv2 + reauthentication lifetime negotiation can instruct the client to perform + reauthentication. + + Reauthentication is disabled by default. Enabling it usually may lead to + small connection interruptions, as strongSwan uses a break-before-make + policy with IKEv2 to avoid any conflicts with associated tunnel resources. + ''; + + rekey_time = mkDurationParam "4h" '' + IKE rekeying refreshes key material using a Diffie-Hellman exchange, but + does not re-check associated credentials. It is supported in IKEv2 only, + IKEv1 performs a reauthentication procedure instead. + + With the default value IKE rekeying is scheduled every 4 hours, minus the + configured rand_time. If a reauth_time is configured, rekey_time defaults + to zero, disabling rekeying; explicitly set both to enforce rekeying and + reauthentication. + ''; + + over_time = mkOptionalDurationParam '' + Hard IKE_SA lifetime if rekey/reauth does not complete, as time. To avoid + having an IKE/ISAKMP kept alive if IKE reauthentication or rekeying fails + perpetually, a maximum hard lifetime may be specified. If the IKE_SA fails + to rekey or reauthenticate within the specified time, the IKE_SA gets + closed. + + In contrast to CHILD_SA rekeying, over_time is relative in time to the + rekey_time and reauth_time values, as it applies to both. + + The default is 10% of the longer of and + . + ''; + + rand_time = mkOptionalDurationParam '' + Time range from which to choose a random value to subtract from + rekey/reauth times. To avoid having both peers initiating the rekey/reauth + procedure simultaneously, a random time gets subtracted from the + rekey/reauth times. + + The default is equal to the configured . + ''; + + pools = mkCommaSepListParam [] '' + List of named IP pools to allocate virtual IP addresses + and other configuration attributes from. Each name references a pool by + name from either the pools section or an external pool. + ''; + + mediation = mkYesNoParam no '' + Whether this connection is a mediation connection, that is, whether this + connection is used to mediate other connections using the IKEv2 Mediation + Extension. Mediation connections create no CHILD_SA. + ''; + + mediated_by = mkOptionalStrParam '' + The name of the connection to mediate this connection through. If given, + the connection will be mediated through the named mediation + connection. The mediation connection must have mediation enabled. + ''; + + mediation_peer = mkOptionalStrParam '' + Identity under which the peer is registered at the mediation server, that + is, the IKE identity the other end of this connection uses as its local + identity on its connection to the mediation server. This is the identity + we request the mediation server to mediate us with. Only relevant on + connections that set mediated_by. If it is not given, the remote IKE + identity of the first authentication round of this connection will be + used. + ''; + + local = mkPrefixedAttrsOfParams { + + round = mkIntParam 0 '' + Optional numeric identifier by which authentication rounds are + sorted. If not specified rounds are ordered by their position in the + config file/vici message. + ''; + + certs = mkCommaSepListParam [] '' + List of certificate candidates to use for + authentication. The certificates may use a relative path from the + swanctl x509 directory or an absolute path. + + The certificate used for authentication is selected based on the + received certificate request payloads. If no appropriate CA can be + located, the first certificate is used. + ''; + + cert = mkPostfixedAttrsOfParams certParams '' + Section for a certificate candidate to use for + authentication. Certificates in certs are transmitted as binary blobs, + these sections offer more flexibility. + ''; + + pubkeys = mkCommaSepListParam [] '' + List of raw public key candidates to use for + authentication. The public keys may use a relative path from the swanctl + pubkey directory or an absolute path. + + Even though multiple local public keys could be defined in principle, + only the first public key in the list is used for authentication. + ''; + + auth = mkStrParam "pubkey" '' + Authentication to perform locally. + + + The default pubkey uses public key authentication + using a private key associated to a usable certificate. + + + psk uses pre-shared key authentication. + + + The IKEv1 specific xauth is used for XAuth or Hybrid + authentication, + + + while the IKEv2 specific eap keyword defines EAP + authentication. + + + For xauth, a specific backend name may be appended, + separated by a dash. The appropriate xauth backend is + selected to perform the XAuth exchange. For traditional XAuth, the + xauth method is usually defined in the second + authentication round following an initial pubkey (or + psk) round. Using xauth in the + first round performs Hybrid Mode client authentication. + + + For eap, a specific EAP method name may be appended, separated by a + dash. An EAP module implementing the appropriate method is selected to + perform the EAP conversation. + + + Since 5.4.0, if both peers support RFC 7427 ("Signature Authentication + in IKEv2") specific hash algorithms to be used during IKEv2 + authentication may be configured. To do so use ike: + followed by a trust chain signature scheme constraint (see description + of the section's + keyword). For example, with ike:pubkey-sha384-sha256 + a public key signature scheme with either SHA-384 or SHA-256 would get + used for authentication, in that order and depending on the hash + algorithms supported by the peer. If no specific hash algorithms are + configured, the default is to prefer an algorithm that matches or + exceeds the strength of the signature key. If no constraints with + ike: prefix are configured any signature scheme + constraint (without ike: prefix) will also apply to + IKEv2 authentication, unless this is disabled in + strongswan.conf. + + + ''; + + id = mkOptionalStrParam '' + IKE identity to use for authentication round. When using certificate + authentication, the IKE identity must be contained in the certificate, + either as subject or as subjectAltName. + ''; + + eap_id = mkOptionalStrParam '' + Client EAP-Identity to use in EAP-Identity exchange and the EAP method. + ''; + + aaa_id = mkOptionalStrParam '' + Server side EAP-Identity to expect in the EAP method. Some EAP methods, + such as EAP-TLS, use an identity for the server to perform mutual + authentication. This identity may differ from the IKE identity, + especially when EAP authentication is delegated from the IKE responder + to an AAA backend. + + For EAP-(T)TLS, this defines the identity for which the server must + provide a certificate in the TLS exchange. + ''; + + xauth_id = mkOptionalStrParam '' + Client XAuth username used in the XAuth exchange. + ''; + + } '' + Section for a local authentication round. A local authentication round + defines the rules how authentication is performed for the local + peer. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple + Authentication or IKEv1 XAuth. + + Each round is defined in a section having local as + prefix, and an optional unique suffix. To define a single authentication + round, the suffix may be omitted. + ''; + + remote = mkPrefixedAttrsOfParams { + + round = mkIntParam 0 '' + Optional numeric identifier by which authentication rounds are + sorted. If not specified rounds are ordered by their position in the + config file/vici message. + ''; + + id = mkStrParam "%any" '' + IKE identity to expect for authentication round. When using certificate + authentication, the IKE identity must be contained in the certificate, + either as subject or as subjectAltName. + ''; + + eap_id = mkOptionalStrParam '' + Identity to use as peer identity during EAP authentication. If set to + %any the EAP-Identity method will be used to ask the + client for an EAP identity. + ''; + + groups = mkCommaSepListParam [] '' + Authorization group memberships to require. The peer + must prove membership to at least one of the specified groups. Group + membership can be certified by different means, for example by + appropriate Attribute Certificates or by an AAA backend involved in the + authentication. + ''; + + cert_policy = mkCommaSepListParam [] '' + List of certificate policy OIDs the peer's certificate + must have. OIDs are specified using the numerical dotted representation. + ''; + + certs = mkCommaSepListParam [] '' + List of certificates to accept for authentication. The certificates may + use a relative path from the swanctl x509 directory + or an absolute path. + ''; + + cert = mkPostfixedAttrsOfParams certParams '' + Section for a certificate candidate to use for + authentication. Certificates in certs are transmitted as binary blobs, + these sections offer more flexibility. + ''; + + cacerts = mkCommaSepListParam [] '' + List of CA certificates to accept for + authentication. The certificates may use a relative path from the + swanctl x509ca directory or an absolute path. + ''; + + cacert = mkPostfixedAttrsOfParams certParams '' + Section for a CA certificate to accept for authentication. Certificates + in cacerts are transmitted as binary blobs, these sections offer more + flexibility. + ''; + + pubkeys = mkCommaSepListParam [] '' + List of raw public keys to accept for + authentication. The public keys may use a relative path from the swanctl + pubkey directory or an absolute path. + ''; + + revocation = mkEnumParam ["strict" "ifuri" "relaxed"] "relaxed" '' + Certificate revocation policy for CRL or OCSP revocation. + + + A strict revocation policy fails if no revocation information is + available, i.e. the certificate is not known to be unrevoked. + + + ifuri fails only if a CRL/OCSP URI is available, but certificate + revocation checking fails, i.e. there should be revocation information + available, but it could not be obtained. + + + The default revocation policy relaxed fails only if a certificate is + revoked, i.e. it is explicitly known that it is bad. + + + ''; + + auth = mkStrParam "pubkey" '' + Authentication to expect from remote. See the + section's keyword description about the details of + supported mechanisms. + + Since 5.4.0, to require a trustchain public key strength for the remote + side, specify the key type followed by the minimum strength in bits (for + example ecdsa-384 or + rsa-2048-ecdsa-256). To limit the acceptable set of + hashing algorithms for trustchain validation, append hash algorithms to + pubkey or a key strength definition (for example + pubkey-sha1-sha256 or + rsa-2048-ecdsa-256-sha256-sha384-sha512). Unless + disabled in strongswan.conf, or explicit IKEv2 + signature constraints are configured (refer to the description of the + section's keyword for + details), such key types and hash algorithms are also applied as + constraints against IKEv2 signature authentication schemes used by the + remote side. + + To specify trust chain constraints for EAP-(T)TLS, append a colon to the + EAP method, followed by the key type/size and hash algorithm as + discussed above (e.g. eap-tls:ecdsa-384-sha384). + ''; + + } '' + Section for a remote authentication round. A remote authentication round + defines the constraints how the peers must authenticate to use this + connection. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple + Authentication or IKEv1 XAuth. + + Each round is defined in a section having remote as + prefix, and an optional unique suffix. To define a single authentication + round, the suffix may be omitted. + ''; + + children = mkAttrsOfParams { + ah_proposals = mkCommaSepListParam [] '' + AH proposals to offer for the CHILD_SA. A proposal is a set of + algorithms. For AH, this includes an integrity algorithm and an optional + Diffie-Hellman group. If a DH group is specified, CHILD_SA/Quick Mode + rekeying and initial negotiation uses a separate Diffie-Hellman exchange + using the specified group (refer to esp_proposals for details). + + In IKEv2, multiple algorithms of the same kind can be specified in a + single proposal, from which one gets selected. In IKEv1, only one + algorithm per kind is allowed per proposal, more algorithms get + implicitly stripped. Use multiple proposals to offer different algorithms + combinations in IKEv1. + + Algorithm keywords get separated using dashes. Multiple proposals may be + specified in a list. The special value default forms + a default proposal of supported algorithms considered safe, and is + usually a good choice for interoperability. By default no AH proposals + are included, instead ESP is proposed. + ''; + + esp_proposals = mkCommaSepListParam ["default"] '' + ESP proposals to offer for the CHILD_SA. A proposal is a set of + algorithms. For ESP non-AEAD proposals, this includes an integrity + algorithm, an encryption algorithm, an optional Diffie-Hellman group and + an optional Extended Sequence Number Mode indicator. For AEAD proposals, + a combined mode algorithm is used instead of the separate + encryption/integrity algorithms. + + If a DH group is specified, CHILD_SA/Quick Mode rekeying and initial + negotiation use a separate Diffie-Hellman exchange using the specified + group. However, for IKEv2, the keys of the CHILD_SA created implicitly + with the IKE_SA will always be derived from the IKE_SA's key material. So + any DH group specified here will only apply when the CHILD_SA is later + rekeyed or is created with a separate CREATE_CHILD_SA exchange. A + proposal mismatch might, therefore, not immediately be noticed when the + SA is established, but may later cause rekeying to fail. + + Extended Sequence Number support may be indicated with the + esn and noesn values, both may be + included to indicate support for both modes. If omitted, + noesn is assumed. + + In IKEv2, multiple algorithms of the same kind can be specified in a + single proposal, from which one gets selected. In IKEv1, only one + algorithm per kind is allowed per proposal, more algorithms get + implicitly stripped. Use multiple proposals to offer different algorithms + combinations in IKEv1. + + Algorithm keywords get separated using dashes. Multiple proposals may be + specified as a list. The special value default forms + a default proposal of supported algorithms considered safe, and is + usually a good choice for interoperability. If no algorithms are + specified for AH nor ESP, the default set of algorithms for ESP is + included. + ''; + + sha256_96 = mkYesNoParam no '' + HMAC-SHA-256 is used with 128-bit truncation with IPsec. For + compatibility with implementations that incorrectly use 96-bit truncation + this option may be enabled to configure the shorter truncation length in + the kernel. This is not negotiated, so this only works with peers that + use the incorrect truncation length (or have this option enabled). + ''; + + local_ts = mkCommaSepListParam ["dynamic"] '' + List of local traffic selectors to include in CHILD_SA. Each selector is + a CIDR subnet definition, followed by an optional proto/port + selector. The special value dynamic may be used + instead of a subnet definition, which gets replaced by the tunnel outer + address or the virtual IP, if negotiated. This is the default. + + A protocol/port selector is surrounded by opening and closing square + brackets. Between these brackets, a numeric or getservent(3) protocol + name may be specified. After the optional protocol restriction, an + optional port restriction may be specified, separated by a slash. The + port restriction may be numeric, a getservent(3) service name, or the + special value opaque for RFC 4301 OPAQUE + selectors. Port ranges may be specified as well, none of the kernel + backends currently support port ranges, though. + + When IKEv1 is used only the first selector is interpreted, except if the + Cisco Unity extension plugin is used. This is due to a limitation of the + IKEv1 protocol, which only allows a single pair of selectors per + CHILD_SA. So to tunnel traffic matched by several pairs of selectors when + using IKEv1 several children (CHILD_SAs) have to be defined that cover + the selectors. The IKE daemon uses traffic selector narrowing for IKEv1, + the same way it is standardized and implemented for IKEv2. However, this + may lead to problems with other implementations. To avoid that, configure + identical selectors in such scenarios. + ''; + + remote_ts = mkCommaSepListParam ["dynamic"] '' + List of remote selectors to include in CHILD_SA. See + for a description of the selector syntax. + ''; + + rekey_time = mkDurationParam "1h" '' + Time to schedule CHILD_SA rekeying. CHILD_SA rekeying refreshes key + material, optionally using a Diffie-Hellman exchange if a group is + specified in the proposal. To avoid rekey collisions initiated by both + ends simultaneously, a value in the range of + gets subtracted to form the effective soft lifetime. + + By default CHILD_SA rekeying is scheduled every hour, minus + . + ''; + + life_time = mkOptionalDurationParam '' + Maximum lifetime before CHILD_SA gets closed. Usually this hard lifetime + is never reached, because the CHILD_SA gets rekeyed before. If that fails + for whatever reason, this limit closes the CHILD_SA. The default is 10% + more than the . + ''; + + rand_time = mkOptionalDurationParam '' + Time range from which to choose a random value to subtract from + . The default is the difference between + and . + ''; + + rekey_bytes = mkIntParam 0 '' + Number of bytes processed before initiating CHILD_SA rekeying. CHILD_SA + rekeying refreshes key material, optionally using a Diffie-Hellman + exchange if a group is specified in the proposal. + + To avoid rekey collisions initiated by both ends simultaneously, a value + in the range of gets subtracted to form the + effective soft volume limit. + + Volume based CHILD_SA rekeying is disabled by default. + ''; + + life_bytes = mkOptionalIntParam '' + Maximum bytes processed before CHILD_SA gets closed. Usually this hard + volume limit is never reached, because the CHILD_SA gets rekeyed + before. If that fails for whatever reason, this limit closes the + CHILD_SA. The default is 10% more than . + ''; + + rand_bytes = mkOptionalIntParam '' + Byte range from which to choose a random value to subtract from + . The default is the difference between + and . + ''; + + rekey_packets = mkIntParam 0 '' + Number of packets processed before initiating CHILD_SA rekeying. CHILD_SA + rekeying refreshes key material, optionally using a Diffie-Hellman + exchange if a group is specified in the proposal. + + To avoid rekey collisions initiated by both ends simultaneously, a value + in the range of gets subtracted to form + the effective soft packet count limit. + + Packet count based CHILD_SA rekeying is disabled by default. + ''; + + life_packets = mkOptionalIntParam '' + Maximum number of packets processed before CHILD_SA gets closed. Usually + this hard packets limit is never reached, because the CHILD_SA gets + rekeyed before. If that fails for whatever reason, this limit closes the + CHILD_SA. + + The default is 10% more than . + ''; + + rand_packets = mkOptionalIntParam '' + Packet range from which to choose a random value to subtract from + . The default is the difference between + and . + ''; + + updown = mkOptionalStrParam '' + Updown script to invoke on CHILD_SA up and down events. + ''; + + hostaccess = mkYesNoParam yes '' + Hostaccess variable to pass to updown script. + ''; + + mode = mkEnumParam [ "tunnel" + "transport" + "transport_proxy" + "beet" + "pass" + "drop" + ] "tunnel" '' + IPsec Mode to establish CHILD_SA with. + + + tunnel negotiates the CHILD_SA in IPsec Tunnel Mode, + + + whereas transport uses IPsec Transport Mode. + + + transport_proxy signifying the special Mobile IPv6 + Transport Proxy Mode. + + + beet is the Bound End to End Tunnel mixture mode, + working with fixed inner addresses without the need to include them in + each packet. + + + Both transport and beet modes are + subject to mode negotiation; tunnel mode is + negotiated if the preferred mode is not available. + + + pass and drop are used to install + shunt policies which explicitly bypass the defined traffic from IPsec + processing or drop it, respectively. + + + ''; + + policies = mkYesNoParam yes '' + Whether to install IPsec policies or not. Disabling this can be useful in + some scenarios e.g. MIPv6, where policies are not managed by the IKE + daemon. Since 5.3.3. + ''; + + policies_fwd_out = mkYesNoParam no '' + Whether to install outbound FWD IPsec policies or not. Enabling this is + required in case there is a drop policy that would match and block + forwarded traffic for this CHILD_SA. Since 5.5.1. + ''; + + dpd_action = mkEnumParam ["clear" "trap" "restart"] "clear" '' + Action to perform for this CHILD_SA on DPD timeout. The default clear + closes the CHILD_SA and does not take further action. trap installs a + trap policy, which will catch matching traffic and tries to re-negotiate + the tunnel on-demand. restart immediately tries to re-negotiate the + CHILD_SA under a fresh IKE_SA. + ''; + + ipcomp = mkYesNoParam no '' + Enable IPComp compression before encryption. If enabled, IKE tries to + negotiate IPComp compression to compress ESP payload data prior to + encryption. + ''; + + inactivity = mkDurationParam "0s" '' + Timeout before closing CHILD_SA after inactivity. If no traffic has been + processed in either direction for the configured timeout, the CHILD_SA + gets closed due to inactivity. The default value of 0 disables inactivity + checks. + ''; + + reqid = mkIntParam 0 '' + Fixed reqid to use for this CHILD_SA. This might be helpful in some + scenarios, but works only if each CHILD_SA configuration is instantiated + not more than once. The default of 0 uses dynamic reqids, allocated + incrementally. + ''; + + priority = mkIntParam 0 '' + Optional fixed priority for IPsec policies. This could be useful to + install high-priority drop policies. The default of 0 uses dynamically + calculated priorities based on the size of the traffic selectors. + ''; + + interface = mkOptionalStrParam '' + Optional interface name to restrict outbound IPsec policies. + ''; + + mark_in = mkStrParam "0/0x00000000" '' + Netfilter mark and mask for input traffic. On Linux Netfilter may + require marks on each packet to match an SA having that option set. This + allows Netfilter rules to select specific tunnels for incoming + traffic. The special value %unique sets a unique mark + on each CHILD_SA instance, beyond that the value + %unique-dir assigns a different unique mark for each + CHILD_SA direction (in/out). + + An additional mask may be appended to the mark, separated by + /. The default mask if omitted is + 0xffffffff. + ''; + + mark_out = mkStrParam "0/0x00000000" '' + Netfilter mark and mask for output traffic. On Linux Netfilter may + require marks on each packet to match a policy having that option + set. This allows Netfilter rules to select specific tunnels for outgoing + traffic. The special value %unique sets a unique mark + on each CHILD_SA instance, beyond that the value + %unique-dir assigns a different unique mark for each + CHILD_SA direction (in/out). + + An additional mask may be appended to the mark, separated by + /. The default mask if omitted is + 0xffffffff. + ''; + + tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 '' + Pads ESP packets with additional data to have a consistent ESP packet + size for improved Traffic Flow Confidentiality. The padding defines the + minimum size of all ESP packets sent. The default value of + 0 disables TFC padding, the special value + mtu adds TFC padding to create a packet size equal to + the Path Maximum Transfer Unit. + ''; + + replay_window = mkIntParam 32 '' + IPsec replay window to configure for this CHILD_SA. Larger values than + the default of 32 are supported using the Netlink + backend only, a value of 0 disables IPsec replay + protection. + ''; + + hw_offload = mkYesNoParam no '' + Enable hardware offload for this CHILD_SA, if supported by the IPsec + implementation. + ''; + + start_action = mkEnumParam ["none" "trap" "start"] "none" '' + Action to perform after loading the configuration. + + + The default of none loads the connection only, which + then can be manually initiated or used as a responder configuration. + + + The value trap installs a trap policy, which triggers + the tunnel as soon as matching traffic has been detected. + + + The value start initiates the connection actively. + + + When unloading or replacing a CHILD_SA configuration having a + different from none, + the inverse action is performed. Configurations with + start get closed, while such with + trap get uninstalled. + ''; + + close_action = mkEnumParam ["none" "trap" "start"] "none" '' + Action to perform after a CHILD_SA gets closed by the peer. + + + The default of none does not take any action, + + + trap installs a trap policy for the CHILD_SA. + + + start tries to re-create the CHILD_SA. + + + + does not provide any guarantee that the + CHILD_SA is kept alive. It acts on explicit close messages only, but not + on negotiation failures. Use trap policies to reliably re-create failed + CHILD_SAs. + ''; + + } '' + CHILD_SA configuration sub-section. Each connection definition may have + one or more sections in its subsection. The + section name defines the name of the CHILD_SA configuration, which must be + unique within the connection (denoted <child> below). + ''; + } '' + Section defining IKE connection configurations, each in its own subsection + with an arbitrary yet unique name + ''; + + secrets = let + mkEapXauthParams = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the EAP/XAuth secret. It may either be an ASCII string, a hex + encoded string if it has a 0x prefix or a Base64 encoded string if it + has a 0s prefix in its value. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + Identity the EAP/XAuth secret belongs to. Multiple unique identities may + be specified, each having an id prefix, if a secret + is shared between multiple users. + ''; + + } '' + EAP secret section for a specific secret. Each EAP secret is defined in a + unique section having the eap prefix. EAP secrets are + used for XAuth authentication as well. + ''; + + in { + + eap = mkEapXauthParams; + xauth = mkEapXauthParams; + + ntlm = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the NTLM secret, which is the NT Hash of the actual secret, + that is, MD4(UTF-16LE(secret)). The resulting 16-byte value may either + be given as a hex encoded string with a 0x prefix or as a Base64 encoded + string with a 0s prefix. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + Identity the NTLM secret belongs to. Multiple unique identities may be + specified, each having an id prefix, if a secret is shared between + multiple users. + ''; + } '' + NTLM secret section for a specific secret. Each NTLM secret is defined in + a unique section having the ntlm prefix. NTLM secrets + may only be used for EAP-MSCHAPv2 authentication. + ''; + + ike = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the IKE preshared secret. It may either be an ASCII string, a + hex encoded string if it has a 0x prefix or a Base64 encoded string if + it has a 0s prefix in its value. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + IKE identity the IKE preshared secret belongs to. Multiple unique + identities may be specified, each having an id + prefix, if a secret is shared between multiple peers. + ''; + } '' + IKE preshared secret section for a specific secret. Each IKE PSK is + defined in a unique section having the ike prefix. + ''; + + private = mkPrefixedAttrsOfParams { + file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + File name in the private folder for which this passphrase should be used. + ''; + + secret = mkOptionalStrParam '' + Value of decryption passphrase for private key. + ''; + } '' + Private key decryption passphrase for a key in the + private folder. + ''; + + rsa = mkPrefixedAttrsOfParams { + file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + File name in the rsa folder for which this passphrase + should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for RSA key. + ''; + } '' + Private key decryption passphrase for a key in the rsa + folder. + ''; + + ecdsa = mkPrefixedAttrsOfParams { + file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + File name in the ecdsa folder for which this + passphrase should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for ECDSA key. + ''; + } '' + Private key decryption passphrase for a key in the + ecdsa folder. + ''; + + pkcs8 = mkPrefixedAttrsOfParams { + file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + File name in the pkcs8 folder for which this + passphrase should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for PKCS#8 key. + ''; + } '' + Private key decryption passphrase for a key in the + pkcs8 folder. + ''; + + pkcs12 = mkPrefixedAttrsOfParams { + file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + File name in the pkcs12 folder for which this + passphrase should be used. + ''; + secret = mkOptionalStrParam '' + Value of decryption passphrase for PKCS#12 container. + ''; + } '' + PKCS#12 decryption passphrase for a container in the + pkcs12 folder. + ''; + + token = mkPrefixedAttrsOfParams { + handle = mkOptionalHexParam '' + Hex-encoded CKA_ID or handle of the private key on the token or TPM, + respectively. + ''; + + slot = mkOptionalIntParam '' + Optional slot number to access the token. + ''; + + module = mkOptionalStrParam '' + Optional PKCS#11 module name to access the token. + ''; + + pin = mkOptionalStrParam '' + Optional PIN required to access the key on the token. If none is + provided the user is prompted during an interactive + --load-creds call. + ''; + } ''Definition for a private key that's stored on a token/smartcard/TPM.''; + + }; + + pools = mkAttrsOfParams { + addrs = mkOptionalStrParam '' + Subnet or range defining addresses allocated in pool. Accepts a single + CIDR subnet defining the pool to allocate addresses from or an address + range (<from>-<to>). Pools must be unique and non-overlapping. + ''; + + dns = mkCommaSepListParam [] "Address or CIDR subnets"; + nbns = mkCommaSepListParam [] "Address or CIDR subnets"; + dhcp = mkCommaSepListParam [] "Address or CIDR subnets"; + netmask = mkCommaSepListParam [] "Address or CIDR subnets"; + server = mkCommaSepListParam [] "Address or CIDR subnets"; + subnet = mkCommaSepListParam [] "Address or CIDR subnets"; + split_include = mkCommaSepListParam [] "Address or CIDR subnets"; + split_exclude = mkCommaSepListParam [] "Address or CIDR subnets"; + } '' + Section defining named pools. Named pools may be referenced by connections + with the pools option to assign virtual IPs and other configuration + attributes. Each pool must have a unique name (denoted <name> below). + ''; +} diff --git a/nixos/release.nix b/nixos/release.nix index 23f050367d69..c3a3fa34338f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -352,6 +352,7 @@ in rec { tests.smokeping = callTest tests/smokeping.nix {}; tests.snapper = callTest tests/snapper.nix {}; tests.statsd = callTest tests/statsd.nix {}; + tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {}; tests.sudo = callTest tests/sudo.nix {}; tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix new file mode 100644 index 000000000000..14be2b9f2206 --- /dev/null +++ b/nixos/tests/strongswan-swanctl.nix @@ -0,0 +1,154 @@ +# This strongswan-swanctl test is based on: +# https://www.strongswan.org/testing/testresults/swanctl/rw-psk-ipv4/index.html +# https://github.com/strongswan/strongswan/tree/master/testing/tests/swanctl/rw-psk-ipv4 +# +# The roadwarrior carol sets up a connection to gateway moon. The authentication +# is based on pre-shared keys and IPv4 addresses. Upon the successful +# establishment of the IPsec tunnels, the specified updown script automatically +# inserts iptables-based firewall rules that let pass the tunneled traffic. In +# order to test both tunnel and firewall, carol pings the client alice behind +# the gateway moon. +# +# alice moon carol +# eth1------vlan_0------eth1 eth2------vlan_1------eth1 +# 192.168.0.1 192.168.0.3 192.168.1.3 192.168.1.2 +# +# See the NixOS manual for how to run this test: +# https://nixos.org/nixos/manual/index.html#sec-running-nixos-tests-interactively + +import ./make-test.nix ({ pkgs, ...} : + +let + ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ip4).address; + + allowESP = "iptables --insert INPUT --protocol ESP --jump ACCEPT"; + + # Shared VPN settings: + vlan0 = "192.168.0.0/24"; + version = 2; + secret = "0sFpZAZqEN6Ti9sqt4ZP5EWcqx"; + esp_proposals = [ "aes128gcm128-x25519" ]; + proposals = [ "aes128-sha256-x25519" ]; +in { + name = "strongswan-swanctl"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ]; + nodes = { + + alice = { nodes, ... } : { + virtualisation.vlans = [ 0 ]; + networking = { + dhcpcd.enable = false; + defaultGateway = ifAddr nodes.moon "eth1"; + }; + }; + + moon = {pkgs, config, nodes, ...} : + let + carolIp = ifAddr nodes.carol "eth1"; + moonIp = ifAddr nodes.moon "eth2"; + strongswan = config.services.strongswan-swanctl.package; + in { + virtualisation.vlans = [ 0 1 ]; + networking = { + dhcpcd.enable = false; + firewall = { + allowedUDPPorts = [ 4500 500 ]; + extraCommands = allowESP; + }; + nat = { + enable = true; + internalIPs = [ vlan0 ]; + internalInterfaces = [ "eth1" ]; + externalIP = moonIp; + externalInterface = "eth2"; + }; + }; + environment.systemPackages = [ strongswan ]; + services.strongswan-swanctl = { + enable = true; + swanctl = { + connections = { + "rw" = { + local_addrs = [ moonIp ]; + local."main" = { + auth = "psk"; + }; + remote."main" = { + auth = "psk"; + }; + children = { + "net" = { + local_ts = [ vlan0 ]; + updown = "${strongswan}/libexec/ipsec/_updown iptables"; + inherit esp_proposals; + }; + }; + inherit version; + inherit proposals; + }; + }; + secrets = { + ike."carol" = { + id."main" = carolIp; + inherit secret; + }; + }; + }; + }; + }; + + carol = {pkgs, config, nodes, ...} : + let + carolIp = ifAddr nodes.carol "eth1"; + moonIp = ifAddr nodes.moon "eth2"; + strongswan = config.services.strongswan-swanctl.package; + in { + virtualisation.vlans = [ 1 ]; + networking = { + dhcpcd.enable = false; + firewall.extraCommands = allowESP; + }; + environment.systemPackages = [ strongswan ]; + services.strongswan-swanctl = { + enable = true; + swanctl = { + connections = { + "home" = { + local_addrs = [ carolIp ]; + remote_addrs = [ moonIp ]; + local."main" = { + auth = "psk"; + id = carolIp; + }; + remote."main" = { + auth = "psk"; + id = moonIp; + }; + children = { + "home" = { + remote_ts = [ vlan0 ]; + start_action = "trap"; + updown = "${strongswan}/libexec/ipsec/_updown iptables"; + inherit esp_proposals; + }; + }; + inherit version; + inherit proposals; + }; + }; + secrets = { + ike."moon" = { + id."main" = moonIp; + inherit secret; + }; + }; + }; + }; + }; + + }; + testScript = '' + startAll(); + $carol->waitUntilSucceeds("ping -c 1 alice"); + ''; +}) From 7cc5ee235482232c7c4137ba46ca2c8dba7f9618 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 28 Nov 2017 00:51:40 +0100 Subject: [PATCH 017/538] strongswan-swanctl: support strongswan-5.6.1 configuration options I determined which options got changed by executing the following commands in the strongswan repository: git diff -U20 5.6.0..5.6.1 src/swanctl/swanctl.opt git diff -U20 5.6.0..5.6.1 conf --- .../strongswan-charon-params.nix | 4 ++ .../strongswan-charon-plugins-params.nix | 10 ++++ .../strongswan-swanctl/strongswan-params.nix | 41 ++++++++++++-- .../strongswan-swanctl/swanctl-params.nix | 56 +++++++++++++------ 4 files changed, 88 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix index 3eec9886811e..2b28b57963e1 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix @@ -431,6 +431,10 @@ in { Priority of the routing table. ''; + rsa_pss = mkYesNoParam no '' + Whether to use RSA with PSS padding instead of PKCS#1 padding by default. + ''; + send_delay = mkIntParam 0 '' Delay in ms for sending packets, to simulate larger RTT. ''; diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix index 56a253d85d39..5fd2b4b0c0a4 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix @@ -214,6 +214,11 @@ lib : with (import ./param-constructors.nix lib); { virtual IP. ''; + eap-radius.accounting_send_class = mkYesNoParam no '' + If enabled, adds the Class attributes received in Access-Accept + message to the RADIUS accounting messages. + ''; + eap-radius.class_group = mkYesNoParam no '' Use the class attribute sent in the Access-Accept message as group membership information, see EapRadius. @@ -916,6 +921,11 @@ lib : with (import ./param-constructors.nix lib); { strptime(3) format used to parse threshold option. ''; + systime-fix.timeout = mkDurationParam "0s" '' + How long to wait for a valid system time if an interval is + configured. 0 to recheck indefinitely. + ''; + tnc-ifmap.client_cert = mkOptionalStrParam '' Path to X.509 certificate file of IF-MAP client. ''; diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix index ad8053053701..90828642da0a 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix @@ -144,12 +144,6 @@ in { ''; }; - pacman.database = mkOptionalStrParam '' - Database URI for the database that stores the package information. If it - contains a password, make sure to adjust the permissions of the config - file accordingly. - ''; - pki.load = mkSpaceSepListParam [] '' Plugins to load in ipsec pki tool. ''; @@ -174,6 +168,41 @@ in { Plugins to load in ipsec scepclient tool. ''; + sec-updater = { + database = mkOptionalStrParam '' + Global IMV policy database URI. If it contains a password, make + sure to adjust the permissions of the config file accordingly. + ''; + + swid_gen.command = mkStrParam "/usr/local/bin/swid_generator" '' + SWID generator command to be executed. + ''; + + swid_gen.tag_creator.name = mkStrParam "strongSwan Project" '' + Name of the tagCreator entity. + ''; + + swid_gen.tag_creator.regid = mkStrParam "strongswan.org" '' + regid of the tagCreator entity. + ''; + + tnc_manage_command = mkStrParam "/var/www/tnc/manage.py" '' + strongTNC manage.py command used to import SWID tags. + ''; + + tmp.deb_file = mkStrParam "/tmp/sec-updater.deb" '' + Temporary storage for downloaded deb package file. + ''; + + tmp.tag_file = mkStrParam "/tmp/sec-updater.tag" '' + Temporary storage for generated SWID tags. + ''; + + load = mkSpaceSepListParam [] '' + Plugins to load in sec-updater tool. + ''; + }; + starter = { config_file = mkStrParam "\${sysconfdir}/ipsec.conf" '' Location of the ipsec.conf file. diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 095ae549730e..39d184131c36 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -286,7 +286,7 @@ in { On initiators this setting specifies whether an INITIAL_CONTACT notify is sent during IKE_AUTH if no existing connection is found with the remote peer (determined by the identities of the first authentication - round). Only if set to keep or replace will the client send a notify. + round). Unless set to never the client will send a notify. ''; reauth_time = mkDurationParam "0s" '' @@ -444,7 +444,12 @@ in { ike: prefix are configured any signature scheme constraint (without ike: prefix) will also apply to IKEv2 authentication, unless this is disabled in - strongswan.conf. + strongswan.conf. To use RSASSA-PSS signatures use + rsa/pss instead of pubkey or + rsa as in e.g. + ike:rsa/pss-sha256. If pubkey or + rsa constraints are configured RSASSA-PSS signatures + will only be used if enabled in strongswan.conf(5). ''; @@ -585,7 +590,12 @@ in { section's keyword for details), such key types and hash algorithms are also applied as constraints against IKEv2 signature authentication schemes used by the - remote side. + remote side. To require RSASSA-PSS signatures use + rsa/pss instead of pubkey or + rsa as in e.g. rsa/pss-sha256. If + pubkey or rsa constraints are + configured RSASSA-PSS signatures will only be accepted if enabled in + strongswan.conf(5). To specify trust chain constraints for EAP-(T)TLS, append a colon to the EAP method, followed by the key type/size and hash algorithm as @@ -872,27 +882,39 @@ in { ''; mark_in = mkStrParam "0/0x00000000" '' - Netfilter mark and mask for input traffic. On Linux Netfilter may - require marks on each packet to match an SA having that option set. This - allows Netfilter rules to select specific tunnels for incoming - traffic. The special value %unique sets a unique mark - on each CHILD_SA instance, beyond that the value - %unique-dir assigns a different unique mark for each - CHILD_SA direction (in/out). + Netfilter mark and mask for input traffic. On Linux, Netfilter may + require marks on each packet to match an SA/policy having that option + set. This allows installing duplicate policies and enables Netfilter + rules to select specific SAs/policies for incoming traffic. Note that + inbound marks are only set on policies, by default, unless + is enabled. The special value + %unique sets a unique mark on each CHILD_SA instance, + beyond that the value %unique-dir assigns a different + unique mark for each An additional mask may be appended to the mark, separated by /. The default mask if omitted is 0xffffffff. ''; + mark_in_sa = mkYesNoParam no '' + Whether to set on the inbound SA. By default, + the inbound mark is only set on the inbound policy. The tuple destination + address, protocol and SPI is unique and the mark is not required to find + the correct SA, allowing to mark traffic after decryption instead (where + more specific selectors may be used) to match different policies. Marking + packets before decryption is still possible, even if no mark is set on + the SA. + ''; + mark_out = mkStrParam "0/0x00000000" '' - Netfilter mark and mask for output traffic. On Linux Netfilter may - require marks on each packet to match a policy having that option - set. This allows Netfilter rules to select specific tunnels for outgoing - traffic. The special value %unique sets a unique mark - on each CHILD_SA instance, beyond that the value - %unique-dir assigns a different unique mark for each - CHILD_SA direction (in/out). + Netfilter mark and mask for output traffic. On Linux, Netfilter may + require marks on each packet to match a policy/SA having that option + set. This allows installing duplicate policies and enables Netfilter + rules to select specific policies/SAs for outgoing traffic. The special + value %unique sets a unique mark on each CHILD_SA + instance, beyond that the value %unique-dir assigns a + different unique mark for each CHILD_SA direction (in/out). An additional mask may be appended to the mark, separated by /. The default mask if omitted is From 7c94804680e6a40ddb4e2ef8039cede241a8b647 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 24 Dec 2017 02:11:49 +0100 Subject: [PATCH 018/538] strongswan-swanctl: don't generate options for charon This reduces the number of options from 1152 to 756. --- .../networking/strongswan-swanctl/strongswan-params.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix index 90828642da0a..249aa22b29ed 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix @@ -28,7 +28,8 @@ in { ''; }; - charon = charonParams; + # Since we only use charon-systemd we don't need to generate options for charon. + # charon = charonParams; charon-nm = { ca_dir = mkStrParam "" '' From 592a89befc71867b22960da752b80ab4707ff586 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 28 Feb 2018 11:04:41 +0100 Subject: [PATCH 019/538] strongswan-swanctl: support strongswan-5.6.2 configuration options --- .../strongswan-charon-params.nix | 2 +- .../strongswan-charon-plugins-params.nix | 33 ++++++++++++++++++- .../strongswan-swanctl/swanctl-params.nix | 7 ++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix index 2b28b57963e1..17bd632dc180 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix @@ -19,7 +19,7 @@ in { ''; cache_crls = mkYesNoParam no '' - Whether Certicate Revocation Lists (CRLs) fetched via HTTP or LDAP + Whether Certificate Revocation Lists (CRLs) fetched via HTTP or LDAP should be saved under a unique file name derived from the public key of the Certification Authority (CA) to /etc/ipsec.d/crls (stroke) or diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix index 5fd2b4b0c0a4..116fb6d00a2c 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix @@ -423,6 +423,12 @@ lib : with (import ./param-constructors.nix lib); { nodes. Set to 0 to disable. ''; + ha.buflen = mkIntParam 2048 '' + Buffer size for received HA messages. For IKEv1 the public DH factors are + also transmitted so depending on the DH group the HA messages can get quite + big (the default should be fine up to modp4096). + ''; + ha.fifo_interface = mkYesNoParam yes ""; ha.heartbeat_delay = mkIntParam 1000 ""; @@ -461,7 +467,7 @@ lib : with (import ./param-constructors.nix lib); { If the maximum Netlink socket receive buffer in bytes set by receive_buffer_size exceeds the system-wide maximum from /proc/sys/net/core/rmem_max, this option can be used to - override the limit. Enabling this option requires special priviliges + override the limit. Enabling this option requires special privileges (CAP_NET_ADMIN). ''; @@ -482,6 +488,12 @@ lib : with (import ./param-constructors.nix lib); { MTU to set on installed routes, 0 to disable. ''; + kernel-netlink.process_rules = mkYesNoParam no '' + Whether to process changes in routing rules to trigger roam events. This is + currently only useful if the kernel based route lookup is used (i.e. if + route installation is disabled or an inverted fwmark match is configured). + ''; + kernel-netlink.receive_buffer_size = mkIntParam 0 '' Maximum Netlink socket receive buffer in bytes. This value controls how many bytes of Netlink messages can be received on a Netlink socket. The default @@ -845,6 +857,25 @@ lib : with (import ./param-constructors.nix lib); { Whether OCSP validation should be enabled. ''; + save-keys.load = mkYesNoParam no '' + Whether to load the plugin. + ''; + + save-keys.esp = mkYesNoParam no '' + Whether to save ESP keys. + ''; + + save-keys.ike = mkYesNoParam no '' + Whether to save IKE keys. + ''; + + save-keys.wireshark_keys = mkOptionalStrParam '' + Directory where the keys are stored in the format supported by Wireshark. + IKEv1 keys are stored in the ikev1_decryption_table file. + IKEv2 keys are stored in the ikev2_decryption_table file. + Keys for ESP CHILD_SAs are stored in the esp_sa file. + ''; + socket-default.fwmark = mkOptionalStrParam '' Firewall mark to set on outbound packets (a possible use case are host-to-host tunnels with kernel-libipsec). diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 39d184131c36..939f58e2bab9 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -583,9 +583,10 @@ in { rsa-2048-ecdsa-256). To limit the acceptable set of hashing algorithms for trustchain validation, append hash algorithms to pubkey or a key strength definition (for example - pubkey-sha1-sha256 or - rsa-2048-ecdsa-256-sha256-sha384-sha512). Unless - disabled in strongswan.conf, or explicit IKEv2 + pubkey-sha256-sha512, + rsa-2048-sha256-sha384-sha512 or + rsa-2048-sha256-ecdsa-256-sha256-sha384). + Unless disabled in strongswan.conf, or explicit IKEv2 signature constraints are configured (refer to the description of the section's keyword for details), such key types and hash algorithms are also applied as From ee95cb8169a5435b860301ecd02510be4b20a525 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 28 Feb 2018 11:44:00 +0100 Subject: [PATCH 020/538] strongswan-swanctl: fix test --- nixos/tests/strongswan-swanctl.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix index 14be2b9f2206..021743021b40 100644 --- a/nixos/tests/strongswan-swanctl.nix +++ b/nixos/tests/strongswan-swanctl.nix @@ -19,12 +19,12 @@ import ./make-test.nix ({ pkgs, ...} : let - ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ip4).address; - allowESP = "iptables --insert INPUT --protocol ESP --jump ACCEPT"; # Shared VPN settings: vlan0 = "192.168.0.0/24"; + carolIp = "192.168.1.2"; + moonIp = "192.168.1.3"; version = 2; secret = "0sFpZAZqEN6Ti9sqt4ZP5EWcqx"; esp_proposals = [ "aes128gcm128-x25519" ]; @@ -38,15 +38,12 @@ in { virtualisation.vlans = [ 0 ]; networking = { dhcpcd.enable = false; - defaultGateway = ifAddr nodes.moon "eth1"; + defaultGateway = "192.168.0.3"; }; }; moon = {pkgs, config, nodes, ...} : - let - carolIp = ifAddr nodes.carol "eth1"; - moonIp = ifAddr nodes.moon "eth2"; - strongswan = config.services.strongswan-swanctl.package; + let strongswan = config.services.strongswan-swanctl.package; in { virtualisation.vlans = [ 0 1 ]; networking = { @@ -98,10 +95,7 @@ in { }; carol = {pkgs, config, nodes, ...} : - let - carolIp = ifAddr nodes.carol "eth1"; - moonIp = ifAddr nodes.moon "eth2"; - strongswan = config.services.strongswan-swanctl.package; + let strongswan = config.services.strongswan-swanctl.package; in { virtualisation.vlans = [ 1 ]; networking = { From 018f66020fe1b5d13643521a5087bae8a4c26010 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 28 Feb 2018 11:44:22 +0100 Subject: [PATCH 021/538] strongswan-swanctl: disable the structured strongswan config for now in favour of a literal config This reduces the number of option by over 600. --- .../networking/strongswan-swanctl/module.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index 8bfb62e6b031..30d039a2b7a9 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -9,7 +9,7 @@ let # TODO: auto-generate these files using: # https://github.com/strongswan/strongswan/tree/master/conf # IDEA: extend the format-options.py script to output these Nix files. - strongswanParams = import ./strongswan-params.nix lib; + #strongswanParams = import ./strongswan-params.nix lib; swanctlParams = import ./swanctl-params.nix lib; in { options.services.strongswan-swanctl = { @@ -24,7 +24,18 @@ in { ''; }; - strongswan = paramsToOptions strongswanParams; + strongswan.extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Contents of the strongswan.conf file. + ''; + }; + + # The structured strongswan configuration is commented out for + # now in favour of the literal config above. We should first + # discus if we want to add the 600+ options by default. + #strongswan = paramsToOptions strongswanParams; swanctl = paramsToOptions swanctlParams; }; @@ -65,7 +76,8 @@ in { path = with pkgs; [ kmod iproute iptables utillinux ]; environment.STRONGSWAN_CONF = pkgs.writeTextFile { name = "strongswan.conf"; - text = paramsToConf cfg.strongswan strongswanParams; + #text = paramsToConf cfg.strongswan strongswanParams; + text = cfg.strongswan.extraConfig; }; restartTriggers = [ config.environment.etc."swanctl/swanctl.conf".source ]; serviceConfig = { From 85abad9e1c70f113faaeba1a95753070233dc06d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 28 Feb 2018 12:01:31 +0100 Subject: [PATCH 022/538] strongswan-swanctl: fixed type of 'file' options --- .../networking/strongswan-swanctl/swanctl-params.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 939f58e2bab9..ad211f41eef0 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -1058,7 +1058,7 @@ in { ''; private = mkPrefixedAttrsOfParams { - file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + file = mkOptionalStrParam '' File name in the private folder for which this passphrase should be used. ''; @@ -1071,7 +1071,7 @@ in { ''; rsa = mkPrefixedAttrsOfParams { - file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + file = mkOptionalStrParam '' File name in the rsa folder for which this passphrase should be used. ''; @@ -1084,7 +1084,7 @@ in { ''; ecdsa = mkPrefixedAttrsOfParams { - file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + file = mkOptionalStrParam '' File name in the ecdsa folder for which this passphrase should be used. ''; @@ -1097,7 +1097,7 @@ in { ''; pkcs8 = mkPrefixedAttrsOfParams { - file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + file = mkOptionalStrParam '' File name in the pkcs8 folder for which this passphrase should be used. ''; @@ -1110,7 +1110,7 @@ in { ''; pkcs12 = mkPrefixedAttrsOfParams { - file = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + file = mkOptionalStrParam '' File name in the pkcs12 folder for which this passphrase should be used. ''; From e234174739907c2a86a15367702654db366614a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Mar 2018 11:01:14 -0300 Subject: [PATCH 023/538] deepin: use libsForQt5 in meta package --- pkgs/desktops/deepin/default.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index b03349ce2dff..2070e7bc77f5 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,14 +1,10 @@ -{ pkgs, newScope }: +{ pkgs, makeScope, libsForQt5 }: let - callPackage = newScope self; - - self = rec { + packages = self: with self; { deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; - deepin-icon-theme = callPackage ./deepin-icon-theme { }; - deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; @@ -16,4 +12,5 @@ let }; -in self +in + makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79d4289d26cc..dbf1858c77af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19214,7 +19214,10 @@ with pkgs; clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; - deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + deepin = recurseIntoAttrs (import ../desktops/deepin { + inherit pkgs libsForQt5; + inherit (lib) makeScope; + }); enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; From 7093810b0ca1ac88f9c3f0d0b50d70c0b04d9dac Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Wed, 7 Mar 2018 15:11:33 +1100 Subject: [PATCH 024/538] bluez: optionally enable midi support --- pkgs/os-specific/linux/bluez/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 62c3986569d0..d14992991160 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, pythonPackages, readline, udev, libical, - systemd, enableWiimote ? false }: + systemd, enableWiimote ? false, enableMidi ? false }: assert stdenv.isLinux; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-udevdir=$(out)/lib/udev" - ] ++ - stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; + ] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ] + ++ stdenv.lib.optional enableMidi [ "--enable-midi" ]; # Work around `make install' trying to create /var/lib/bluetooth. installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; From 51e0baf41de6129c5004ab26d10ce46982df30ca Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Wed, 7 Mar 2018 17:01:56 +1100 Subject: [PATCH 025/538] bitwig-studio2: update version 2.2.2 -> 2.3.1 --- pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index e5a5cc7c9c6a..922acf9e3e00 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + sha256 = "18gghx0ygwh01cidj8mkf82l9qhq2dy1b3yc4ajksvj762yg6cf2"; }; buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; From 2a147bea028327410dac064639eddeae96c56914 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Wed, 7 Mar 2018 20:05:08 +0200 Subject: [PATCH 026/538] iwd: 2017-12-14 -> 0.1 --- nixos/modules/services/networking/iwd.nix | 2 +- pkgs/os-specific/linux/iwd/default.nix | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 23787bce9911..344212ad8329 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -26,7 +26,7 @@ in { wants = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.iwd}/bin/iwd"; + serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd"; }; }; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index f4f870f16c3b..a1c577d2bb57 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,16 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "8192131685be0f27d6f51b14b78ef93fa7f3c692"; - sha256 = "1k74qz3w0l4zq8llrxc4p62xy0c0n33f260vy3d14wx5rhvf0544"; + rev = "0.4"; + sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv"; }; in stdenv.mkDerivation rec { - name = "iwd-unstable-2017-12-14"; + name = "iwd-${version}"; + version = "0.1"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; - rev = "cf3372235c4592ca7366b27548abc4e89a982414"; - sha256 = "0dg28j919w1v8sqr6jdj12c233rsjzd2jzkcpag1hx2h3g35hnlz"; + rev = version; + sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0"; }; nativeBuildInputs = [ @@ -24,7 +25,7 @@ in stdenv.mkDerivation rec { readline python3Packages.python ]; - + pythonPath = [ python3Packages.dbus-python python3Packages.pygobject3 @@ -33,7 +34,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - "--with-dbusconfdir=$(out)/etc/" + "--with-dbus-datadir=$(out)/etc/" + "--disable-systemd-service" ]; postUnpack = '' From 0555f247dcb9782fbb77e5896006d4ad95b3750b Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Wed, 7 Mar 2018 15:12:22 +1100 Subject: [PATCH 027/538] nixos/bluetooth: allow to specify custom bluez package --- nixos/modules/services/hardware/bluetooth.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 4a8cd86b0b11..d7ca8a431794 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -3,8 +3,8 @@ with lib; let - bluez-bluetooth = pkgs.bluez; cfg = config.hardware.bluetooth; + bluez-bluetooth = cfg.package; in { @@ -21,6 +21,16 @@ in { description = "Whether to power up the default Bluetooth controller on boot."; }; + package = mkOption { + type = types.package; + default = pkgs.bluez; + defaultText = "pkgs.bluez"; + example = "pkgs.bluez.override { enableMidi = true; }"; + description = '' + Which BlueZ package to use. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; From 02757a6a45617f6ca6e1e2d9b82d3b7aff9d2cb4 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 15:03:31 -0800 Subject: [PATCH 028/538] grml-zsh-config: 0.14.2 -> 0.14.3 Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.14.3 in filename of file in /nix/store/2z6cjbqfwc5h5rwz64c3pjd0a008yhp8-grml-zsh-config-0.14.3 --- pkgs/shells/grml-zsh-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix index d49e13e1eb35..45d73cb41654 100644 --- a/pkgs/shells/grml-zsh-config/default.nix +++ b/pkgs/shells/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm"; + sha256 = "1akx6lwxnbcccddzw41rci8rb9n5vb6q2vpn5qr07f0grchyiifk"; }; buildInputs = [ zsh coreutils txt2tags ] From 695a62e777f17e57504175d5c08a281dcf4f68fd Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 15:30:04 -0800 Subject: [PATCH 029/538] gromacs: 4.6.7 -> 2018 Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/GMXRC.bash -h` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/GMXRC.bash --help` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/GMXRC.bash help` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/GMXRC.zsh -h` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/GMXRC.zsh --help` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/GMXRC.zsh help` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/gmx -h` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/gmx help` got 0 exit code - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/gmx --version` and found version 2018 - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/gmx -h` and found version 2018 - ran `/nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018/bin/gmx help` and found version 2018 - found 2018 with grep in /nix/store/i2ls9z094j6a3vqvq6gz4hyhl86dh31d-gromacs-2018 --- .../science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 351bcccd45d8..ae21af65584c 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-4.6.7"; + name = "gromacs-2018"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.7.tar.gz"; - sha256 = "6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.tar.gz"; + sha256 = "1sfh3wdrw07797xm86fq10r0024ym585yyrnhdh0qam596vx1dfy"; }; buildInputs = [cmake fftw] From 4897346fd3b916e6ddef53d057ace8a4f431348e Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 16:35:55 -0800 Subject: [PATCH 030/538] gssdp: 1.0.1 -> 1.0.2 Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.0.2 with grep in /nix/store/dyf9dj8j9nlhh3kv4zvg6aj85hw5k42n-gssdp-1.0.2 - found 1.0.2 in filename of file in /nix/store/dyf9dj8j9nlhh3kv4zvg6aj85hw5k42n-gssdp-1.0.2 --- pkgs/development/libraries/gssdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 55e20065732c..d48ba9082af2 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gssdp-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz"; - sha256 = "1qfj4gir1qf6v86z70ryzmjb75ns30q6zi5p89vhd3621gs6f7b0"; + sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; }; nativeBuildInputs = [ pkgconfig ]; From d04b8206b7d1b684ec00215eeaa1f889af085893 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 18:48:56 -0800 Subject: [PATCH 031/538] hsqldb: 1.8.0.9 -> 2.4.0 Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.4.0 with grep in /nix/store/4179pxpwkjn7xk7rj0g538zjhsx9xzy1-hsqldb-2.4.0 --- pkgs/development/libraries/java/hsqldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index ad849a4d6d53..97ffcb647d62 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ }: stdenv.mkDerivation { - name = "hsqldb-1.8.0.9"; + name = "hsqldb-2.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://sourceforge/hsqldb/hsqldb_1_8_0_9.zip; - sha256 = "e98d1d8bca15059f4ef4f0d3dde2d75778a5e1bbe8bc12abd4ec2cac39d5adec"; + sha256 = "1v5dslwsqb7csjmi5g78pghsay2pszidvlzhyi79y18mra5iv3g9"; }; buildInputs = [ unzip From 64f1c7ea982f00fa3764a1b50f0722e5e453b2ed Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 9 Mar 2018 11:47:04 -0800 Subject: [PATCH 032/538] shairport-sync: 3.0.2 -> 3.1.7 Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.1.7 with grep in /nix/store/8r3k0r8vf0wfpj14443pm1k0jddlnii2-shairport-sync-3.1.7 - found 3.1.7 in filename of file in /nix/store/8r3k0r8vf0wfpj14443pm1k0jddlnii2-shairport-sync-3.1.7 --- pkgs/servers/shairport-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 79f2012c7a9f..f7a9fc658352 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.1.7"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1lpfl591lhk66a5jfp86j669iswjzj503x02hg9h3211vxv3h9pa"; + sha256 = "1ip8vlyly190fhcd55am5xvqisvch8mnw50xwbm663dapdb1f8ys"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; From 219c6f7bbf27559e81ad5a7fc54a6285ee8b0621 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 9 Mar 2018 15:02:50 -0800 Subject: [PATCH 033/538] tradcpp: 0.4 -> 0.5.2 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.5.2 with grep in /nix/store/s2kanna6c53sqm590xv8598j075j1ikb-tradcpp-0.5.2 - found 0.5.2 in filename of file in /nix/store/s2kanna6c53sqm590xv8598j075j1ikb-tradcpp-0.5.2 --- pkgs/development/tools/tradcpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index e5a3004bfdb6..3891617e1c79 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation { - name = "tradcpp-0.4"; + name = "tradcpp-0.5.2"; src = fetchurl { - url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.4.tar.gz; - sha256 = "c60aa356945e0b6634bd449ead6a4fca0059d2ce3ae8044cf982140bbd54e688"; + url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; # tradcpp only comes with BSD-make Makefile; the patch adds configure support From 3f5b03551f5f4cbb774884fa3c5851aec7d69728 Mon Sep 17 00:00:00 2001 From: pjan vandaele Date: Sun, 11 Mar 2018 17:47:36 +0900 Subject: [PATCH 034/538] adds tmuxPlugins --- pkgs/misc/tmux-plugins/default.nix | 224 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 226 insertions(+) create mode 100644 pkgs/misc/tmux-plugins/default.nix diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix new file mode 100644 index 000000000000..b29565d01ecb --- /dev/null +++ b/pkgs/misc/tmux-plugins/default.nix @@ -0,0 +1,224 @@ +{ fetchgit, stdenv, pkgs }: + +let + rtpPath = "share/tmux-plugins"; + + addRtp = path: pluginName: attrs: derivation: + derivation // { rtp = "${derivation}/${path}/${builtins.replaceStrings ["-"] ["_"] pluginName}.tmux"; } // { + overrideAttrs = f: buildTmuxPlugin (attrs // f attrs); + }; + + buildTmuxPlugin = a@{ + pluginName, + namePrefix ? "tmuxplugin-", + src, + unpackPhase ? "", + configurePhase ? "", + buildPhase ? "", + addonInfo ? null, + preInstall ? "", + postInstall ? "", + path ? (builtins.parseDrvName pluginName).name, + dependencies ? [], + ... + }: + addRtp "${rtpPath}/${path}" pluginName a (stdenv.mkDerivation (a // { + name = namePrefix + pluginName; + + inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; + + installPhase = '' + runHook preInstall + + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target + if [ -n "$addonInfo" ]; then + echo "$addonInfo" > $target/addon-info.json + fi + + runHook postInstall + ''; + + dependencies = [ pkgs.bash ] ++ dependencies; + })); + + buildTmuxPluginFrom2Nix = a: buildTmuxPlugin ({ + buildPhase = ":"; + configurePhase =":"; + } // a); + +in rec { + + battery = buildTmuxPluginFrom2Nix { + pluginName = "battery"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-battery"; + rev = "09be78c35ee84f858f724442b94ad045ade23eb0"; + sha256 = "0gm6qiay0k5b3yzrabfmh4inyh9r6rfhja2l3r4cixcvc8sgvh8l"; + }; + }; + + continuum = buildTmuxPluginFrom2Nix { + pluginName = "continuum"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-continuum"; + rev = "90f4a00c41de094864dd4e29231253bcd80d4409"; + sha256 = "1hviqz62mnq5h4vgcy9bl5004q18yz5b90bnih0ibsna877x3nbc"; + }; + dependencies = [ resurrect ]; + }; + + copycat = buildTmuxPluginFrom2Nix { + pluginName = "copycat"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-copycat"; + rev = "6f9b9cd2d93872cef60e3ea7f7ae89598569ed25"; + sha256 = "12dgn5wnzrhd6sqa64w875ld3lrrny8xvdq6b6lzxyain9q49mrf"; + }; + }; + + cpu = buildTmuxPluginFrom2Nix { + pluginName = "cpu"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-cpu"; + rev = "12f7a74e25bf59701456e2c0d98b39bb19ec7039"; + sha256 = "0qxn8ngg297980lj6w8ih2m8m8bxxdbcz5hsjmlia92h5rdkm5kl"; + }; + }; + + fpp = buildTmuxPluginFrom2Nix { + pluginName = "fpp"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-fpp"; + rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e"; + sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws"; + }; + postInstall = '' + sed -i -e 's|fpp |${pkgs.fpp}/bin/fpp |g' $target/fpp.tmux + ''; + dependencies = [ pkgs.fpp ]; + }; + + logging = buildTmuxPluginFrom2Nix { + pluginName = "logging"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-logging"; + rev = "b2706119cd587230beae02980d3d7fa2d5afebe9"; + sha256 = "1w1ymscfbz87lypaxgjdva1rg7jw2jyf7nnfgyngghw9m1l2xk2c"; + }; + }; + + net-speed = buildTmuxPluginFrom2Nix { + pluginName = "net-speed"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-net-speed"; + rev = "536d2bdd053a3bdfcc5cf7680c0dba76127c95ca"; + sha256 = "1bly5f40dgiym378jkfwm7qag9xl6qvziqiqnj65yblqd5py325z"; + }; + }; + + maildir-counter = buildTmuxPluginFrom2Nix { + pluginName = "maildir-counter"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-maildir-counter"; + rev = "9415f0207e71e37cbd870c9443426dbea6da78b9"; + sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4"; + }; + }; + + online-status = buildTmuxPluginFrom2Nix { + pluginName = "online-status"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-online-status"; + rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312"; + sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r"; + }; + }; + + open = buildTmuxPluginFrom2Nix { + pluginName = "open"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-open"; + rev = "f99d3189c445188eae5fa9bfeabc95df16deca92"; + sha256 = "13q3zd5jv7akkjjwhgimmfylrvalxdn54fnpfb14g6xam6h8808m"; + }; + }; + + pain-control = buildTmuxPluginFrom2Nix { + pluginName = "pain-control"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-pain-control"; + rev = "731667692da46d51a6a9dffb4c43384a5d68ff28"; + sha256 = "1ihpl5wgjmhfgcrasgnydd7vpsar865sx2whra19gpfm4bglmdzl"; + }; + }; + + prefix-highlight = buildTmuxPluginFrom2Nix { + pluginName = "prefix-highlight"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-prefix-highlight"; + rev = "34f7125ae46e5123bedad03e08027332d1186186"; + sha256 = "16z8sm8pifg1m9lmv0z50fb0ws9mk5zqs7a1ddl2bfwkqi7yc0c0"; + }; + }; + + resurrect = buildTmuxPluginFrom2Nix { + pluginName = "resurrect"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-resurrect"; + rev = "7c77c70483b818d331e46c4cf64c716ded09a152"; + sha256 = "08gjxwdmfy16xpgi87rp9dj5338imqsy392pixf7xcnr05413ap1"; + }; + }; + + sensible = buildTmuxPluginFrom2Nix { + pluginName = "sensible"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sensible"; + rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; + sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; + }; + }; + + sessionist = buildTmuxPluginFrom2Nix { + pluginName = "sessionist"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sessionist"; + rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89"; + sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4"; + }; + }; + + sidebar = buildTmuxPluginFrom2Nix { + pluginName = "sidebar"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-sidebar"; + rev = "23014524cab53f8d36373983500fe05a527a444d"; + sha256 = "1w363587isdip1r81h0vkp5163lpa83lvasg8l04h43sbip2y6i8"; + }; + }; + + urlview = buildTmuxPluginFrom2Nix { + pluginName = "urlview"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-urlview"; + rev = "b84c876cffdd22990b4ab51247e795cbd7813d53"; + sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn"; + }; + postInstall = '' + sed -i -e '14,20{s|urlview|${pkgs.urlview}/bin/urlview|g}' $target/urlview.tmux + ''; + dependencies = [ pkgs.urlview ]; + }; + + yank = buildTmuxPluginFrom2Nix { + pluginName = "yank"; + src = fetchgit { + url = "https://github.com/tmux-plugins/tmux-yank"; + rev = "feb9611b7d1c323ca54cd8a5111a53e3e8265b59"; + sha256 = "1ywbm09jfh6cm2m6gracmdc3pp5p2dwraalbhfaafqaydjr22qc3"; + }; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2b4239314a3..2ff9ba23aefa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5021,6 +5021,8 @@ with pkgs; tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); + tmsu = callPackage ../tools/filesystems/tmsu { }; toilet = callPackage ../tools/misc/toilet { }; From 6ef19f8e974d428cfaaca186e903ff94b04d7720 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Tue, 13 Mar 2018 18:15:44 +0200 Subject: [PATCH 035/538] androidenv.buildTools: 26.0.1 -> 26.0.2 --- pkgs/development/mobile/androidenv/build-tools.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index c09fd6142703..457a9b6720af 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "26.0.1"; + version = "26.0.2"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "1sp0ir1d88ffw0gz78zlbvnxalz02fsaxwdcvjfynanylwjpyqf8"; + sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "1ns6c8361l18s3a5x0jc2m3qr06glsb6ak7csrrw6dkzlv8cj5dk"; + sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx"; } else throw "System ${stdenv.system} not supported!"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd $out/build-tools unzip $src mv android-* ${version} - + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' cd ${version} @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { fi done ''} - + patchShebangs . ''; - + buildInputs = [ unzip file ]; } From 55b4a2b670d57bb77d9950609683b2340f8b8b1a Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Wed, 14 Mar 2018 06:16:48 +0000 Subject: [PATCH 036/538] cfitsio: Change has for 3.43 to reflect upstream --- pkgs/development/libraries/cfitsio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index dedcb8053277..f5e503e94e37 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -5,7 +5,7 @@ src = fetchurl { url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3430.tar.gz"; - sha256 = "1rw481bv5srfmldf1h8bqmyljjh0siqh87xh6rip67ms59ssxpn8"; + sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l"; }; # Shared-only build From 5ec1ae9883e4fd2fd47019de9fe80e1283149f0e Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 15 Mar 2018 06:36:47 -0700 Subject: [PATCH 037/538] sawfish: 1.12.0 -> 1.12.90 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/sawfish --help` got 0 exit code - ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/sawfish --version` and found version 1.12.90 - ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/sawfish --help` and found version 1.12.90 - ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/.sawfish-wrapped --help` got 0 exit code - ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/.sawfish-wrapped --version` and found version 1.12.90 - ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/.sawfish-wrapped --help` and found version 1.12.90 - found 1.12.90 with grep in /nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90 --- pkgs/applications/window-managers/sawfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index d18ffb507956..c219c81c2a50 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sawfish-${version}"; - version = "1.12.0"; + version = "1.12.90"; sourceName = "sawfish_${version}"; src = fetchurl { url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; - sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4"; + sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From d32ea36e8caae8701742466b4034471246222226 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 05:25:15 -0700 Subject: [PATCH 038/538] buildbot-worker: 1.0.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/.buildbot-worker-wrapped --help` got 0 exit code - ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/.buildbot-worker-wrapped --version` and found version 1.1.0 - ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/buildbot-worker --help` got 0 exit code - ran `/nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0/bin/buildbot-worker --version` and found version 1.1.0 - found 1.1.0 with grep in /nix/store/y8nbk5hk9d291bgwi1aag83z01w1l04i-buildbot-worker-1.1.0 --- pkgs/development/tools/build-managers/buildbot/worker.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 75e6bb0404be..59d3c93bb877 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.0.0"; + version = "1.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0ws31ypmksah1c83h4npwg560p8v7n9j6l94p79y5pispjsgzqzl"; + sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; From ad7bd4c7a3b692dfeae9dee0e3863dc43c493504 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 18:07:08 -0700 Subject: [PATCH 039/538] jack1: 0.124.1 -> 0.125.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jackd -V` and found version 0.125.0 - ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jackd --version` and found version 0.125.0 - ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -h` got 0 exit code - ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -V` and found version 0.125.0 - ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -v` and found version 0.125.0 - ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -h` and found version 0.125.0 - ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_midi_dump -h` got 0 exit code - found 0.125.0 with grep in /nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0 - directory tree listing: https://gist.github.com/359dc1584108a662b645c49abe027c95 --- pkgs/misc/jackaudio/jack1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 43d23dd525ae..848215ae17af 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "jack1-${version}"; - version = "0.124.1"; + version = "0.125.0"; src = fetchurl { url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; - sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"; + sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; configureFlags = '' From ee45689f1430c564acda19efa5d2b12dd267cafb Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 21:28:59 -0700 Subject: [PATCH 040/538] libupnp: 1.6.21 -> 1.8.3 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.8.3 with grep in /nix/store/54dv1yd3bi54ci4kvlj9j7jc1khxm1ax-libupnp-1.8.3 - directory tree listing: https://gist.github.com/b72d1e3b6abc82c6c158d097f98780b9 --- pkgs/development/libraries/pupnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index fd738faf5074..018a57ad0571 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libupnp-${version}"; - version = "1.6.21"; + version = "1.8.3"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "07ksfhadinaa20542gblrxi9pqz0v6y70a836hp3qr4037id4nm9"; + sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; }; nativeBuildInputs = [ autoreconfHook ]; From cdfd7ccdc1daaf33528c66ca0e691cfb8e43b007 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sat, 17 Mar 2018 11:50:46 -0700 Subject: [PATCH 041/538] autoconf-archive: 2017.09.28 -> 2018.03.13 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2018.03.13 with grep in /nix/store/gpwn8923mppc2h6vx2rgg8q52ss2mg2l-autoconf-archive-2018.03.13 - directory tree listing: https://gist.github.com/eaaa4f78b6bd461710c33aea9e21fdea --- pkgs/development/tools/misc/autoconf-archive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 0225a3f81416..cb64a4c876b1 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2017.09.28"; + version = "2018.03.13"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw"; + sha256 = "0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1"; }; buildInputs = [ xz ]; From 8ee6a03a3e75c6aaf4d7cf53bd6ffc6892d89950 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 18 Mar 2018 09:33:24 -0700 Subject: [PATCH 042/538] libsForQt5.qscintilla: 2.9.4 -> 2.10.3 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.10.3 with grep in /nix/store/2q8rpns7liydfjw0sfxmr4dqb6ydn7fh-qscintilla-qt5-2.10.3 - directory tree listing: https://gist.github.com/a8a71ce267574bdfa3cfb49ecd9d784e --- pkgs/development/libraries/qscintilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index f5c5a667418c..1e715fdbbc22 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.9.4"; + version = "2.10.3"; name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; - sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; + sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav"; }; buildInputs = if withQt5 then [ qtbase ] else [ qt4 ]; From 7bb9c5cbbea932224e91c07769f318afa4394f68 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 18 Mar 2018 10:26:46 -0700 Subject: [PATCH 043/538] librdf_rasqal: 0.9.32 -> 0.9.33 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/g22gwl6x47gblsjw1103d9s0db2f8q62-rasqal-0.9.33/bin/roqet -h` got 0 exit code - ran `/nix/store/g22gwl6x47gblsjw1103d9s0db2f8q62-rasqal-0.9.33/bin/roqet --help` got 0 exit code - ran `/nix/store/g22gwl6x47gblsjw1103d9s0db2f8q62-rasqal-0.9.33/bin/roqet -v` and found version 0.9.33 - ran `/nix/store/g22gwl6x47gblsjw1103d9s0db2f8q62-rasqal-0.9.33/bin/roqet --version` and found version 0.9.33 - ran `/nix/store/g22gwl6x47gblsjw1103d9s0db2f8q62-rasqal-0.9.33/bin/roqet -h` and found version 0.9.33 - ran `/nix/store/g22gwl6x47gblsjw1103d9s0db2f8q62-rasqal-0.9.33/bin/roqet --help` and found version 0.9.33 - found 0.9.33 with grep in /nix/store/g22gwl6x47gblsjw1103d9s0db2f8q62-rasqal-0.9.33 - directory tree listing: https://gist.github.com/ed6057974e0e9e152484b22dca593388 --- pkgs/development/libraries/librdf/rasqal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 56272b319917..ceff244670f3 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: stdenv.mkDerivation rec { - name = "rasqal-0.9.32"; + name = "rasqal-0.9.33"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "eeba03218e3b7dfa033934d523a1a64671a9a0f64eadc38a01e4b43367be2e8f"; + sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939"; }; nativeBuildInputs = [ pkgconfig ]; From 375ba615d400750f41429c4409a6600ff45372ee Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 20 Mar 2018 07:53:15 -0700 Subject: [PATCH 044/538] libsForQt5.kdb: 3.0.2 -> 3.1.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/a5vvjndyd5qccy1fphllczql9hdfnfah-kdb-3.1.0/bin/kdb3_sqlite3_dump -h` got 0 exit code - ran `/nix/store/a5vvjndyd5qccy1fphllczql9hdfnfah-kdb-3.1.0/bin/kdb3_sqlite3_dump --help` got 0 exit code - ran `/nix/store/a5vvjndyd5qccy1fphllczql9hdfnfah-kdb-3.1.0/bin/kdb3_sqlite3_dump -h` and found version 3.1.0 - ran `/nix/store/a5vvjndyd5qccy1fphllczql9hdfnfah-kdb-3.1.0/bin/kdb3_sqlite3_dump --help` and found version 3.1.0 - found 3.1.0 with grep in /nix/store/a5vvjndyd5qccy1fphllczql9hdfnfah-kdb-3.1.0 - directory tree listing: https://gist.github.com/05674b3e604ee41cd435090c4b6c8101 --- pkgs/development/libraries/kdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index e85190cdfcec..1dedd3836c29 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "kdb"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1n11xhqk3sf4a5nzvnrnj7bj21yqqqkm2d1xzfx3q82fkyah8s49"; + sha256 = "1wi9z7j0nr9wi6aqqkdcpnr38ixyxbv00sblya7pakdf96hlamhp"; }; nativeBuildInputs = [ extra-cmake-modules ]; From 1aa8905e508d22d333693c6f4ace5da4ef809cca Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 20 Mar 2018 08:32:56 -0700 Subject: [PATCH 045/538] libsForQt5.kpmcore: 3.0.3 -> 3.3.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.3.0 with grep in /nix/store/axq1y6dwgl8xn4da4jwnf1zxjz7n74gz-kpmcore-3.3.0 - found 3.3.0 in filename of file in /nix/store/axq1y6dwgl8xn4da4jwnf1zxjz7n74gz-kpmcore-3.3.0 - directory tree listing: https://gist.github.com/c296e20046c16727398c12f703502545 --- pkgs/development/libraries/kpmcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 8532a8880ce8..2a2f0c79490e 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.0.3"; + version = "3.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "17lqrp39w31fm7haigwq23cp92zwk3czjzqa2fhn3wafx3vafwd2"; + sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; }; buildInputs = [ From 38516ba27e673ea711e1b96448a19e152b4d93cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 9 Jul 2017 07:43:07 +0200 Subject: [PATCH 046/538] emsciptenStdenv: allow reuse without ./autogen.sh The configure phase of emscriptenStdenv exspects an ./autogen.sh script, which is anoying when this step is not needed. Good example is emscriptenPackages.zlib which needs to override configurePhase. --- pkgs/development/em-modules/generic/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index 332fab8e14aa..f03e6e42739a 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -22,8 +22,6 @@ pkgs.stdenv.mkDerivation ( HOME=$TMPDIR runHook preConfigure - # probably requires autotools as dependency - ./autogen.sh emconfigure ./configure --prefix=$out runHook postConfigure From 006332d8acf011bb119448f3b58db24e00366f63 Mon Sep 17 00:00:00 2001 From: Thomas Karolski Date: Wed, 21 Mar 2018 01:57:58 +0100 Subject: [PATCH 047/538] Fix spark scripts that use dirname --- pkgs/applications/networking/cluster/spark/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 99b7566fc713..2b36d7c5647a 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, jre, pythonPackages +{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils , RSupport? true, R , mesosSupport ? true, mesos , version @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do makeWrapper "$n" "$out/bin/$(basename $n)" + substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname done ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java ''; From e5073bcb8099a331251f1a7928dfc752459967ea Mon Sep 17 00:00:00 2001 From: Thomas Karolski Date: Wed, 21 Mar 2018 02:26:04 +0100 Subject: [PATCH 048/538] Fix permission on working directory The working directory needs the x flag, otherwise executors (e.g. sparks executor) are unable to cd into their sandbox and create e.g. temporary files. --- nixos/modules/services/misc/mesos-slave.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 12485141e219..effa29b64f63 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -213,7 +213,7 @@ in { PermissionsStartOnly = true; }; preStart = '' - mkdir -m 0700 -p ${cfg.workDir} + mkdir -m 0701 -p ${cfg.workDir} ''; }; }; From 66deb3aa29801db9c42ef70f0f17fd6d8d47f603 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 25 Mar 2018 21:19:21 +0200 Subject: [PATCH 049/538] quagga service: fix service and re-enable test adding quagga to quaggavty reverting 8a18e1f --- nixos/modules/module-list.nix | 2 +- nixos/modules/services/networking/quagga.nix | 2 +- nixos/release.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d47600fbc61a..da52cb9acdc3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -530,7 +530,7 @@ ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix - # ./services/networking/quagga.nix + ./services/networking/quagga.nix ./services/networking/quassel.nix ./services/networking/racoon.nix ./services/networking/radicale.nix diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix index aab58cc77b90..22204e53203c 100644 --- a/nixos/modules/services/networking/quagga.nix +++ b/nixos/modules/services/networking/quagga.nix @@ -133,7 +133,7 @@ in users.groups = { quagga = {}; # Members of the quaggavty group can use vtysh to inspect the Quagga daemons - quaggavty = {}; + quaggavty = { members = [ "quagga" ]; }; }; systemd.services = diff --git a/nixos/release.nix b/nixos/release.nix index 9b4aa4b0399d..760fd9189598 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -346,7 +346,7 @@ in rec { tests.prometheus = callTest tests/prometheus.nix {}; tests.prosody = callTest tests/prosody.nix {}; tests.proxy = callTest tests/proxy.nix {}; - # tests.quagga = callTest tests/quagga.nix {}; + tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.rabbitmq = callTest tests/rabbitmq.nix {}; tests.radicale = callTest tests/radicale.nix {}; From 2f3dc5108ba44aac6614e483836fcd18ec6bd39a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 14:02:34 -0700 Subject: [PATCH 050/538] glew: 2.0.0 -> 2.1.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/glew/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.1.0 with grep in /nix/store/r6kh84dxq1pi99hcc2dip060kwbg5164-glew-2.1.0-bin - directory tree listing: https://gist.github.com/5a1de7b9365c14af6aca6f9b9c76b6c1 --- pkgs/development/libraries/glew/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index eebf4dded4ad..a8add880090f 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-2.0.0"; + name = "glew-2.1.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5"; + sha256 = "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4"; }; outputs = [ "bin" "out" "dev" "doc" ]; From 4ba85f508f194a6f3374151c370d8bf684ff7afe Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 22:34:47 -0700 Subject: [PATCH 051/538] talloc: 2.1.11 -> 2.1.12 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/talloc/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.1.12 with grep in /nix/store/scinsbqmcna4ch1d7yrmbi5zimxjbnzj-talloc-2.1.12 - found 2.1.12 in filename of file in /nix/store/scinsbqmcna4ch1d7yrmbi5zimxjbnzj-talloc-2.1.12 - directory tree listing: https://gist.github.com/741812f2d0252396e3ecb9ab86f33f66 --- pkgs/development/libraries/talloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 8b06e3f2e096..1d6818276eb8 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.11"; + name = "talloc-2.1.12"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "1lzfxv2zjxap5snf9ydl1bqgjpz0kgkq7n644f8rkbx0arav77k3"; + sha256 = "0jv0ri9vj93fczzgl7rn7xvnfgl2kfx4x85cr8h8v52yh7v0qz4q"; }; nativeBuildInputs = [ pkgconfig ]; From e9de38eb61e159e36ce4d905b02b8f4898ddae89 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 26 Mar 2018 17:18:08 +0200 Subject: [PATCH 052/538] strongswan-swanctl: actually removed the strongswan parameter files --- .../networking/strongswan-swanctl/module.nix | 14 +- .../strongswan-charon-params.nix | 572 --------- .../strongswan-charon-plugins-params.nix | 1111 ----------------- .../strongswan-libimcv-params.nix | 291 ----- .../strongswan-loglevel-params.nix | 29 - .../strongswan-swanctl/strongswan-params.nix | 258 ---- 6 files changed, 2 insertions(+), 2273 deletions(-) delete mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix delete mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix delete mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix delete mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix delete mode 100644 nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index 30d039a2b7a9..d770094960b2 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -5,12 +5,7 @@ with (import ./param-lib.nix lib); let cfg = config.services.strongswan-swanctl; - - # TODO: auto-generate these files using: - # https://github.com/strongswan/strongswan/tree/master/conf - # IDEA: extend the format-options.py script to output these Nix files. - #strongswanParams = import ./strongswan-params.nix lib; - swanctlParams = import ./swanctl-params.nix lib; + swanctlParams = import ./swanctl-params.nix lib; in { options.services.strongswan-swanctl = { enable = mkEnableOption "strongswan-swanctl service"; @@ -32,11 +27,7 @@ in { ''; }; - # The structured strongswan configuration is commented out for - # now in favour of the literal config above. We should first - # discus if we want to add the 600+ options by default. - #strongswan = paramsToOptions strongswanParams; - swanctl = paramsToOptions swanctlParams; + swanctl = paramsToOptions swanctlParams; }; config = mkIf cfg.enable { @@ -76,7 +67,6 @@ in { path = with pkgs; [ kmod iproute iptables utillinux ]; environment.STRONGSWAN_CONF = pkgs.writeTextFile { name = "strongswan.conf"; - #text = paramsToConf cfg.strongswan strongswanParams; text = cfg.strongswan.extraConfig; }; restartTriggers = [ config.environment.etc."swanctl/swanctl.conf".source ]; diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix deleted file mode 100644 index 17bd632dc180..000000000000 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-params.nix +++ /dev/null @@ -1,572 +0,0 @@ -lib: with (import ./param-constructors.nix lib); - -let loglevelParams = import ./strongswan-loglevel-params.nix lib; -in { - accept_unencrypted_mainmode_messages = mkYesNoParam no '' - Accept unencrypted ID and HASH payloads in IKEv1 Main Mode. Some - implementations send the third Main Mode message unencrypted, probably - to find the PSKs for the specified ID for authentication. This is very - similar to Aggressive Mode, and has the same security implications: A - passive attacker can sniff the negotiated Identity, and start brute - forcing the PSK using the HASH payload. It is recommended to keep this - option to no, unless you know exactly what the implications are and - require compatibility to such devices (for example, some SonicWall - boxes). - ''; - - block_threshold = mkIntParam 5 '' - Maximum number of half-open IKE_SAs for a single peer IP. - ''; - - cache_crls = mkYesNoParam no '' - Whether Certificate Revocation Lists (CRLs) fetched via HTTP or LDAP - should be saved under a unique file name derived from the public - key of the Certification Authority (CA) to - /etc/ipsec.d/crls (stroke) or - /etc/swanctl/x509crl (vici), respectively. - ''; - - cert_cache = mkYesNoParam yes '' - Whether relations in validated certificate chains should be cached in memory. - ''; - - cisco_unity = mkYesNoParam no '' - Send Cisco Unity vendor ID payload (IKEv1 only), see unity plugin. - ''; - - close_ike_on_child_failure = mkYesNoParam no '' - Close the IKE_SA if setup of the CHILD_SA along with IKE_AUTH failed. - ''; - - cookie_threshold = mkIntParam 10 '' - Number of half-open IKE_SAs that activate the cookie mechanism. - ''; - - crypto_test.bench = mkYesNoParam no '' - Benchmark crypto algorithms and order them by efficiency. - ''; - - crypto_test.bench_size = mkIntParam 1024 '' - Buffer size used for crypto benchmark. - ''; - - crypto_test.bench_time = mkIntParam 50 '' - Number of iterations to test each algorithm. - ''; - - crypto_test.on_add = mkYesNoParam no '' - Test crypto algorithms during registration - (requires test vectors provided by the test-vectors plugin). - ''; - - crypto_test.on_create = mkYesNoParam no '' - Test crypto algorithms on each crypto primitive instantiation. - ''; - - crypto_test.required = mkYesNoParam no '' - Strictly require at least one test vector to enable an algorithm. - ''; - - crypto_test.rng_true = mkYesNoParam no '' - Whether to test RNG with TRUE quality; requires a lot of entropy. - ''; - - delete_rekeyed = mkYesNoParam no '' - Delete CHILD_SAs right after they got successfully rekeyed (IKEv1 only). - Reduces the number of stale CHILD_SAs in scenarios with a lot of rekeyings. - However, this might cause problems with implementations that continue - to use rekeyed SAs until they expire. - ''; - - delete_rekeyed_delay = mkIntParam 5 '' - Delay in seconds until inbound IPsec SAs are deleted after rekeyings - (IKEv2 only). - - To process delayed packets the inbound part of a CHILD_SA is kept - installed up to the configured number of seconds after it got replaced - during a rekeying. If set to 0 the CHILD_SA will be kept installed until - it expires (if no lifetime is set it will be destroyed immediately). - ''; - - dh_exponent_ansi_x9_42 = mkYesNoParam yes '' - Use ANSI X9.42 DH exponent size or optimum size matched to - cryptographical strength. - ''; - - dlopen_use_rtld_now = mkYesNoParam no '' - Use RTLD_NOW with dlopen() when loading plugins and IMV/IMCs to reveal - missing symbols immediately. Useful during development of custom plugins. - ''; - - dns1 = mkOptionalStrParam '' - DNS server assigned to peer via configuration payload (CP), see attr plugin. - ''; - - dns2 = mkOptionalStrParam '' - DNS server assigned to peer via configuration payload (CP). - ''; - - dos_protection = mkYesNoParam yes '' - Enable Denial of Service protection using cookies and aggressiveness checks. - ''; - - ecp_x_coordinate_only = mkYesNoParam yes '' - Compliance with the errata for RFC 4753. - ''; - - filelog = mkAttrsOfParams ({ - append = mkYesNoParam yes '' - If this option is enabled log entries are appended to the existing file. - ''; - - flush_line = mkYesNoParam no '' - Enabling this option disables block buffering and enables line - buffering. That is, a flush to disk is enforced for each logged line. - ''; - - ike_name = mkYesNoParam no '' - Prefix each log entry with the connection name and a unique numerical - identifier for each IKE_SA. - ''; - - time_format = mkOptionalStrParam '' - Prefix each log entry with a timestamp. The option accepts a format string - as passed to strftime(3). - ''; - - time_add_ms = mkYesNoParam no '' - Adds the milliseconds within the current second after the timestamp - (separated by a dot, so time_format should end with %S or %T) - ''; - } // loglevelParams) ''Section to define file loggers, see LoggerConfiguration.''; - - flush_auth_cfg = mkYesNoParam no '' - If enabled objects used during authentication (certificates, identities - etc.) are released to free memory once an IKE_SA is - established. Enabling this might conflict with plugins that later need - access to e.g. the used certificates. - ''; - - follow_redirects = mkYesNoParam yes '' - Whether to follow IKEv2 redirects (RFC 5685). - ''; - - fragment_size = mkIntParam 1280 '' - Maximum size (complete IP datagram size in bytes) of a sent IKE fragment - when using proprietary IKEv1 or standardized IKEv2 fragmentation, - defaults to 1280 (use 0 for address family specific default values, - which uses a lower value for IPv4). If specified this limit is used for - both IPv4 and IPv6. - ''; - - group = mkOptionalStrParam '' - Name of the group the daemon changes to after startup. - ''; - - half_open_timeout = mkIntParam 30 '' - Timeout in seconds for connecting IKE_SAs, also see IKE_SA_INIT dropping. - ''; - - hash_and_url = mkYesNoParam no '' - Enable hash and URL support. - ''; - - host_resolver.max_threads = mkIntParam 3 '' - Maximum number of concurrent resolver threads (they are terminated if unused). - ''; - - host_resolver.min_threads = mkIntParam 0 '' - Minimum number of resolver threads to keep around. - ''; - - i_dont_care_about_security_and_use_aggressive_mode_psk = mkYesNoParam no '' - If enabled responders are allowed to use IKEv1 Aggressive Mode with - pre-shared keys, which is discouraged due to security concerns (offline - attacks on the openly transmitted hash of the PSK). - ''; - - ignore_acquire_ts = mkYesNoParam no '' - If this is disabled the traffic selectors from the kernel's acquire - events, which are derived from the triggering packet, are prepended to - the traffic selectors from the configuration for IKEv2 connection. By - enabling this, such specific traffic selectors will be ignored and only - the ones in the config will be sent. This always happens for IKEv1 - connections as the protocol only supports one set of traffic selectors - per CHILD_SA. - ''; - - ignore_routing_tables = mkSpaceSepListParam [] '' - A space-separated list of routing tables to be excluded from route lookup. - ''; - - ikesa_limit = mkIntParam 0 '' - Maximum number of IKE_SAs that can be established at the same time - before new connection attempts are blocked. - ''; - - ikesa_table_segments = mkIntParam 1 '' - Number of exclusively locked segments in the hash table, see IKE_SA - lookup tuning. - ''; - - ikesa_table_size = mkIntParam 1 '' - Size of the IKE_SA hash table, see IKE_SA lookup tuning. - ''; - - inactivity_close_ike = mkYesNoParam no '' - Whether to close IKE_SA if the only CHILD_SA closed due to inactivity. - ''; - - init_limit_half_open = mkIntParam 0 '' - Limit new connections based on the current number of half open IKE_SAs, - see IKE_SA_INIT dropping. - ''; - - init_limit_job_load = mkIntParam 0 '' - Limit new connections based on the number of jobs currently queued for - processing, see IKE_SA_INIT dropping. - ''; - - initiator_only = mkYesNoParam no '' - Causes charon daemon to ignore IKE initiation requests. - ''; - - install_routes = mkYesNoParam yes '' - Install routes into a separate routing table for established IPsec - tunnels. If disabled a more efficient lookup for source and next-hop - addresses is used since 5.5.2. - ''; - - install_virtual_ip = mkYesNoParam yes '' - Install virtual IP addresses. - ''; - - install_virtual_ip_on = mkOptionalStrParam '' - The name of the interface on which virtual IP addresses should be - installed. If not specified the addresses will be installed on the - outbound interface. - ''; - - integrity_test = mkYesNoParam no '' - Check daemon, libstrongswan and plugin integrity at startup. - ''; - - interfaces_ignore = mkCommaSepListParam [] '' - List of network interfaces that should be ignored, if - is specified this option has no effect. - ''; - - interfaces_use = mkCommaSepListParam [] '' - List of network interfaces that should be used by - charon. All other interfaces are ignored. - ''; - - keep_alive = mkIntParam 20 '' - NAT keep alive interval in seconds. - ''; - - leak_detective.detailed = mkYesNoParam yes '' - Includes source file names and line numbers in leak detective output. - ''; - - leak_detective.usage_threshold = mkIntParam 10240 '' - Threshold in bytes for leaks to be reported (0 to report all). - ''; - - leak_detective.usage_threshold_count = mkIntParam 0 '' - Threshold in number of allocations for leaks to be reported (0 to report - all). - ''; - - load = mkSpaceSepListParam [] '' - Plugins to load in IKEv2 charon daemon, see PluginLoad. - ''; - - load_modular = mkYesNoParam no '' - If enabled the list of plugins to load is determined by individual load - settings for each plugin, see PluginLoad. - ''; - - make_before_break = mkYesNoParam no '' - Initiate IKEv2 reauthentication with a make-before-break instead of a - break-before-make scheme. Make-before-break uses overlapping IKE and - CHILD_SA during reauthentication by first recreating all new SAs before - deleting the old ones. This behavior can be beneficial to avoid - connectivity gaps during reauthentication, but requires support for - overlapping SAs by the peer. strongSwan can handle such overlapping SAs - since 5.3.0. - ''; - - max_ikev1_exchanges = mkIntParam 3 '' - Maximum number of IKEv1 phase 2 exchanges per IKE_SA to keep state about - and track concurrently. - ''; - - max_packet = mkIntParam 10000 '' - Maximum packet size accepted by charon. - ''; - - multiple_authentication = mkYesNoParam yes '' - Enable multiple authentication exchanges (RFC 4739). - ''; - - nbns1 = mkOptionalStrParam '' - WINS server assigned to peer via configuration payload (CP), see attr - plugin. - ''; - - nbns2 = mkOptionalStrParam '' - WINS server assigned to peer via configuration payload (CP). - ''; - - port = mkIntParam 500 '' - UDP port used locally. If set to 0 a random port will be allocated. - ''; - - port_nat_t = mkIntParam 4500 '' - UDP port used locally in case of NAT-T. If set to 0 a random port will - be allocated. Has to be different from charon.port, otherwise a random - port will be allocated. - ''; - - prefer_best_path = mkYesNoParam no '' - By default, charon keeps SAs on the routing path with addresses it - previously used if that path is still usable. By enabling this option, - it tries more aggressively to update SAs with MOBIKE on routing priority - changes using the cheapest path. This adds more noise, but allows to - dynamically adapt SAs to routing priority changes. This option has no - effect if MOBIKE is not supported or disabled. - ''; - - prefer_configured_proposals = mkYesNoParam yes '' - Prefer locally configured proposals for IKE/IPsec over supplied ones as - responder (disabling this can avoid keying retries due to - INVALID_KE_PAYLOAD notifies). - ''; - - prefer_temporary_addrs = mkYesNoParam no '' - By default public IPv6 addresses are preferred over temporary ones - (according to RFC 4941), to make connections more stable. Enable this - option to reverse this. - ''; - - process_route = mkYesNoParam yes '' - Process RTM_NEWROUTE and RTM_DELROUTE events. - ''; - - processor.priority_threads = { - critical = mkIntParam 0 '' - Threads reserved for CRITICAL priority class jobs. - ''; - - high = mkIntParam 0 '' - Threads reserved for HIGH priority class jobs. - ''; - - medium = mkIntParam 0 '' - Threads reserved for MEDIUM priority class jobs. - ''; - - low = mkIntParam 0 '' - Threads reserved for LOW priority class jobs. - ''; - }; - - receive_delay = mkIntParam 0 '' - Delay in ms for receiving packets, to simulate larger RTT. - ''; - - receive_delay_response = mkYesNoParam yes '' - Delay response messages. - ''; - - receive_delay_request = mkYesNoParam yes '' - Delay request messages. - ''; - - receive_delay_type = mkIntParam 0 '' - Specific IKEv2 message type to delay, 0 for any. - ''; - - replay_window = mkIntParam 32 '' - Size of the AH/ESP replay window, in packets. - ''; - - retransmit_base = mkFloatParam "1.8" '' - Base to use for calculating exponential back off, see Retransmission. - ''; - - retransmit_jitter = mkIntParam 0 '' - Maximum jitter in percent to apply randomly to calculated retransmission - timeout (0 to disable). - ''; - - retransmit_limit = mkIntParam 0 '' - Upper limit in seconds for calculated retransmission timeout (0 to - disable). - ''; - - retransmit_timeout = mkFloatParam "4.0" '' - Timeout in seconds before sending first retransmit. - ''; - - retransmit_tries = mkIntParam 5 '' - Number of times to retransmit a packet before giving up. - ''; - - retry_initiate_interval = mkIntParam 0 '' - Interval in seconds to use when retrying to initiate an IKE_SA (e.g. if - DNS resolution failed), 0 to disable retries. - ''; - - reuse_ikesa = mkYesNoParam yes '' - Initiate CHILD_SA within existing IKE_SAs (always enabled for IKEv1). - ''; - - routing_table = mkIntParam 220 '' - Numerical routing table to install routes to. - ''; - - routing_table_prio = mkIntParam 220 '' - Priority of the routing table. - ''; - - rsa_pss = mkYesNoParam no '' - Whether to use RSA with PSS padding instead of PKCS#1 padding by default. - ''; - - send_delay = mkIntParam 0 '' - Delay in ms for sending packets, to simulate larger RTT. - ''; - - send_delay_request = mkYesNoParam yes '' - Delay request messages. - ''; - - send_delay_response = mkYesNoParam yes '' - Delay response messages. - ''; - - send_delay_type = mkIntParam 0 '' - Specific IKEv2 message type to delay, 0 for any. - ''; - - send_vendor_id = mkYesNoParam no '' - Send strongSwan vendor ID payload. - ''; - - signature_authentication = mkYesNoParam yes '' - Whether to enable Signature Authentication as per RFC 7427. - ''; - - signature_authentication_constraints = mkYesNoParam yes '' - If enabled, signature schemes configured in rightauth, in addition to - getting used as constraints against signature schemes employed in the - certificate chain, are also used as constraints against the signature - scheme used by peers during IKEv2. - ''; - - spi_min = mkHexParam "0xc0000000" '' - The lower limit for SPIs requested from the kernel for IPsec SAs. Should - not be set lower than 0x00000100 (256), as SPIs between 1 and 255 are - reserved by IANA. - ''; - - spi_max = mkHexParam "0xcfffffff" '' - The upper limit for SPIs requested from the kernel for IPsec SAs. - ''; - - start-scripts = mkAttrsOfParam (mkStrParam "" "") '' - Section containing a list of scripts (name = path) that are executed - when the daemon is started. - ''; - - stop-scripts = mkAttrsOfParam (mkStrParam "" "") '' - Section containing a list of scripts (name = path) that are executed - when the daemon is terminated. - ''; - - syslog = loglevelParams // { - identifier = mkOptionalStrParam '' - Identifier for use with openlog(3). - - Global identifier used for an openlog(3) call, prepended to each log - message by syslog. If not configured, openlog(3) is not called, so - the value will depend on system defaults (often the program name). - ''; - - ike_name = mkYesNoParam no '' - Prefix each log entry with the connection name and a unique numerical - identifier for each IKE_SA. - ''; - }; - - threads = mkIntParam 16 '' - Number of worker threads in charon. Several of these are reserved for - long running tasks in internal modules and plugins. Therefore, make sure - you don't set this value too low. The number of idle worker threads - listed in ipsec statusall might be used as indicator on the number of - reserved threads (JobPriority has more on this). - ''; - - user = mkOptionalStrParam '' - Name of the user the daemon changes to after startup. - ''; - - x509.enforce_critical = mkYesNoParam yes '' - Discard certificates with unsupported or unknown critical extensions. - ''; - - plugins = import ./strongswan-charon-plugins-params.nix lib; - - imcv = { - assessment_result = mkYesNoParam yes '' - Whether IMVs send a standard IETF Assessment Result attribute. - ''; - - database = mkOptionalStrParam '' - Global IMV policy database URI. If it contains a password, make sure to - adjust the permissions of the config file accordingly. - ''; - - os_info.default_password_enabled = mkYesNoParam no '' - Manually set whether a default password is enabled. - ''; - - os_info.name = mkOptionalStrParam '' - Manually set the name of the client OS (e.g. NixOS). - ''; - - os_info.version = mkOptionalStrParam '' - Manually set the version of the client OS (e.g. 17.09). - ''; - - policy_script = mkStrParam "ipsec _imv_policy" '' - Script called for each TNC connection to generate IMV policies. - ''; - }; - - tls = { - cipher = mkSpaceSepListParam [] '' - List of TLS encryption ciphers. - ''; - - key_exchange = mkSpaceSepListParam [] '' - List of TLS key exchange methods. - ''; - - mac = mkSpaceSepListParam [] '' - List of TLS MAC algorithms. - ''; - - suites = mkSpaceSepListParam [] '' - List of TLS cipher suites. - ''; - }; - - tnc = { - libtnccs.tnc_config = mkStrParam "/etc/tnc_config" '' - TNC IMC/IMV configuration file. - ''; - }; -} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix deleted file mode 100644 index 116fb6d00a2c..000000000000 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-charon-plugins-params.nix +++ /dev/null @@ -1,1111 +0,0 @@ -lib : with (import ./param-constructors.nix lib); { - addrblock.strict = mkYesNoParam yes '' - If enabled, a subject certificate without an RFC 3779 address block - extension is rejected if the issuer certificate has such an addrblock - extension. If disabled, subject certificates issued without addrblock - extension are accepted without any traffic selector checks and no policy - is enforced by the plugin. - ''; - - android_log.loglevel = mkIntParam 1 '' - Loglevel for logging to Android specific logger. - ''; - - attr = mkAttrsOfParam (mkCommaSepListParam [] "") '' - Section to specify arbitrary attributes that are assigned to a peer - via configuration payload, see attr plugin. - - The attribute can be either - address, - netmask, - dns, - nbns, - dhcp, - subnet, - split-include, - split-exclude - or the numeric identifier of the attribute type. The assigned value can be - an IPv4/IPv6 address, a subnet in CIDR notation or an arbitrary value - depending on the attribute type. Since some attribute types accept multiple - values all values must be specified as a list. - ''; - - attr-sql.crash_recovery = mkYesNoParam yes '' - Release all online leases during startup. Disable this to share the DB - between multiple VPN gateways. - ''; - - attr-sql.database = mkOptionalStrParam '' - Database URI for attr-sql plugin used by charon. If it contains a - password, make sure to adjust the permissions of the config file - accordingly. - ''; - - attr-sql.lease_history = mkYesNoParam yes '' - Enable logging of SQL IP pool leases. - ''; - - bliss.use_bliss_b = mkYesNoParam yes '' - Use the enhanced BLISS-B key generation and signature algorithm. - ''; - - bypass-lan.interfaces_ignore = mkCommaSepListParam [] '' - List of network interfaces for which connected subnets - should be ignored, if interfaces_use is specified this option has no - effect. - ''; - - bypass-lan.interfaces_use = mkCommaSepListParam [] '' - List of network interfaces for which connected subnets - should be considered. All other interfaces are ignored. - ''; - - certexpire.csv.cron = mkOptionalStrParam '' - Cron style string specifying CSV export times, see certexpire for - details. - ''; - - certexpire.csv.empty_string = mkOptionalStrParam '' - String to use in empty intermediate CA fields. - ''; - - certexpire.csv.fixed_fields = mkYesNoParam yes '' - Use a fixed intermediate CA field count. - ''; - - certexpire.csv.force = mkYesNoParam yes '' - Force export of all trustchains we have a private key for. - ''; - - certexpire.csv.format = mkStrParam "%d:%m:%Y" '' - strftime(3) format string to export expiration dates as. - ''; - - certexpire.csv.local = mkOptionalStrParam '' - strftime(3) format string for the CSV file name to export local - certificates to. - ''; - - certexpire.csv.remote = mkOptionalStrParam '' - strftime(3) format string for the CSV file name to export remote - certificates to. - ''; - - certexpire.csv.separator = mkStrParam "," '' - CSV field separator. - ''; - - coupling.file = mkOptionalStrParam '' - File to store coupling list to, see certcoupling plugin for details. - ''; - - coupling.hash = mkStrParam "sha1" '' - Hashing algorithm to fingerprint coupled certificates. - ''; - - coupling.max = mkIntParam 1 '' - Maximum number of coupling entries to create. - ''; - - curl.redir = mkIntParam (-1) '' - Maximum number of redirects followed by the plugin, set to 0 to disable - following redirects, set to -1 for no limit. - ''; - - dhcp.force_server_address = mkYesNoParam no '' - Always use the configured server address, see DHCP plugin for details. - ''; - - dhcp.identity_lease = mkYesNoParam no '' - Derive user-defined MAC address from hash of IKEv2 identity. - ''; - - dhcp.interface = mkOptionalStrParam '' - Interface name the plugin uses for address allocation. The default is to - bind to any and let the system decide which way to route the packets to - the DHCP server. - ''; - - dhcp.server = mkStrParam "255.255.255.255" '' - DHCP server unicast or broadcast IP address. - ''; - - dnscert.enable = mkYesNoParam no '' - Enable fetching of CERT RRs via DNS. - ''; - - duplicheck.enable = mkYesNoParam yes '' - Enable duplicheck plugin (if loaded). - ''; - - duplicheck.socket = mkStrParam "unix://\${piddir}/charon.dck" '' - Socket provided by the duplicheck plugin. - ''; - - eap-aka.request_identity = mkYesNoParam yes ""; - - eap-aka-3ggp2.seq_check = mkOptionalStrParam '' - Enable to activate sequence check of the AKA SQN values in order to trigger - resync cycles. - ''; - - eap-dynamic.prefer_user = mkYesNoParam no '' - If enabled, the eap-dynamic plugin will prefer the order of the EAP - methods in an EAP-Nak message sent by a client over the one configured - locally. - ''; - - eap-dynamic.preferred = mkCommaSepListParam [] '' - The preferred EAP method(s) to be used by the eap-dynamic plugin. If it is - not set, the first registered method will be used initially. The methods - are tried in the given order before trying the rest of the registered - methods. - ''; - - eap-gtc.backend = mkStrParam "pam" '' - XAuth backend to be used for credential verification, see EAP-GTC. - ''; - - eap-peap.fragment_size = mkIntParam 1024 '' - Maximum size of an EAP-PEAP packet. - ''; - - eap-peap.max_message_count = mkIntParam 32 '' - Maximum number of processed EAP-PEAP packets. - ''; - - eap-peap.include_length = mkYesNoParam no '' - Include length in non-fragmented EAP-PEAP packets. - ''; - - eap-peap.phase2_method = mkStrParam "mschapv2" '' - Phase2 EAP client authentication method. - ''; - - eap-peap.phase2_piggyback = mkYesNoParam no '' - Phase2 EAP Identity request piggybacked by server onto TLS Finished - message. - ''; - - eap-peap.phase2_tnc = mkYesNoParam no '' - Start phase2 EAP-TNC protocol after successful client authentication. - ''; - - eap-peap.request_peer_auth = mkYesNoParam no '' - Request peer authentication based on a client certificate. - ''; - - eap-radius.accounting = mkYesNoParam no '' - Enable EAP-RADIUS accounting. - ''; - - eap-radius.accounting_close_on_timeout = mkYesNoParam yes '' - Close the IKE_SA if there is a timeout during interim RADIUS accounting - updates. - ''; - - eap-radius.accounting_interval = mkIntParam 0 '' - Interval in seconds for interim RADIUS accounting updates, if not - specified by the RADIUS server in the Access-Accept message. - ''; - - eap-radius.accounting_requires_vip = mkYesNoParam no '' - If enabled, accounting is disabled unless an IKE_SA has at least one - virtual IP. - ''; - - eap-radius.accounting_send_class = mkYesNoParam no '' - If enabled, adds the Class attributes received in Access-Accept - message to the RADIUS accounting messages. - ''; - - eap-radius.class_group = mkYesNoParam no '' - Use the class attribute sent in the Access-Accept message as group - membership information, see EapRadius. - ''; - - eap-radius.close_all_on_timeout = mkYesNoParam no '' - Closes all IKE_SAs if communication with the RADIUS server times out. If - it is not set only the current IKE_SA is closed. - ''; - - eap-radius.dae.enable = mkYesNoParam no '' - Enables support for the Dynamic Authorization Extension (RFC 5176). - ''; - - eap-radius.dae.listen = mkStrParam "0.0.0.0" '' - Address to listen for DAE messages from the RADIUS server. - ''; - - eap-radius.dae.port = mkIntParam 3799 '' - Port to listen for DAE requests. - ''; - - eap-radius.dae.secret = mkOptionalStrParam '' - Shared secret used to verify/sign DAE messages.If set, make sure to - adjust the permissions of the config file accordingly. - ''; - - eap-radius.eap_start = mkYesNoParam no '' - Send EAP-Start instead of EAP-Identity to start RADIUS conversation. - ''; - - eap-radius.filter_id = mkYesNoParam no '' - Use the filter_id attribute sent in the RADIUS-Accept message as group - membership if the RADIUS tunnel_type attribute is set to ESP. - ''; - - eap-radius.forward.ike_to_radius = mkOptionalStrParam '' - RADIUS attributes to be forwarded from IKEv2 to RADIUS (can be defined - by name or attribute number, a colon can be used to specify - vendor-specific attributes, e.g. Reply-Message, or 11, or 36906:12). - ''; - - eap-radius.forward.radius_to_ike = mkOptionalStrParam '' - Same as above but from RADIUS to IKEv2, a strongSwan specific private - notify (40969) is used to transmit the attributes. - ''; - - eap-radius.id_prefix = mkOptionalStrParam '' - Prefix to EAP-Identity, some AAA servers use a IMSI prefix to select the - EAP method. - ''; - - eap-radius.nas_identifier = mkStrParam "strongSwan" '' - NAS-Identifier to include in RADIUS messages. - ''; - - eap-radius.port = mkIntParam 1812 '' - Port of RADIUS server (authentication). - ''; - - eap-radius.retransmit_base = mkFloatParam "1.4" '' - Base to use for calculating exponential back off. - ''; - - eap-radius.retransmit_timeout = mkFloatParam "2.0" '' - Timeout in seconds before sending first retransmit. - ''; - - eap-radius.retransmit_tries = mkIntParam 4 '' - Number of times to retransmit a packet before giving up. - ''; - - eap-radius.secret = mkOptionalStrParam '' - Shared secret between RADIUS and NAS. If set, make sure to adjust the - permissions of the config file accordingly. - ''; - - eap-radius.server = mkOptionalStrParam '' - IP/Hostname of RADIUS server. - ''; - - eap-radius.servers = mkAttrsOfParams { - nas_identifier = mkStrParam "strongSwan" '' - The nas_identifer (default: strongSwan) identifies the gateway against the - RADIUS server and allows it to enforce a policy, for example. - ''; - - secret = mkOptionalStrParam ""; - - sockets = mkIntParam 1 '' - The number of pre-allocated sockets to use. A value of 5 allows the - gateway to authentication 5 clients simultaneously over RADIUS. - ''; - - auth_port = mkIntParam 1812 '' - RADIUS UDP port - ''; - - address = mkOptionalStrParam '' - The server's IP/Hostname. - ''; - - acct_port = mkIntParam 1813 '' - Accounting port. - ''; - - preference = mkIntParam 0 '' - With the preference paramter of a server, priorities for specific servers - can be defined. This allows to use a secondary RADIUS server only if the - first gets unresponsive, or if it is overloaded. - ''; - } ''Section to specify multiple RADIUS servers, see EapRadius.''; - - eap-radius.sockets = mkIntParam 1 '' - Number of sockets (ports) to use, increase for high load. - ''; - - eap-radius.xauth = mkAttrsOfParams { - nextpin = mkOptionalStrParam ""; - password = mkOptionalStrParam ""; - passcode = mkOptionalStrParam ""; - answer = mkOptionalStrParam ""; - } '' - Section to configure multiple XAuth authentication rounds via RADIUS. - ''; - - eap-sim.request_identity = mkYesNoParam yes ""; - - eap-simaka-sql.database = mkOptionalStrParam ""; - - eap-simaka-sql.remove_used = mkOptionalStrParam ""; - - eap-tls.fragment_size = mkIntParam 1024 '' - Maximum size of an EAP-TLS packet. - ''; - - eap-tls.include_length = mkYesNoParam yes '' - Include length in non-fragmented EAP-TLS packets. - ''; - - eap-tls.max_message_count = mkIntParam 32 '' - Maximum number of processed EAP-TLS packets (0 = no limit). - ''; - - eap-tnc.max_message_count = mkIntParam 10 '' - Maximum number of processed EAP-TNC packets (0 = no limit). - ''; - - eap-tnc.protocol = mkStrParam "tnccs-2.0" '' - IF-TNCCS protocol version to be used (tnccs-1.1, tnccs-2.0, - tnccs-dynamic). - ''; - - eap-ttls.fragment_size = mkIntParam 1024 '' - Maximum size of an EAP-TTLS packet. - ''; - - eap-ttls.include_length = mkYesNoParam yes '' - Include length in non-fragmented EAP-TTLS packets. - ''; - - eap-ttls.max_message_count = mkIntParam 32 '' - Maximum number of processed EAP-TTLS packets (0 = no limit). - ''; - - eap-ttls.phase2_method = mkStrParam "md5" '' - Phase2 EAP client authentication method. - ''; - - eap-ttls.phase2_piggyback = mkYesNoParam no '' - Phase2 EAP Identity request piggybacked by server onto TLS Finished - message. - ''; - - eap-ttls.phase2_tnc = mkYesNoParam no '' - Start phase2 EAP TNC protocol after successful client authentication. - ''; - - eap-ttls-phase2_tnc_method = mkEnumParam ["pt" "legacy"] "pt" '' - Phase2 EAP TNC transport protocol (pt as IETF standard or legacy tnc) - ''; - - eap-ttls.request_peer_auth = mkYesNoParam no '' - Request peer authentication based on a client certificate. - ''; - - error-notify.socket = mkStrParam "unix://\${piddir}/charon.enfy" '' - Socket provided by the error-notify plugin. - ''; - - ext-auth.script = mkOptionalStrParam '' - Shell script to invoke for peer authorization (see ext-auth). - ''; - - gcrypt.quick_random = mkYesNoParam no '' - Use faster random numbers in gcrypt. For testing only, produces weak - keys! - ''; - - ha.autobalance = mkIntParam 0 '' - Interval in seconds to automatically balance handled segments between - nodes. Set to 0 to disable. - ''; - - ha.buflen = mkIntParam 2048 '' - Buffer size for received HA messages. For IKEv1 the public DH factors are - also transmitted so depending on the DH group the HA messages can get quite - big (the default should be fine up to modp4096). - ''; - - ha.fifo_interface = mkYesNoParam yes ""; - - ha.heartbeat_delay = mkIntParam 1000 ""; - - ha.heartbeat_timeout = mkIntParam 2100 ""; - - ha.local = mkOptionalIntParam ""; - - ha.monitor = mkYesNoParam yes ""; - - ha.pools = mkOptionalStrParam ""; - - ha.remote = mkOptionalStrParam ""; - - ha.resync = mkYesNoParam yes ""; - - ha.secret = mkOptionalStrParam ""; - - ha.segment_count = mkIntParam 1 ""; - - ipseckey.enable = mkYesNoParam no '' - Enable fetching of IPSECKEY RRs via DNS. - ''; - - kernel-libipsec.allow_peer_ts = mkYesNoParam no '' - Allow that the remote traffic selector equals the IKE peer (see - kernel-libipsec for details). - ''; - - kernel-netlink.buflen = mkOptionalIntParam '' - Buffer size for received Netlink messages. Defaults to - min(PAGE_SIZE, 8192). - ''; - - kernel-netlink.force_receive_buffer_size = mkYesNoParam no '' - If the maximum Netlink socket receive buffer in bytes set by - receive_buffer_size exceeds the system-wide maximum from - /proc/sys/net/core/rmem_max, this option can be used to - override the limit. Enabling this option requires special privileges - (CAP_NET_ADMIN). - ''; - - kernel-netlink.fwmark = mkOptionalStrParam '' - Firewall mark to set on the routing rule that directs traffic to our own - routing table. The format is [!]mark[/mask], where the - optional exclamation mark inverts the meaning (i.e. the rule only applies to - packets that don't match the mark). A possible use case are host-to-host - tunnels with kernel-libipsec. When set to !<mark> a more efficient - lookup for source and next-hop addresses may also be used since 5.3.3. - ''; - - kernel-netlink.mss = mkIntParam 0 '' - MSS to set on installed routes, 0 to disable. - ''; - - kernel-netlink.mtu = mkIntParam 0 '' - MTU to set on installed routes, 0 to disable. - ''; - - kernel-netlink.process_rules = mkYesNoParam no '' - Whether to process changes in routing rules to trigger roam events. This is - currently only useful if the kernel based route lookup is used (i.e. if - route installation is disabled or an inverted fwmark match is configured). - ''; - - kernel-netlink.receive_buffer_size = mkIntParam 0 '' - Maximum Netlink socket receive buffer in bytes. This value controls how many - bytes of Netlink messages can be received on a Netlink socket. The default - value is set by /proc/sys/net/core/rmem_default. The - specified value cannot exceed the system-wide maximum from - /proc/sys/net/core/rmem_max, unless - is enabled. - ''; - - kernel-netlink.roam_events = mkYesNoParam yes '' - Whether to trigger roam events when interfaces, addresses or routes - change. - ''; - - kernel-netlink.set_proto_port_transport_sa = mkYesNoParam no '' - Whether to set protocol and ports in the selector installed on transport - mode IPsec SAs in the kernel. While doing so enforces policies for - inbound traffic, it also prevents the use of a single IPsec SA by more - than one traffic selector. - ''; - - kernel-netlink.spdh_thresh.ipv4.lbits = mkIntParam 32 '' - Local subnet XFRM policy hashing threshold for IPv4. - ''; - - kernel-netlink.spdh_thresh.ipv4.rbits = mkIntParam 32 '' - Remote subnet XFRM policy hashing threshold for IPv4. - ''; - - kernel-netlink.spdh_thresh.ipv6.lbits = mkIntParam 128 '' - Local subnet XFRM policy hashing threshold for IPv6. - ''; - - kernel-netlink.spdh_thresh.ipv6.rbits = mkIntParam 128 '' - Remote subnet XFRM policy hashing threshold for IPv6. - ''; - - kernel-netlink.xfrm_acq_expires = mkIntParam 165 '' - Lifetime of XFRM acquire state created by the kernel when traffic matches a - trap policy. The value gets written to - /proc/sys/net/core/xfrm_acq_expires. Indirectly controls - the delay between XFRM acquire messages triggered by the kernel for a trap - policy. The same value is used as timeout for SPIs allocated by the - kernel. The default value equals the default total retransmission timeout - for IKE messages (since 5.5.3 this value is determined dynamically based on - the configuration). - ''; - - kernel-pfkey.events_buffer_size = mkIntParam 0 '' - Size of the receive buffer for the event socket (0 for default - size). Because events are received asynchronously installing e.g. lots - of policies may require a larger buffer than the default on certain - platforms in order to receive all messages. - ''; - - kernel-pfroute.vip_wait = mkIntParam 1000 '' - Time in ms to wait until virtual IP addresses appear/disappear before - failing. - ''; - - led.activity_led = mkOptionalStrParam ""; - - led.blink_time = mkIntParam 50 ""; - - load-tester = { - addrs = mkAttrsOfParam (mkOptionalStrParam "") '' - Section that contains key/value pairs with address pools (in CIDR - notation) to use for a specific network interface e.g. - eth0 = 10.10.0.0/16. - ''; - - addrs_keep = mkYesNoParam no '' - Whether to keep dynamic addresses even after the associated SA got - terminated. - ''; - - addrs_prefix = mkIntParam 16 '' - Network prefix length to use when installing dynamic addresses. - If set to -1 the full address is used (i.e. 32 or 128). - ''; - - ca_dir = mkOptionalStrParam '' - Directory to load (intermediate) CA certificates from. - ''; - - child_rekey = mkIntParam 600 '' - Seconds to start CHILD_SA rekeying after setup. - ''; - - crl = mkOptionalStrParam '' - URI to a CRL to include as certificate distribution point in generated - certificates. - ''; - - delay = mkIntParam 0 '' - Delay between initiatons for each thread. - ''; - - delete_after_established = mkYesNoParam no '' - Delete an IKE_SA as soon as it has been established. - ''; - - digest = mkStrParam "sha1" '' - Digest algorithm used when issuing certificates. - ''; - - dpd_delay = mkIntParam 0 '' - DPD delay to use in load test. - ''; - - dynamic_port = mkIntParam 0 '' - Base port to be used for requests (each client uses a different port). - ''; - - eap_password = mkStrParam "default-pwd" '' - EAP secret to use in load test. - ''; - - enable = mkYesNoParam no '' - Enable the load testing plugin. **WARNING**: Never enable this plugin on - productive systems. It provides preconfigured credentials and allows an - attacker to authenticate as any user. - ''; - - esp = mkStrParam "aes128-sha1" '' - CHILD_SA proposal to use for load tests. - ''; - - fake_kernel = mkYesNoParam no '' - Fake the kernel interface to allow load-testing against self. - ''; - - ike_rekey = mkIntParam 0 '' - Seconds to start IKE_SA rekeying after setup. - ''; - - init_limit = mkIntParam 0 '' - Global limit of concurrently established SAs during load test. - ''; - - initiator = mkStrParam "0.0.0.0" '' - Address to initiate from. - ''; - - initiators = mkIntParam 0 '' - Number of concurrent initiator threads to use in load test. - ''; - - initiator_auth = mkStrParam "pubkey" '' - Authentication method(s) the intiator uses. - ''; - - initiator_id = mkOptionalStrParam '' - Initiator ID used in load test. - ''; - - initiator_match = mkOptionalStrParam '' - Initiator ID to match against as responder. - ''; - - initiator_tsi = mkOptionalStrParam '' - Traffic selector on initiator side, as proposed by initiator. - ''; - - initiator_tsr = mkOptionalStrParam '' - Traffic selector on responder side, as proposed by initiator. - ''; - - iterations = mkIntParam 1 '' - Number of IKE_SAs to initiate by each initiator in load test. - ''; - - issuer_cert = mkOptionalStrParam '' - Path to the issuer certificate (if not configured a hard-coded default - value is used). - ''; - - issuer_key = mkOptionalStrParam '' - Path to private key that is used to issue certificates (if not configured - a hard-coded default value is used). - ''; - - mode = mkEnumParam ["tunnel" "transport" "beet"] "tunnel" '' - IPsec mode to use. - ''; - - pool = mkOptionalStrParam '' - Provide INTERNAL_IPV4_ADDRs from a named pool. - ''; - - preshared_key = mkStrParam "" '' - Preshared key to use in load test. - ''; - - proposal = mkStrParam "aes128-sha1-modp768" '' - IKE proposal to use in load test. - ''; - - responder = mkStrParam "127.0.0.1" '' - Address to initiation connections to. - ''; - - responder_auth = mkStrParam "pubkey" '' - Authentication method(s) the responder uses. - ''; - - responder_id = mkOptionalStrParam '' - Responder ID used in load test. - ''; - - responder_tsi = mkStrParam "initiator_tsi" '' - Traffic selector on initiator side, as narrowed by responder. - ''; - - responder_tsr = mkStrParam "initiator_tsr" '' - Traffic selector on responder side, as narrowed by responder. - ''; - - request_virtual_ip = mkYesNoParam no '' - Request an INTERNAL_IPV4_ADDR from the server. - ''; - - shutdown_when_complete = mkYesNoParam no '' - Shutdown the daemon after all IKE_SAs have been established. - ''; - - socket = mkStrParam "unix://\\\${piddir}/charon.ldt" '' - Socket provided by the load-tester plugin. - ''; - - version = mkIntParam 0 '' - IKE version to use (0 means use IKEv2 as initiator and accept any version - as responder). - ''; - }; - - lookip.socket = mkStrParam "unix://\\\${piddir}/charon.lkp" '' - Socket provided by the lookip plugin. - ''; - - ntru.max_drbg_requests = mkIntParam 4294967294 '' - Number of pseudo-random bit requests from the DRBG before an automatic - reseeding occurs. - ''; - - ntru.parameter_set = - mkEnumParam ["x9_98_speed" "x9_98_bandwidth" "x9_98_balance" "optimum"] "optimum" '' - The following parameter sets are available: - x9_98_speed, x9_98_bandwidth, - x9_98_balance and optimum, the last - set not being part of the X9.98 standard but having the best performance. - ''; - - openssl.engine_id = mkStrParam "pkcs11" '' - ENGINE ID to use in the OpenSSL plugin. - ''; - - openssl.fips_mode = mkIntParam 0 '' - Set OpenSSL FIPS mode: - - disabled (0), - enabled (1), - Suite B enabled (2). - - Defaults to the value configured with the - --with-fips-mode option. - - ''; - - osx-attr.append = mkYesNoParam yes '' - Whether DNS servers are appended to existing entries, instead of - replacing them. - ''; - - pkcs11.load_certs = mkYesNoParam yes '' - Whether to load certificates from tokens. - ''; - - pkcs11.modules = mkAttrsOfParams { - path = mkOptionalStrParam '' - Full path to the shared object file of this PKCS#11 module - ''; - - os_locking = mkYesNoParam no '' - Whether OS locking should be enabled for this module - ''; - - load_certs = mkYesNoParam no '' - Whether the PKCS#11 modules should load certificates from tokens (since 5.0.2) - ''; - } '' - List of available PKCS#11 modules, see SmartCardsIKEv2. - ''; - - pkcs11.reload_certs = mkYesNoParam no '' - Reload certificates from all tokens if charon receives a SIGHUP. - ''; - - pkcs11.use_dh = mkYesNoParam no '' - Whether the PKCS#11 modules should be used for DH and ECDH. - ''; - - pkcs11.use_ecc = mkYesNoParam no '' - Whether the PKCS#11 modules should be used for ECDH and ECDSA public key - operations. ECDSA private keys are used regardless of this option. - ''; - - pkcs11.use_hasher = mkYesNoParam no '' - Whether the PKCS#11 modules should be used to hash data. - ''; - - pkcs11.use_pubkey = mkYesNoParam no '' - Whether the PKCS#11 modules should be used for public key operations, - even for keys not stored on tokens. - ''; - - pkcs11.use_rng = mkYesNoParam no '' - Whether the PKCS#11 modules should be used as RNG. - ''; - - radattr.dir = mkOptionalStrParam '' - Directory where RADIUS attributes are stored in client-ID specific - files, see radattr. - ''; - - radattr.message_id = mkIntParam (-1) '' - RADIUS attributes are added to all IKE_AUTH messages by default (-1), or - only to the IKE_AUTH message with the given IKEv2 message ID. - ''; - - random.random = mkStrParam "/dev/random" '' - File to read random bytes from. - ''; - - random.urandom = mkStrParam "/dev/urandom" '' - File to read pseudo random bytes from. - ''; - - random.strong_equals_true = mkYesNoParam no '' - If enabled the RNG_STRONG class reads random bytes from the same source - as the RNG_TRUE class. - ''; - - resolve.file = mkStrParam "/etc/resolv.conf" '' - File used by the resolve plugin to write DNS server entries to. - ''; - - resolve.resolvconf.iface_prefix = mkStrParam "lo.inet.ipsec." '' - Prefix used by the resolve plugin for interface names sent to - resolvconf(8). The name server address is appended to this prefix to - make it unique. The result has to be a valid interface name according to - the rules defined by resolvconf. Also, it should have a high priority - according to the order defined in interface-order(5). - ''; - - revocation.enable_crl = mkYesNoParam yes '' - Whether CRL validation should be enabled. - ''; - - revocation.enable_ocsp = mkYesNoParam yes '' - Whether OCSP validation should be enabled. - ''; - - save-keys.load = mkYesNoParam no '' - Whether to load the plugin. - ''; - - save-keys.esp = mkYesNoParam no '' - Whether to save ESP keys. - ''; - - save-keys.ike = mkYesNoParam no '' - Whether to save IKE keys. - ''; - - save-keys.wireshark_keys = mkOptionalStrParam '' - Directory where the keys are stored in the format supported by Wireshark. - IKEv1 keys are stored in the ikev1_decryption_table file. - IKEv2 keys are stored in the ikev2_decryption_table file. - Keys for ESP CHILD_SAs are stored in the esp_sa file. - ''; - - socket-default.fwmark = mkOptionalStrParam '' - Firewall mark to set on outbound packets (a possible use case are - host-to-host tunnels with kernel-libipsec). - ''; - - socket-default.set_source = mkYesNoParam yes '' - Set source address on outbound packets, if possible. - ''; - - socket-default.set_sourceif = mkYesNoParam no '' - Force sending interface on outbound packets, if possible. This allows - using IPv6 link-local addresses as tunnel endpoints. - ''; - - socket-default.use_ipv4 = mkYesNoParam yes '' - Listen on IPv4, if possible. - ''; - - socket-default.use_ipv6 = mkYesNoParam yes '' - Listen on IPv6, if possible. - ''; - - sql.database = mkOptionalStrParam '' - Database URI for charon's SQL plugin. If it contains a password, make - sure to adjust the permissions of the config file accordingly. - ''; - - sql.loglevel = mkIntParam (-1) '' - Loglevel for logging to SQL database. - ''; - - stroke.allow_swap = mkYesNoParam yes '' - Analyze addresses/hostnames in left/right to detect which side is local - and swap configuration options if necessary. If disabled left is always - local. - ''; - - stroke.ignore_missing_ca_basic_constraint = mkYesNoParam no '' - Treat certificates in ipsec.d/cacerts and ipsec.conf ca sections as CA - certificates even if they don't contain a CA basic constraint. - ''; - - stroke.max_concurrent = mkIntParam 4 '' - Maximum number of stroke messages handled concurrently. - ''; - - stroke.secrets_file = mkStrParam "\${sysconfdir}/ipsec.secrets" '' - Location of the ipsec.secrets file. - ''; - - stroke.socket = mkStrParam "unix://\${piddir}/charon.ctl" '' - Socket provided by the stroke plugin. - ''; - - stroke.timeout = mkIntParam 0 '' - Timeout in ms for any stroke command. Use 0 to disable the timeout. - ''; - - systime-fix.interval = mkIntParam 0 '' - Interval in seconds to check system time for validity. 0 disables the - check. See systime-fix plugin. - ''; - - systime-fix.reauth = mkYesNoParam no '' - Whether to use reauth or delete if an invalid cert lifetime is detected. - ''; - - systime-fix.threshold = mkOptionalStrParam '' - Threshold date where system time is considered valid. Disabled if not - specified. - ''; - - systime-fix.threshold_format = mkStrParam "%Y" '' - strptime(3) format used to parse threshold option. - ''; - - systime-fix.timeout = mkDurationParam "0s" '' - How long to wait for a valid system time if an interval is - configured. 0 to recheck indefinitely. - ''; - - tnc-ifmap.client_cert = mkOptionalStrParam '' - Path to X.509 certificate file of IF-MAP client. - ''; - - tnc-ifmap.client_key = mkOptionalStrParam '' - Path to private key file of IF-MAP client. - ''; - - tnc-ifmap.device_name = mkOptionalStrParam '' - Unique name of strongSwan server as a PEP and/or PDP device. - ''; - - tnc-ifmap.renew_session_interval = mkIntParam 150 '' - Interval in seconds between periodic IF-MAP RenewSession requests. - ''; - - tnc-ifmap.server_cert = mkOptionalStrParam '' - Path to X.509 certificate file of IF-MAP server. - ''; - - tnc-ifmap.server_uri = mkStrParam "https://localhost:8444/imap" '' - URI of the form [https://]servername[:port][/path]. - ''; - - tnc-ifmap.username_password = mkOptionalStrParam '' - Credentials of IF-MAP client of the form - username:password. If set, make sure to adjust the - permissions of the config file accordingly. - ''; - - tnc-imc.dlcose = mkYesNoParam yes '' - Unload IMC after use. - ''; - - tnc-imc.preferred_language = mkStrParam "en" '' - Preferred language for TNC recommendations. - ''; - - tnc-imv.dlcose = mkYesNoParam yes '' - Unload IMV after use. - ''; - - tnc-imv.recommendation_policy = mkEnumParam ["default" "any" "all"] "default" '' - default TNC recommendation policy. - ''; - - tnc-pdp.pt_tls.enable = mkYesNoParam yes '' - Enable PT-TLS protocol on the strongSwan PDP. - ''; - - tnc-pdp.pt_tls.port = mkIntParam 271 '' - PT-TLS server port the strongSwan PDP is listening on. - ''; - - tnc-pdp.radius.enable = mkYesNoParam yes '' - Enable RADIUS protocol on the strongSwan PDP. - ''; - - tnc-pdp.radius.method = mkStrParam "ttls" '' - EAP tunnel method to be used. - ''; - - tnc-pdp.radius.port = mkIntParam 1812 '' - RADIUS server port the strongSwan PDP is listening on. - ''; - - tnc-pdp.radius.secret = mkOptionalStrParam '' - Shared RADIUS secret between strongSwan PDP and NAS. If set, make sure - to adjust the permissions of the config file accordingly. - ''; - - tnc-pdp.server = mkOptionalStrParam '' - Name of the strongSwan PDP as contained in the AAA certificate. - ''; - - tnc-pdp.timeout = mkOptionalIntParam '' - Timeout in seconds before closing incomplete connections. - ''; - - tnccs-11.max_message_size = mkIntParam 45000 '' - Maximum size of a PA-TNC message (XML & Base64 encoding). - ''; - - tnccs-20.max_batch_size = mkIntParam 65522 '' - Maximum size of a PB-TNC batch (upper limit via PT-EAP = 65529). - ''; - - tnccs-20.max_message_size = mkIntParam 65490 '' - Maximum size of a PA-TNC message (upper limit via PT-EAP = 65497). - ''; - - tnccs-20.mutual = mkYesNoParam no '' - Enable PB-TNC mutual protocol. - ''; - - tpm.use_rng = mkYesNoParam no '' - Whether the TPM should be used as RNG. - ''; - - unbound.dlv_anchors = mkOptionalStrParam '' - File to read trusted keys for DLV from. It uses the same format as - . Only one DLV can be configured, which is - then used as a root trusted DLV, this means that it is a lookaside for the - root. - ''; - - unbound.resolv_conf = mkStrParam "/etc/resolv.conf" '' - File to read DNS resolver configuration from. - ''; - - unbound.trust_anchors = mkStrParam "/etc/ipsec.d/dnssec.keys" '' - File to read DNSSEC trust anchors from (usually root zone KSK). The - format of the file is the standard DNS Zone file format, anchors can be - stored as DS or DNSKEY entries in the file. - ''; - - updown.dns_handler = mkYesNoParam no '' - Whether the updown script should handle DNS servers assigned via IKEv1 - Mode Config or IKEv2 Config Payloads (if enabled they can't be handled - by other plugins, like resolve). - ''; - - vici.socket = mkStrParam "unix://\${piddir}/charon.vici" '' - Socket the vici plugin serves clients. - ''; - - whitelist.enable = mkYesNoParam yes '' - Enable loaded whitelist plugin. - ''; - - whitelist.socket = mkStrParam "unix://\${piddir}/charon.wlst" '' - Socket provided by the whitelist plugin. - ''; - - xauth-eap.backend = mkStrParam "radius" '' - EAP plugin to be used as backend for XAuth credential verification, see - XAuthEAP. - ''; - - xauth-pam.pam_service = mkStrParam "login" '' - PAM service to be used for authentication, see XAuthPAM. - ''; - - xauth-pam.session = mkYesNoParam no '' - Open/close a PAM session for each active IKE_SA. - ''; - - xauth-pam.trim_email = mkYesNoParam yes '' - If an email address is given as an XAuth username, trim it to just the - username part. - ''; -} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix deleted file mode 100644 index 2ca2c9c396e3..000000000000 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-libimcv-params.nix +++ /dev/null @@ -1,291 +0,0 @@ -lib : with (import ./param-constructors.nix lib); { - debug_level = mkIntParam 1 '' - Debug level for a stand-alone libimcv library. - ''; - - load = mkSpaceSepListParam ["random" "nonce" "gmp" "pubkey" "x509"] '' - Plugins to load in IMC/IMVs with stand-alone libimcv library. - ''; - - stderr_quiet = mkYesNoParam no '' - Disable the output to stderr with a stand-alone libimcv library. - ''; - - swid_gen = { - command = mkStrParam "/usr/local/bin/swid_generator" '' - SWID generator command to be executed. - ''; - - tag_creator = { - name = mkStrParam "strongSwan Project" '' - Name of the tagCreator entity. - ''; - - regid = mkStrParam "strongswan.org" '' - regid of the tagCreator entity. - ''; - }; - }; - - plugins = { - - imc-attestation = { - aik_blob = mkOptionalStrParam '' - AIK encrypted private key blob file. - ''; - - aik_cert = mkOptionalStrParam '' - AIK certificate file. - ''; - - aik_handle = mkOptionalStrParam '' - AIK object handle, e.g. 0x81010003. - ''; - - aik_pubkey = mkOptionalStrParam '' - AIK public key file. - ''; - - mandatory_dh_groups = mkYesNoParam yes '' - Enforce mandatory Diffie-Hellman groups - ''; - - nonce_len = mkIntParam 20 '' - DH nonce length. - ''; - - pcr_info = mkYesNoParam no '' - Whether to send pcr_before and pcr_after info. - ''; - - use_quote2 = mkYesNoParam yes '' - Use Quote2 AIK signature instead of Quote signature. - ''; - - use_version_info = mkYesNoParam no '' - Version Info is included in Quote2 signature. - ''; - }; - - imc-hcd.push_info = mkYesNoParam yes '' - Send quadruple info without being prompted. - ''; - - imc-hcd.subtypes = let - imcHcdSubtypeParams = let - softwareParams = mkAttrsOfParams { - name = mkOptionalStrParam '' - Name of the software installed on the hardcopy device. - ''; - - patches = mkOptionalStrParam '' - String describing all patches applied to the given software on this - hardcopy device. The individual patches are separated by a newline - character '\\n'. - ''; - - string_version = mkOptionalStrParam '' - String describing the version of the given software on this hardcopy device. - ''; - - version = mkOptionalStrParam '' - Hex-encoded version string with a length of 16 octets consisting of - the fields major version number (4 octets), minor version number (4 - octets), build number (4 octets), service pack major number (2 - octets) and service pack minor number (2 octets). - ''; - } '' - Defines a software section having an arbitrary name. - ''; - in { - firmware = softwareParams; - resident_application = softwareParams; - user_application = softwareParams; - attributes_natural_language = mkStrParam "en" '' - Variable length natural language tag conforming to RFC 5646 specifies - the language to be used in the health assessment message of a given - subtype. - ''; - }; - in { - system = imcHcdSubtypeParams // { - certification_state = mkOptionalStrParam '' - Hex-encoded certification state. - ''; - - configuration_state = mkOptionalStrParam '' - Hex-encoded configuration state. - ''; - - machine_type_model = mkOptionalStrParam '' - String specifying the machine type and model of the hardcopy device. - ''; - - pstn_fax_enabled = mkYesNoParam no '' - Specifies if a PSTN facsimile interface is installed and enabled on the - hardcopy device. - ''; - - time_source = mkOptionalStrParam '' - String specifying the hostname of the network time server used by the - hardcopy device. - ''; - - user_application_enabled = mkYesNoParam no '' - Specifies if users can dynamically download and execute applications on - the hardcopy device. - ''; - - user_application_persistence_enabled = mkYesNoParam no '' - Specifies if user dynamically downloaded applications can persist outside - the boundaries of a single job on the hardcopy device. - ''; - - vendor_name = mkOptionalStrParam '' - String specifying the manufacturer of the hardcopy device. - ''; - - vendor_smi_code = mkOptionalIntParam '' - Integer specifying the globally unique 24-bit SMI code assigned to the - manufacturer of the hardcopy device. - ''; - }; - control = imcHcdSubtypeParams; - marker = imcHcdSubtypeParams; - finisher = imcHcdSubtypeParams; - interface = imcHcdSubtypeParams; - scanner = imcHcdSubtypeParams; - }; - - imc-os = { - device_cert = mkOptionalStrParam '' - Manually set the path to the client device certificate - (e.g. /etc/pts/aikCert.der) - ''; - - device_id = mkOptionalStrParam '' - Manually set the client device ID in hexadecimal format - (e.g. 1083f03988c9762703b1c1080c2e46f72b99cc31) - ''; - - device_pubkey = mkOptionalStrParam '' - Manually set the path to the client device public key - (e.g. /etc/pts/aikPub.der) - ''; - - push_info = mkYesNoParam yes '' - Send operating system info without being prompted. - ''; - }; - - imc-scanner.push_info = mkYesNoParam yes '' - Send open listening ports without being prompted. - ''; - - imc-swid = { - swid_full = mkYesNoParam no '' - Include file information in the XML-encoded SWID tags. - ''; - - swid_pretty = mkYesNoParam no '' - Generate XML-encoded SWID tags with pretty indentation. - ''; - - swid_directory = mkStrParam "\${prefix}/share" '' - Directory where SWID tags are located. - ''; - }; - - imc-swima = { - eid_epoch = mkHexParam "0x11223344" '' - Set 32 bit epoch value for event IDs manually if software collector - database is not available. - ''; - - swid_database = mkOptionalStrParam '' - URI to software collector database containing event timestamps, software - creation and deletion events and collected software identifiers. If it - contains a password, make sure to adjust the permissions of the config - file accordingly. - ''; - - swid_directory = mkStrParam "\${prefix}/share" '' - Directory where SWID tags are located. - ''; - - swid_pretty = mkYesNoParam no '' - Generate XML-encoded SWID tags with pretty indentation. - ''; - - swid_full = mkYesNoParam no '' - Include file information in the XML-encoded SWID tags. - ''; - }; - - imc-test = { - additional_ids = mkIntParam 0 '' - Number of additional IMC IDs. - ''; - - command = mkStrParam "none" '' - Command to be sent to the Test IMV. - ''; - - dummy_size = mkIntParam 0 '' - Size of dummy attribute to be sent to the Test IMV (0 = disabled). - ''; - - retry = mkYesNoParam no '' - Do a handshake retry. - ''; - - retry_command = mkOptionalStrParam '' - Command to be sent to the IMV Test in the handshake retry. - ''; - }; - - imv-attestation = { - cadir = mkOptionalStrParam '' - Path to directory with AIK cacerts. - ''; - - dh_group = mkStrParam "ecp256" '' - Preferred Diffie-Hellman group. - ''; - - hash_algorithm = mkStrParam "sha256" '' - Preferred measurement hash algorithm. - ''; - - min_nonce_len = mkIntParam 0 '' - DH minimum nonce length. - ''; - - remediation_uri = mkOptionalStrParam '' - URI pointing to attestation remediation instructions. - ''; - }; - - imv-os.remediation_uri = mkOptionalStrParam '' - URI pointing to operating system remediation instructions. - ''; - - imv-scanner.remediation_uri = mkOptionalStrParam '' - URI pointing to scanner remediation instructions. - ''; - - imv-swima.rest_api = { - uri = mkOptionalStrParam '' - HTTP URI of the SWID REST API. - ''; - - timeout = mkIntParam 120 '' - Timeout of SWID REST API HTTP POST transaction. - ''; - }; - - imv-test.rounds = mkIntParam 0 '' - Number of IMC-IMV retry rounds. - ''; - }; -} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix deleted file mode 100644 index 0f517d8ead4e..000000000000 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-loglevel-params.nix +++ /dev/null @@ -1,29 +0,0 @@ -lib : with (import ./param-constructors.nix lib); - -let mkJournalParam = description : - mkEnumParam [(-1) 0 1 2 3 4] 0 "Logging level for ${description}"; -in { - default = mkIntParam 1 '' - Specifies the default loglevel to be used for subsystems for which no - specific loglevel is defined. - ''; - - app = mkJournalParam "applications other than daemons."; - asn = mkJournalParam "low-level encoding/decoding (ASN.1, X.509 etc.)"; - cfg = mkJournalParam "configuration management and plugins."; - chd = mkJournalParam "CHILD_SA/IPsec SA."; - dmn = mkJournalParam "main daemon setup/cleanup/signal handling."; - enc = mkJournalParam "packet encoding/decoding encryption/decryption operations."; - esp = mkJournalParam "libipsec library messages."; - ike = mkJournalParam "IKE_SA/ISAKMP SA."; - imc = mkJournalParam "integrity Measurement Collector."; - imv = mkJournalParam "integrity Measurement Verifier."; - job = mkJournalParam "jobs queuing/processing and thread pool management."; - knl = mkJournalParam "IPsec/Networking kernel interface."; - lib = mkJournalParam "libstrongwan library messages."; - mgr = mkJournalParam "IKE_SA manager, handling synchronization for IKE_SA access."; - net = mkJournalParam "IKE network communication."; - pts = mkJournalParam "platform Trust Service."; - tls = mkJournalParam "libtls library messages."; - tnc = mkJournalParam "trusted Network Connect."; -} diff --git a/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix b/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix deleted file mode 100644 index 249aa22b29ed..000000000000 --- a/nixos/modules/services/networking/strongswan-swanctl/strongswan-params.nix +++ /dev/null @@ -1,258 +0,0 @@ -# See: https://wiki.strongswan.org/projects/strongswan/wiki/StrongswanConf -# -# When strongSwan is upgraded please update the parameters in this file. You can -# see which parameters should be deleted, changed or added by diffing -# the strongswan conf directory: -# -# git clone https://github.com/strongswan/strongswan.git -# cd strongswan -# git diff 5.5.3..5.6.0 conf/ - -lib: with (import ./param-constructors.nix lib); - -let charonParams = import ./strongswan-charon-params.nix lib; -in { - aikgen = { - load = mkSpaceSepListParam [] '' - Plugins to load in ipsec aikgen tool. - ''; - }; - attest = { - database = mkOptionalStrParam '' - File measurement information database URI. If it contains a password, - make sure to adjust the permissions of the config file accordingly. - ''; - - load = mkSpaceSepListParam [] '' - Plugins to load in ipsec attest tool. - ''; - }; - - # Since we only use charon-systemd we don't need to generate options for charon. - # charon = charonParams; - - charon-nm = { - ca_dir = mkStrParam "" '' - Directory from which to load CA certificates if no certificate is - configured. - ''; - }; - - charon-systemd = charonParams // { - journal = import ./strongswan-loglevel-params.nix lib; - }; - - imv_policy_manager = { - command_allow = mkOptionalStrParam '' - Shell command to be executed with recommendation allow. - ''; - - command_block = mkOptionalStrParam '' - Shell command to be executed with all other recommendations. - ''; - - database = mkOptionalStrParam '' - Database URI for the database that stores the package information. If it - contains a password, make sure to adjust permissions of the config file - accordingly. - ''; - - load = mkSpaceSepListParam ["sqlite"] '' - Plugins to load in IMV policy manager. - ''; - }; - - libimcv = import ./strongswan-libimcv-params.nix lib; - - manager = { - database = mkOptionalStrParam '' - Credential database URI for manager. If it contains a password, make - sure to adjust the permissions of the config file accordingly. - ''; - - debug = mkYesNoParam no '' - Enable debugging in manager. - ''; - - load = mkSpaceSepListParam [] '' - Plugins to load in manager. - ''; - - socket = mkOptionalStrParam '' - FastCGI socket of manager, to run it statically. - ''; - - threads = mkIntParam 10 '' - Threads to use for request handling. - ''; - - timeout = mkDurationParam "15m" '' - Session timeout for manager. - ''; - }; - - medcli = { - database = mkOptionalStrParam '' - Mediation client database URI. If it contains a password, make sure to - adjust the permissions of the config file accordingly. - ''; - - dpd = mkDurationParam "5m" '' - DPD timeout to use in mediation client plugin. - ''; - - rekey = mkDurationParam "20m" '' - Rekeying time on mediation connections in mediation client plugin. - ''; - }; - - medsrv = { - database = mkOptionalStrParam '' - Mediation server database URI. If it contains a password, make sure to - adjust the permissions of the config file accordingly. - ''; - - debug = mkYesNoParam no '' - Debugging in mediation server web application. - ''; - - dpd = mkDurationParam "5m" '' - DPD timeout to use in mediation server plugin. - ''; - - load = mkSpaceSepListParam [] '' - Plugins to load in mediation server plugin. - ''; - - password_length = mkIntParam 6 '' - Minimum password length required for mediation server user accounts. - ''; - - rekey = mkDurationParam "20m" '' - Rekeying time on mediation connections in mediation server plugin. - ''; - - socket = mkOptionalStrParam '' - Run Mediation server web application statically on socket. - ''; - - threads = mkIntParam 5 '' - Number of thread for mediation service web application. - ''; - - timeout = mkDurationParam "15m" '' - Session timeout for mediation service. - ''; - }; - - pki.load = mkSpaceSepListParam [] '' - Plugins to load in ipsec pki tool. - ''; - - pool = { - database = mkOptionalStrParam '' - Database URI for the database that stores IP pools and configuration - attributes. If it contains a password, make sure to adjust the - permissions of the config file accordingly. - ''; - - load = mkSpaceSepListParam [] '' - Plugins to load in ipsec pool tool. - ''; - }; - - pt-tls-client.load = mkSpaceSepListParam [] '' - Plugins to load in ipsec pt-tls-client tool. - ''; - - scepclient.load = mkSpaceSepListParam [] '' - Plugins to load in ipsec scepclient tool. - ''; - - sec-updater = { - database = mkOptionalStrParam '' - Global IMV policy database URI. If it contains a password, make - sure to adjust the permissions of the config file accordingly. - ''; - - swid_gen.command = mkStrParam "/usr/local/bin/swid_generator" '' - SWID generator command to be executed. - ''; - - swid_gen.tag_creator.name = mkStrParam "strongSwan Project" '' - Name of the tagCreator entity. - ''; - - swid_gen.tag_creator.regid = mkStrParam "strongswan.org" '' - regid of the tagCreator entity. - ''; - - tnc_manage_command = mkStrParam "/var/www/tnc/manage.py" '' - strongTNC manage.py command used to import SWID tags. - ''; - - tmp.deb_file = mkStrParam "/tmp/sec-updater.deb" '' - Temporary storage for downloaded deb package file. - ''; - - tmp.tag_file = mkStrParam "/tmp/sec-updater.tag" '' - Temporary storage for generated SWID tags. - ''; - - load = mkSpaceSepListParam [] '' - Plugins to load in sec-updater tool. - ''; - }; - - starter = { - config_file = mkStrParam "\${sysconfdir}/ipsec.conf" '' - Location of the ipsec.conf file. - ''; - - load_warning = mkYesNoParam yes '' - Show charon.load setting warning, see - https://wiki.strongswan.org/projects/strongswan/wiki/PluginLoad - ''; - }; - - sw-collector = { - database = mkOptionalStrParam '' - URI to software collector database containing event timestamps, - software creation and deletion events and collected software - identifiers. If it contains a password, make sure to adjust the - permissions of the config file accordingly. - ''; - - first_file = mkStrParam "/var/log/bootstrap.log" '' - Path pointing to file created when the Linux OS was installed. - ''; - - first_time = mkStrParam "0000-00-00T00:00:00Z" '' - Time in UTC when the Linux OS was installed. - ''; - - history = mkOptionalStrParam '' - Path pointing to apt history.log file. - ''; - - rest_api = { - uri = mkOptionalStrParam '' - HTTP URI of the central collector's REST API. - ''; - - timeout = mkIntParam 120 '' - Timeout of REST API HTTP POST transaction. - ''; - }; - - load = mkSpaceSepListParam [] "Plugins to load in sw-collector tool."; - }; - - swanctl = { - load = mkSpaceSepListParam [] "Plugins to load in swanctl."; - - socket = mkStrParam "unix://\${piddir}/charon.vici" '' - VICI socket to connect to by default. - ''; - }; -} From 2355189b15ae4e1f2805a2a230fc515edc2ac693 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 27 Mar 2018 07:35:36 +0900 Subject: [PATCH 053/538] gnulib: symlink include/ to lib/ so that some programs can find the headers automatically instead of adding -I${gnulib}/lib --- pkgs/development/tools/gnulib/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 4ca3bf5e0741..eeaec8eb0335 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -9,8 +9,12 @@ stdenv.mkDerivation { sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k"; }; - installPhase = "mkdir -p $out; mv * $out/"; dontFixup = true; + # no "make install", gnulib is a collection of source code + installPhase = '' + mkdir -p $out; mv * $out/ + ln -s $out/lib $out/include + ''; meta = { homepage = http://www.gnu.org/software/gnulib/; From 1f8382547f6d84b8eed9d81b93e8679c2ae4f4b6 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 19 Mar 2018 15:24:45 -0400 Subject: [PATCH 054/538] locate: fix `update-locatedb` service for `mlocate` This fixes the `update-locatedb` service when using the `mlocate` package. The service as-is does not properly handle flags during update of the relevant database when configured to use the `mlocate` package. The man entry for `updatedb` associated with `mlocate` does not say that it supports environment variables in place of command line flags, whereas the `findutils` package's updatedb does so. To support this distinction, we pass the relevant settings as flags to the `updatedb` program when using the `mlocate` package. Fixes #29279 --- nixos/modules/misc/locate.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 51953d1110c4..ce5765cf1978 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -97,7 +97,7 @@ in { Whether not to index bind mounts ''; }; - + }; config = mkIf cfg.enable { @@ -133,13 +133,26 @@ in { systemd.services.update-locatedb = { description = "Update Locate Database"; path = mkIf (!isMLocate) [ pkgs.su ]; + + # mlocate's updatedb takes flags via a configuration file or + # on the command line, but not by environment variable. script = + if isMLocate + then let toFlags = x: optional (cfg.${x} != []) + "--${lib.toLower x} '${concatStringsSep " " cfg.${x}}'"; + args = concatLists (map toFlags ["pruneFS" "pruneNames" "prunePaths"]); + in '' + exec ${cfg.locate}/bin/updatedb \ + --output ${toString cfg.output} ${concatStringsSep " " args} \ + --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ + ${concatStringsSep " " cfg.extraFlags} '' + else '' exec ${cfg.locate}/bin/updatedb \ ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; - environment = { + environment = optionalAttrs (!isMLocate) { PRUNEFS = concatStringsSep " " cfg.pruneFS; PRUNEPATHS = concatStringsSep " " cfg.prunePaths; PRUNENAMES = concatStringsSep " " cfg.pruneNames; From cf45cfc58c20faa12c0a93c9c9b5328aa4cbdf4e Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 30 Mar 2018 08:08:29 +0200 Subject: [PATCH 055/538] ansible_2_5: init at 2.5.0 --- pkgs/tools/admin/ansible/2.5.nix | 40 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/admin/ansible/2.5.nix diff --git a/pkgs/tools/admin/ansible/2.5.nix b/pkgs/tools/admin/ansible/2.5.nix new file mode 100644 index 000000000000..9c8a143d0d9b --- /dev/null +++ b/pkgs/tools/admin/ansible/2.5.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchurl +, pythonPackages +, windowsSupport ? false +}: + +pythonPackages.buildPythonPackage rec { + pname = "ansible"; + version = "2.5.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "1p76d1pv89yhi8q05jas5gskkd1anjmqqvaks8nynmal1x5xwkki"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = false; + + propagatedBuildInputs = with pythonPackages; [ + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython + ] ++ stdenv.lib.optional windowsSupport pywinrm; + + meta = with stdenv.lib; { + homepage = http://www.ansible.com; + description = "A simple automation tool"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ + jgeerds + joamaki + ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79145b7f996e..8034b9bb7590 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7425,6 +7425,7 @@ with pkgs; ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {}; ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {}; ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {}; + ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {}; ansible = ansible_2_4; ansible2 = ansible_2_4; From 38f7daebdb3b51ef977b5a4ac21e2dd38b96f0b8 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 30 Mar 2018 22:40:36 +0100 Subject: [PATCH 056/538] gmtp: pass --datapath in the wrapper gmtp gets somewhat confused trying to lookup some of its own assets when installed system-wide. It first attempts to locate the path to its own binary by searching for itself in $PATH, arrives at /run/current-system/sw/bin/gmtp, and then performs lookups relative to that path without dereferencing the symlink. Some of the lookups result in searching for, for example, icons in /run/current-system/sw/bin/../share/gmtp/ which doesn't exist. --- pkgs/applications/misc/gmtp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 423eea914b95..bb1556c7c4dc 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + ''; + meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; homepage = https://gmtp.sourceforge.io; From e3a91b050bfb227ce0643518c78931a99cd65f1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 00:23:07 -0700 Subject: [PATCH 057/538] palemoon: 27.8.0 -> 27.8.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/palemoon/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 27.8.3 with grep in /nix/store/jnhd2rzskaad61xh3d3rs63hjy8cwi7y-palemoon-27.8.3 - directory tree listing: https://gist.github.com/97a439e8880c3937586c5d06a2ac0844 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index f3eb38422c69..0c0ef501e996 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.8.0"; + version = "27.8.3"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "0b08rzn50jg59rnjzx6dvsmj5dikfjipnmvhpkimvr38v8q7wdar"; + sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh"; }; desktopItem = makeDesktopItem { From 0514ae44df84156b544e87694f012a35bce0ab46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 01:44:01 -0700 Subject: [PATCH 058/538] mbedtls: 2.7.1 -> 2.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mbedtls/versions. These checks were done: - built on NixOS - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_aescrypt2 -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_aescrypt2 --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_aescrypt2 help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_hello -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_hello --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_hello help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ecdh_curve25519 -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ecdh_curve25519 --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ecdh_curve25519 help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_key_app -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_key_app --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_key_app help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_mpi_demo -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_mpi_demo --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_mpi_demo help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_pk_decrypt -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_pk_decrypt --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_pk_decrypt help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_rsa_genkey -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_rsa_genkey --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_rsa_genkey help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_rsa_sign -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_rsa_sign --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_rsa_sign help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_entropy -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_entropy --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_entropy help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_random_ctr_drbg -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_random_ctr_drbg --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_random_ctr_drbg help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_random_havege -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_random_havege --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_gen_random_havege help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ssl_mail_client -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ssl_mail_client --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ssl_mail_client help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_benchmark -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_benchmark --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_benchmark help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ssl_cert_test -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ssl_cert_test --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_ssl_cert_test help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_pem2der -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_pem2der --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_pem2der help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_strerror -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_strerror --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_strerror help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_crl_app -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_crl_app --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_crl_app help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_req_app -h` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_req_app --help` got 0 exit code - ran `/nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0/bin/mbedtls_req_app help` got 0 exit code - found 2.8.0 with grep in /nix/store/x57v8nrdybz3s7r1m45cszyv2057qipx-mbedtls-2.8.0 - directory tree listing: https://gist.github.com/92469e3cebca93b78007715bf034598e --- pkgs/development/libraries/mbedtls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 91fcba97e184..8c2a2a694b03 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.7.1"; + name = "mbedtls-2.8.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "0dkmhvs38sqgnfxgzrs81ghajyyzp9bb7wy9kn96q7zy4lly0gg6"; + sha256 = "1pnwmy0qg8g9lz26fpr5fzpvrdjm59winxpwdjfp6d62qxdjbgmn"; }; nativeBuildInputs = [ perl ]; From c8eef1d77185486aae6c4ee59efa8a2085035fcd Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 1 Apr 2018 19:16:04 +0200 Subject: [PATCH 059/538] pgmanage: the data_root option is renamed to sql_root --- nixos/modules/services/databases/pgmanage.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 86733a3e5a07..d1b48c06440e 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -22,7 +22,7 @@ let web_root = ${cfg.package}/etc/pgmanage/web_root - data_root = ${cfg.dataRoot} + sql_root = ${cfg.sqlRoot} ${optionalString (!isNull cfg.tls) '' tls_cert = ${cfg.tls.cert} @@ -130,7 +130,7 @@ let ''; }; - dataRoot = mkOption { + sqlRoot = mkOption { type = types.str; default = "/var/lib/pgmanage"; description = '' @@ -210,7 +210,7 @@ in { users."${pgmanage}" = { name = pgmanage; group = pgmanage; - home = cfg.dataRoot; + home = cfg.sqlRoot; createHome = true; }; groups."${pgmanage}" = { From 75f79581736c4f233fcca354118479c5a4f4ecdd Mon Sep 17 00:00:00 2001 From: DJP Date: Sun, 1 Apr 2018 18:10:05 -0400 Subject: [PATCH 060/538] Use lib/purple-2 directory instead of lib/pidgin --- .../pidgin-plugins/telegram-purple/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 68083a7b9d25..8527593c1a20 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin libwebp libgcrypt gettext ]; preConfigure = '' - sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/pidgin/server.tglpub|g" telegram-purple.c + sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/purple-2/server.tglpub|g" telegram-purple.c echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h ''; installPhase = '' - mkdir -p $out/lib/pidgin/ - cp bin/*.so $out/lib/pidgin/ #*/ - cp tg-server.tglpub $out/lib/pidgin/server.tglpub + mkdir -p $out/lib/purple-2/ + cp bin/*.so $out/lib/purple-2/ #*/ + cp tg-server.tglpub $out/lib/purple-2/server.tglpub mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16 cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22 From fd09c3dcae0365871b9bc995a5241431a210e506 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Mon, 2 Apr 2018 11:25:54 +0200 Subject: [PATCH 061/538] Fix openshift oc cluster up mount --- .../networking/cluster/openshift/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 3f7e0650e0d5..07c9e9ba6784 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux , iptables, coreutils, kerberos, clang , components ? [ "cmd/oc" @@ -37,6 +37,18 @@ in stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./hack + + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' + + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' + + substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ + 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' ''; buildPhase = '' From 767f4fec1e4e579f1fb126672103a8eb08e580e4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Apr 2018 12:29:14 +0200 Subject: [PATCH 062/538] react-native-debugger: init at 0.7.18 --- .../tools/react-native-debugger/default.nix | 83 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/tools/react-native-debugger/default.nix diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix new file mode 100644 index 000000000000..5e88384c58db --- /dev/null +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib +, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem +}: + +let + rpath = stdenv.lib.makeLibraryPath [ + cairo + stdenv.cc.cc + gdk_pixbuf + fontconfig + pango + atk + gtk2 + glib + freetype + dbus + nss + nspr + alsaLib + cups + expat + libudev + + gnome2.GConf + + xorg.libX11 + xorg.libXcursor + xorg.libXtst + xorg.libxcb + xorg.libXext + xorg.libXi + xorg.libXdamage + xorg.libXrandr + xorg.libXcomposite + xorg.libXfixes + xorg.libXrender + xorg.libXScrnSaver + ]; +in stdenv.mkDerivation rec { + name = "react-native-debugger-${version}"; + version = "0.7.18"; + + src = fetchurl { + url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; + sha256 = "186n438sy9wzrx2zdw4qq4hsz89wiy01bpfa6fdjisvxgz6r8sgw"; + }; + + buildInputs = [ unzip ]; + buildCommand = '' + shopt -s extglob + mkdir -p $out + unzip $src -d $out + + mkdir $out/{lib,bin,share} + mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/!(lib|share|bin) $out/share + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath ${rpath}:$out/lib \ + $out/share/React\ Native\ Debugger + + ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + + install -Dm644 "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + ''; + + desktopItem = makeDesktopItem { + name = "rndebugger"; + exec = "React\\ Native\\ Debugger"; + desktopName = "React Native Debugger"; + genericName = "React Native Debugger"; + categories = "Development;Tools;"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/jhen0409/react-native-debugger; + license = licenses.mit; + description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2704910be948..3f432bbe4abb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4506,6 +4506,8 @@ with pkgs; rdma-core = callPackage ../os-specific/linux/rdma-core { }; + react-native-debugger = callPackage ../development/tools/react-native-debugger { }; + read-edid = callPackage ../os-specific/linux/read-edid { }; redir = callPackage ../tools/networking/redir { }; From e9fc2558f95152020e8b588f92563d6664f4c3c3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 3 Apr 2018 00:36:52 +0200 Subject: [PATCH 063/538] nixos/systemd: Fix environment type -> allows overriding --- nixos/modules/system/boot/systemd-unit-options.nix | 2 +- nixos/modules/system/boot/systemd.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 43a9c28bb694..5255f1a1b97a 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -217,7 +217,7 @@ in rec { environment = mkOption { default = {}; - type = types.attrs; # FIXME + type = with types; attrsOf (nullOr (either str package)); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b8a2d42e0fbc..e02105c88044 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -516,7 +516,7 @@ in }; systemd.globalEnvironment = mkOption { - type = types.attrs; + type = with types; attrsOf (nullOr (either str package)); default = {}; example = { TZ = "CET"; }; description = '' From af86bf34ff2d7a6e31280921461a241f4b043aac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 16 Mar 2018 16:05:56 -0400 Subject: [PATCH 064/538] rapidjson: fix build on darwin Disables -Werror Alternatively one could use NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" "-Wno-error=zero-as-null-pointer-constant" "-Wno-error=shadow" ]; --- pkgs/development/libraries/rapidjson/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 8e6b3b44491e..a1671aa3e0f9 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -13,14 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - # detected by gcc7 - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "-Werror" "" + substituteInPlace example/CMakeLists.txt --replace "-Werror" "" + ''; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; homepage = "http://rapidjson.org/"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } From c5df226c738d26944487914d11a3531745cdd79a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 16 Mar 2018 16:19:24 -0400 Subject: [PATCH 065/538] arrow-cpp: init at 0.8.0 --- .../libraries/arrow-cpp/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/arrow-cpp/default.nix diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix new file mode 100644 index 000000000000..7b7099cb610e --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -0,0 +1,40 @@ +{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, rapidjson, snappy, zlib, zstd }: + +stdenv.mkDerivation rec { + name = "arrow-cpp-${version}"; + version = "0.8.0"; + + src = fetchurl { + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + sha256 = "1i79sh9ip32agbrn4n51pjn9266i45s8spk5jsi8ax0hqy1vhhmi"; + }; + + sourceRoot = "apache-arrow-${version}/cpp"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + preConfigure = '' + substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + ''; + + BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; }; + FLATBUFFERS_HOME = flatbuffers; + GTEST_HOME = gtest; + GFLAGS_HOME = gflags; + LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; + RAPIDJSON_HOME = rapidjson; + SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + ZSTD_HOME = zstd; + + meta = { + description = "A cross-language development platform for in-memory data"; + homepage = https://arrow.apache.org/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62ad5f27dfe7..9ffabd197861 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8379,6 +8379,8 @@ with pkgs; armadillo = callPackage ../development/libraries/armadillo {}; + arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; + assimp = callPackage ../development/libraries/assimp { }; asio = callPackage ../development/libraries/asio { }; From f9192c542467085dee4b817ea753ae40916cbf62 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 18 Mar 2018 20:13:16 -0400 Subject: [PATCH 066/538] pythonPackages.pyarrow: init at 0.8.0 --- .../libraries/arrow-cpp/default.nix | 8 +++- .../python-modules/pyarrow/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pyarrow/default.nix diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7b7099cb610e..1db034170ddc 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, rapidjson, snappy, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, pythonPackages, rapidjson, snappy, zlib, zstd }: stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "apache-arrow-${version}/cpp"; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; + buildInputs = [ boost pythonPackages.python pythonPackages.numpy ]; preConfigure = '' substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; ZSTD_HOME = zstd; + cmakeFlags = [ + "-DARROW_PYTHON=ON" + ]; + meta = { description = "A cross-language development platform for in-memory data"; homepage = https://arrow.apache.org/; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix new file mode 100644 index 000000000000..8804953045e4 --- /dev/null +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -0,0 +1,47 @@ +{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: + +buildPythonPackage rec { + pname = "pyarrow"; + version = "0.8.0"; + + src = fetchurl { + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + sha256 = "1i79sh9ip32agbrn4n51pjn9266i45s8spk5jsi8ax0hqy1vhhmi"; + }; + + sourceRoot = "apache-arrow-${version}/python"; + + nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; + propagatedBuildInputs = [ futures numpy six ]; + checkInputs = [ pandas pytest ]; + + PYARROW_BUILD_TYPE = "release"; + PYARROW_BUNDLE_ARROW_CPP = 1; # sets RPATH on darwin + + preBuild = '' + substituteInPlace CMakeLists.txt --replace "''${ARROW_SO_VERSION}" '"0"' + ''; + + preCheck = '' + rm pyarrow/tests/test_hdfs.py + + # fails: "ArrowNotImplementedError: Unsupported numpy type 22" + substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled" + + # runs out of memory on @grahamcofborg linux box + substituteInPlace pyarrow/tests/test_feather.py --replace "test_large_dataframe" "_disabled" + + # probably broken on python2 + substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled" + ''; + + ARROW_HOME = arrow-cpp; + + meta = with lib; { + description = "A cross-language development platform for in-memory data"; + homepage = https://arrow.apache.org/; + license = lib.licenses.asl20; + platforms = platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85179ccce3f8..635b779ce29c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -305,6 +305,10 @@ in { pyamf = callPackage ../development/python-modules/pyamf { }; + pyarrow = callPackage ../development/python-modules/pyarrow { + inherit (pkgs) arrow-cpp cmake pkgconfig; + }; + pyatspi = disabledIf (!isPy3k) (callPackage ../development/python-modules/pyatspi { }); pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; From a49ebbb7435b08509f05e894d37e93a5498a9d69 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 20 Mar 2018 18:19:39 -0400 Subject: [PATCH 067/538] parquet-cpp: init at 1.4.0 Also fix RPATH issues in pyarrow --- .../libraries/parquet-cpp/default.nix | 37 +++++++++++++++++++ .../python-modules/pyarrow/default.nix | 13 +++++-- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/parquet-cpp/default.nix diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix new file mode 100644 index 000000000000..e281e604380b --- /dev/null +++ b/pkgs/development/libraries/parquet-cpp/default.nix @@ -0,0 +1,37 @@ +{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }: + +stdenv.mkDerivation rec { + name = "parquet-cpp-${version}"; + version = "1.4.0"; + + src = fetchurl { + url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz"; + sha256 = "1kn7pjzi5san5f05qbl8l8znqsa3f9cq9bflfr4s2jfwr7k9p2aj"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + preConfigure = '' + substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + ''; + + ARROW_HOME = arrow-cpp; + THRIFT_HOME = thrift; + GTEST_HOME = gtest; + SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + + cmakeFlags = [ + "-DPARQUET_BUILD_BENCHMARKS=OFF" + ]; + + meta = { + description = "A C++ library to read and write the Apache Parquet columnar data format"; + homepage = http://parquet.apache.org; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 8804953045e4..11c2868c3370 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, parquet-cpp, pkgconfig, setuptools_scm, six }: buildPythonPackage rec { pname = "pyarrow"; @@ -16,10 +16,14 @@ buildPythonPackage rec { checkInputs = [ pandas pytest ]; PYARROW_BUILD_TYPE = "release"; - PYARROW_BUNDLE_ARROW_CPP = 1; # sets RPATH on darwin + PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib"; preBuild = '' - substituteInPlace CMakeLists.txt --replace "''${ARROW_SO_VERSION}" '"0"' + substituteInPlace CMakeLists.txt --replace "\''${ARROW_ABI_VERSION}" '"0.0.0"' + substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"' + + # fix the hardcoded value + substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${parquet-cpp.version}")' ''; preCheck = '' @@ -36,6 +40,9 @@ buildPythonPackage rec { ''; ARROW_HOME = arrow-cpp; + PARQUET_HOME = parquet-cpp; + + setupPyBuildFlags = ["--with-parquet" ]; meta = with lib; { description = "A cross-language development platform for in-memory data"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ffabd197861..a81fe88b8a85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10872,6 +10872,8 @@ with pkgs; paperkey = callPackage ../tools/security/paperkey { }; + parquet-cpp = callPackage ../development/libraries/parquet-cpp {}; + pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcaudiolib = callPackage ../development/libraries/pcaudiolib { From cdf612bc0d86f02a9f2d837656366872ed4e9376 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 4 Apr 2018 14:35:47 -0400 Subject: [PATCH 068/538] arrow-cpp,pythonPackages.pyarrow: 0.8.0 -> 0.9.0 --- pkgs/development/libraries/arrow-cpp/default.nix | 4 ++-- .../development/python-modules/pyarrow/default.nix | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 1db034170ddc..7704cfd1c53b 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1i79sh9ip32agbrn4n51pjn9266i45s8spk5jsi8ax0hqy1vhhmi"; + sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; }; sourceRoot = "apache-arrow-${version}/cpp"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 11c2868c3370..5939e3a77949 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,19 +1,19 @@ -{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, parquet-cpp, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: buildPythonPackage rec { pname = "pyarrow"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1i79sh9ip32agbrn4n51pjn9266i45s8spk5jsi8ax0hqy1vhhmi"; + sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; }; sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ futures numpy six ]; - checkInputs = [ pandas pytest ]; + checkInputs = [ pandas pytest pytestrunner ]; PYARROW_BUILD_TYPE = "release"; PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib"; @@ -37,6 +37,12 @@ buildPythonPackage rec { # probably broken on python2 substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled" + + # fails "error: [Errno 2] No such file or directory: 'test'" because + # nix_run_setup invocation somehow manages to import deserialize_buffer.py + # when it is not intended to be imported at all + rm pyarrow/tests/deserialize_buffer.py + substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" ''; ARROW_HOME = arrow-cpp; From c6f7d4367894047592cc412740f0c1f5b2ca2b59 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 5 Apr 2018 15:22:45 -0400 Subject: [PATCH 069/538] nixpkgs module: Clean up platform options - `localSystem` is added, it strictly supercedes system - `crossSystem`'s description mentions `localSystem` (and vice versa). - No more weird special casing I don't even understand TEMP --- lib/systems/parse.nix | 4 +- nixos/doc/manual/man-nixos-build-vms.xml | 6 +- nixos/lib/eval-config.nix | 4 +- nixos/modules/misc/nixpkgs.nix | 69 ++++++++++++++++---- nixos/modules/services/misc/dysnomia.nix | 2 +- nixos/modules/services/misc/nixos-manual.nix | 2 +- nixos/modules/virtualisation/containers.nix | 4 +- pkgs/stdenv/generic/check-meta.nix | 2 +- 8 files changed, 67 insertions(+), 26 deletions(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 641a7f5d7584..0dd8999f5f9f 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -201,7 +201,7 @@ rec { ################################################################################ - types.system = mkOptionType { + types.parsedPlatform = mkOptionType { name = "system"; description = "fully parsed representation of llvm- or nix-style platform tuple"; merge = mergeOneOption; @@ -215,7 +215,7 @@ rec { isSystem = isType "system"; mkSystem = components: - assert types.system.check components; + assert types.parsedPlatform.check components; setType "system" components; mkSkeletonFromList = l: { diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index 878ebee05273..f4b59a7c6d4b 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -40,7 +40,7 @@ points to the generated virtual network. test1 = {pkgs, config, ...}: { services.openssh.enable = true; - nixpkgs.system = "i686-linux"; + nixpkgs.localSystem.system = "i686-linux"; deployment.targetHost = "test1.example.net"; # Other NixOS options @@ -51,7 +51,7 @@ points to the generated virtual network. services.openssh.enable = true; services.httpd.enable = true; environment.systemPackages = [ pkgs.lynx ]; - nixpkgs.system = "x86_64-linux"; + nixpkgs.localSystem.system = "x86_64-linux"; deployment.targetHost = "test2.example.net"; # Other NixOS options @@ -66,7 +66,7 @@ In each NixOS configuration, two attributes have a special meaning. The deployment.targetHost specifies the address (domain name or IP address) of the system which is used by ssh to perform -remote deployment operations. The nixpkgs.system +remote deployment operations. The nixpkgs.localSystem.system attribute can be used to specify an architecture for the target machine, such as i686-linux which builds a 32-bit NixOS configuration. Omitting this property will build the configuration diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 2e7971cca810..97c79487df4c 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -26,7 +26,7 @@ , lib ? import ../../lib }: -let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; +let extraArgs_ = extraArgs; pkgs_ = pkgs; extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; in if e == "" then [] else [(import (builtins.toPath e))]; in @@ -36,7 +36,7 @@ let _file = ./eval-config.nix; key = _file; config = { - nixpkgs.system = lib.mkDefault system_; + nixpkgs.localSystem = lib.mkDefault { inherit system; }; _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; }; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 9217250eec29..b8a55a24394e 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -58,10 +58,13 @@ in pkgs = mkOption { defaultText = literalExample ''import "''${nixos}/.." { - inherit (config.nixpkgs) config overlays system; + inherit (config.nixpkgs) config overlays localSystem crossSystem; } ''; - default = import ../../.. { inherit (cfg) config overlays system crossSystem; }; + default = import ../../.. { + localSystem = { inherit (cfg) system; } // cfg.localSystem; + inherit (cfg) config overlays crossSystem; + }; type = pkgsType; example = literalExample ''import {}''; description = '' @@ -73,8 +76,9 @@ in relative to the location of this NixOS module, because NixOS and Nixpkgs are distributed together for consistency, so the nixos in the default value is in fact a - relative path. The config, overlays - and system come from this option's siblings. + relative path. The config, overlays, + localSystem, and crossSystem come + from this option's siblings. This option can be used by applications like NixOps to increase the performance of evaluation, or to create packages that depend @@ -130,13 +134,40 @@ in ''; }; - crossSystem = mkOption { - type = types.nullOr types.attrs; - default = null; + localSystem = mkOption { + type = types.attrs; # TODO utilize lib.systems.parsedPlatform + default = { system = builtins.currentSystem; }; + example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + defaultText = literalExample + ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' - The description of the system we're cross-compiling to, or null - if this isn't a cross-compile. See the description of the - crossSystem argument in the nixpkgs manual. + Specifies the platform on which NixOS should be built. When + nixpkgs.crossSystem is unset, it also specifies + the platform for which NixOS should be + built. If this option is unset, it defaults to the platform + type of the machine where evaluation happens. Specifying this + option is useful when doing distributed multi-platform + deployment, or when building virtual machines. See its + description in the Nixpkgs manual for more details. + + Ignored when nixpkgs.pkgs is set. + ''; + }; + + crossSystem = mkOption { + type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform + default = null; + example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + defaultText = literalExample + ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; + description = '' + Specifies the platform for which NixOS should be + built. Specify this only if it is different from + nixpkgs.localSystem, the platform + on which NixOS should be built. In other + words, specify this to cross-compile NixOS. Otherwise it + should be set as null, the default. See its description in the + Nixpkgs manual for more details. Ignored when nixpkgs.pkgs is set. ''; @@ -146,10 +177,20 @@ in type = types.str; example = "i686-linux"; description = '' - Specifies the Nix platform type for which NixOS should be built. - If unset, it defaults to the platform type of your host system. - Specifying this option is useful when doing distributed - multi-platform deployment, or when building virtual machines. + Specifies the Nix platform type on which NixOS should be built. + It is better to specify nixpkgs.localSystem instead. + + { + nixpkgs.system = ..; + } + + is the same as + + { + nixpkgs.localSystem.system = ..; + } + + See nixpkgs.localSystem for more information. Ignored when nixpkgs.pkgs is set. ''; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 25cd0038e36d..9e66e0811ab7 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -158,7 +158,7 @@ in services.dysnomia.properties = { hostname = config.networking.hostName; - system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system; + inherit (config.nixpkgs.localSystem) system; supportedTypes = (import "${pkgs.stdenv.mkDerivation { name = "supportedtypes"; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index abf506ea7c67..4bd1c20edf71 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -23,7 +23,7 @@ let options = let scrubbedEval = evalModules { - modules = [ { nixpkgs.system = config.nixpkgs.system; } ] ++ baseModules; + modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules; args = (config._module.args) // { modules = [ ]; }; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; }; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e54a5fe7d40c..7ec443248de6 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -112,7 +112,7 @@ let # If the host is 64-bit and the container is 32-bit, add a # --personality flag. - ${optionalString (config.nixpkgs.system == "x86_64-linux") '' + ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") '' if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then extraFlags+=" --personality=x86" fi @@ -255,7 +255,7 @@ let }; - system = config.nixpkgs.system; + system = config.nixpkgs.localSystem.system; bindMountOpts = { name, config, ... }: { diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 26522ad6045e..c86f1c8bd441 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -144,7 +144,7 @@ let license = either (listOf lib.types.attrs) (either lib.types.attrs str); maintainers = listOf (attrsOf str); priority = int; - platforms = listOf (either str lib.systems.parsed.types.system); + platforms = listOf (either str lib.systems.parsedPlatform.types.system); hydraPlatforms = listOf str; broken = bool; From fdbd53e97c9821420a14cd814d92f5f0ca1947b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Apr 2018 14:12:19 -0700 Subject: [PATCH 070/538] hamlib: 1.2.15.3 -> 3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hamlib/versions. These checks were done: - built on NixOS - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctl -h’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctl --help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctl help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctld -h’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctld --help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigmem -h’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigmem --help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigsmtr -h’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigsmtr --help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigswr -h’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigswr --help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctl -h’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctl --help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctl help’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctld -h’ got 0 exit code - ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctld --help’ got 0 exit code - found 3.2 with grep in /nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2 - directory tree listing: https://gist.github.com/af20bb24f2d2a1b901f88663a7966181 --- pkgs/development/libraries/hamlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 3ea70fd49908..9825d6ed64a9 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "1.2.15.3"; + version = "3.2"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2"; + sha256 = "07ddsykbliiv0p717z1h5vzmvsx6lm75j32rhvmwqxp8m3kbap5m"; }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 From e9dbe1a2a31c4ad02ff6118449c2b476b706a094 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 08:36:04 -0700 Subject: [PATCH 071/538] hdf5-threadsafe: 1.10.1 -> 1.10.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hdf5-threadsafe/versions. These checks were done: - built on NixOS - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5diff -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5diff --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5diff -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5diff --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5ls -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5ls --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5ls -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5ls --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5dump -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5dump --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5dump -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5dump --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5mkgrp -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5mkgrp --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5mkgrp -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5mkgrp --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5clear -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5clear --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5clear -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5clear --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5import -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5import -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5repack -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5repack --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5repack -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5repack --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5jam -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5jam --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5jam -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5unjam -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5unjam --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5unjam -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5copy -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5copy --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5copy -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5copy --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5format_convert -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5format_convert --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5format_convert -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5format_convert --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5stat -h’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5stat --help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5stat -V’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5stat --version’ and found version 1.10.2 - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5perf_serial help’ got 0 exit code - ran ‘/nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2/bin/h5cc --help’ got 0 exit code - found 1.10.2 with grep in /nix/store/29yg9dx5p3ppcvyz7fk2lb14hmmy2slj-hdf5-1.10.2 - directory tree listing: https://gist.github.com/aedb29e367d0b709b77bbdc794b96dd6 --- pkgs/tools/misc/hdf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 2c1ba43a5587..494616d2b485 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -17,11 +17,11 @@ assert !cpp || mpi == null; let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.1"; + version = "1.10.2"; name = "hdf5-${version}"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; - sha256 = "1wpbi15za7kbsvih88kfcxblw412pjndl16x88dgnqr47piy2p4w"; + sha256 = "0wfb3w6dzi6zr2g1sdswqy9lxbp7yr4blvyi7k2xya7izmxmpb8w"; }; passthru = { From a2c1a90f76ee6c1f8570168b63b3f9c505dad070 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 10:04:51 -0700 Subject: [PATCH 072/538] geos: 3.6.1 -> 3.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/geos/versions. These checks were done: - built on NixOS - ran ‘/nix/store/17821mvnx0ilvicbzxvli6jq58fg7yy6-geos-3.6.2/bin/geos-config --version’ and found version 3.6.2 - found 3.6.2 with grep in /nix/store/17821mvnx0ilvicbzxvli6jq58fg7yy6-geos-3.6.2 - directory tree listing: https://gist.github.com/bf03d4beea8e52684689747456f95948 --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index de7111f6be36..24e3b4842faf 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, python }: stdenv.mkDerivation rec { - name = "geos-3.6.1"; + name = "geos-3.6.2"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja"; + sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; }; enableParallelBuilding = true; From 671e9bd3bf4a1e9ac56288f86e8d59db289911e5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 8 Apr 2018 19:59:38 -0400 Subject: [PATCH 073/538] python.pkgs.pyarrow: fix for python3 --- pkgs/development/libraries/arrow-cpp/default.nix | 4 ++-- .../python-modules/pyarrow/default.nix | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 7704cfd1c53b..952f7435c069 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, pythonPackages, rapidjson, snappy, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }: stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "apache-arrow-${version}/cpp"; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost pythonPackages.python pythonPackages.numpy ]; + buildInputs = [ boost python.pkgs.python python.pkgs.numpy ]; preConfigure = '' substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 5939e3a77949..1c2cb4a7643d 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: + +let + _arrow-cpp = arrow-cpp.override { inherit python;}; + _parquet-cpp = parquet-cpp.override { arrow-cpp = _arrow-cpp; }; +in buildPythonPackage rec { pname = "pyarrow"; @@ -12,7 +17,7 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; - propagatedBuildInputs = [ futures numpy six ]; + propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; checkInputs = [ pandas pytest pytestrunner ]; PYARROW_BUILD_TYPE = "release"; @@ -23,7 +28,7 @@ buildPythonPackage rec { substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"' # fix the hardcoded value - substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${parquet-cpp.version}")' + substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${_parquet-cpp.version}")' ''; preCheck = '' @@ -45,8 +50,8 @@ buildPythonPackage rec { substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" ''; - ARROW_HOME = arrow-cpp; - PARQUET_HOME = parquet-cpp; + ARROW_HOME = _arrow-cpp; + PARQUET_HOME = _parquet-cpp; setupPyBuildFlags = ["--with-parquet" ]; From f8cbdd53550c09d7cfa6717cd5eeaeec5e4b6870 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Mon, 9 Apr 2018 14:25:29 +0300 Subject: [PATCH 074/538] nodejs: 9.10.1 -> 9.11.1 --- pkgs/development/web/nodejs/v9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 85d6dd7493eb..f6f8aa8d1ab0 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.10.1"; - sha256 = "1widvxbc8sp8p8vp7q38b3zy0w1nx4iaqmp81s6bvaqs08h7wfy9"; + version = "9.11.1"; + sha256 = "0k4xkcymf4y3k2bxjryb2lj97bxnng75x7a77i2wgx94749kvp13"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } From 156dfd6eaef34489543da69a4d512ae36281d52a Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 9 Apr 2018 14:32:35 +0200 Subject: [PATCH 075/538] faust: add more faust2appl scripts --- pkgs/applications/audio/faust/faust1.nix | 2 +- pkgs/applications/audio/faust/faust2.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 4875ee8b57da..bf5bb7815856 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -49,7 +49,7 @@ let # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index f0564f37d6b1..db5433cc35fc 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -78,7 +78,7 @@ let # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly - pattern="faust2!(svg)" + pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" (shopt -s extglob; rm "$out"/bin/$pattern) ''; From a73cdc7333db7b95fef8c7b94b5ffa5430097266 Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Mon, 9 Apr 2018 16:58:06 +0200 Subject: [PATCH 076/538] gitea: 1.3.3 -> 1.4.0 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 8fcc3e7e9270..da9ee9b40811 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0ikkpvarp6mzsqk56ihw72fbv7r98g5v5i83rxq8dk709fdqplm6"; + sha256 = "07fbcd134n7giwxpqli5hfywmi0vb8awgdh3gyiwyzhjwwzfrxkq"; }; patches = [ ./static-root-path.patch ]; From 1ee4331a309b1932c3e1ea3dbe12961fff9ae875 Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Mon, 9 Apr 2018 19:49:49 +0200 Subject: [PATCH 077/538] sleepyhead: init at 1.0.0-beta By git revision since last tag 1.0.0-beta2 is over a year old and doesn't seem to build --- maintainers/maintainer-list.nix | 5 +++ pkgs/applications/misc/sleepyhead/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 49 insertions(+) create mode 100644 pkgs/applications/misc/sleepyhead/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 66a47333aa08..7f85f276d3b9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1961,6 +1961,11 @@ github = "kragniz"; name = "Louis Taylor"; }; + krav = { + email = "kristoffer@microdisko.no"; + github = "krav"; + name = "Kristoffer Thømt Ravneberg"; + }; kristoff3r = { email = "k.soeholm@gmail.com"; github = "kristoff3r"; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix new file mode 100644 index 000000000000..cf5c4625c952 --- /dev/null +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }: + +let + name = "sleepyhead-${version}"; + version = "1.0.0-beta-git"; +in stdenv.mkDerivation { + inherit name; + + src = fetchgit { + url = https://gitlab.com/sleepyhead/sleepyhead-code.git; + rev = "9e2329d8bca45693231b5e3dae80063717c24578"; + sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; + }; + + buildInputs = [ + qt5.qtbase qt5.qtwebkit qt5.qtserialport + zlib + libGLU + libX11 + ]; + + patchPhase = '' + patchShebangs configure + ''; + + installPhase = '' + mkdir -p $out/bin + cp sleepyhead/SleepyHead $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://sleepyhead.jedimark.net/; + description = "Review and explore data produced by CPAP and related machines"; + longDescription = '' + SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. + ''; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.krav ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c493337c161..ed3801611d63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4843,6 +4843,8 @@ with pkgs; sleuthkit = callPackage ../tools/system/sleuthkit {}; + sleepyhead = callPackage ../applications/misc/sleepyhead {}; + slimrat = callPackage ../tools/networking/slimrat { inherit (perlPackages) WWWMechanize LWP; }; From e729255db9586fe7a1a1f57b0116e1bf57560cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 9 Apr 2018 21:00:40 +0200 Subject: [PATCH 078/538] dnsdist: init at 1.3.0 --- pkgs/servers/dns/dnsdist/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/servers/dns/dnsdist/default.nix diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix new file mode 100644 index 000000000000..7369713dc86a --- /dev/null +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, systemd +, boost, libsodium, libedit, re2 +, net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec { + name = "dnsdist-${version}"; + version = "1.3.0"; + + src = fetchurl { + url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; + sha256 = "025sgvpi3ps0n4mzfwkk6a5ang90a3c7s2fi9vni6jj0p16wsrxa"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ systemd boost libsodium libedit re2 net_snmp lua protobuf openssl ]; + + configureFlags = [ + "--enable-libsodium" + "--enable-re2" + "--enable-dnscrypt" + "--enable-dns-over-tls" + "--with-protobuf=yes" + "--with-net-snmp" + "--disable-dependency-tracking" + "--enable-unit-tests" + "--enable-systemd" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "DNS Loadbalancer"; + homepage = "https://dnsdist.org"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c493337c161..fa0158b782a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13887,6 +13887,8 @@ with pkgs; powerdns = callPackage ../servers/dns/powerdns { }; + dnsdist = callPackage ../servers/dns/dnsdist { }; + pdns-recursor = callPackage ../servers/dns/pdns-recursor { }; powertop = callPackage ../os-specific/linux/powertop { }; From 99dc5f4ab0e3ddae4bc27150d8f41a1fdb08eca2 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 24 Sep 2017 17:28:16 -0400 Subject: [PATCH 079/538] libminc: 2.3.00 -> 2.3.01 (develop branch) --- .../development/libraries/libminc/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index 673b572c0899..e133e4be01ce 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, hdf5 }: +{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: stdenv.mkDerivation rec { - name = "${pname}-2.3.00"; pname = "libminc"; + name = "${pname}-2.3.01"; + # current master significantly ahead of most recent release src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = builtins.replaceStrings [ "." ] [ "-" ] name; - sha256 = "1gv1rq1q1brhglll2256cm6sns77ph6fvgbzk3ihkzq46y07yi9s"; + owner = "BIC-MNI"; + repo = pname; + rev = "e11c6df9321b4061bf87a7d43171ec55e9e3908f"; + sha256 = "0lmd0js3jgni2mw1zfvd4qg6byxiv3ndgv2z3nm7975i83zw48xk"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib netcdf hdf5 ]; + buildInputs = [ zlib netcdf nifticlib hdf5 ]; - cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" - "-DLIBMINC_MINC1_SUPPORT=ON" ]; + cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "TRUE" else "FALSE"}" + "-DLIBMINC_MINC1_SUPPORT=TRUE" + "-DLIBMINC_BUILD_SHARED_LIBS=TRUE" + "-DLIBMINC_USE_SYSTEM_NIFTI=TRUE" ]; - checkPhase = "ctest"; + + checkPhase = '' + export LD_LIBRARY_PATH="$(pwd)" # see #22060 + ctest -E ezminc_rw_test --output-on-failure # ezminc_rw_test can't find libminc_io.so.5.2.0 + ''; doCheck = true; enableParallelBuilding = true; From fa2cc0e72fc3e978b6132904d2adb2f3005d15d9 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 24 Sep 2017 17:50:02 -0400 Subject: [PATCH 080/538] perlPackages.TextFormat: init at 0.60 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d455dde6aeef..5a7e4000fe58 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14997,6 +14997,20 @@ let self = _self // overrides; _self = with self; { }; }; + TextFormat = buildPerlPackage rec { + name = "Text-Format-0.60"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "664f313570604624ff9e1fc9b26b6d04e06897b3e4eac83089fc0905a692a2b8"; + }; + buildInputs = [ ModuleBuild ]; + meta = { + homepage = http://www.shlomifish.org/open-source/projects/Text-Format/; + description = "Format text"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextGlob = buildPerlPackage rec { name = "Text-Glob-0.09"; src = fetchurl { From 082b3f1058458713bd56ea096de16f243cb47f32 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 24 Sep 2017 18:06:00 -0400 Subject: [PATCH 081/538] minc-tools: 2.3.00 -> 2.3.01 (develop branch) --- .../science/biology/minc-tools/default.nix | 26 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 7864658c9582..011db3f0fb86 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchFromGitHub, perl, cmake, flex, bison, libminc }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, libminc, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "${pname}-2.3.00"; pname = "minc-tools"; + name = "${pname}-2.3.01"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = builtins.replaceStrings [ "." ] [ "-" ] name; - sha256 = "0px5paprx4ds9aln3jdg1pywszgyz2aykgkdbj1y8gc1lwcizsl9"; + owner = "BIC-MNI"; + repo = pname; + rev = "5b7c40425cd4f67a018055cb85c0157ee50a3056"; + sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7"; }; - nativeBuildInputs = [ cmake flex bison ] ++ (if doCheck then [ perl ] else [ ]); - buildInputs = [ libminc ]; + nativeBuildInputs = [ cmake flex bison makeWrapper ]; + buildInputs = [ libminc libjpeg zlib ]; + propagatedBuildInputs = [ perl TextFormat ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; - checkPhase = "ctest"; - doCheck = false; + checkPhase = "ctest --output-on-failure"; # still some weird test failures though + + postFixup = '' + for prog in minccomplete minchistory mincpik; do + wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB + done + ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03018649317b..6315c140f176 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19759,7 +19759,9 @@ with pkgs; mrbayes = callPackage ../applications/science/biology/mrbayes { }; - minc-tools = callPackage ../applications/science/biology/minc-tools { }; + minc_tools = callPackage ../applications/science/biology/minc-tools { + inherit (perlPackages) TextFormat; + }; ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { }; From e7d447ce2c86dd1d97d03a274348afce15c9afed Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 24 Sep 2017 18:11:30 -0400 Subject: [PATCH 082/538] EBTKS: init at 1.6.50 (develop branch) --- .../science/biology/EBTKS/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/science/biology/EBTKS/default.nix diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix new file mode 100644 index 000000000000..3103eb31fb8c --- /dev/null +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, libminc }: + +stdenv.mkDerivation rec { + pname = "EBTKS"; + name = "${pname}-1.6.50"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; + sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libminc ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; + + checkPhase = "ctest --output-on-failure"; # but there are no tests ... + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Library for working with MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6315c140f176..d16043ce2747 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1144,6 +1144,8 @@ with pkgs; earlyoom = callPackage ../os-specific/linux/earlyoom { }; + EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; + ecasound = callPackage ../applications/audio/ecasound { }; edac-utils = callPackage ../os-specific/linux/edac-utils { }; From 61864898f3221de40d6ed9fc1a1ec1c64fd01329 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 24 Sep 2017 18:19:52 -0400 Subject: [PATCH 083/538] perlPackages.MNI-Perllib: init at 0.08 --- pkgs/development/perl-modules/MNI/default.nix | 20 +++++++++++++++++++ .../perl-modules/MNI/no-stdin.patch | 13 ++++++++++++ pkgs/top-level/perl-packages.nix | 4 ++++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/perl-modules/MNI/default.nix create mode 100644 pkgs/development/perl-modules/MNI/no-stdin.patch diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix new file mode 100644 index 000000000000..806c7703c889 --- /dev/null +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -0,0 +1,20 @@ +{ fetchFromGitHub, buildPerlPackage, stdenv, perl }: + +buildPerlPackage rec { + name = "MNI-Perllib-0.08"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = "mni-perllib"; + rev = "b908472b4390180ea5d19a121ac5edad6ed88d83"; + sha256 = "0vk99pwgbard62k63386r7dpnm3h435jdqywr4xqfq7p04dz6kyb"; + }; + + patches = [ ./no-stdin.patch ]; + + doCheck = false; # TODO: almost all tests fail ... is this a real problem? + + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; +} diff --git a/pkgs/development/perl-modules/MNI/no-stdin.patch b/pkgs/development/perl-modules/MNI/no-stdin.patch new file mode 100644 index 000000000000..1e9e791257e7 --- /dev/null +++ b/pkgs/development/perl-modules/MNI/no-stdin.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.PL b/Makefile.PL +index 9f2039a..12d699c 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -213,7 +213,7 @@ TEXT + } # &MY::postamble + + +-query_subs; ++#query_subs; + + my $f; + WriteMakefile diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5a7e4000fe58..c34986db3859 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8983,6 +8983,10 @@ let self = _self // overrides; _self = with self; { }; }; + MNI-Perllib = import ../development/perl-modules/MNI { + inherit buildPerlPackage fetchFromGitHub stdenv perl; + }; + ModernPerl = buildPerlPackage { name = "Modern-Perl-1.20140107"; src = fetchurl { From bd460f54a3de827ce87fcedfa534c6321a4ef7ac Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 25 Sep 2017 11:34:39 -0400 Subject: [PATCH 084/538] mni_autoreg: init at 0.99.70 --- .../science/biology/mni_autoreg/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/biology/mni_autoreg/default.nix diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix new file mode 100644 index 000000000000..5e7808918e99 --- /dev/null +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, cmake, makeWrapper, perl, GetoptTabular, MNI-Perllib, libminc }: + +stdenv.mkDerivation rec { + pname = "mni_autoreg"; + name = "${pname}-0.99.70"; + + src = fetchgit { + url = "https://github.com/BIC-MNI/${pname}.git"; + rev = "a4367b82012fe3b40e794fc1eb6c3c86e86148bf"; + sha256 = "1j5vk7hf03y38fwb5klfppk3g4d2hx1fg3ikph2708pnssmim2qr"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc ]; + propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; + # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc + + postFixup = '' + for prog in autocrop mritoself mritotal xfmtool; do + echo $out/bin/$prog + wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB; + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/BIC-MNI/mni_autoreg; + description = "Tools for automated registration using the MINC image format"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d16043ce2747..ba3d6192a216 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19765,6 +19765,10 @@ with pkgs; inherit (perlPackages) TextFormat; }; + mni_autoreg = callPackage ../applications/science/biology/mni_autoreg { + inherit (perlPackages) GetoptTabular MNI-Perllib; + }; + ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { }; paml = callPackage ../applications/science/biology/paml { }; From f532f9f5f4d79a0ce3d2903ab9cd0dc7cfaa6aec Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 25 Sep 2017 12:17:49 -0400 Subject: [PATCH 085/538] minc-widgets: init at "1.0.0" (package seems to lack a consistent version) --- .../science/biology/minc-widgets/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/science/biology/minc-widgets/default.nix diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix new file mode 100644 index 000000000000..0474ad1bff07 --- /dev/null +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, + perl, GetoptTabular, MNI-Perllib, + libminc, octave, coreutils, minc_tools }: + +stdenv.mkDerivation rec { + pname = "minc-widgets"; + name = "${pname}-1.0.0"; + + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "f08b643894c81a1a2e0fbfe595a17a42ba8906db"; + sha256 = "1b9g6lf37wpp211ikaji4rf74rl9xcmrlyqcw1zq3z12ji9y33bm"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc ]; + propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib octave coreutils minc_tools ]; + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + done + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Collection of Perl and shell scripts for processing MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba3d6192a216..056b35f14263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19765,6 +19765,10 @@ with pkgs; inherit (perlPackages) TextFormat; }; + minc_widgets = callPackage ../applications/science/biology/minc-widgets { + inherit (perlPackages) GetoptTabular MNI-Perllib; + }; + mni_autoreg = callPackage ../applications/science/biology/mni_autoreg { inherit (perlPackages) GetoptTabular MNI-Perllib; }; From 54c543b03b60bdd78bcfe86aab6784a2a54bd68e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 25 Sep 2017 13:14:59 -0400 Subject: [PATCH 086/538] n3: init at 1.0.20 --- .../science/biology/N3/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/science/biology/N3/default.nix diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix new file mode 100644 index 000000000000..feaea5b15342 --- /dev/null +++ b/pkgs/applications/science/biology/N3/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, + perl, MNI-Perllib, GetoptTabular, + libminc, EBTKS }: + +stdenv.mkDerivation rec { + pname = "N3"; + name = "${pname}-1.0.20"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "2fdd939f0f2b24a4039bc6a8ade4a190a1d8e75d"; + sha256 = "13z21c4r09hna3q1csvcn4i7ws5ixbdaja6ch421xv6nydjh2w5g"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc EBTKS ]; + propagatedBuildInputs = [ perl MNI-Perllib GetoptTabular ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + + checkPhase = "ctest --output-on-failure"; + # don't run the tests as they fail at least due to missing program wrappers in this phase ... + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB + done + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "MRI non-uniformity correction for MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 056b35f14263..51edd6d16e03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19749,6 +19749,10 @@ with pkgs; muscle = callPackage ../applications/science/biology/muscle/default.nix { }; + n3 = callPackage ../applications/science/biology/N3 { + inherit (perlPackages) perl GetoptTabular MNI-Perllib; + }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; From e90d1e8631d62053b9f16343baececda9e92406f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 25 Sep 2017 14:20:56 -0400 Subject: [PATCH 087/538] inormalize: init at 1.0.20 (develop branch) --- .../science/biology/inormalize/default.nix | 38 +++++++++++++++++++ .../biology/inormalize/lgmask-interp.patch | 10 +++++ .../inormalize/nu_correct_norm-interp.patch | 10 +++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 62 insertions(+) create mode 100644 pkgs/applications/science/biology/inormalize/default.nix create mode 100644 pkgs/applications/science/biology/inormalize/lgmask-interp.patch create mode 100644 pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix new file mode 100644 index 000000000000..d202db8521cf --- /dev/null +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, makeWrapper, + perl, GetoptTabular, MNI-Perllib, + libminc, EBTKS }: + +stdenv.mkDerivation rec { + pname = "inormalize"; + name = "${pname}-1.0.20"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "79cea9cdfe7b99abfd40afda89ab2253b596ad2f"; + sha256 = "1ahqv5q0ljvji99a5q8azjkdf6bgp6nr8lwivkqwqs3jm0k5clq7"; + }; + + patches = [ ./lgmask-interp.patch ./nu_correct_norm-interp.patch ]; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc EBTKS ]; + propagatedBuildInputs = [ perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + + checkPhase = "ctest --output-on-failure"; # but no tests + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB + done + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Program to normalize intensity of MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/biology/inormalize/lgmask-interp.patch b/pkgs/applications/science/biology/inormalize/lgmask-interp.patch new file mode 100644 index 000000000000..953bce9a1848 --- /dev/null +++ b/pkgs/applications/science/biology/inormalize/lgmask-interp.patch @@ -0,0 +1,10 @@ +diff --git a/lgmask.in b/lgmask.in +index 17dbe4d..2195d91 100644 +--- a/lgmask.in ++++ b/lgmask.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/env perl + + #--------------------------------------------------------------------------- + #@COPYRIGHT : diff --git a/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch b/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch new file mode 100644 index 000000000000..75dc46a799ce --- /dev/null +++ b/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch @@ -0,0 +1,10 @@ +diff --git a/nu_correct_norm.in b/nu_correct_norm.in +index 1dc84ac..1bc6235 100644 +--- a/nu_correct_norm.in ++++ b/nu_correct_norm.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + + #--------------------------------------------------------------------------- + #@COPYRIGHT : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51edd6d16e03..cd34788fc39b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19741,6 +19741,10 @@ with pkgs; igv = callPackage ../applications/science/biology/igv { }; + inormalize = callPackage ../applications/science/biology/inormalize { + inherit (perlPackages) GetoptTabular MNI-Perllib; + }; + iv = callPackage ../applications/science/biology/iv { neuron-version = neuron.version; }; From cf2aac6a045f97a20b79978693547ea83abc076a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 26 Sep 2017 13:22:46 -0400 Subject: [PATCH 088/538] address license/version issues for PR #29782 --- pkgs/applications/science/biology/N3/default.nix | 3 ++- .../science/biology/inormalize/default.nix | 3 ++- .../science/biology/minc-tools/default.nix | 3 ++- .../science/biology/minc-widgets/default.nix | 3 ++- .../science/biology/mni_autoreg/default.nix | 14 ++++++++------ pkgs/development/libraries/libminc/default.nix | 11 +++++++---- .../libraries/science/biology/EBTKS/default.nix | 5 +++-- pkgs/development/perl-modules/MNI/default.nix | 7 ++++--- pkgs/top-level/perl-packages.nix | 1 + 9 files changed, 31 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix index feaea5b15342..c14846beec2f 100644 --- a/pkgs/applications/science/biology/N3/default.nix +++ b/pkgs/applications/science/biology/N3/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "N3"; - name = "${pname}-1.0.20"; + name = "${pname}-2017-09-18"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { description = "MRI non-uniformity correction for MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index d202db8521cf..f17143ad06bb 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "inormalize"; - name = "${pname}-1.0.20"; + name = "${pname}-2014-10-21"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { description = "Program to normalize intensity of MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 011db3f0fb86..8e1f74686d1f 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "minc-tools"; - name = "${pname}-2.3.01"; + name = "${pname}-2017-09-11"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index 0474ad1bff07..9084dfb2e1c3 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "minc-widgets"; - name = "${pname}-1.0.0"; + name = "${pname}-2016-04-20"; src = fetchFromGitHub { @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "Collection of Perl and shell scripts for processing MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index 5e7808918e99..076ecd03a1b1 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cmake, makeWrapper, perl, GetoptTabular, MNI-Perllib, libminc }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, perl, GetoptTabular, MNI-Perllib, libminc }: stdenv.mkDerivation rec { pname = "mni_autoreg"; - name = "${pname}-0.99.70"; + name = "${pname}-2017-09-22"; - src = fetchgit { - url = "https://github.com/BIC-MNI/${pname}.git"; - rev = "a4367b82012fe3b40e794fc1eb6c3c86e86148bf"; - sha256 = "1j5vk7hf03y38fwb5klfppk3g4d2hx1fg3ikph2708pnssmim2qr"; + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "ab99e29987dc029737785baebf24896ec37a2d76"; + sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { description = "Tools for automated registration using the MINC image format"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index e133e4be01ce..971741a019ca 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -2,11 +2,13 @@ stdenv.mkDerivation rec { pname = "libminc"; - name = "${pname}-2.3.01"; + name = "${pname}-2017-09-14"; - # current master significantly ahead of most recent release + owner = "BIC-MNI"; + + # current master is significantly ahead of most recent release, so use Git version: src = fetchFromGitHub { - owner = "BIC-MNI"; + inherit owner; repo = pname; rev = "e11c6df9321b4061bf87a7d43171ec55e9e3908f"; sha256 = "0lmd0js3jgni2mw1zfvd4qg6byxiv3ndgv2z3nm7975i83zw48xk"; @@ -30,9 +32,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/libminc; + homepage = "https://github.com/${owner}/${pname}"; description = "Medical imaging library based on HDF5"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + license = licenses.free; }; } diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix index 3103eb31fb8c..6ed6c8262a50 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -14,14 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libminc ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; - checkPhase = "ctest --output-on-failure"; # but there are no tests ... + checkPhase = "ctest --output-on-failure"; # but cmake doesn't run the tests ... meta = with stdenv.lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Library for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; + licenses = licenses.free; }; } diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index 806c7703c889..50a2d71ad224 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, buildPerlPackage, stdenv, perl }: buildPerlPackage rec { - name = "MNI-Perllib-0.08"; + name = "MNI-Perllib-2012-04-13"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -14,7 +14,8 @@ buildPerlPackage rec { doCheck = false; # TODO: almost all tests fail ... is this a real problem? - meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + meta = with stdenv.lib; { + license = with licenses; [ artistic1 gpl1Plus ]; + maintainer = with maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c34986db3859..d67a3f7f1dd4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15012,6 +15012,7 @@ let self = _self // overrides; _self = with self; { homepage = http://www.shlomifish.org/open-source/projects/Text-Format/; description = "Format text"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainer = with maintainers; [ bcdarwin ]; }; }; From c14342d44fa000773bcb9a6f092d2c703b294b1f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 26 Sep 2017 17:59:53 -0400 Subject: [PATCH 089/538] itk: enable more MINC support --- pkgs/development/libraries/itk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 10c160eacc6e..5280a95afb40 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" + "-DModule_ITKMINC=ON" "-DModule_ITKIOMINC=ON" + "-DModule_ITKIOTransformMINC=ON" "-DModule_ITKVtkGlue=ON" "-DModule_ITKReview=ON" ]; From c9db4cabc8e5e630a5fc9e3533c3954370907139 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 26 Sep 2017 18:03:47 -0400 Subject: [PATCH 090/538] bicpl: init at 2017-09-10 --- .../science/biology/bicpl/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/science/biology/bicpl/default.nix diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix new file mode 100644 index 000000000000..d00a74f61e20 --- /dev/null +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, netpbm }: + +stdenv.mkDerivation rec { + pname = "bicpl"; + name = "${pname}-2017-09-10"; + + owner = "BIC-MNI"; + + # current master is significantly ahead of most recent release, so use Git version: + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "612a63e740fadb162fcf27ee00da6a18dec4d5a9"; + sha256 = "1vv9gi184bkvp3f99v9xmmw1ly63ip5b09y7zdjn39g7kmwzrga7"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libminc netpbm ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ]; + + checkPhase = "ctest --output-on-failure"; + doCheck = false; + # internal_volume_io.h: No such file or directory + + meta = with stdenv.lib; { + homepage = "https://github.com/${owner}/${pname}"; + description = "Brain Imaging Centre programming library"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd34788fc39b..f74a9b75f5ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8469,6 +8469,8 @@ with pkgs; libopcodes = callPackage ../development/libraries/libopcodes { }; + bicpl = callPackage ../development/libraries/science/biology/bicpl { }; + # TODO(@Ericson2314): Build bionic libc from source bionic = assert hostPlatform.useAndroidPrebuilt; androidenv.androidndkPkgs.libraries; From de2f36982bd22053d0686dbec6aa8a7fe5fddfcb Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 26 Sep 2017 18:08:14 -0400 Subject: [PATCH 091/538] ezminc: init at 2017-08-29 --- .../science/biology/EZminc/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/biology/EZminc/default.nix diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix new file mode 100644 index 000000000000..20d88eb3aafb --- /dev/null +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, itk, fftwFloat, gsl }: + +stdenv.mkDerivation rec { pname = "EZminc"; + name = "${pname}-2017-08-29"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "4e017236cb6e7f6e07507446b18b759c584b6fc3"; + sha256 = "1pg06x42pgsg7zy7dz9wf6ajakkm2n8by64lg9z64qi8qqy82b8v"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" + "-DEZMINC_BUILD_TOOLS=TRUE" + "-DEZMINC_BUILD_MRFSEG=TRUE" + "-DEZMINC_BUILD_DD=TRUE" ]; + + checkPhase = "ctest --output-on-failure ../tests/"; # but ctest doesn't find the tests ... + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/BIC-MNI/${pname}"; + description = "Collection of Perl and shell scripts for processing MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f74a9b75f5ed..c5faf48dda84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19739,6 +19739,8 @@ with pkgs; emboss = callPackage ../applications/science/biology/emboss { }; + ezminc = callPackage ../applications/science/biology/EZminc { }; + htslib = callPackage ../development/libraries/science/biology/htslib { }; igv = callPackage ../applications/science/biology/igv { }; From d094f52112e3ffa75d5d9371fbeca804bd0200c9 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 26 Sep 2017 23:50:51 -0400 Subject: [PATCH 092/538] fix EBTKS version naming --- pkgs/development/libraries/science/biology/EBTKS/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix index 6ed6c8262a50..9e27d041f8d6 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "EBTKS"; - name = "${pname}-1.6.50"; + name = "${pname}-2017-09-23"; src = fetchFromGitHub { owner = "BIC-MNI"; From 6972e366beb9c6b25567ed0d5378193301a73ef5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 29 Sep 2017 14:03:25 -0400 Subject: [PATCH 093/538] arguments: init at 2015-11-30 --- .../libraries/arguments/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/arguments/default.nix diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix new file mode 100644 index 000000000000..912ea53c3d3a --- /dev/null +++ b/pkgs/development/libraries/arguments/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, bicpl }: + +stdenv.mkDerivation rec { + pname = "arguments"; + name = "${pname}-2015-11-30"; + + owner = "BIC-MNI"; + + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "b3aad97f6b6892cb8733455d0d448649a48fa108"; + sha256 = "1ar8lm1w1jflz3vdmjr5c4x6y7rscvrj78b8gmrv79y95qrgzv6s"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ]; + + #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ]; + + checkPhase = "ctest --output-on-failure"; + doCheck = false; + # internal_volume_io.h: No such file or directory + + meta = with stdenv.lib; { + homepage = "https://github.com/${owner}/${pname}"; + description = "Library for argument handling for MINC programs"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5faf48dda84..944abb463ccd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -517,6 +517,8 @@ with pkgs; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; + arguments = callPackage ../development/libraries/arguments { }; + argus = callPackage ../tools/networking/argus {}; argus-clients = callPackage ../tools/networking/argus-clients {}; From c1488921a03d6e4119934169e941438bc4e1da39 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 29 Sep 2017 14:04:05 -0400 Subject: [PATCH 094/538] oobicpl: init at 2016-03-02 --- .../science/biology/oobicpl/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/science/biology/oobicpl/default.nix diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/development/libraries/science/biology/oobicpl/default.nix new file mode 100644 index 000000000000..8755b7fd2eba --- /dev/null +++ b/pkgs/development/libraries/science/biology/oobicpl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }: + +stdenv.mkDerivation rec { + pname = "oobicpl"; + name = "${pname}-2016-03-02"; + + owner = "BIC-MNI"; + + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "bc062a65dead2e58461f5afb37abedfa6173f10c"; + sha256 = "05l4ml9djw17bgdnrldhcxydrzkr2f2scqlyak52ph5azj5n4zsx"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libminc bicpl arguments pcre-cpp ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" + "-DBICPL_DIR=${bicpl}/lib" + "-DARGUMENTS_DIR=${arguments}/lib" + "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/${owner}/${pname}"; + description = "Brain Imaging Centre object-oriented programming library (and tools)"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 944abb463ccd..ec9c00a7a79e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10787,6 +10787,8 @@ with pkgs; oniguruma = callPackage ../development/libraries/oniguruma { }; + oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; + openal = self.openalSoft; openalSoft = callPackage ../development/libraries/openal-soft { From 0b307aa73804bbd7a7172899e59ae0b8c347a62d Mon Sep 17 00:00:00 2001 From: John Boehr Date: Mon, 9 Apr 2018 16:28:13 -0700 Subject: [PATCH 095/538] cockroachdb: 1.1.5 -> 2.0.0 --- pkgs/servers/sql/cockroachdb/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index f40a5df0f5c0..65d2dd17528c 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,16 +1,17 @@ -{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf }: +{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf, ncurses6 }: buildGoPackage rec { name = "cockroach-${version}"; - version = "1.1.5"; + version = "2.0.0"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0i2lg60424i1yg9dhapfsy3majnlbad2wlf93d9l161jf5lp9a2d"; + sha256 = "0x8hf5qwvgb2w6dcnvy20v77nf19f0l1pb40jf31rm72xhk3bwvy"; }; + buildInputs = [ ncurses6 ]; nativeBuildInputs = [ cmake xz which autoconf ]; buildPhase = '' From 524b606f16ac59e1877e2e62994b7752c0b7206a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 9 Apr 2018 20:29:03 -0400 Subject: [PATCH 096/538] disable a second libminc test --- pkgs/development/libraries/libminc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index 971741a019ca..704c73284ae1 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { checkPhase = '' export LD_LIBRARY_PATH="$(pwd)" # see #22060 - ctest -E ezminc_rw_test --output-on-failure # ezminc_rw_test can't find libminc_io.so.5.2.0 + ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure + # ezminc_rw_test can't find libminc_io.so.5.2.0; minc_conversion hits netcdf compilation issue ''; doCheck = true; From 1595f3cc454ccd859281b244710b6a084c2c646c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 9 Apr 2018 20:29:29 -0400 Subject: [PATCH 097/538] delete broken alias --- pkgs/top-level/aliases.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c6a9825a1d68..4a169c69295d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -133,7 +133,6 @@ mapAliases (rec { man_db = man-db; # added 2016-05 piwik = matomo; # added 2018-01-16 midoriWrapper = midori; # added 2015-01 - minc_tools = minc-tools; # 2017-12 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 module_init_tools = kmod; # added 2016-04-22 From 12fa2f9fd37eaf0c12de0d2ef75e93a05d9788a4 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 9 Apr 2018 23:52:18 -0400 Subject: [PATCH 098/538] metadata fixes: EBTKS, MNI::Perllib, Text::Format --- pkgs/development/libraries/science/biology/EBTKS/default.nix | 2 +- pkgs/development/perl-modules/MNI/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix index 9e27d041f8d6..67f868a91a7b 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Library for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - licenses = licenses.free; + license = licenses.free; }; } diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index 50a2d71ad224..176cd06a9cc3 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -16,6 +16,6 @@ buildPerlPackage rec { meta = with stdenv.lib; { license = with licenses; [ artistic1 gpl1Plus ]; - maintainer = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d67a3f7f1dd4..0d2df26e050a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15012,7 +15012,7 @@ let self = _self // overrides; _self = with self; { homepage = http://www.shlomifish.org/open-source/projects/Text-Format/; description = "Format text"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainer = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ bcdarwin ]; }; }; From f4b5e1045878c97e03df21e2b9f50bb243a44441 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 09:53:04 -0700 Subject: [PATCH 099/538] weston: 3.0.0 -> 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/weston/versions. These checks were done: - built on NixOS - ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/weston -h’ got 0 exit code - ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/weston --help’ got 0 exit code - ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/weston --version’ and found version 4.0.0 - ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/wcap-decode --help’ got 0 exit code - found 4.0.0 with grep in /nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0 - directory tree listing: https://gist.github.com/01f9658faac9a7816ccf1ca44d11fe15 --- pkgs/applications/window-managers/weston/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 2ea0480cc5ec..7fd752e38627 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "weston-${version}"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd"; + sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50"; }; nativeBuildInputs = [ pkgconfig ]; From 2afa959559b8c90e2e51f1614319c916e4a83e88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 09:59:44 -0700 Subject: [PATCH 100/538] sysstat: 11.7.2 -> 11.7.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sysstat/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2f4cmqnz0wn43pyq8qnlb7pvhk3gh7bq-sysstat-11.7.3/bin/sar --help’ got 0 exit code - ran ‘/nix/store/2f4cmqnz0wn43pyq8qnlb7pvhk3gh7bq-sysstat-11.7.3/bin/iostat -h’ got 0 exit code - ran ‘/nix/store/2f4cmqnz0wn43pyq8qnlb7pvhk3gh7bq-sysstat-11.7.3/bin/iostat help’ got 0 exit code - ran ‘/nix/store/2f4cmqnz0wn43pyq8qnlb7pvhk3gh7bq-sysstat-11.7.3/bin/pidstat -h’ got 0 exit code - ran ‘/nix/store/2f4cmqnz0wn43pyq8qnlb7pvhk3gh7bq-sysstat-11.7.3/bin/cifsiostat -h’ got 0 exit code - ran ‘/nix/store/2f4cmqnz0wn43pyq8qnlb7pvhk3gh7bq-sysstat-11.7.3/bin/cifsiostat help’ got 0 exit code - found 11.7.3 with grep in /nix/store/2f4cmqnz0wn43pyq8qnlb7pvhk3gh7bq-sysstat-11.7.3 - directory tree listing: https://gist.github.com/1274e29f5a0476b26643f85767b98e40 --- pkgs/os-specific/linux/sysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index d8e95ff74c43..db9f05f5f4d8 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-11.7.2"; + name = "sysstat-11.7.3"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "169yh9d0ags9xrn5g0k42wd1c895117zbzs257cjxqnb2vk0a38v"; + sha256 = "1sk6rhdqr8xsm456fkhkcmbnqgkymqqs3jkapcf8mrnsx36gz94f"; }; buildInputs = [ gettext ]; From ec0495c0323833e4e8a238ea7e0e1a7713b288d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 10:27:18 -0700 Subject: [PATCH 101/538] scantailor-advanced: 1.0.12 -> 1.0.14 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/scantailor-advanced/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.0.14 with grep in /nix/store/idixvv43hjsy4v0xp2mfcryw55wg88c3-scantailor-advanced-1.0.14 - directory tree listing: https://gist.github.com/1f4938c03503cfde35a6b4d10d6538d1 --- pkgs/applications/graphics/scantailor/advanced.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 8f26d5a9884a..bea4fe9b2c6c 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "scantailor-advanced-${version}"; - version = "1.0.12"; + version = "1.0.14"; src = fetchFromGitHub { owner = "4lex4"; repo = "scantailor-advanced"; rev = "v${version}"; - sha256 = "0i80jzky7l8wdv0wqdx48x1q0wmj72hhm0050pd43q80pj5r78a0"; + sha256 = "1h7lng0hxkjcvwbdf1yx59a382kiwn9bpll42acqs71nsvw65p28"; }; nativeBuildInputs = [ cmake qttools ]; From efb02d3c00bf7852263daadb1f5c6207da52a705 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 10 Apr 2018 13:34:29 -0400 Subject: [PATCH 102/538] elastix: 4.8 -> 4.9.0 --- .../science/biology/elastix/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 06550372ba8a..7b9e6b24d418 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python }: +{ stdenv, fetchurl, cmake, itk, python }: stdenv.mkDerivation rec { - _name = "elastix"; - _version = "4.8"; - name = "${_name}-${_version}"; + pname = "elastix"; + pversion = "4.9.0"; + name = "${pname}-${pversion}"; - src = fetchFromGitHub { - owner = "SuperElastix"; - repo = "elastix"; - rev = "ef057ff89233822b26b04b31c3c043af57d5deff"; - sha256 = "0gm3a8dgqww50h6zld9ighjk92wlpybpimjwfz4s5h82vdjsvxrm"; + src = fetchurl { + url = "https://github.com/SuperElastix/${pname}/archive/${pversion}.tar.gz"; + sha256 = "02pbln36nq98xxfyqwlxg7b6gmigdq4fgfqr9mym1qn58aj04shg"; }; nativeBuildInputs = [ cmake python ]; buildInputs = [ itk ]; - cmakeFlags = [ "-DUSE_KNNGraphAlphaMutualInformationMetric=OFF" ]; - checkPhase = "ctest"; meta = with stdenv.lib; { From 6908f0ce89cd3dd9fa4b3c8f5ee10f2bd9895817 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 10 Apr 2018 13:38:14 -0400 Subject: [PATCH 103/538] c3d: updated rev still won't compile; mark broken --- pkgs/applications/graphics/c3d/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 74631e88ebfb..7e1c6d7c8c4b 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "c3d"; - version = "1.1.0"; + version = "2018-10-04"; src = fetchgit { url = "https://git.code.sf.net/p/c3d/git"; - rev = "3453f6133f0df831dcbb0d0cfbd8b26e121eb153"; - sha256 = "1xgbk20w22jwvf7pa0n4lcbyx35fq56zzlslj0nvcclh6vx0b4z8"; + rev = "351929a582b2ef68fb9902df0b11d38f44a0ccd0"; + sha256 = "0mpv4yl6hdnxgvnwrmd182h64n3ppp30ldzm0jz6jglk0nvpzq9w"; }; nativeBuildInputs = [ cmake ]; @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl2; + broken = true; }; } From e0de2d7ae60ee491a6bdf1389aaae49c64dea48e Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Tue, 10 Apr 2018 20:27:59 +0200 Subject: [PATCH 104/538] murmur: fix /tmp usage --- nixos/modules/services/networking/murmur.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 13d7c3254f9d..873d62dbf341 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -80,7 +80,7 @@ in pidfile = mkOption { type = types.path; - default = "/tmp/murmurd.pid"; + default = "/run/murmur/murmurd.pid"; description = "Path to PID file for Murmur daemon."; }; @@ -252,6 +252,7 @@ in serviceConfig = { Type = "forking"; + RuntimeDirectory = "murmur"; PIDFile = cfg.pidfile; Restart = "always"; User = "murmur"; From 7cb50de416819e8505d70931c899fc8692aecb33 Mon Sep 17 00:00:00 2001 From: John Boehr Date: Mon, 9 Apr 2018 14:41:25 -0700 Subject: [PATCH 105/538] altcoins.mist: init at 0.10.0 --- pkgs/applications/altcoins/default.nix | 2 + pkgs/applications/altcoins/mist.nix | 71 ++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/altcoins/mist.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index d7cce586b9b7..174ff96a1247 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -51,6 +51,8 @@ rec { memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; }; + mist = callPackage ./mist.nix { }; + namecoin = callPackage ./namecoin.nix { withGui = true; }; namecoind = callPackage ./namecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix new file mode 100644 index 000000000000..c112384f3d84 --- /dev/null +++ b/pkgs/applications/altcoins/mist.nix @@ -0,0 +1,71 @@ +{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: + +let + version = "0.10.0"; + name = "mist-${version}"; + + throwSystem = throw "Unsupported system: ${stdenv.system}"; + + meta = with stdenv.lib; { + description = "Browse and use Ðapps on the Ethereum network"; + homepage = https://github.com/ethereum/mist; + license = licenses.gpl3; + maintainers = with maintainers; []; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + + urlVersion = builtins.replaceStrings ["."] ["-"] version; + + desktopItem = makeDesktopItem rec { + name = "Mist"; + exec = "mist"; + icon = "mist"; + desktopName = name; + genericName = "Mist Browser"; + categories = "Network;"; + }; + + mist = stdenv.mkDerivation { + inherit name version; + + src = { + i686-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip"; + sha256 = "01hvxlm9w522pwvsjdy18gsrapkfjr7d1jjl4bqjjysxnjaaj2lk"; + }; + x86_64-linux = fetchurl { + url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip"; + sha256 = "01k17j7fdfhxfd26njdsiwap0xnka2536k9ydk32czd8db7ya9zi"; + }; + }.${stdenv.system} or throwSystem; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out/lib/mist $out/bin + unzip -d $out/lib/mist $src + ln -s $out/lib/mist/mist $out/bin + fixupPhase + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${atomEnv.libPath}:$out/lib/mist" \ + $out/lib/mist/mist + ''; + }; +in +buildFHSUserEnv { + name = "mist"; + + targetPkgs = pkgs: with pkgs; [ + mist + ]; + + extraInstallCommands = '' + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* $out/share/applications + ''; + + runScript = "mist"; +} From c478b6217fd493ebf5d4eebf8c5c282dbe0732c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 13:04:09 -0700 Subject: [PATCH 106/538] samtools: 1.7 -> 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/samtools/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/samtools --help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/samtools help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/blast2sam.pl -h’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/blast2sam.pl --help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/blast2sam.pl help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/novo2sam.pl help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/psl2sam.pl -h’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/psl2sam.pl --help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/psl2sam.pl help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/soap2sam.pl -h’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/soap2sam.pl --help’ got 0 exit code - ran ‘/nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8/bin/soap2sam.pl help’ got 0 exit code - found 1.8 with grep in /nix/store/ip1zr4rg4pwq8f3fs8ar570l0zdicai7-samtools-1.8 - directory tree listing: https://gist.github.com/4673ea3645eb509035dcb386c4ad1da2 --- pkgs/applications/science/biology/samtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 365057414e99..87e708526ef7 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "e7b09673176aa32937abd80f95f432809e722f141b5342186dfef6a53df64ca1"; + sha256 = "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9"; }; nativeBuildInputs = [ perl ]; From c26f4405247badc6ca33ba7bca43677f78b9d26f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 16:33:08 -0700 Subject: [PATCH 107/538] libcouchbase: 2.8.5 -> 2.8.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcouchbase/versions. These checks were done: - built on NixOS - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-cat --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-create --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-observe --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-observe-seqno --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-incr --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-decr --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-mcflush --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-hash --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-lock --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-unlock --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-rm --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-stats --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-version -h’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-version --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-version help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-verbosity --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-view --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-n1ql --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-admin --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-admin help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-ping --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-create --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-create help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-delete --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-delete help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-bucket-flush --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-connstr --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-connstr help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-write-config --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-write-config help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-strerror --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-touch --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-role-list --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-role-list help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-list --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-list help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-upsert --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-delete --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-user-delete help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-watch --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-pillowfight --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-n1qlback --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-subdoc --help’ got 0 exit code - ran ‘/nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6/bin/cbc-proxy --help’ got 0 exit code - found 2.8.6 with grep in /nix/store/bdbh79dlqlynjsj0xvdpk0ardxjh3856-libcouchbase-2.8.6 - directory tree listing: https://gist.github.com/7a5ce11b6bb1930fe5c10a4f96a9ca79 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 7c7cd1c3aae2..c3050bf8c676 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.8.5"; + version = "2.8.6"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "1iwzf0y5f25g5hgdkmv6qf3k5mzlazrpx5sj3m2pvrl9jg9wn4s1"; + sha256 = "1in0fdl5mgzhwmd8kvniqkizi7isf2g2gvbknfbbdmxkki7a8p95"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; From 6214e1d82badc3518be0fe05c9d044497db837c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 16:58:22 -0700 Subject: [PATCH 108/538] librime: 1.3.0 -> 1.3.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/librime/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.3.1 with grep in /nix/store/xpam0vd7m94cd2v53szc6y270l3qsp1n-librime-1.3.1 - directory tree listing: https://gist.github.com/52addb8eb8a8dc5778cc5ef320fd6b1e --- pkgs/development/libraries/librime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 1384b3e7a74e..e6d2612fe626 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "librime-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; rev = "${version}"; - sha256 = "1sxxxliqjjsfblx9n6ijw9gx40xqw71v352b28aw51gg3k201v0j"; + sha256 = "1y0h3nnz97smx9z8h5fzk4c27mvrwv8kajxffqc43bhyvxvb2jd6"; }; nativeBuildInputs = [ cmake ]; From 29a319dd6eb85060be18afd99d1bdd0d5cbbdc3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 21:08:54 -0700 Subject: [PATCH 109/538] lldpd: 0.9.9 -> 1.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lldpd/versions. These checks were done: - built on NixOS - ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpcli help’ got 0 exit code - ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpcli -v’ and found version 1.0.1 - ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpctl help’ got 0 exit code - ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpctl -v’ and found version 1.0.1 - ran ‘/nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1/bin/lldpd -v’ and found version 1.0.1 - found 1.0.1 with grep in /nix/store/00pbm219d71n3rf14xbza3fzy0fjcb2w-lldpd-1.0.1 - directory tree listing: https://gist.github.com/932f1a4dc800d742ebb11c348d927eac --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 20e65c5ea3ca..02e4672a1aee 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lldpd-${version}"; - version = "0.9.9"; + version = "1.0.1"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; - sha256 = "1nq2z03hbs5qc3kdk3rdxcwcsrxilhcqx7xw3iipc4yj03shi7jy"; + sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5"; }; configureFlags = [ From fd8326aaa9bb89ea3fd8cc8fa53a76c6d081b466 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 21:16:58 -0700 Subject: [PATCH 110/538] libbson: 1.9.3 -> 1.9.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libbson/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.9.4 with grep in /nix/store/120cz3gc3s0hasql1p3zc3sgjzvn4753-libbson-1.9.4 - directory tree listing: https://gist.github.com/da41b1208cf5cb999e6de11ad1fb2fc6 --- pkgs/development/libraries/libbson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6e9b033a976a..6b370f46e70d 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "0dbpmvd2p9bdqdyiijmsc1hd9d6l36migk79smw7fpfvh0y6ldsk"; + sha256 = "01lyikbpqky1ib8g4vhwpb5rjwyzm6g1z24z8m73lk4vcdl65190"; }; nativeBuildInputs = [ cmake ]; From 8564ceac8dd55bd93ca980d6ef915fc7221a005c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:12:46 -0700 Subject: [PATCH 111/538] hwdata: 0.310 -> 0.311 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hwdata/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.311 with grep in /nix/store/gfaiffnb4k4pmszbnv41jxmibvd07v1w-hwdata-0.311 - directory tree listing: https://gist.github.com/a3dcff8ef8aec362a11c36f07277ad0d --- pkgs/os-specific/linux/hwdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 724242c588a1..15b3903ddd1a 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.310"; + version = "0.311"; src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.310.tar.gz"; - sha256 = "08mhwwc9g9cpfyxrwwviflkdk2jnqs6hc95iv4r5d59hqrj5kida"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz"; + sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z"; }; preConfigure = "patchShebangs ./configure"; From 7344356fa0a09daa3d24ba4b6d4222700bf5218c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:31:01 -0700 Subject: [PATCH 112/538] groonga: 8.0.0 -> 8.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/groonga/versions. These checks were done: - built on NixOS - ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga-suggest-create-dataset -h’ got 0 exit code - ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga-suggest-create-dataset --help’ got 0 exit code - ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga -h’ got 0 exit code - ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga --help’ got 0 exit code - ran ‘/nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1/bin/groonga-httpd -h’ got 0 exit code - found 8.0.1 with grep in /nix/store/q7ml0yi4cgbk80hzsps8ili5c6iypp4r-groonga-8.0.1 - directory tree listing: https://gist.github.com/082e5c57cc92d0367e65c277e2f6dd90 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index e3555d0076f6..063ad8c3f576 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "14il1biqpx5qs5dkmsrikw33pc8gj8scmr90y639wap87z5i3dcz"; + sha256 = "074r71dcv1l8rm6an7b8iyfpcxbk00iysmzszssknqg8mrqvsphg"; }; buildInputs = with stdenv.lib; From c03cb44ad1e04b964f0026265b5e09181587e22e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:48:52 -0700 Subject: [PATCH 113/538] fox_1_6: 1.6.56 -> 1.6.57 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fox/versions. These checks were done: - built on NixOS - ran ‘/nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57/bin/reswrap -h’ got 0 exit code - ran ‘/nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57/bin/reswrap --help’ got 0 exit code - ran ‘/nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57/bin/fox-config --version’ and found version 1.6.57 - found 1.6.57 with grep in /nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57 - directory tree listing: https://gist.github.com/baa2d8696211116ff0be92b664965741 --- pkgs/development/libraries/fox/fox-1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index a0ba95480129..4f1e0eaee7fb 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -3,7 +3,7 @@ , CoreServices }: let - version = "1.6.56"; + version = "1.6.57"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - sha256 = "1ckcb12gblz1ad1371ah1qirxn3r9zdngh9w0357hsqfmkyfa5y5"; + sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5"; }; buildInputs = [ From 7fc3e0e0cfd9d5e896a553269d9dad7a65ee2e4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 00:16:27 -0700 Subject: [PATCH 114/538] fail2ban: 0.10.2 -> 0.10.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fail2ban/versions. These checks were done: - built on NixOS - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-python -h’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-python --help’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-client-wrapped -h’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-client-wrapped --help’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-client -h’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-client --help’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-regex-wrapped -h’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-regex-wrapped --help’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-regex -h’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-regex --help’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-server-wrapped -h’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-server-wrapped --help’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-server -h’ got 0 exit code - ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-server --help’ got 0 exit code - found 0.10.3.1 with grep in /nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1 - directory tree listing: https://gist.github.com/3b1b92178d21ce7b05d59b7e88a6620c --- pkgs/tools/security/fail2ban/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 23061b6962e8..30e8d4303dc1 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.10.2"; in +let version = "0.10.3.1"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1asn9gp0ybz6fak991vki9vln4ijramvr13rbwpxyj5wfmnh05r5"; + sha256 = "03gljmqykwwvwxcfhqqfccmnsjhsl93052i38r9mf7hj4jj8v7x5"; }; propagatedBuildInputs = [ gamin ] From 2db78d5be6d21e9d15e9c783d4cf20403f7abd33 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 00:28:41 -0700 Subject: [PATCH 115/538] chrony: 3.2 -> 3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chrony/versions. These checks were done: - built on NixOS - ran ‘/nix/store/d5v3k2h8rdhxzyg4my66nrr0zhdhzvaw-chrony-3.3/bin/chronyc --help’ got 0 exit code - ran ‘/nix/store/d5v3k2h8rdhxzyg4my66nrr0zhdhzvaw-chrony-3.3/bin/chronyc help’ got 0 exit code - ran ‘/nix/store/d5v3k2h8rdhxzyg4my66nrr0zhdhzvaw-chrony-3.3/bin/chronyd -h’ got 0 exit code - ran ‘/nix/store/d5v3k2h8rdhxzyg4my66nrr0zhdhzvaw-chrony-3.3/bin/chronyd --help’ got 0 exit code - found 3.3 with grep in /nix/store/d5v3k2h8rdhxzyg4my66nrr0zhdhzvaw-chrony-3.3 - directory tree listing: https://gist.github.com/60dede830d6efc2bf29be2b4983e4c97 --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 5ddb663a4ae5..1299c5eea5f3 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "05j17i1zlg19v8jkzlp710kbdgnb4541zgkqxqzcwglcvlc6g7rj"; + sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd"; }; buildInputs = [ readline texinfo nss nspr ] From 82058196299ce102eefc3b004173ce8d6282edfc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 00:45:18 -0700 Subject: [PATCH 116/538] efibootmgr: 15 -> 16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/efibootmgr/versions. These checks were done: - built on NixOS - ran ‘/nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16/bin/efibootdump --help’ got 0 exit code - ran ‘/nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16/bin/efibootdump help’ got 0 exit code - ran ‘/nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16/bin/efibootmgr -h’ got 0 exit code - ran ‘/nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16/bin/efibootmgr --help’ got 0 exit code - ran ‘/nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16/bin/efibootmgr help’ got 0 exit code - ran ‘/nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16/bin/efibootmgr -V’ and found version 16 - ran ‘/nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16/bin/efibootmgr --version’ and found version 16 - found 16 with grep in /nix/store/vfs7k6wfqa5xci24ckn8i28qkksw7wam-efibootmgr-16 - directory tree listing: https://gist.github.com/d9d04d34e09782b7b051fbc60d7793aa --- pkgs/tools/system/efibootmgr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 08cdec72c5b9..fbce70e9e8ea 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efibootmgr-${version}"; - version = "15"; + version = "16"; nativeBuildInputs = [ pkgconfig ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "rhboot"; repo = "efibootmgr"; rev = version; - sha256 = "0z7h1dirp8za6lbbf4f3dzn7l1px891rdymhkbqc10yj6gi1jpqp"; + sha256 = "0b27h8vf1b6laln5n0wk2hkzyyh87sxanj7wrz9kimyx03dcq6vi"; }; makeFlags = [ "EFIDIR=nixos" ]; From 65e18bd38fcbf631b799a21bbb86083ac35516d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:12:34 -0700 Subject: [PATCH 117/538] cytoscape: 3.6.0 -> 3.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cytoscape/versions. These checks were done: - built on NixOS - ran ‘/nix/store/87clhargb10b1aps6nq86k0xz6yqyydz-cytoscape-3.6.1/bin/cytoscape -h’ got 0 exit code - ran ‘/nix/store/87clhargb10b1aps6nq86k0xz6yqyydz-cytoscape-3.6.1/bin/cytoscape --help’ got 0 exit code - found 3.6.1 with grep in /nix/store/87clhargb10b1aps6nq86k0xz6yqyydz-cytoscape-3.6.1 - directory tree listing: https://gist.github.com/8bad808238fc034c5394a80d8a5c1554 --- pkgs/applications/science/misc/cytoscape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 0194ee0b83c0..36c7884d108b 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cytoscape-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz"; - sha256 = "13q8caksbzi6j7xy8v5f0pi6766yfawys6jcm50ng78mnhrv2v97"; + sha256 = "1pkdilv1nw6vvdxk71bwjngr8yafrsqwaqvlakhp8yb342r1jd4s"; }; buildInputs = [jre makeWrapper]; From 4a89e6faf088d27072129a2be143f05793261f87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:13:06 -0700 Subject: [PATCH 118/538] di: 4.44 -> 4.45 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/di/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lywps7y61srkjdi9pr5dv5dwjz8290mk-di-4.45/bin/mi -h’ got 0 exit code - ran ‘/nix/store/lywps7y61srkjdi9pr5dv5dwjz8290mk-di-4.45/bin/mi --help’ got 0 exit code - ran ‘/nix/store/lywps7y61srkjdi9pr5dv5dwjz8290mk-di-4.45/bin/di -h’ got 0 exit code - ran ‘/nix/store/lywps7y61srkjdi9pr5dv5dwjz8290mk-di-4.45/bin/di --help’ got 0 exit code - found 4.45 with grep in /nix/store/lywps7y61srkjdi9pr5dv5dwjz8290mk-di-4.45 - directory tree listing: https://gist.github.com/1cd553895ef02afdac0366bfee9f022e --- pkgs/tools/system/di/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 8bc94b64be99..54c9bbb14060 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "di-${version}"; - version = "4.44"; + version = "4.45"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "0803lp8kd3mp1jcm17i019xiqxdy85hhs6xk67zib8gmvg500gcn"; + sha256 = "18z56rprhpm6y0s7pqs19yf7ilq7n50020qzxdm9yra77ivdr09z"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; From f180c93b9560ce383e8995f1e3b4606eee4cd5c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:33:03 -0700 Subject: [PATCH 119/538] alsaTools: 1.1.5 -> 1.1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-tools/versions. These checks were done: - built on NixOS - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/as10k1 -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/as10k1 --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/echomixer -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/echomixer --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/echomixer help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/sscape_ctl -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/sscape_ctl --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/hdajacksensetest -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/hdajacksensetest --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/hdsploader -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/hdsploader --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/hdsploader help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/lo10k1 -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/lo10k1 --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/cspctl -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/cspctl --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/dl10k1 -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/dl10k1 --help’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/ld10k1 -h’ got 0 exit code - ran ‘/nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6/bin/ld10k1 --help’ got 0 exit code - found 1.1.6 with grep in /nix/store/b9byiplg5vv8gs42kl9kc24cqa0m3q6f-alsa-tools-1.1.6 - directory tree listing: https://gist.github.com/52572b1174e43598c17cb9679c3256f0 --- pkgs/os-specific/linux/alsa-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index d1cae06d7fff..67cae46164fc 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "alsa-tools-${version}"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2" "http://alsa.cybermirror.org/tools/${name}.tar.bz2" ]; - sha256 = "0d6m5dm5yskfr6q42cv1ihp5lfgv4a67nj39gpp26ll3vrknag5w"; + sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n"; }; nativeBuildInputs = [ pkgconfig ]; From ad0045db87f997c02eb0e5e317f61601c7b31882 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:54:38 -0700 Subject: [PATCH 120/538] altcoins.bitcoin-abc: 0.16.2 -> 0.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bitcoin-abc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0/bin/bitcoind -h’ got 0 exit code - ran ‘/nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0/bin/bitcoind --help’ got 0 exit code - ran ‘/nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0/bin/bitcoin-cli -h’ got 0 exit code - ran ‘/nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0/bin/bitcoin-cli --help’ got 0 exit code - ran ‘/nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0/bin/bitcoin-tx -h’ got 0 exit code - ran ‘/nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0/bin/bitcoin-tx --help’ got 0 exit code - ran ‘/nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0/bin/test_bitcoin --help’ got 0 exit code - found 0.17.0 with grep in /nix/store/vwqhg8q3z2dd624hwhfgi5w0n26674xm-bitcoin-abc-0.17.0 - directory tree listing: https://gist.github.com/986ce04c77ecd347fc83c78829ee2005 --- pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 219ab5d4f805..35488732117d 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0d5npn4p321jqsbqjxkbv0ncvs2hp9vdp30np6n8n53f896cxl92"; + sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; From 479d38c588c5455cbc2f038c607ebb6e29eb8445 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:56:24 -0700 Subject: [PATCH 121/538] certbot: 0.22.2 -> 0.23.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/certbot/versions. These checks were done: - built on NixOS - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot -h’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot --help’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot help’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/certbot --version’ and found version 0.23.0 - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped help’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/..certbot-wrapped-wrapped --version’ and found version 0.23.0 - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped -h’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped --help’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped help’ got 0 exit code - ran ‘/nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0/bin/.certbot-wrapped --version’ and found version 0.23.0 - found 0.23.0 with grep in /nix/store/nfz2crys8022jwc4caw7z8sm5ldpq265-certbot-0.23.0 - directory tree listing: https://gist.github.com/16960558211e845b02775a58c7aef6ce --- pkgs/tools/admin/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index bf2b4ac6799d..3106552a6610 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { name = "certbot-${version}"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; - sha256 = "08x80x9d71j84mwjm5wzd0x5gcw6gwyvkvadi2js39js6hfnc6jg"; + sha256 = "0dv9d1byppnvx54rhi2w3gqjk01444m5hbr9553n9gin4ribviii"; }; propagatedBuildInputs = with pythonPackages; [ From c3c91b0153287037e3f0eb2befa4a05d04b4ee1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 02:02:09 -0700 Subject: [PATCH 122/538] alsaPlugins: 1.1.5 -> 1.1.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-plugins/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.1.6 with grep in /nix/store/cak73591y0nnrnqw3ls6cpg59d73y5s1-alsa-plugins-1.1.6 - directory tree listing: https://gist.github.com/2e3b209cae378a23684ba6f7b276a4b4 --- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index dc11d21ff1cb..f57f84b293b5 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.1.5"; + name = "alsa-plugins-1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "073zpgvj4pldmzqq97l40wngvbqnvrkc8yw153mgny9kypwaazbr"; + sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg"; }; # ToDo: a52, etc.? From ba08d7ed063d2e1d6919b0a012aae602a6cf2fbd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 02:04:51 -0700 Subject: [PATCH 123/538] burp: 2.1.30 -> 2.1.32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/burp/versions. These checks were done: - built on NixOS - ran ‘/nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32/bin/vss_strip help’ got 0 exit code - ran ‘/nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32/bin/bedup -V’ and found version 2.1.32 - ran ‘/nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32/bin/bsparse -V’ and found version 2.1.32 - ran ‘/nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32/bin/burp -v’ and found version 2.1.32 - ran ‘/nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32/bin/burp_ca -h’ got 0 exit code - ran ‘/nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32/bin/burp_ca --help’ got 0 exit code - ran ‘/nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32/bin/burp_ca help’ got 0 exit code - found 2.1.32 with grep in /nix/store/byii5dn5c62s50mg7gz2vjiqhgwa4wlb-burp-2.1.32 - directory tree listing: https://gist.github.com/04574e27524ea2d8cf54af1b381a7277 --- pkgs/tools/backup/burp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 24065f7308b7..c079d8272b12 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.1.30"; + version = "2.1.32"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "0l9zcw50zr081ddspl6vnh6d6cwyzgqzg7n5pq92dwbmd64qpz9p"; + sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 3f78f4c64ef6db0e8885ee5ce85a72a169923429 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 02:32:47 -0700 Subject: [PATCH 124/538] alsaOss: 1.0.28 -> 1.1.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alsa-oss/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.1.6 with grep in /nix/store/x4l70759q1c4gjq4h8prws3swww92z81-alsa-oss-1.1.6 - directory tree listing: https://gist.github.com/f16ebb93572b01d112dfe2b8d92d4b65 --- pkgs/os-specific/linux/alsa-oss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 0d02daebe1d7..5cd937a37928 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-oss-1.0.28"; + name = "alsa-oss-1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2" "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2" ]; - sha256 = "1mbabiywxjjlvdh257j3a0v4vvy69mwwnvc3xlq7pg50i2m2rris"; + sha256 = "1sj512wyci5qv8cisps96xngh7y9r5mv18ybqnazy18zwr1zgly3"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; From 81bd50ecb34045ff1d5ff85f12abdad7f6f5dcec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 07:15:35 -0700 Subject: [PATCH 125/538] apktool: 2.3.1 -> 2.3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apktool/versions. These checks were done: - built on NixOS - ran ‘/nix/store/dhjjw9xk7rx4gm6ngpgbf5kdhcgaxdgw-apktool-2.3.2/bin/apktool -h’ got 0 exit code - ran ‘/nix/store/dhjjw9xk7rx4gm6ngpgbf5kdhcgaxdgw-apktool-2.3.2/bin/apktool --help’ got 0 exit code - ran ‘/nix/store/dhjjw9xk7rx4gm6ngpgbf5kdhcgaxdgw-apktool-2.3.2/bin/apktool help’ got 0 exit code - ran ‘/nix/store/dhjjw9xk7rx4gm6ngpgbf5kdhcgaxdgw-apktool-2.3.2/bin/apktool --version’ and found version 2.3.2 - found 2.3.2 with grep in /nix/store/dhjjw9xk7rx4gm6ngpgbf5kdhcgaxdgw-apktool-2.3.2 - directory tree listing: https://gist.github.com/7989c4dc760bbeb74791e11fb1bbebb1 --- pkgs/development/tools/apktool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index d1320960f39a..65211ca088b4 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "01xj2hivwwp3msvv0psxyxrzg95vj2ny56l3n90glhwznn7l60ai"; + sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4"; }; phases = [ "installPhase" ]; From 23a1b1264ddc6369e385ebdfa612394017780a4e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 11 Apr 2018 14:01:07 -0400 Subject: [PATCH 126/538] add worldofpeace as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5f47c859a8ec..b6a79427b168 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3971,6 +3971,11 @@ github = "womfoo"; name = "Kranium Gikos Mendoza"; }; + worldofpeace = { + email = "worldofpeace@users.noreply.github.com"; + github = "worldofpeace"; + name = "Worldofpeace"; + }; wscott = { email = "wsc9tt@gmail.com"; github = "wscott"; From 32cf225ad9ba75bc08e499ba7d4aad0cc9c703ca Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 21:14:16 +0200 Subject: [PATCH 127/538] giac: enable checks, separate outputs --- .../science/math/giac/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 6acaa4067440..dd92e264889f 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texlive, bison, flex +{ stdenv, fetchurl, fetchpatch, texlive, bison, flex , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas , readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null @@ -16,6 +16,15 @@ stdenv.mkDerivation rec { sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk"; }; + patches = stdenv.lib.optionals (!enableGUI) [ + # when enableGui is false, giac is compiled without fltk. That means some + # outputs differ in the make check. Patch around this: + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; + sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw"; + }) + ]; + postPatch = '' for i in doc/*/Makefile*; do substituteInPlace "$i" --replace "/bin/cp" "cp"; @@ -37,10 +46,11 @@ stdenv.mkDerivation rec { libGLU_combined fltk xorg.libX11 ]; - outputs = [ "out" ]; + outputs = [ "out" "doc" ]; + + doCheck = true; enableParallelBuilding = true; - hardeningDisable = [ "format" "bindnow" "relro" ]; configureFlags = [ "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" @@ -57,6 +67,13 @@ stdenv.mkDerivation rec { for file in $(find $out -name Makefile) ; do sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ; done; + + # reference cycle + rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile + + mkdir -p "$doc/share/giac" + mv "$out/share/giac/doc" "$doc/share/giac" + mv "$out/share/giac/examples" "$doc/share/giac" ''; meta = with stdenv.lib; { From 4fddb8b9c3ee137f45ce3d3f79d5fb66c80843a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 12 Apr 2018 01:35:14 +0200 Subject: [PATCH 128/538] dovecot module: test dovecot's LDA That's apparently not enough to catch the bug I ran into with the update to 2.3.1, but at least it will check the LDA appears to work. --- nixos/tests/dovecot.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix index 3814855ed8e7..156079d1d585 100644 --- a/nixos/tests/dovecot.nix +++ b/nixos/tests/dovecot.nix @@ -18,6 +18,18 @@ import ./make-test.nix { MAIL ''; + sendTestMailViaDeliveryAgent = pkgs.writeScriptBin "send-lda" '' + #!${pkgs.stdenv.shell} + + exec ${pkgs.dovecot}/libexec/dovecot/deliver -d bob <waitForUnit('postfix.service'); $machine->waitForUnit('dovecot2.service'); $machine->succeed('send-testmail'); + $machine->succeed('send-lda'); $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]'); $machine->succeed('test-imap'); $machine->succeed('test-pop'); From 7c3475563b331dc75487126a42fe63ce50ed13d2 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Thu, 12 Apr 2018 15:55:46 +0800 Subject: [PATCH 129/538] ipfs 0.4.13 -> 0.4.14 --- pkgs/applications/networking/ipfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 74c19b07aaa9..4153d527b9ff 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.13"; + version = "0.4.14"; rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "150lhf5999jz0nck5s0fs0fp3pgaj85s7dndh68h9caw1fwpwb4f"; + sha256 = "0gad5y5clkrk5jsjj9gmrlnx8kbn2vg50vka1b8jg7b55hdvvlcg"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "103mlsnqfnnqxh4phr192haaiv98d1bwpvca1sqrxz1216r5x0ik"; + sha256 = "0wvjw8jziwhvfwhksg26qlj2irznl5bs2yll9jkv335pnwb5qi3v"; }; meta = with stdenv.lib; { From 54dc22f6efeecc46655d5c986b136a8cfbe77621 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 21:57:09 +0200 Subject: [PATCH 130/538] altcoins.dcrd: mark broken on linux builds on darwin --- pkgs/applications/altcoins/dcrd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix index 8a8c4a7f1021..cc3e83befa64 100644 --- a/pkgs/applications/altcoins/dcrd.nix +++ b/pkgs/applications/altcoins/dcrd.nix @@ -29,5 +29,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } From d0d320803e93fccc40d89b5cc03903b462cf43ab Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:02:41 +0200 Subject: [PATCH 131/538] altcoins.dcrwallet: mark broken on linux builds on darwin --- pkgs/applications/altcoins/dcrwallet.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix index aa6e8a0315e7..8d966684b23c 100644 --- a/pkgs/applications/altcoins/dcrwallet.nix +++ b/pkgs/applications/altcoins/dcrwallet.nix @@ -38,5 +38,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } From 4af83283cd86d493960595d615c9d4f315a93cc7 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:07:33 +0200 Subject: [PATCH 132/538] altcoins.hevm: mark as broken --- pkgs/applications/altcoins/hevm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix index 51e5f6bcb298..1aa598f32545 100644 --- a/pkgs/applications/altcoins/hevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -55,6 +55,7 @@ lib.overrideDerivation (mkDerivation rec { description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; maintainers = [stdenv.lib.maintainers.dbrock]; + broken = true; # 2018-04-10 }) (attrs: { buildInputs = attrs.buildInputs ++ [solc]; nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper]; From dc3aeab7531d881f9937dc5b0793cfbb3dbe4f63 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:23:49 +0200 Subject: [PATCH 133/538] antimicro: mark as broken --- pkgs/tools/misc/antimicro/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index ee0accac2d9b..62d46bba5b0d 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -22,5 +22,6 @@ mkDerivation rec { maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; platforms = with platforms; linux; + broken = true; # 2018-04-10 }; } From 535f2eeea51110ca8d5b7f26ae1b86d06721da29 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:27:14 +0200 Subject: [PATCH 134/538] ao: mark as broken --- pkgs/applications/graphics/ao/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index d415df1bae80..f51777bdbf73 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+ maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } From 1fc55ad414be5985a5fa98a6dc8734db5b416bcc Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:29:56 +0200 Subject: [PATCH 135/538] avarice: mark as broken --- pkgs/development/tools/misc/avarice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index ca6cb14c2a43..a8f6426a3b7b 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } From d8627004861019d589c1ca4aaee16c40df816473 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:31:44 +0200 Subject: [PATCH 136/538] avxsynth: mark as broken --- pkgs/applications/video/avxsynth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 06dcaf31b443..3a595da96d07 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel viric ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } From 51cc22c14aa3954e67feb6b88df11a22d4d0b372 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:42:52 +0200 Subject: [PATCH 137/538] client-ip-echo: mark as broken --- pkgs/servers/misc/client-ip-echo/client-ip-echo.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index 08c08d7d3c16..92bbc309ed3d 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -13,4 +13,5 @@ mkDerivation { executableHaskellDepends = [ base bytestring network ]; description = "accepts TCP connections and echoes the client's IP address back to it"; license = stdenv.lib.licenses.lgpl3; + broken = true; # 2018-04-10 } From ccbefc66bbe528f70fd77a69b30d9d9838638249 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 22:54:46 +0200 Subject: [PATCH 138/538] cpp_ethereum: mark as broken --- pkgs/applications/misc/cpp-ethereum/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 857254c3cb03..33b16e3242c6 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } From b82170a1bc3520cd8a6c79f70a1292d422ed263b Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 23:11:20 +0200 Subject: [PATCH 139/538] dvb_apps: mark as broken --- pkgs/applications/video/dvb-apps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 8ceb7875be4d..1e671b4ea7bf 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = https://linuxtv.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; + broken = true; # 2018-04-10 }; } From 0defae41cf09c5f5f7d674e12280708635c5b716 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 23:19:16 +0200 Subject: [PATCH 140/538] gencfsm: mark as broken --- pkgs/tools/security/gencfsm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 7f6f28593d20..3a9c81df2343 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.spacefrogg ]; + broken = true; # 2018-04-10 }; } From 96cf58abf4647a272eb3aa5906ca4d3eefd51522 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 23:34:03 +0200 Subject: [PATCH 141/538] gnokii: mark as broken --- pkgs/tools/misc/gnokii/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index adad66c9bfa4..eb029d32f73e 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnokii.org; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } From 11a7c29004216ecd3fa99e7840106dfa8f7bfaa4 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 23:50:56 +0200 Subject: [PATCH 142/538] ignition.transport: mark as broken --- pkgs/development/libraries/ignition-transport/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 639af2dd2089..3568edb7890c 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ pxc ]; platforms = platforms.all; + broken = true; # 2018-04-10 }; } From 5ee52f9d4e620c908a733070b2e9fab668678f4a Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 23:55:41 +0200 Subject: [PATCH 143/538] imatix_gsl: mark broken on linux --- pkgs/development/tools/imatix_gsl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 61f211b95802..1d7b22ac5ee0 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "A universal code generator"; platforms = platforms.unix; maintainers = [ maintainers.moosingin3space ]; + broken = stdenv.isLinux; # 2018-04-10 }; } From 68c15ceaa8305ff11f110b226679fa6776782cb7 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 00:20:12 +0200 Subject: [PATCH 144/538] jamomacore: mark as broken --- pkgs/development/libraries/audio/jamomacore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 7057b020d429..4e316ff1c991 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } From 1f8712c00bea3ae35595bea31412d9c0e3098ac3 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 00:23:38 +0200 Subject: [PATCH 145/538] julia_04: mark as broken --- pkgs/development/compilers/julia/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a263703ffa5d..b5a3a8c6be2d 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; + #broken = stdenv.isi686; + broken = true; # 2018-04-10 }; } From 2456b4e4a51073b5cff640f54328240ca315f7fa Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 00:55:29 +0200 Subject: [PATCH 146/538] qtstyleplugin-kvantum: mark as broken --- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 5085d9bf5ef9..e81368b216f0 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; + broken = true; # 2018-04-10 }; } From a13945e1a24919405d3929ab3f96ec07c217dd68 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 01:02:55 +0200 Subject: [PATCH 147/538] lispPackages.postmodern: mark as broken --- pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 0c12f169cf7b..111d99527498 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -158,4 +158,9 @@ $out/lib/common-lisp/query-fs" deps = pkgs.lib.filter (x: x.name != quicklisp-to-nix-packages.buildnode-xhtml.name) x.deps; parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; }; + postmodern = x: { + overrides = y : (x.overrides y) // { + meta.broken = true; # 2018-04-10 + }; + }; } From db409adaace9eb1d5698af357a18080ee0e76afc Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 01:15:18 +0200 Subject: [PATCH 148/538] meshlab: mark as broken --- pkgs/applications/graphics/meshlab/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index adb1ec29237e..eaaabe8fd395 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -61,5 +61,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; # 2018-04-11 }; } From 9768b0457a82cdab882e3547d44fbc1569770c28 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 01:17:23 +0200 Subject: [PATCH 149/538] mht2htm: mark as broken --- pkgs/tools/misc/mht2htm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix index 930fd1e5d3ec..4f6c4bad97c7 100644 --- a/pkgs/tools/misc/mht2htm/default.nix +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -39,5 +39,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + broken = true; # 2018-04-11 }; } From 386772b665a51b90faaec2e4f8843c428e65455d Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 01:19:25 +0200 Subject: [PATCH 150/538] mi2ly: mark as broken --- pkgs/applications/audio/mi2ly/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index fa4ea6343e91..4dfc7b13046e 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-11 }; } From 1ca9e4ae4ce372ee8ed5c91295883f9ef9e8e481 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 01:20:44 +0200 Subject: [PATCH 151/538] mstflint: mark as broken --- pkgs/tools/misc/mstflint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 9706e3f02882..748c0917defb 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; + broken = true; # 2018-04-11 }; } From 3edb293d8a6c4fbea1da21d4c4361f59ffcb004f Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 01:23:17 +0200 Subject: [PATCH 152/538] ndn-cxx: mark as broken --- pkgs/development/libraries/ndn-cxx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee7d4765fb22..1040cb9a9343 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.lgpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.sjmackenzie ]; + broken = true; # 2018-04-11 }; } From d63702a47374e5bcb5373c0f415dca351eb3e78b Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:31:38 +0200 Subject: [PATCH 153/538] openmvg: mark as broken --- pkgs/applications/science/misc/openmvg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index fb3b0a29724b..b139f30b3d18 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ mdaiter ]; + broken = true; # 2018-04-11 }; } From 8146cf699a94ad57944deefc0b5b1a687068958f Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:36:35 +0200 Subject: [PATCH 154/538] ori: mark as broken --- pkgs/tools/backup/ori/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index d95716864c88..279652b0cd0b 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://ori.scs.stanford.edu/; license = licenses.mit; platforms = platforms.unix; + broken = true; # 2018-04-11 }; } From 48573657b5191790761887246efe8292de68d1c6 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:37:46 +0200 Subject: [PATCH 155/538] osquery: mark as broken --- pkgs/tools/system/osquery/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index c06ba8e541b7..44d5bcf5f38a 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; # 2018-04-11 }; } From eb9a133eb67bc7adb46741931c2103548218f5f2 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:39:07 +0200 Subject: [PATCH 156/538] percona-server: mark as broken --- pkgs/servers/sql/percona/5.6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index fc6c54f82c91..e440f11b2e44 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ grahamc ]; + broken = true; # 2018-04-11 }; } From bc17a66732ba60f7548a8bc263d49aa562445663 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:40:50 +0200 Subject: [PATCH 157/538] pretty: mark as broken --- pkgs/development/libraries/agda/pretty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index 25e6ff6667fe..0e4f1da6e140 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -21,5 +21,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ fuuzetsu ]; + broken = true; # 2018-04-11 }; }) From 6c2b87fd3c50d5fa72af3ac63fdb3704ec23fa23 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:42:18 +0200 Subject: [PATCH 158/538] rapcad: mark as broken --- pkgs/applications/graphics/rapcad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index c8327b9bca19..b300c0071fae 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; description = ''Constructive solid geometry package''; + broken = true; # 2018-04-11 }; } From d7cb688d68c8dbafb6e6249eff5de62afddfbe6b Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:50:42 +0200 Subject: [PATCH 159/538] retdec-full: mark as broken --- pkgs/development/tools/analysis/retdec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index f88546163d44..a4c62e6fc32c 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -116,5 +116,6 @@ in stdenv.mkDerivation rec { homepage = https://retdec.com; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + broken = withPEPatterns; # retdec-full is broken, 2018-04-11 }; } From b5a9656511dc40614765f16d248027f5382da9c1 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:52:48 +0200 Subject: [PATCH 160/538] seeks: mark as broken --- pkgs/tools/networking/p2p/seeks/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index cddfb9621dc5..f11c0a63b07e 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation { stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice + broken = true; # 2018-04-11 }; } From af555f8f2165cc2e4b9463eddb4ea73c5cc14c92 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:54:31 +0200 Subject: [PATCH 161/538] stumpwm, stumpwm-git: mark as broken --- pkgs/applications/window-managers/stumpwm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index e7427fa7763a..117d4fe1d6a8 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; + broken = true; # 2018-04-11 }; } From 68665427510bb8350decd031a3652538b3958ac8 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 11:58:39 +0200 Subject: [PATCH 162/538] torchPackages.{sundown,lbase64}: mark as broken --- .../science/machine-learning/torch/torch-distro.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 91adb5283fdc..a4247eac627b 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -131,6 +131,7 @@ let name = "sundown"; src = "${distro_src}/pkg/sundown"; rockspec = "rocks/${name}-scm-1.rockspec"; + meta.broken = true; # 2018-04-11 }; cwrap = buildLuaRocks rec { @@ -289,6 +290,7 @@ let rev = "1e9e4f1e0bf589a0ed39f58acc185ec5e213d207"; sha256 = "1i1fpy9v6r4w3lrmz7bmf5ppq65925rv90gx39b3pykfmn0hcb9c"; }; + meta.broken = true; # 2018-04-11 }; luuid = stdenv.mkDerivation rec { From db872b1bc1801de516a60973a79316acc1ffdc83 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 13:04:24 +0200 Subject: [PATCH 163/538] python27Packages.caldavclientlibrary-asynk: mark as broken --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e90405cd2e7..dee8007b4b62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1034,6 +1034,7 @@ in { homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/; maintainers = with maintainers; [ pjones ]; + broken = true; # 2018-04-11 }; }; From c307e5b0f3523ff7a96a5f56b9031193e3a7cddb Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 13:11:56 +0200 Subject: [PATCH 164/538] pythonPackages.dynd: disable on python2 tests fail on python2 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dee8007b4b62..d1836850329c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8888,7 +8888,7 @@ in { dynd = buildPythonPackage rec { version = "0.7.2"; name = "dynd-${version}"; - disabled = isPyPy; + disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11 src = pkgs.fetchFromGitHub { owner = "libdynd"; From ac7d4661074b062220f336d8b3493f8839e4f9ce Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 13:26:30 +0200 Subject: [PATCH 165/538] pythonPackages.pycapnp: mark as broken --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1836850329c..3bc24631e12f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10572,6 +10572,7 @@ in { license = licenses.bsd2; platforms = platforms.all; homepage = "http://jparyani.github.io/pycapnp/index.html"; + broken = true; # 2018-04-11 }; }; From 0925b16a20380fc3561e29e858a9a6035b68ba46 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 13:31:32 +0200 Subject: [PATCH 166/538] pythonPackages.pyocr: disable on python2 doesn't build --- pkgs/development/python-modules/pyocr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index e253e64a41ca..c30d80a00155 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,11 +1,12 @@ { lib, fetchFromGitHub, buildPythonPackage, pillow, six -, tesseract, cuneiform +, tesseract, cuneiform, isPy3k }: buildPythonPackage rec { pname = "pyocr"; version = "0.4.7"; name = pname + "-" + version; + disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. src = fetchFromGitHub { From db93c68f80a91bafbac4c6c556da6b9ab62b39a0 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 13:44:01 +0200 Subject: [PATCH 167/538] pythonPackages.serversyncstorage: mark as broken --- pkgs/development/python-modules/serversyncstorage/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 40a580877af5..1d9274610dad 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -35,4 +35,8 @@ buildPythonPackage rec { pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; + + meta = { + broken = true; # 2018-11-04 + }; } From cc648ab387eac2f22d2db67b9a9fd8e1a956dbe7 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 13:47:20 +0200 Subject: [PATCH 168/538] pythonPackages.weboob: mark as broken --- pkgs/development/python-modules/weboob/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index b71e4d3a4fff..a4b1b9c467a4 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = stdenv.lib.licenses.agpl3; + broken = true; # 2018-04-11 }; } From efbd773828d0bc992c505401353118883e0008a3 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 22:27:10 +0200 Subject: [PATCH 169/538] pythonPackages.lightblue: disable on python 3 ... build fails --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bc24631e12f..fc50862685a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3395,6 +3395,7 @@ in { pname = "lightblue"; version = "0.4"; name = "${pname}-${version}"; + disabled = isPy3k; # build fails, 2018-04-11 src = pkgs.fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; From cdc293b19b4a5a446f517e735d520daa357b9f14 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 11 Apr 2018 22:33:53 +0200 Subject: [PATCH 170/538] pythonPackages.pyblock: disable on python 3 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc50862685a0..e54a38985b99 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10511,6 +10511,7 @@ in { meta = { description = "Interface for working with block devices"; license = licenses.gpl2Plus; + broken = isPy3k; # doesn't build on python 3, 2018-04-11 }; }; From a82aae30846c9531058a767fd8cab90fd59fafe7 Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 25 Feb 2018 14:22:23 +0100 Subject: [PATCH 171/538] nixos/containers: add extraFlags option to pass extra flags to systemd-nspawn --- nixos/modules/virtualisation/containers.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e54a5fe7d40c..0753aa25ce4a 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -575,6 +575,16 @@ in ''; }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--drop-capability=CAP_SYS_CHROOT" ]; + description = '' + Extra flags passed to the systemd-nspawn command. + See systemd-nspawn(1) for details. + ''; + }; + } // networkOptions; config = mkMerge @@ -714,7 +724,9 @@ in ${optionalString cfg.autoStart '' AUTO_START=1 ''} - EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" + EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts + + optionalString (cfg.extraFlags != []) + (" " + concatStringsSep " " cfg.extraFlags)}" ''; }) config.containers; From b8b3fea5d8d4a5f347d4433c4c93ab71103b676f Mon Sep 17 00:00:00 2001 From: mko Date: Thu, 12 Apr 2018 23:35:24 +0200 Subject: [PATCH 172/538] storm: 1.0.1 -> 1.2.1 --- pkgs/servers/computing/storm/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 0219a1bf7ecb..90c87f8019d0 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "apache-storm-" + version; - version = "1.0.1"; + version = "1.2.1"; src = fetchurl { url = "mirror://apache/storm/${name}/${name}.tar.gz"; - sha256 = "1gr00s0fhf8ci0faf3x5dinkiw9mlnc1x1vqki8cfszvij6w0x0m"; + sha256 = "177dqgbviagrpvalg8h67mwiwwgmiqsg0hh97hcqqcjg71ypnjkv"; }; buildInputs = [ zip unzip jzmq ]; @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { mv examples $out/share/${name}/. rm -f lib/jzmq* || exit 1 - mv lib $out/. - mv external extlib* $out/lib/. + mv external extlib* lib $out/. mv conf bin $out/. mv log4j2 $out/conf/. ''; From 0ab54def16f5c6005f5ee19f51908be16d7d15d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 22:18:15 -0700 Subject: [PATCH 173/538] yaws: 2.0.4 -> 2.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yaws/versions. These checks were done: - built on NixOS - ran ‘/nix/store/jyan70fmxqlifcsfk6zidpbapjnclw8g-yaws-2.0.5/bin/yaws -v’ and found version 2.0.5 - ran ‘/nix/store/jyan70fmxqlifcsfk6zidpbapjnclw8g-yaws-2.0.5/bin/yaws --version’ and found version 2.0.5 - found 2.0.5 with grep in /nix/store/jyan70fmxqlifcsfk6zidpbapjnclw8g-yaws-2.0.5 - directory tree listing: https://gist.github.com/2cc3d4631b98fff26e8453c8e0b92ba8 --- pkgs/servers/http/yaws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index ed7765b15403..aae4589ebbe8 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yaws-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://yaws.hyber.org/download/${name}.tar.gz"; - sha256 = "1ig6q4waqlb6h1hhrly7hslfnqczlbm79vvhr5j7rp5a2p1pfrns"; + sha256 = "00bnvf26xlhm3v3c6jzk5kcdk8jkwr1gbd2f4h329lyrpjsx30my"; }; # The tarball includes a symlink yaws -> yaws-1.95, which seems to be From b4ac50a816ba79d367f81cf2154608dd6f68123b Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Fri, 13 Apr 2018 07:56:04 +0200 Subject: [PATCH 174/538] asterisk: 14.6.1 -> 15.3.0, 13.17.1 -> 13.20.0 --- pkgs/servers/asterisk/default.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index c6cd9f3df4c5..10ffa918e5bd 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -18,10 +18,6 @@ let # This patch changes the runtime behavior to look for state # directories in /var rather than ${out}/var. ./runtime-vardirs.patch - (fetchpatch { - url = "http://sources.debian.net/data/main/a/asterisk/1:13.14.1~dfsg-1/debian/patches/pjsip_unresolved_symbol.patch"; - sha256 = "0i6a6zplvzbjcvxqlmr87jmrfza7c3qx0rlym2nlmzzp2m7qpnfp"; - }) ]; # Disable MD5 verification for pjsip @@ -73,9 +69,9 @@ let }; }; - pjproject-26 = fetchurl { - url = http://www.pjsip.org/release/2.6/pjproject-2.6.tar.bz2; - sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; + pjproject-27 = fetchurl { + url = http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2; + sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; }; mp3-202 = fetchsvn { @@ -88,19 +84,19 @@ in { asterisk-lts = common { - version = "13.17.1"; - sha256 = "0d7vqpkz0wv8d17vi7qxs9j7dbqwf4n80s411qva030hljcmdqdf"; + version = "13.20.0"; + sha256 = "a3d6d953f844867ea11e0be22ee6225049cd4f5870df6ab23454623bcfbc94d5"; externals = { - "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; + "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; "addons/mp3" = mp3-202; }; }; asterisk-stable = common { - version = "14.6.1"; - sha256 = "0xg26p8rx9gw1ym9xdnpxr7bqp0kp76afy7f4ywmh25ki41inz08"; + version = "15.3.0"; + sha256 = "f424f89f23b72f267ff9baab82d449bebbbf00c54e54fcd06b8fca13788b012c"; externals = { - "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; + "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; "addons/mp3" = mp3-202; }; }; From 0b57c3ef214c051279dcaee7143baec72a01a2a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Apr 2018 05:46:32 -0700 Subject: [PATCH 175/538] emby: 3.3.0.0 -> 3.3.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/emby/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.3.1.0 with grep in /nix/store/b5qx498y0lan20ran7ci7wdhlisvy1jd-emby-3.3.1.0 - directory tree listing: https://gist.github.com/eb93cdffbfae9ffe18d439df893237d8 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index eeb3d39fa1da..964fa77c31a9 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.3.0.0"; + version = "3.3.1.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "14nnrlwx8bghiz72lspxahwadhvnf8vs3bqbffnd5nrrv4shijhm"; + sha256 = "04qq3rl3pwxnsr8z6x3dwplh6brn1nd0jpmmnvizln4ffx9wspb8"; }; buildInputs = with pkgs; [ From 04113fb8647c526101cb8685f9adedd79dec154c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 13 Apr 2018 13:47:53 +0200 Subject: [PATCH 176/538] praw: 5.2.0 -> 5.4.0 --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index c0be1009b069..de7e4e3ee12d 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "praw"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "0nwfadczxa1fyq65zc3sfv8g2r4w3xrx3bdi5fv9xpn97wh2ifgw"; + sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; }; propagatedBuildInputs = [ From d20c6ffd657a61ec607467ef1c8c9ced94d0b5ab Mon Sep 17 00:00:00 2001 From: xeji Date: Fri, 13 Apr 2018 17:39:37 +0200 Subject: [PATCH 177/538] Revert "qtstyleplugin-kvantum: mark as broken" No longer broken on master, fixed by version bump in 35049f9e61dd4e87413d137122cced4764f50f2f. This reverts commit 2456b4e4a51073b5cff640f54328240ca315f7fa. --- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index e81368b216f0..5085d9bf5ef9 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; - broken = true; # 2018-04-10 }; } From 4e0a5e253387a51c19e3ce82ac6b30753a769a8f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 13 Apr 2018 18:12:53 +0200 Subject: [PATCH 178/538] eli: init at 4.8.1 --- pkgs/development/compilers/eli/default.nix | 91 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 93 insertions(+) create mode 100644 pkgs/development/compilers/eli/default.nix diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix new file mode 100644 index 000000000000..93e53aa30d13 --- /dev/null +++ b/pkgs/development/compilers/eli/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, fetchurl +, symlinkJoin +, makeWrapper +, tcl +, fontconfig +, tk +, ncurses +, xorg +, file +}: + +let + # eli derives the location of the include folder from the location of the lib folder + tk_combined = symlinkJoin { + name = "tk_combined"; + paths = [ + tk + tk.dev + ]; + }; + curses_combined = symlinkJoin { + name = "curses_combined"; + paths = [ + ncurses + ncurses.dev + ]; + }; +in +stdenv.mkDerivation rec { + name = "eli"; + version = "4.8.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2"; + sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; + }; + + buildInputs = [ + ncurses + fontconfig + ] ++ (with xorg; [ + libX11.dev + libXt.dev + libXaw.dev + libXext.dev + ]); + + nativeBuildInputs = [ + file + makeWrapper + ]; + + # skip interactive browser check + buildFlags = "nobrowsers"; + + + preConfigure='' + configureFlagsArray=( + --with-tcltk="${tcl} ${tk_combined}" + --with-curses="${curses_combined}" + ) + export ODIN_LOCALIPC=1 + ''; + + postInstall = '' + wrapProgram "$out/bin/eli" \ + --set ODIN_LOCALIPC 1 + ''; + + # Test if eli starts + doInstallCheck = true; + installCheckPhase = '' + export HOME="$TMP/home" + mkdir -p "$HOME" + $out/bin/eli "!ls" + ''; + + meta = { + description = "Translator Construction Made Easy"; + longDescription = '' + Eli is a programming environment that supports all phases of translator + construction with extensive libraries implementing common tasks, yet handling + arbitrary special cases. Output is the C subset of C++. + ''; + homepage = http://eli-project.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ timokau ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fd53aefa54c..640d1f963a27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5986,6 +5986,8 @@ with pkgs; ecl = callPackage ../development/compilers/ecl { }; ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; + eli = callPackage ../development/compilers/eli { }; + eql = callPackage ../development/compilers/eql {}; elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); From 5a545ca9bdf59c18b123d2a99dccdd1a173a749d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 14 Apr 2018 14:05:09 +0200 Subject: [PATCH 179/538] Fix stdenv-native by creating a bintools wrapper with similar settings --- pkgs/stdenv/native/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 19efac3700a6..78f7a82d2952 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -119,14 +119,23 @@ in }; stdenvNoCC = stdenv; - cc = import ../../build-support/cc-wrapper { - name = "cc-native"; - nativeTools = true; - nativeLibc = true; + cc = let nativePrefix = { # switch "i686-solaris" = "/usr/gnu"; "x86_64-solaris" = "/opt/local/gcc47"; }.${system} or "/usr"; + in + import ../../build-support/cc-wrapper { + name = "cc-native"; + nativeTools = true; + nativeLibc = true; + inherit nativePrefix; + bintools = import ../../build-support/bintools-wrapper { + name = "bintools"; + inherit stdenvNoCC nativePrefix; + nativeTools = true; + nativeLibc = true; + }; inherit stdenvNoCC; }; From a7adffdd47dbf0be6c1ad08295c28b0de1e75adf Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 14 Apr 2018 14:06:09 +0200 Subject: [PATCH 180/538] Fix invalid Baseaddress must be > 0x200000000 on cygwin --- pkgs/stdenv/cygwin/rebase-x86_64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh index 77adc52d53b6..4c8f8ebd7eb2 100644 --- a/pkgs/stdenv/cygwin/rebase-x86_64.sh +++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh @@ -8,7 +8,7 @@ _cygwinFixAutoImageBase() { if [ -f /etc/rebasenix.nextbase ]; then NEXTBASE="$( Date: Sat, 14 Apr 2018 13:51:41 -0700 Subject: [PATCH 181/538] quakespasm, vkquake: enable userdirs support --- pkgs/games/quakespasm/default.nix | 14 ++++++++------ pkgs/games/quakespasm/vulkan.nix | 8 +++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index be480009b8a6..45c3deef172f 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -10,30 +10,32 @@ stdenv.mkDerivation rec { }; sourceRoot = "${name}/Quake"; - + buildInputs = [ gzip SDL libvorbis libmad ]; + buildFlags = [ "DO_USERDIRS=1" ]; + preInstall = '' mkdir -p "$out/bin" substituteInPlace Makefile --replace "/usr/local/games" "$out/bin" ''; enableParallelBuilding = true; - + meta = { description = "An engine for iD software's Quake"; homepage = http://quakespasm.sourceforge.net/; longDescription = '' QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. - It includes support for 64 bit CPUs and custom music playback, a new sound driver, + It includes support for 64 bit CPUs and custom music playback, a new sound driver, some graphical niceities, and numerous bug-fixes and other improvements. - Quakespasm utilizes either the SDL or SDL2 frameworks, so choose which one - works best for you. SDL is probably less buggy, but SDL2 has nicer features + Quakespasm utilizes either the SDL or SDL2 frameworks, so choose which one + works best for you. SDL is probably less buggy, but SDL2 has nicer features and smoother mouse input - though no CD support. ''; - + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.m3tti ]; }; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 675c2ab4b4d8..d53977448f63 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { }; sourceRoot = "source/Quake"; - + buildInputs = [ makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev ]; + buildFlags = [ "DO_USERDIRS=1" ]; + preInstall = '' mkdir -p "$out/bin" ''; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - + meta = { description = "Vulkan Quake port based on QuakeSpasm"; homepage = src.meta.homepage; @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { passes & sub passes, pipeline barriers & synchronization, compute shaders, push & specialization constants, CPU/GPU parallelism and memory pooling. ''; - + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.gnidorah ]; }; From 642c8a8d8dae5047d5020578d36558a3dea465ce Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 12 Mar 2018 23:25:28 +0800 Subject: [PATCH 182/538] nixos ddclient: support multiple domains and run via systemd timer a) Some providers can update multiple domains - support that. b) Make "zone" and "script" configurable. Some providers require these. c) Instead of leaving the ddclient daemon running all the time, use a systemd timer to kick it off. d) Don't use a predefined user - run everything via DynamicUser e) Add documentation --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/rename.nix | 2 + .../modules/services/networking/ddclient.nix | 114 +++++++++--------- pkgs/tools/networking/ddclient/default.nix | 6 + 4 files changed, 70 insertions(+), 56 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 39a24cfecc53..0aad2e7adc2a 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -56,7 +56,7 @@ #dialout = 27; # unused polkituser = 28; #utmp = 29; # unused - ddclient = 30; + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; #disnix = 33; # unused osgi = 34; @@ -343,7 +343,7 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; - ddclient = 30; + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; disnix = 33; osgi = 34; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 489d7d8b9b50..dbd671029509 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -22,6 +22,8 @@ with lib; (config: let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config; in if enabled then [ pkgs.gutenprint ] else [ ])) + (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]) + (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 9e56545f746c..9a2e13e9553c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -3,24 +3,24 @@ let cfg = config.services.ddclient; boolToStr = bool: if bool then "yes" else "no"; + dataDir = "/var/lib/ddclient"; configText = '' # This file can be used as a template for configFile or is automatically generated by Nix options. - daemon=${toString cfg.interval} - cache=${cfg.homeDir}/ddclient.cache - pid=/run/ddclient/ddclient.pid - foreground=NO + cache=${dataDir}/ddclient.cache + foreground=YES use=${cfg.use} login=${cfg.username} password=${cfg.password} protocol=${cfg.protocol} - ${let server = cfg.server; in - lib.optionalString (server != "") "server=${server}"} + ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} + ${lib.optionalString (cfg.server != "") "server=${cfg.server}"} + ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} ssl=${boolToStr cfg.ssl} wildcard=YES quiet=${boolToStr cfg.quiet} verbose=${boolToStr cfg.verbose} - ${cfg.domain} + ${lib.concatStringsSep "," cfg.domains} ${cfg.extraConfig} ''; @@ -44,17 +44,11 @@ with lib; ''; }; - homeDir = mkOption { - default = "/var/lib/ddclient"; - type = str; - description = "Home directory for the daemon user."; - }; - - domain = mkOption { - default = ""; - type = str; + domains = mkOption { + default = [ "" ]; + type = listOf str; description = '' - Domain name to synchronize. + Domain name(s) to synchronize. ''; }; @@ -62,7 +56,7 @@ with lib; default = ""; type = str; description = '' - Username. + User name. ''; }; @@ -75,9 +69,12 @@ with lib; }; interval = mkOption { - default = 600; - type = int; - description = "The interval at which to run the check and update."; + default = "10min"; + type = str; + description = '' + The interval at which to run the check and update. + See man 7 systemd.time for the format. + ''; }; configFile = mkOption { @@ -95,7 +92,7 @@ with lib; default = "dyndns2"; type = str; description = '' - Protocol to use with dynamic DNS provider (see http://sourceforge.net/apps/trac/ddclient/wiki/Protocols). + Protocol to use with dynamic DNS provider (see https://sourceforge.net/p/ddclient/wiki/protocols). ''; }; @@ -115,11 +112,20 @@ with lib; ''; }; - extraConfig = mkOption { - default = ""; - type = lines; + + quiet = mkOption { + default = false; + type = bool; description = '' - Extra configuration. Contents will be added verbatim to the configuration file. + Print no messages for unnecessary updates. + ''; + }; + + script = mkOption { + default = ""; + type = str; + description = '' + script as required by some providers. ''; }; @@ -139,11 +145,19 @@ with lib; ''; }; - quiet = mkOption { - default = false; - type = bool; + zone = mkOption { + default = ""; + type = str; description = '' - Print no messages for unnecessary updates. + zone as required by some providers. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = lines; + description = '' + Extra configuration. Contents will be added verbatim to the configuration file. ''; }; }; @@ -153,23 +167,8 @@ with lib; ###### implementation config = mkIf config.services.ddclient.enable { - - users = { - extraGroups.ddclient.gid = config.ids.gids.ddclient; - - extraUsers.ddclient = { - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - group = "ddclient"; - home = cfg.homeDir; - createHome = true; - }; - }; - environment.etc."ddclient.conf" = { enable = cfg.configFile == "/etc/ddclient.conf"; - uid = config.ids.uids.ddclient; - gid = config.ids.gids.ddclient; mode = "0600"; text = configText; }; @@ -180,15 +179,22 @@ with lib; after = [ "network.target" ]; restartTriggers = [ config.environment.etc."ddclient.conf".source ]; - serviceConfig = { - RuntimeDirectory = "ddclient"; - # we cannot run in forking mode as it swallows all the program output - Type = "simple"; - User = "ddclient"; - Group = "ddclient"; - ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}"; - ProtectSystem = "full"; - PrivateTmp = true; + serviceConfig = rec { + DynamicUser = true; + RuntimeDirectory = StateDirectory; + StateDirectory = builtins.baseNameOf dataDir; + Type = "oneshot"; + ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf"; + ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf"; + }; + }; + + systemd.timers.ddclient = { + description = "Run ddclient"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = cfg.interval; + OnUnitInactiveSec = cfg.interval; }; }; }; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 6d3ca27df1d6..93828c10d135 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -9,6 +9,7 @@ buildPerlPackage rec { sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy"; }; + # perl packages by default get devdoc which isn't present outputs = [ "out" ]; buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ]; @@ -25,7 +26,12 @@ buildPerlPackage rec { ''; installPhase = '' + runHook preInstall + install -Dm755 ddclient $out/bin/ddclient + install -Dm644 -t $out/share/doc/ddclient COP* ChangeLog README.* RELEASENOTE + + runHook postInstall ''; # there are no tests distributed with ddclient From b532cc3766acbb1d70318804836203ef3fc8a691 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 22 Feb 2018 18:50:42 +0000 Subject: [PATCH 183/538] python: misaka: init at 2.1.0 --- .../python-modules/misaka/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/misaka/default.nix diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix new file mode 100644 index 000000000000..b40aead39090 --- /dev/null +++ b/pkgs/development/python-modules/misaka/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, cffi }: +buildPythonPackage rec { + pname = "misaka"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7"; + }; + + propagatedBuildInputs = [ cffi ]; + + # The tests require write access to $out + doCheck = false; + + meta = with lib; { + description = "A CFFI binding for Hoedown, a markdown parsing library"; + homepage = "http://misaka.61924.nl/"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e572eaefb2eb..19536fbb28ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3539,6 +3539,8 @@ in { }; }; + misaka = callPackage ../development/python-modules/misaka {}; + mt-940 = callPackage ../development/python-modules/mt-940 { }; mwlib = let From 357d8f600c943965d91ca810db9e6ca6a481b6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 15 Apr 2018 11:13:33 +0200 Subject: [PATCH 184/538] clblas: Enable darwin build --- .../libraries/science/math/clblas/default.nix | 17 +++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 40b02d303417..7a653a58eb2a 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -7,6 +7,7 @@ , python , ocl-icd , opencl-headers +, Accelerate, CoreGraphics, CoreVideo, OpenCL , gtest }: @@ -40,11 +41,19 @@ stdenv.mkDerivation rec { gfortran blas python - ocl-icd - opencl-headers boost gtest - ]; + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ocl-icd + opencl-headers + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreVideo + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + OpenCL + ]; enableParallelBuilding = true; @@ -56,7 +65,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a515c543a91d..47ecd3333e6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19673,7 +19673,9 @@ with pkgs; blas = callPackage ../development/libraries/science/math/blas { }; - clblas = callPackage ../development/libraries/science/math/clblas { }; + clblas = callPackage ../development/libraries/science/math/clblas { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; + }; jags = callPackage ../applications/science/math/jags { }; From 5f97adccdc23117c87825cf410b3366e9139a74b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Apr 2018 17:37:39 +0000 Subject: [PATCH 185/538] coq: move some attributes inside `passthru` --- pkgs/applications/science/logic/coq/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2c785472114a..39bed68cdf1f 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -34,11 +34,9 @@ let self = stdenv.mkDerivation { name = "coq-${version}"; - inherit coq-version; - inherit camlp5; - inherit (ocamlPackages) ocaml; passthru = { - inherit (ocamlPackages) findlib num; + inherit coq-version camlp5; + inherit (ocamlPackages) ocaml findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") From caec7dbb9fe4efced4d35c5496e592396bbb1b06 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Apr 2018 17:38:45 +0000 Subject: [PATCH 186/538] coq: fix installation of OCaml libraries --- pkgs/applications/science/logic/coq/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 39bed68cdf1f..5344eda0c3a9 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -123,8 +123,11 @@ self = stdenv.mkDerivation { buildFlags = "revision coq coqide bin/votour"; + createFindlibDestdir = true; + postInstall = '' cp bin/votour $out/bin/ + ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq ''; meta = with stdenv.lib; { From d96f0c5682a63e0eef72899a4e52164e1dde4e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 15 Apr 2018 18:34:45 +0200 Subject: [PATCH 187/538] pythonPackages.libgpuarray: enable darwin build --- pkgs/development/python-modules/libgpuarray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index c0c2b205f58b..26fe33995ed8 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { libraryPath = lib.makeLibraryPath ( [] ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] - ++ lib.optionals openclSupport [ ocl-icd clblas ] + ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); preBuild = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { postFixup = '' rm $out/lib/libgpuarray-static.a - + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 @@ -75,7 +75,7 @@ buildPythonPackage rec { description = "Library to manipulate tensors on GPU."; license = licenses.free; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 4707e69aac4456a19611a3754bd1f0c5251113e5 Mon Sep 17 00:00:00 2001 From: John Boehr Date: Sun, 15 Apr 2018 12:15:26 -0700 Subject: [PATCH 188/538] Incorporate libedit changes from #38968 --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 65d2dd17528c..aba997d75f13 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf, ncurses6 }: +{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf, ncurses6, libedit }: buildGoPackage rec { name = "cockroach-${version}"; @@ -11,7 +11,7 @@ buildGoPackage rec { sha256 = "0x8hf5qwvgb2w6dcnvy20v77nf19f0l1pb40jf31rm72xhk3bwvy"; }; - buildInputs = [ ncurses6 ]; + buildInputs = [ (if stdenv.isDarwin then libedit else ncurses6) ]; nativeBuildInputs = [ cmake xz which autoconf ]; buildPhase = '' From 6d09fbfcf4a721317dd9a042db440887eb58b64b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 22 Feb 2018 18:52:54 +0000 Subject: [PATCH 189/538] python: isso: init at 0.10.6 --- pkgs/servers/isso/default.nix | 54 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/servers/isso/default.nix diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix new file mode 100644 index 000000000000..5aafe55512be --- /dev/null +++ b/pkgs/servers/isso/default.nix @@ -0,0 +1,54 @@ +{ stdenv, python2, fetchurl, fetchFromGitHub }: + +let python = python2.override { + packageOverrides = self: super: { + misaka = super.misaka.overridePythonAttrs (old: rec { + version = "1.0.2"; + src = old.src.override { + inherit version; + sha256 = "05rmjxlfhghj90m1kc55lx3z8igabw5y8wmly66p3hphdy4f95v1"; + }; + propagatedBuildInputs = [ ]; + }); + html5lib = super.html5lib.overridePythonAttrs (old: rec { + version = "0.9999999"; + src = old.src.override { + inherit version; + sha256 = "2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868"; + }; + checkInputs = with self; [ nose flake8 ]; + propagatedBuildInputs = with self; [ six ]; + checkPhase = '' + nosetests + ''; + }); + }; +}; + +in with python.pkgs; buildPythonApplication rec { + pname = "isso"; + version = "0.10.6"; + + # no tests on PyPI + src = fetchFromGitHub { + owner = "posativ"; + repo = pname; + rev = version; + sha256 = "19x9xbwd15fikhchyl4i1wrqx589hdmh279xhnxdszrq898igywb"; + }; + + propagatedBuildInputs = [ misaka werkzeug ipaddr configparser html5lib ]; + + checkInputs = [ nose ]; + + checkPhase = '' + ${python.interpreter} setup.py nosetests + ''; + + meta = with stdenv.lib; { + description = "A commenting server similar to Disqus"; + homepage = https://posativ.org/isso/; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a582ffa2eec4..275c2e11737a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9429,6 +9429,8 @@ with pkgs; stdenv = llvmPackages_4.stdenv; }; + isso = callPackage ../servers/isso { }; + itk = callPackage ../development/libraries/itk { }; jasper = callPackage ../development/libraries/jasper { }; From 10149ef5e3dd186c77979901b7aa57916d8e0f22 Mon Sep 17 00:00:00 2001 From: xeji Date: Sat, 14 Apr 2018 02:33:25 +0200 Subject: [PATCH 190/538] qemu: add option to build with gtk support --- pkgs/applications/virtualization/qemu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 055273d0dac6..7b246df01a93 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -8,6 +8,7 @@ , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 +, gtkSupport ? !xenSupport, gtk3, gettext, gnome3 , vncSupport ? true, libjpeg, libpng , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL2 ] + ++ optionals gtkSupport [ gtk3 gettext gnome3.vte ] ++ optionals vncSupport [ libjpeg libpng ] ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] @@ -110,6 +112,7 @@ stdenv.mkDerivation rec { ++ optional hostCpuOnly "--target-list=${hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio" + ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer"; From fa9359110bdb4c9560bf47e701d4c7bb1044d242 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 15 Apr 2018 21:38:32 +0000 Subject: [PATCH 191/538] tixati: 2.55 -> 2.57 --- pkgs/applications/networking/p2p/tixati/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 688f908c798c..9f47f8464a13 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tixati-${version}"; - version = "2.55"; + version = "2.57"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "02mha6lfcb0mg0y977bxa6xg8krpbsbzpm4b5xw6y6wign4d8a8w"; + sha256 = "0z6znh62ry4fmc6c54zq79pk1b5bwkz93bxsfgvxpf6sajpyf9n7"; }; installPhase = '' From 232e0386cdc73d7c2eecc3b6b2aa97a971c9c7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 15 Apr 2018 23:54:00 +0200 Subject: [PATCH 192/538] borgbackup: add blake2 library to build inputs --- pkgs/tools/backup/borg/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 77d7626a526a..43dcc5dfd7bf 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, acl, lz4, openssl, openssh }: +{ stdenv, python3Packages, acl, libb2, lz4, openssl, openssh }: python3Packages.buildPythonApplication rec { pname = "borgbackup"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { sphinx guzzle_sphinx_theme ]; buildInputs = [ - lz4 openssl python3Packages.setuptools_scm + libb2 lz4 openssl python3Packages.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ cython msgpack-python @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4.dev}" + export BORG_LIBB2_PREFIX="${libb2}" ''; makeWrapperArgs = [ From 9d5af5871d7099185d35c836934fc5b551a0080a Mon Sep 17 00:00:00 2001 From: xeji Date: Mon, 16 Apr 2018 00:43:33 +0200 Subject: [PATCH 193/538] nixos/test/systemd: fix broken test timing bug resulted in sporadic test failures on hydra --- nixos/tests/systemd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 2df6f341c4ef..65aa553b3148 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -46,6 +46,8 @@ import ./make-test.nix { testScript = '' $machine->waitForX; + # wait for user services + $machine->waitForUnit("default.target","alice"); # Regression test for https://github.com/NixOS/nixpkgs/issues/35415 subtest "configuration files are recognized by systemd", sub { From 8c3ef5e6808a3fd25bb40e61006606aec679573c Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 15 Apr 2018 18:47:38 -0400 Subject: [PATCH 194/538] dbeaver: 5.0.2 -> 5.0.3 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 27ff0360a8dc..002d8fc8f23b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.2"; + version = "5.0.3"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0jk8z0s14rc1fnmi7pynhybslwm147mqih187zsa33xqmmhlw1lp"; + sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581"; }; installPhase = '' From 368947a3a5a7de4c2bcb336eac47faafc02f9a03 Mon Sep 17 00:00:00 2001 From: Raphael Das Gupta Date: Mon, 16 Apr 2018 01:14:23 +0200 Subject: [PATCH 195/538] nixos manual: add missing space after "copytoram" --- nixos/doc/manual/installation/installing-usb.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 122a4745f194..d68cd6162632 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -51,7 +51,7 @@ ISO, copy its contents verbatim to your drive, then either: If you want to load the contents of the ISO to ram after bootin (So you can remove the stick after bootup) you can append the parameter - copytoramto the options field. + copytoram to the options field. From dec5e5a602e3132f7c61edbc727aff04468f19ea Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Mon, 16 Apr 2018 01:57:12 +0200 Subject: [PATCH 196/538] icicles: 2017-10-28 -> 2018-04-16 --- .../editors/emacs-modes/icicles/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index f0d120dd8030..2277ebef4ff0 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,25 +2,25 @@ let modules = [ - { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; } - { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; } - { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; } - { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; } - { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; } - { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; } - { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; } - { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; } - { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; } - { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; } - { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; } - { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; } - { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; } + { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } + { name = "icicles-chg.el"; sha256 = "1kqlhisg5g9ycylzqiwxrmmgfw2jw599wisz26wvi48lac2icgg7"; } + { name = "icicles-cmd1.el"; sha256 = "17cpw798bl6p77cmjl7lwdnxa1qpw4z1wacjq2mdc8fh81cyw3am"; } + { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } + { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } + { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } + { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } + { name = "icicles-fn.el"; sha256 = "1sn56z5rjsvqsy3vs7af7yai0c0qdjvcxvwwc59rhswrbi6zlxz5"; } + { name = "icicles-mac.el"; sha256 = "1wyvqzlpq5n70mggqijb8f5r5q9y1hxxngp64sixy0xszy5d12dk"; } + { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } + { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } + { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } + { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; } ]; forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2017-10-28"; + version = "2018-04-16"; name = "icicles-${version}"; srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); From 406749c82cb8e4e243caa122425004631426c778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Apr 2018 08:32:28 +0200 Subject: [PATCH 197/538] borgbackup: use system zstd --- pkgs/tools/backup/borg/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 43dcc5dfd7bf..43f45a1783f5 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, acl, libb2, lz4, openssl, openssh }: +{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: python3Packages.buildPythonApplication rec { pname = "borgbackup"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 openssl python3Packages.setuptools_scm + libb2 lz4 zstd openssl python3Packages.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ cython msgpack-python @@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec { export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4.dev}" export BORG_LIBB2_PREFIX="${libb2}" + export BORG_LIBZSTD_PREFIX="${zstd}" ''; makeWrapperArgs = [ From 9751771c73209b58c89829bf3889473a801a013f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Thu, 12 Apr 2018 13:03:56 +0200 Subject: [PATCH 198/538] dockerTools.buildImage: add /nix/store with correct permissions Fixes #38835. --- pkgs/build-support/docker/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b8eda3d09673..75e279afdc37 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -497,6 +497,16 @@ rec { # Record the contents of the tarball with ls_tar. ls_tar temp/layer.tar >> baseFiles + # Append nix/store directory to the layer so that when the layer is loaded in the + # image /nix/store has read permissions for non-root users. + # nix/store is added only if the layer has /nix/store paths in it. + if [ $(wc -l < $layerClosure) -gt 1 ] && [ $(grep -c -e "^/nix/store$" baseFiles) -eq 0 ]; then + mkdir -p nix/store + chmod -R 555 nix + echo "./nix" >> layerFiles + echo "./nix/store" >> layerFiles + fi + # Get the files in the new layer which were *not* present in # the old layer, and record them as newFiles. comm <(sort -n baseFiles|uniq) \ From 9c24f5001abfd9a7b4682d6baaf4d635a11b71ec Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Mon, 16 Apr 2018 03:30:57 -0500 Subject: [PATCH 199/538] linux_testing_bcachefs: 4.15.2018.03.22 -> 4.15.2018.04.14 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index f5e219bc74e3..1366a11b573c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.15.2018.03.22"; + version = "4.15.2018.04.14"; modDirVersion = "4.15.0"; extraMeta.branch = "master"; extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ]; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "919a34d47a68f3e5f00a7ce5efb67748ec31bd62"; - sha256 = "1j17my3046ry8zdcvf8h2vnij89wkwmv64w3g2pf9lksh2909djw"; + rev = "3b7c824e9330a640312fce1b04537c684c1d602c"; + sha256 = "1l5ib28qkhrxggn6zj9b2839543anbxk2ip75yizgzlv9vr5m4pk"; }; extraConfig = '' diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 3684b216cd75..c2e13b75daa9 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -2,12 +2,12 @@ , keyutils, liburcu, zlib, libaio, zstd }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-03-20"; + name = "bcachefs-tools-unstable-2018-04-10"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "ff5e165532a2eed87700649d03f91a612a58e92a"; - sha256 = "1mikhffkr4a1yhy36yh70dhgcimcpvdm5mjl5fyni0bpgqrw67dn"; + rev = "c598d91dcb0c7e95abdacb2711898ae14ab52ca1"; + sha256 = "1mglw6p1145nryn8babkg2hj778kqa0vrzjbdp9kxjlyb3fksmff"; }; enableParallelBuilding = true; From ecc5a2bc153148f7e554c45ca6d6e2d0582d1bb5 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 16 Apr 2018 12:17:24 +0200 Subject: [PATCH 200/538] =?UTF-8?q?gnupg:=202.2.5=C2=A0->=202.2.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See http://lists.gnu.org/archive/html/info-gnu/2018-04/msg00005.html for release information --- pkgs/tools/security/gnupg/22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 860c90eb4c9d..87dcbe4e7066 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0mzgibq4dpxh3i9anmwg12xdjry28y83icafhx3j3djg5niqk89z"; + sha256 = "110rf476l3cgn52gh9ia5y0y06y2ialq9dqc12jkhnfhl9gqqkg6"; }; nativeBuildInputs = [ pkgconfig ]; From 78f661fd5e348746fa6c7998280ed5950e10a295 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Mon, 16 Apr 2018 13:37:41 +0300 Subject: [PATCH 201/538] yarn: 1.5.1 -> 1.6.0 --- pkgs/development/tools/yarn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index bd7dd5924c06..eefe7dcfa74a 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.5.1"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "13m1y1c2h1fvq8fw1vlmnmnh3jx3l2cx7mz3x55sbgwcinzhkz9m"; + sha256 = "0bblp1jy4s9y5rpcqn40w61qwsmxr342xkcn7ykk88i7sng2cgfw"; }; buildInputs = [makeWrapper nodejs]; From f13cb56360cbf9cc1059221a24acdb5ac4ca69a3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 11 Apr 2018 20:08:51 +0000 Subject: [PATCH 202/538] yosys: fix build with clang --- pkgs/development/compilers/yosys/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 568c94718e7f..c20bffe26ed1 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -35,14 +35,18 @@ stdenv.mkDerivation rec { buildInputs = [ tcl readline libffi python3 bison flex ]; patchPhase = '' + substituteInPlace ../yosys-abc/Makefile \ + --replace 'CC := gcc' "" substituteInPlace ./Makefile \ + --replace 'CXX = clang' "" \ + --replace 'ABCMKARGS = CC="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' ''; preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc - make config-gcc + make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCREV := default' >> Makefile.conf makeFlags="PREFIX=$out $makeFlags" ''; @@ -61,6 +65,6 @@ stdenv.mkDerivation rec { homepage = http://www.clifford.at/yosys/; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From dc4a8435f021d520b4628fc3cdcdcd6f1cb72fa2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Apr 2018 11:44:53 +0000 Subject: [PATCH 203/538] symbiyosys: larger meta.platforms --- pkgs/applications/science/logic/symbiyosys/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index b6312bfe4668..98acebcf2cc5 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = https://symbiyosys.readthedocs.io/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 29a30597461b641df53f3ca06a76eb5b699d4b6c Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Mon, 16 Apr 2018 14:11:25 +0200 Subject: [PATCH 204/538] Carnix 0.7 --- pkgs/build-support/rust/build-rust-crate.nix | 41 +- pkgs/build-support/rust/carnix.nix | 1627 +++++++++--------- 2 files changed, 866 insertions(+), 802 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index b07a09d63559..99d6094891cc 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -47,7 +47,7 @@ let makeDeps = dependencies: ''; configureCrate = - { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies }: + { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); @@ -58,6 +58,7 @@ let makeDeps = dependencies: completeDepsDir = lib.concatStringsSep " " completeDeps; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; in '' + cd ${workspace_member} runHook preConfigure ${echo_build_heading colors} ${noisily colors verbose} @@ -146,10 +147,15 @@ let makeDeps = dependencies: mkdir -p $OUT_DIR target/build/${crateName}/build_script_build > target/build/${crateName}.opt set +e - EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') - EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') - EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + + for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do + export $env + done + CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env @@ -171,8 +177,7 @@ let makeDeps = dependencies: dependencies, completeDeps, completeBuildDeps, crateFeatures, libName, build, release, libPath, crateType, metadata, crateBin, finalBins, - extraRustcOpts, - verbose, colors }: + extraRustcOpts, verbose, colors }: let depsDir = lib.concatStringsSep " " dependencies; completeDepsDir = lib.concatStringsSep " " completeDeps; @@ -221,12 +226,12 @@ let makeDeps = dependencies: build_bin() { crate_name=$1 crate_name_=$(echo $crate_name | sed -e "s/-/_/g") - main_file="" - if [[ ! -z $2 ]]; then + main_file="" + if [[ ! -z $2 ]]; then main_file=$2 - fi - echo_build_heading $@ - noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ + fi + echo_build_heading $@ + noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} @@ -374,7 +379,7 @@ stdenv.mkDerivation (rec { ); crateFeatures = if crate ? features then - lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) + lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #" else ""; libName = if crate ? libName then crate.libName else crate.crateName; @@ -407,24 +412,26 @@ stdenv.mkDerivation (rec { ) "" crate.crateBin else ""; - build = if crate ? build then crate.build else ""; + build = crate.build or ""; + workspace_member = crate.workspace_member or "."; crateVersion = crate.version; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = if lib.attrByPath ["procMacro"] false crate then "proc-macro" else if lib.attrByPath ["plugin"] false crate then "dylib" else - if crate ? type then crate.type else "lib"; + (crate.type or "lib"); colors = lib.attrByPath [ "colors" ] "always" crate; configurePhase = configureCrate { inherit crateName dependencies buildDependencies completeDeps completeBuildDeps - crateFeatures libName build release libPath crateVersion + crateFeatures libName build workspace_member release libPath crateVersion crateAuthors verbose colors; }; extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else []; buildPhase = buildCrate { inherit crateName dependencies completeDeps completeBuildDeps - crateFeatures libName build release libPath crateType crateVersion - crateAuthors metadata crateBin finalBins verbose colors extraRustcOpts; + crateFeatures libName build release libPath crateType + crateVersion crateAuthors metadata crateBin finalBins verbose colors + extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index ebb46b0f5921..cecddab22c37 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,4 +1,4 @@ -# Generated by carnix 0.6.5: carnix -o carnix.nix Cargo.lock +# Generated by carnix 0.7.0: /home/pe/.cargo/bin/cargo-generate-nixfile generate-nixfile { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; @@ -18,35 +18,36 @@ let kernel = buildPlatform.parsed.kernel.name; ) [] (builtins.attrNames feat); in rec { - carnix = f: carnix_0_6_6 { features = carnix_0_6_6_features { carnix_0_6_6 = f; }; }; - aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + carnix = f: carnix_0_7_0 { features = carnix_0_7_0_features { carnix_0_7_0 = f; }; }; + __all = [ (carnix {}) ]; + aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "aho-corasick"; - version = "0.6.3"; + version = "0.6.4"; authors = [ "Andrew Gallant " ]; - sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; + sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; libName = "aho_corasick"; crateBin = [ { name = "aho-corasick-dot"; } ]; inherit dependencies buildDependencies features; }; - ansi_term_0_10_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "ansi_term"; - version = "0.10.2"; + version = "0.11.0"; authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; - sha256 = "07k0hfmlhv43lihyxb9d81l5mq5zlpqvv30dkfd3knmv2ginasn9"; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; inherit dependencies buildDependencies features; }; - atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "atty"; - version = "0.2.3"; + version = "0.2.8"; authors = [ "softprops " ]; - sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d"; inherit dependencies buildDependencies features; }; - backtrace_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "backtrace"; - version = "0.3.4"; + version = "0.3.6"; authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "1caba8w3rqd5ghr88ghyz5wgkf81dgx18bj1llkax6qmianc6gk7"; + sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx"; inherit dependencies buildDependencies features; }; backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -57,13 +58,6 @@ rec { build = "build.rs"; inherit dependencies buildDependencies features; }; - bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.7.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; - inherit dependencies buildDependencies features; - }; bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "bitflags"; version = "1.0.1"; @@ -71,18 +65,19 @@ rec { sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; inherit dependencies buildDependencies features; }; - carnix_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + carnix_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "carnix"; - version = "0.6.6"; + version = "0.7.0"; authors = [ "pe@pijul.org " ]; - sha256 = "1ai2r52j6vlrclhb7cvifx3lsg9naiy3jpsrbi3mmfmr6zbi7rdw"; + sha256 = "17b9psm7z29pwhlwgnvj0fwsy1ljyh8i86hjnwscnanjpnxbi089"; + crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ]; inherit dependencies buildDependencies features; }; - cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "cc"; - version = "1.0.3"; + version = "1.0.10"; authors = [ "Alex Crichton " ]; - sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; + sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn"; inherit dependencies buildDependencies features; }; cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -92,27 +87,11 @@ rec { sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; inherit dependencies buildDependencies features; }; - chrono_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "chrono"; - version = "0.4.0"; - authors = [ "Kang Seonghoon " ]; - sha256 = "0hm53hi6v7b6b1va6vn96lx26wvj8gzi2g51s1j02nlz0jcprw6a"; - inherit dependencies buildDependencies features; - }; - clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "clap"; - version = "2.28.0"; + version = "2.31.2"; authors = [ "Kevin K. " ]; - sha256 = "0m0rj9xw6mja4gdhqmaldv0q5y5jfsfzbyzfd70mm3857aynq03k"; - inherit dependencies buildDependencies features; - }; - dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dbghelp-sys"; - version = "0.2.0"; - authors = [ "Peter Atashian " ]; - sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; - libName = "dbghelp"; - build = "build.rs"; + sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; inherit dependencies buildDependencies features; }; dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -122,18 +101,18 @@ rec { sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; inherit dependencies buildDependencies features; }; - either_1_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "either"; - version = "1.4.0"; + version = "1.5.0"; authors = [ "bluss" ]; - sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; inherit dependencies buildDependencies features; }; - env_logger_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "env_logger"; - version = "0.5.3"; + version = "0.5.7"; authors = [ "The Rust Project Developers" ]; - sha256 = "1i7jyxrwwv3w2h200ynq3fjg1iyyvi76ny215hi6d334vkkw2s2y"; + sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l"; inherit dependencies buildDependencies features; }; error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -143,62 +122,61 @@ rec { sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; inherit dependencies buildDependencies features; }; - fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "fuchsia-zircon"; - version = "0.2.1"; + version = "0.3.3"; authors = [ "Raph Levien " ]; - sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; inherit dependencies buildDependencies features; }; - fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "fuchsia-zircon-sys"; - version = "0.2.0"; + version = "0.3.3"; authors = [ "Raph Levien " ]; - sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; inherit dependencies buildDependencies features; }; - itertools_0_7_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "humantime"; + version = "1.1.1"; + authors = [ "Paul Colomiets " ]; + sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "itertools"; - version = "0.7.3"; + version = "0.7.8"; authors = [ "bluss" ]; - sha256 = "128a69cnmgpj38rs6lcwzya773d2vx7f9y7012iycjf9yi2pyckj"; + sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; inherit dependencies buildDependencies features; }; - itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "itoa"; - version = "0.3.4"; + version = "0.4.1"; authors = [ "David Tolnay " ]; - sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij"; inherit dependencies buildDependencies features; }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "lazy_static"; - version = "0.2.11"; + version = "1.0.0"; authors = [ "Marvin Löbel " ]; - sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; inherit dependencies buildDependencies features; }; - libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "libc"; - version = "0.2.33"; + version = "0.2.40"; authors = [ "The Rust Project Developers" ]; - sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1"; + sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; inherit dependencies buildDependencies features; }; - libsqlite3_sys_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "libsqlite3-sys"; - version = "0.9.0"; + version = "0.9.1"; authors = [ "John Gallagher " ]; - sha256 = "1pnx3i9h85si6cs4nhazfb28hsvk7dn0arnfvpdzpjdnj9z38q57"; + sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7"; build = "build.rs"; inherit dependencies buildDependencies features; }; @@ -230,6 +208,13 @@ rec { sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; inherit dependencies buildDependencies features; }; + memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "2.0.1"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; + inherit dependencies buildDependencies features; + }; nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "nom"; version = "3.2.1"; @@ -237,32 +222,11 @@ rec { sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; inherit dependencies buildDependencies features; }; - num_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num"; - version = "0.1.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0b29c25n9mpf6a921khj7a6y3hz5va4vgwppcd2if975qq1shakg"; - inherit dependencies buildDependencies features; - }; - num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-integer"; - version = "0.1.35"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; - inherit dependencies buildDependencies features; - }; - num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-iter"; - version = "0.1.34"; - authors = [ "The Rust Project Developers" ]; - sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; - inherit dependencies buildDependencies features; - }; - num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "num-traits"; - version = "0.1.40"; + version = "0.2.2"; authors = [ "The Rust Project Developers" ]; - sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0"; inherit dependencies buildDependencies features; }; pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -272,25 +236,39 @@ rec { sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; inherit dependencies buildDependencies features; }; - quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.3.6"; + authors = [ "Alex Crichton " ]; + sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp"; + inherit dependencies buildDependencies features; + }; + quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quick-error"; + version = "1.2.1"; + authors = [ "Paul Colomiets " "Colin Kiegel " ]; + sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6"; + inherit dependencies buildDependencies features; + }; + quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "quote"; - version = "0.3.15"; + version = "0.5.1"; authors = [ "David Tolnay " ]; - sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r"; inherit dependencies buildDependencies features; }; - rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "rand"; - version = "0.3.18"; + version = "0.4.2"; authors = [ "The Rust Project Developers" ]; - sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; + sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; inherit dependencies buildDependencies features; }; - redox_syscall_0_1_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "redox_syscall"; - version = "0.1.32"; + version = "0.1.37"; authors = [ "Jeremy Soller " ]; - sha256 = "1axxj8x6ngh6npkzqc5h216fajkcyrdxdgb7m2f0n5xfclbk47fv"; + sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; libName = "syscall"; inherit dependencies buildDependencies features; }; @@ -302,18 +280,25 @@ rec { libPath = "src/lib.rs"; inherit dependencies buildDependencies features; }; - regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "regex"; - version = "0.2.2"; + version = "0.2.10"; authors = [ "The Rust Project Developers" ]; - sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; + sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca"; inherit dependencies buildDependencies features; }; - regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "regex-syntax"; - version = "0.4.1"; + version = "0.5.5"; authors = [ "The Rust Project Developers" ]; - sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; + sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp"; + inherit dependencies buildDependencies features; + }; + remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.0"; + authors = [ "Aaronepower " ]; + sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y"; inherit dependencies buildDependencies features; }; rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -323,75 +308,68 @@ rec { sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; inherit dependencies buildDependencies features; }; - rustc_demangle_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "rustc-demangle"; - version = "0.1.5"; + version = "0.1.7"; authors = [ "Alex Crichton " ]; - sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; + sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6"; inherit dependencies buildDependencies features; }; - serde_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde"; - version = "1.0.21"; + version = "1.0.38"; authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; + sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk"; inherit dependencies buildDependencies features; }; - serde_derive_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde_derive"; - version = "1.0.21"; + version = "1.0.38"; authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0r20qyimm9scfaz7lc0swnhik9d045zklmbidd0zzpd4b2f3jsqm"; + sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m"; procMacro = true; inherit dependencies buildDependencies features; }; - serde_derive_internals_0_17_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde_derive_internals"; - version = "0.17.0"; + version = "0.23.1"; authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1g1j3v6pj9wbcz3v3w4smjpwrcdwjicmf6yd5cbai04as9iwhw74"; + sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4"; inherit dependencies buildDependencies features; }; - serde_json_1_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde_json"; - version = "1.0.6"; + version = "1.0.14"; authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; + sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj"; inherit dependencies buildDependencies features; }; - strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "strsim"; - version = "0.6.0"; + version = "0.7.0"; authors = [ "Danny Guo " ]; - sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; inherit dependencies buildDependencies features; }; - syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "syn"; - version = "0.11.11"; + version = "0.13.1"; authors = [ "David Tolnay " ]; - sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg"; inherit dependencies buildDependencies features; }; - synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "synom"; - version = "0.11.3"; - authors = [ "David Tolnay " ]; - sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; - inherit dependencies buildDependencies features; - }; - tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "tempdir"; - version = "0.3.5"; + version = "0.3.7"; authors = [ "The Rust Project Developers" ]; - sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; inherit dependencies buildDependencies features; }; - termcolor_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "termcolor"; - version = "0.3.3"; + version = "0.3.6"; authors = [ "Andrew Gallant " ]; - sha256 = "1rb853jzvkbwm62373dhls4x4r3r5cvfcsxvqh0i75rhx5j8kwsz"; + sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; inherit dependencies buildDependencies features; }; termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -408,25 +386,32 @@ rec { sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; inherit dependencies buildDependencies features; }; - thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "thread_local"; - version = "0.3.4"; + version = "0.3.5"; authors = [ "Amanieu d'Antras " ]; - sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; inherit dependencies buildDependencies features; }; - time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "time"; - version = "0.1.38"; + version = "0.1.39"; authors = [ "The Rust Project Developers" ]; - sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; + sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if"; inherit dependencies buildDependencies features; }; - toml_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "toml"; - version = "0.4.5"; + version = "0.4.6"; authors = [ "Alex Crichton " ]; - sha256 = "06zxqhn3y58yzjfaykhcrvlf7p2dnn54kn3g4apmja3cn5b18lkk"; + sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; + inherit dependencies buildDependencies features; + }; + ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; inherit dependencies buildDependencies features; }; unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -436,11 +421,11 @@ rec { sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; inherit dependencies buildDependencies features; }; - unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "unicode-xid"; - version = "0.0.4"; + version = "0.1.0"; authors = [ "erick.tryzelaar " "kwantam " ]; - sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; inherit dependencies buildDependencies features; }; unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -457,11 +442,11 @@ rec { sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; inherit dependencies buildDependencies features; }; - vcpkg_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "vcpkg"; - version = "0.2.2"; + version = "0.2.3"; authors = [ "Jim McGrath " ]; - sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; + sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; inherit dependencies buildDependencies features; }; vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -478,141 +463,161 @@ rec { sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; inherit dependencies buildDependencies features; }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "winapi"; - version = "0.2.8"; + version = "0.3.4"; authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; + build = "build.rs"; inherit dependencies buildDependencies features; }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; + winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; inherit dependencies buildDependencies features; }; - wincolor_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "wincolor"; - version = "0.1.4"; + version = "0.1.6"; authors = [ "Andrew Gallant " ]; - sha256 = "0cxv6hadnj5vffb8a73y7055p59n20bpqd524df85cm29dcjl38a"; + sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; inherit dependencies buildDependencies features; }; - aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ { - dependencies = mapFeatures features ([ memchr_1_0_2 ]); + aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { + dependencies = mapFeatures features ([ memchr_2_0_1 ]); }; - aho_corasick_0_6_3_features = f: updateFeatures f (rec { - aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true); - memchr_1_0_2.default = true; - }) [ memchr_1_0_2_features ]; - ansi_term_0_10_2 = { features?(ansi_term_0_10_2_features {}) }: ansi_term_0_10_2_ {}; - ansi_term_0_10_2_features = f: updateFeatures f (rec { - ansi_term_0_10_2.default = (f.ansi_term_0_10_2.default or true); - }) []; - atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ { + aho_corasick_0_6_4_features = f: updateFeatures f (rec { + aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); + memchr_2_0_1.default = true; + }) [ memchr_2_0_1_features ]; + ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + ansi_term_0_11_0_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.errhandlingapi = true; + winapi_0_3_4.processenv = true; + }) [ winapi_0_3_4_features ]; + atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ { dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); }; - atty_0_2_3_features = f: updateFeatures f (rec { - atty_0_2_3.default = (f.atty_0_2_3.default or true); - kernel32_sys_0_2_2.default = true; - libc_0_2_33.default = (f.libc_0_2_33.default or false); + atty_0_2_8_features = f: updateFeatures f (rec { + atty_0_2_8.default = (f.atty_0_2_8.default or true); + libc_0_2_40.default = (f.libc_0_2_40.default or false); termion_1_5_1.default = true; - winapi_0_2_8.default = true; - }) [ termion_1_5_1_features libc_0_2_33_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - backtrace_0_3_4 = { features?(backtrace_0_3_4_features {}) }: backtrace_0_3_4_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_5 ]) + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwinbase = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processenv = true; + winapi_0_3_4.winbase = true; + }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; + backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ]) ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_4.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else []) + ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) ++ (if kernel == "windows" then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_4.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else []) - ++ (if features.backtrace_0_3_4.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else []) - ++ (if features.backtrace_0_3_4.winapi or false then [ winapi_0_2_8 ] else [])) else []); - features = mkFeatures (features.backtrace_0_3_4 or {}); + ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []); + features = mkFeatures (features.backtrace_0_3_6 or {}); }; - backtrace_0_3_4_features = f: updateFeatures f (rec { - backtrace_0_3_4.addr2line = - (f.backtrace_0_3_4.addr2line or false) || - (f.backtrace_0_3_4.gimli-symbolize or false) || - (backtrace_0_3_4.gimli-symbolize or false); - backtrace_0_3_4.backtrace-sys = - (f.backtrace_0_3_4.backtrace-sys or false) || - (f.backtrace_0_3_4.libbacktrace or false) || - (backtrace_0_3_4.libbacktrace or false); - backtrace_0_3_4.coresymbolication = - (f.backtrace_0_3_4.coresymbolication or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.dbghelp = - (f.backtrace_0_3_4.dbghelp or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.dbghelp-sys = - (f.backtrace_0_3_4.dbghelp-sys or false) || - (f.backtrace_0_3_4.dbghelp or false) || - (backtrace_0_3_4.dbghelp or false); - backtrace_0_3_4.default = (f.backtrace_0_3_4.default or true); - backtrace_0_3_4.dladdr = - (f.backtrace_0_3_4.dladdr or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.findshlibs = - (f.backtrace_0_3_4.findshlibs or false) || - (f.backtrace_0_3_4.gimli-symbolize or false) || - (backtrace_0_3_4.gimli-symbolize or false); - backtrace_0_3_4.kernel32-sys = - (f.backtrace_0_3_4.kernel32-sys or false) || - (f.backtrace_0_3_4.dbghelp or false) || - (backtrace_0_3_4.dbghelp or false); - backtrace_0_3_4.libbacktrace = - (f.backtrace_0_3_4.libbacktrace or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.libunwind = - (f.backtrace_0_3_4.libunwind or false) || - (f.backtrace_0_3_4.default or false) || - (backtrace_0_3_4.default or false); - backtrace_0_3_4.rustc-serialize = - (f.backtrace_0_3_4.rustc-serialize or false) || - (f.backtrace_0_3_4.serialize-rustc or false) || - (backtrace_0_3_4.serialize-rustc or false); - backtrace_0_3_4.serde = - (f.backtrace_0_3_4.serde or false) || - (f.backtrace_0_3_4.serialize-serde or false) || - (backtrace_0_3_4.serialize-serde or false); - backtrace_0_3_4.serde_derive = - (f.backtrace_0_3_4.serde_derive or false) || - (f.backtrace_0_3_4.serialize-serde or false) || - (backtrace_0_3_4.serialize-serde or false); - backtrace_0_3_4.winapi = - (f.backtrace_0_3_4.winapi or false) || - (f.backtrace_0_3_4.dbghelp or false) || - (backtrace_0_3_4.dbghelp or false); + backtrace_0_3_6_features = f: updateFeatures f (rec { + backtrace_0_3_6.addr2line = + (f.backtrace_0_3_6.addr2line or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.backtrace-sys = + (f.backtrace_0_3_6.backtrace-sys or false) || + (f.backtrace_0_3_6.libbacktrace or false) || + (backtrace_0_3_6.libbacktrace or false); + backtrace_0_3_6.coresymbolication = + (f.backtrace_0_3_6.coresymbolication or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.dbghelp = + (f.backtrace_0_3_6.dbghelp or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true); + backtrace_0_3_6.dladdr = + (f.backtrace_0_3_6.dladdr or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.findshlibs = + (f.backtrace_0_3_6.findshlibs or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.gimli = + (f.backtrace_0_3_6.gimli or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.libbacktrace = + (f.backtrace_0_3_6.libbacktrace or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.libunwind = + (f.backtrace_0_3_6.libunwind or false) || + (f.backtrace_0_3_6.default or false) || + (backtrace_0_3_6.default or false); + backtrace_0_3_6.memmap = + (f.backtrace_0_3_6.memmap or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.object = + (f.backtrace_0_3_6.object or false) || + (f.backtrace_0_3_6.gimli-symbolize or false) || + (backtrace_0_3_6.gimli-symbolize or false); + backtrace_0_3_6.rustc-serialize = + (f.backtrace_0_3_6.rustc-serialize or false) || + (f.backtrace_0_3_6.serialize-rustc or false) || + (backtrace_0_3_6.serialize-rustc or false); + backtrace_0_3_6.serde = + (f.backtrace_0_3_6.serde or false) || + (f.backtrace_0_3_6.serialize-serde or false) || + (backtrace_0_3_6.serialize-serde or false); + backtrace_0_3_6.serde_derive = + (f.backtrace_0_3_6.serde_derive or false) || + (f.backtrace_0_3_6.serialize-serde or false) || + (backtrace_0_3_6.serialize-serde or false); + backtrace_0_3_6.winapi = + (f.backtrace_0_3_6.winapi or false) || + (f.backtrace_0_3_6.dbghelp or false) || + (backtrace_0_3_6.dbghelp or false); backtrace_sys_0_1_16.default = true; cfg_if_0_1_2.default = true; - dbghelp_sys_0_2_0.default = true; - kernel32_sys_0_2_2.default = true; - libc_0_2_33.default = true; - rustc_demangle_0_1_5.default = true; - winapi_0_2_8.default = true; - }) [ cfg_if_0_1_2_features rustc_demangle_0_1_5_features backtrace_sys_0_1_16_features libc_0_2_33_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + libc_0_2_40.default = true; + rustc_demangle_0_1_7.default = true; + winapi_0_3_4.dbghelp = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processthreadsapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.winnt = true; + }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ]; backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ { - dependencies = mapFeatures features ([ libc_0_2_33 ]); - buildDependencies = mapFeatures features ([ cc_1_0_3 ]); + dependencies = mapFeatures features ([ libc_0_2_40 ]); + buildDependencies = mapFeatures features ([ cc_1_0_10 ]); }; backtrace_sys_0_1_16_features = f: updateFeatures f (rec { backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true); - cc_1_0_3.default = true; - libc_0_2_33.default = true; - }) [ libc_0_2_33_features cc_1_0_3_features ]; - bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; - bitflags_0_7_0_features = f: updateFeatures f (rec { - bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); - }) []; + cc_1_0_10.default = true; + libc_0_2_40.default = true; + }) [ libc_0_2_40_features cc_1_0_10_features ]; bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { features = mkFeatures (features.bitflags_1_0_1 or {}); }; @@ -623,159 +628,143 @@ rec { (f.bitflags_1_0_1.default or false) || (bitflags_1_0_1.default or false); }) []; - carnix_0_6_6 = { features?(carnix_0_6_6_features {}) }: carnix_0_6_6_ { - dependencies = mapFeatures features ([ clap_2_28_0 env_logger_0_5_3 error_chain_0_11_0 itertools_0_7_3 log_0_4_1 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]); + carnix_0_7_0 = { features?(carnix_0_7_0_features {}) }: carnix_0_7_0_ { + dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]); }; - carnix_0_6_6_features = f: updateFeatures f (rec { - carnix_0_6_6.default = (f.carnix_0_6_6.default or true); - clap_2_28_0.default = true; - env_logger_0_5_3.default = true; + carnix_0_7_0_features = f: updateFeatures f (rec { + carnix_0_7_0.default = (f.carnix_0_7_0.default or true); + clap_2_31_2.default = true; + env_logger_0_5_7.default = true; error_chain_0_11_0.default = true; - itertools_0_7_3.default = true; + itertools_0_7_8.default = true; log_0_4_1.default = true; nom_3_2_1.default = true; - regex_0_2_2.default = true; + regex_0_2_10.default = true; rusqlite_0_13_0.default = true; - serde_1_0_21.default = true; - serde_derive_1_0_21.default = true; - serde_json_1_0_6.default = true; - tempdir_0_3_5.default = true; - toml_0_4_5.default = true; - }) [ clap_2_28_0_features env_logger_0_5_3_features error_chain_0_11_0_features itertools_0_7_3_features log_0_4_1_features nom_3_2_1_features regex_0_2_2_features rusqlite_0_13_0_features serde_1_0_21_features serde_derive_1_0_21_features serde_json_1_0_6_features tempdir_0_3_5_features toml_0_4_5_features ]; - cc_1_0_3 = { features?(cc_1_0_3_features {}) }: cc_1_0_3_ { + serde_1_0_38.default = true; + serde_derive_1_0_38.default = true; + serde_json_1_0_14.default = true; + tempdir_0_3_7.default = true; + toml_0_4_6.default = true; + }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ]; + cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_3 or {}); + features = mkFeatures (features.cc_1_0_10 or {}); }; - cc_1_0_3_features = f: updateFeatures f (rec { - cc_1_0_3.default = (f.cc_1_0_3.default or true); - cc_1_0_3.rayon = - (f.cc_1_0_3.rayon or false) || - (f.cc_1_0_3.parallel or false) || - (cc_1_0_3.parallel or false); + cc_1_0_10_features = f: updateFeatures f (rec { + cc_1_0_10.default = (f.cc_1_0_10.default or true); + cc_1_0_10.rayon = + (f.cc_1_0_10.rayon or false) || + (f.cc_1_0_10.parallel or false) || + (cc_1_0_10.parallel or false); }) []; cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; cfg_if_0_1_2_features = f: updateFeatures f (rec { cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); }) []; - chrono_0_4_0 = { features?(chrono_0_4_0_features {}) }: chrono_0_4_0_ { - dependencies = mapFeatures features ([ num_0_1_40 time_0_1_38 ]); - }; - chrono_0_4_0_features = f: updateFeatures f (rec { - chrono_0_4_0.default = (f.chrono_0_4_0.default or true); - num_0_1_40.default = (f.num_0_1_40.default or false); - time_0_1_38.default = true; - }) [ num_0_1_40_features time_0_1_38_features ]; - clap_2_28_0 = { features?(clap_2_28_0_features {}) }: clap_2_28_0_ { + clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ] - ++ (if features.clap_2_28_0.ansi_term or false then [ ansi_term_0_10_2 ] else []) - ++ (if features.clap_2_28_0.atty or false then [ atty_0_2_3 ] else []) - ++ (if features.clap_2_28_0.strsim or false then [ strsim_0_6_0 ] else []) - ++ (if features.clap_2_28_0.vec_map or false then [ vec_map_0_8_0 ] else [])); - features = mkFeatures (features.clap_2_28_0 or {}); + ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else []) + ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) + ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ ] + ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); + features = mkFeatures (features.clap_2_31_2 or {}); }; - clap_2_28_0_features = f: updateFeatures f (rec { - ansi_term_0_10_2.default = true; - atty_0_2_3.default = true; + clap_2_31_2_features = f: updateFeatures f (rec { + ansi_term_0_11_0.default = true; + atty_0_2_8.default = true; bitflags_1_0_1.default = true; - clap_2_28_0.ansi_term = - (f.clap_2_28_0.ansi_term or false) || - (f.clap_2_28_0.color or false) || - (clap_2_28_0.color or false); - clap_2_28_0.atty = - (f.clap_2_28_0.atty or false) || - (f.clap_2_28_0.color or false) || - (clap_2_28_0.color or false); - clap_2_28_0.clippy = - (f.clap_2_28_0.clippy or false) || - (f.clap_2_28_0.lints or false) || - (clap_2_28_0.lints or false); - clap_2_28_0.color = - (f.clap_2_28_0.color or false) || - (f.clap_2_28_0.default or false) || - (clap_2_28_0.default or false); - clap_2_28_0.default = (f.clap_2_28_0.default or true); - clap_2_28_0.strsim = - (f.clap_2_28_0.strsim or false) || - (f.clap_2_28_0.suggestions or false) || - (clap_2_28_0.suggestions or false); - clap_2_28_0.suggestions = - (f.clap_2_28_0.suggestions or false) || - (f.clap_2_28_0.default or false) || - (clap_2_28_0.default or false); - clap_2_28_0.term_size = - (f.clap_2_28_0.term_size or false) || - (f.clap_2_28_0.wrap_help or false) || - (clap_2_28_0.wrap_help or false); - clap_2_28_0.vec_map = - (f.clap_2_28_0.vec_map or false) || - (f.clap_2_28_0.default or false) || - (clap_2_28_0.default or false); - clap_2_28_0.yaml = - (f.clap_2_28_0.yaml or false) || - (f.clap_2_28_0.doc or false) || - (clap_2_28_0.doc or false); - clap_2_28_0.yaml-rust = - (f.clap_2_28_0.yaml-rust or false) || - (f.clap_2_28_0.yaml or false) || - (clap_2_28_0.yaml or false); - strsim_0_6_0.default = true; + clap_2_31_2.ansi_term = + (f.clap_2_31_2.ansi_term or false) || + (f.clap_2_31_2.color or false) || + (clap_2_31_2.color or false); + clap_2_31_2.atty = + (f.clap_2_31_2.atty or false) || + (f.clap_2_31_2.color or false) || + (clap_2_31_2.color or false); + clap_2_31_2.clippy = + (f.clap_2_31_2.clippy or false) || + (f.clap_2_31_2.lints or false) || + (clap_2_31_2.lints or false); + clap_2_31_2.color = + (f.clap_2_31_2.color or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.default = (f.clap_2_31_2.default or true); + clap_2_31_2.strsim = + (f.clap_2_31_2.strsim or false) || + (f.clap_2_31_2.suggestions or false) || + (clap_2_31_2.suggestions or false); + clap_2_31_2.suggestions = + (f.clap_2_31_2.suggestions or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.term_size = + (f.clap_2_31_2.term_size or false) || + (f.clap_2_31_2.wrap_help or false) || + (clap_2_31_2.wrap_help or false); + clap_2_31_2.vec_map = + (f.clap_2_31_2.vec_map or false) || + (f.clap_2_31_2.default or false) || + (clap_2_31_2.default or false); + clap_2_31_2.yaml = + (f.clap_2_31_2.yaml or false) || + (f.clap_2_31_2.doc or false) || + (clap_2_31_2.doc or false); + clap_2_31_2.yaml-rust = + (f.clap_2_31_2.yaml-rust or false) || + (f.clap_2_31_2.yaml or false) || + (clap_2_31_2.yaml or false); + strsim_0_7_0.default = true; textwrap_0_9_0.default = true; textwrap_0_9_0.term_size = (f.textwrap_0_9_0.term_size or false) || - (clap_2_28_0.wrap_help or false) || - (f.clap_2_28_0.wrap_help or false); + (clap_2_31_2.wrap_help or false) || + (f.clap_2_31_2.wrap_help or false); unicode_width_0_1_4.default = true; vec_map_0_8_0.default = true; - }) [ ansi_term_0_10_2_features atty_0_2_3_features bitflags_1_0_1_features strsim_0_6_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; - dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); - }; - dbghelp_sys_0_2_0_features = f: updateFeatures f (rec { - dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ]; dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; dtoa_0_4_2_features = f: updateFeatures f (rec { dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); }) []; - either_1_4_0 = { features?(either_1_4_0_features {}) }: either_1_4_0_ { + either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.either_1_4_0 or {}); + features = mkFeatures (features.either_1_5_0 or {}); }; - either_1_4_0_features = f: updateFeatures f (rec { - either_1_4_0.default = (f.either_1_4_0.default or true); - either_1_4_0.use_std = - (f.either_1_4_0.use_std or false) || - (f.either_1_4_0.default or false) || - (either_1_4_0.default or false); + either_1_5_0_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or true); + either_1_5_0.use_std = + (f.either_1_5_0.use_std or false) || + (f.either_1_5_0.default or false) || + (either_1_5_0.default or false); }) []; - env_logger_0_5_3 = { features?(env_logger_0_5_3_features {}) }: env_logger_0_5_3_ { - dependencies = mapFeatures features ([ atty_0_2_3 chrono_0_4_0 log_0_4_1 termcolor_0_3_3 ] - ++ (if features.env_logger_0_5_3.regex or false then [ regex_0_2_2 ] else [])); - features = mkFeatures (features.env_logger_0_5_3 or {}); + env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ { + dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ] + ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else [])); + features = mkFeatures (features.env_logger_0_5_7 or {}); }; - env_logger_0_5_3_features = f: updateFeatures f (rec { - atty_0_2_3.default = true; - chrono_0_4_0.default = true; - env_logger_0_5_3.default = (f.env_logger_0_5_3.default or true); - env_logger_0_5_3.regex = - (f.env_logger_0_5_3.regex or false) || - (f.env_logger_0_5_3.default or false) || - (env_logger_0_5_3.default or false); + env_logger_0_5_7_features = f: updateFeatures f (rec { + atty_0_2_8.default = true; + env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true); + env_logger_0_5_7.regex = + (f.env_logger_0_5_7.regex or false) || + (f.env_logger_0_5_7.default or false) || + (env_logger_0_5_7.default or false); + humantime_1_1_1.default = true; log_0_4_1.default = true; log_0_4_1.std = true; - regex_0_2_2.default = true; - termcolor_0_3_3.default = true; - }) [ atty_0_2_3_features chrono_0_4_0_features log_0_4_1_features regex_0_2_2_features termcolor_0_3_3_features ]; + regex_0_2_10.default = true; + termcolor_0_3_6.default = true; + }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ]; error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { dependencies = mapFeatures features ([ ] - ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_4 ] else [])); + ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else [])); features = mkFeatures (features.error_chain_0_11_0 or {}); }; error_chain_0_11_0_features = f: updateFeatures f (rec { - backtrace_0_3_4.default = true; + backtrace_0_3_6.default = true; error_chain_0_11_0.backtrace = (f.error_chain_0_11_0.backtrace or false) || (f.error_chain_0_11_0.default or false) || @@ -785,129 +774,129 @@ rec { (f.error_chain_0_11_0.example_generated or false) || (f.error_chain_0_11_0.default or false) || (error_chain_0_11_0.default or false); - }) [ backtrace_0_3_4_features ]; - fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ { - dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]); + }) [ backtrace_0_3_6_features ]; + fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]); }; - fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec { - fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true); - fuchsia_zircon_sys_0_2_0.default = true; - }) [ fuchsia_zircon_sys_0_2_0_features ]; - fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ { - dependencies = mapFeatures features ([ bitflags_0_7_0 ]); - }; - fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec { - bitflags_0_7_0.default = true; - fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true); - }) [ bitflags_0_7_0_features ]; - itertools_0_7_3 = { features?(itertools_0_7_3_features {}) }: itertools_0_7_3_ { - dependencies = mapFeatures features ([ either_1_4_0 ]); - features = mkFeatures (features.itertools_0_7_3 or {}); - }; - itertools_0_7_3_features = f: updateFeatures f (rec { - either_1_4_0.default = (f.either_1_4_0.default or false); - itertools_0_7_3.default = (f.itertools_0_7_3.default or true); - itertools_0_7_3.use_std = - (f.itertools_0_7_3.use_std or false) || - (f.itertools_0_7_3.default or false) || - (itertools_0_7_3.default or false); - }) [ either_1_4_0_features ]; - itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { - features = mkFeatures (features.itoa_0_3_4 or {}); - }; - itoa_0_3_4_features = f: updateFeatures f (rec { - itoa_0_3_4.default = (f.itoa_0_3_4.default or true); + fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); + fuchsia_zircon_sys_0_3_3.default = true; + }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ]; + fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; + fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); }) []; - kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { - dependencies = mapFeatures features ([ winapi_0_2_8 ]); - buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ { + dependencies = mapFeatures features ([ quick_error_1_2_1 ]); }; - kernel32_sys_0_2_2_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); - winapi_0_2_8.default = true; - winapi_build_0_1_1.default = true; - }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { + humantime_1_1_1_features = f: updateFeatures f (rec { + humantime_1_1_1.default = (f.humantime_1_1_1.default or true); + quick_error_1_2_1.default = true; + }) [ quick_error_1_2_1_features ]; + itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ { + dependencies = mapFeatures features ([ either_1_5_0 ]); + features = mkFeatures (features.itertools_0_7_8 or {}); + }; + itertools_0_7_8_features = f: updateFeatures f (rec { + either_1_5_0.default = (f.either_1_5_0.default or false); + itertools_0_7_8.default = (f.itertools_0_7_8.default or true); + itertools_0_7_8.use_std = + (f.itertools_0_7_8.use_std or false) || + (f.itertools_0_7_8.default or false) || + (itertools_0_7_8.default or false); + }) [ either_1_5_0_features ]; + itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ { + features = mkFeatures (features.itoa_0_4_1 or {}); + }; + itoa_0_4_1_features = f: updateFeatures f (rec { + itoa_0_4_1.default = (f.itoa_0_4_1.default or true); + itoa_0_4_1.std = + (f.itoa_0_4_1.std or false) || + (f.itoa_0_4_1.default or false) || + (itoa_0_4_1.default or false); + }) []; + lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_0_2_11 or {}); + features = mkFeatures (features.lazy_static_1_0_0 or {}); }; - lazy_static_0_2_11_features = f: updateFeatures f (rec { - lazy_static_0_2_11.compiletest_rs = - (f.lazy_static_0_2_11.compiletest_rs or false) || - (f.lazy_static_0_2_11.compiletest or false) || - (lazy_static_0_2_11.compiletest or false); - lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); - lazy_static_0_2_11.nightly = - (f.lazy_static_0_2_11.nightly or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); - lazy_static_0_2_11.spin = - (f.lazy_static_0_2_11.spin or false) || - (f.lazy_static_0_2_11.spin_no_std or false) || - (lazy_static_0_2_11.spin_no_std or false); + lazy_static_1_0_0_features = f: updateFeatures f (rec { + lazy_static_1_0_0.compiletest_rs = + (f.lazy_static_1_0_0.compiletest_rs or false) || + (f.lazy_static_1_0_0.compiletest or false) || + (lazy_static_1_0_0.compiletest or false); + lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); + lazy_static_1_0_0.nightly = + (f.lazy_static_1_0_0.nightly or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + lazy_static_1_0_0.spin = + (f.lazy_static_1_0_0.spin or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); }) []; - libc_0_2_33 = { features?(libc_0_2_33_features {}) }: libc_0_2_33_ { - features = mkFeatures (features.libc_0_2_33 or {}); + libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { + features = mkFeatures (features.libc_0_2_40 or {}); }; - libc_0_2_33_features = f: updateFeatures f (rec { - libc_0_2_33.default = (f.libc_0_2_33.default or true); - libc_0_2_33.use_std = - (f.libc_0_2_33.use_std or false) || - (f.libc_0_2_33.default or false) || - (libc_0_2_33.default or false); + libc_0_2_40_features = f: updateFeatures f (rec { + libc_0_2_40.default = (f.libc_0_2_40.default or true); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || + (f.libc_0_2_40.default or false) || + (libc_0_2_40.default or false); }) []; - libsqlite3_sys_0_9_0 = { features?(libsqlite3_sys_0_9_0_features {}) }: libsqlite3_sys_0_9_0_ { + libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ { dependencies = (if abi == "msvc" then mapFeatures features ([]) else []); buildDependencies = mapFeatures features ([ ] - ++ (if features.libsqlite3_sys_0_9_0.pkg-config or false then [ pkg_config_0_3_9 ] else [])); - features = mkFeatures (features.libsqlite3_sys_0_9_0 or {}); + ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else [])); + features = mkFeatures (features.libsqlite3_sys_0_9_1 or {}); }; - libsqlite3_sys_0_9_0_features = f: updateFeatures f (rec { - libsqlite3_sys_0_9_0.bindgen = - (f.libsqlite3_sys_0_9_0.bindgen or false) || - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_0.buildtime_bindgen or false); - libsqlite3_sys_0_9_0.cc = - (f.libsqlite3_sys_0_9_0.cc or false) || - (f.libsqlite3_sys_0_9_0.bundled or false) || - (libsqlite3_sys_0_9_0.bundled or false); - libsqlite3_sys_0_9_0.default = (f.libsqlite3_sys_0_9_0.default or true); - libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_0.default or false) || - (libsqlite3_sys_0_9_0.default or false); - libsqlite3_sys_0_9_0.pkg-config = - (f.libsqlite3_sys_0_9_0.pkg-config or false) || - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false); - libsqlite3_sys_0_9_0.vcpkg = - (f.libsqlite3_sys_0_9_0.vcpkg or false) || - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_0.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false); + libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec { + libsqlite3_sys_0_9_1.bindgen = + (f.libsqlite3_sys_0_9_1.bindgen or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false); + libsqlite3_sys_0_9_1.cc = + (f.libsqlite3_sys_0_9_1.cc or false) || + (f.libsqlite3_sys_0_9_1.bundled or false) || + (libsqlite3_sys_0_9_1.bundled or false); + libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true); + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.default or false) || + (libsqlite3_sys_0_9_1.default or false); + libsqlite3_sys_0_9_1.pkg-config = + (f.libsqlite3_sys_0_9_1.pkg-config or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); + libsqlite3_sys_0_9_1.vcpkg = + (f.libsqlite3_sys_0_9_1.vcpkg or false) || + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); pkg_config_0_3_9.default = true; }) [ pkg_config_0_3_9_features ]; linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ { @@ -955,13 +944,13 @@ rec { }) [ linked_hash_map_0_4_2_features ]; memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { dependencies = mapFeatures features ([ ] - ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_33 ] else [])); + ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else [])); features = mkFeatures (features.memchr_1_0_2 or {}); }; memchr_1_0_2_features = f: updateFeatures f (rec { - libc_0_2_33.default = (f.libc_0_2_33.default or false); - libc_0_2_33.use_std = - (f.libc_0_2_33.use_std or false) || + libc_0_2_40.default = (f.libc_0_2_40.default or false); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || (memchr_1_0_2.use_std or false) || (f.memchr_1_0_2.use_std or false); memchr_1_0_2.default = (f.memchr_1_0_2.default or true); @@ -975,7 +964,30 @@ rec { (f.memchr_1_0_2.use_std or false) || (f.memchr_1_0_2.default or false) || (memchr_1_0_2.default or false); - }) [ libc_0_2_33_features ]; + }) [ libc_0_2_40_features ]; + memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { + dependencies = mapFeatures features ([ ] + ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); + features = mkFeatures (features.memchr_2_0_1 or {}); + }; + memchr_2_0_1_features = f: updateFeatures f (rec { + libc_0_2_40.default = (f.libc_0_2_40.default or false); + libc_0_2_40.use_std = + (f.libc_0_2_40.use_std or false) || + (memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.use_std or false); + memchr_2_0_1.default = (f.memchr_2_0_1.default or true); + memchr_2_0_1.libc = + (f.memchr_2_0_1.libc or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false) || + (f.memchr_2_0_1.use_std or false) || + (memchr_2_0_1.use_std or false); + memchr_2_0_1.use_std = + (f.memchr_2_0_1.use_std or false) || + (f.memchr_2_0_1.default or false) || + (memchr_2_0_1.default or false); + }) [ libc_0_2_40_features ]; nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { dependencies = mapFeatures features ([ memchr_1_0_2 ]); features = mkFeatures (features.nom_3_2_1 or {}); @@ -1012,282 +1024,303 @@ rec { (f.nom_3_2_1.default or false) || (nom_3_2_1.default or false); }) [ memchr_1_0_2_features ]; - num_0_1_40 = { features?(num_0_1_40_features {}) }: num_0_1_40_ { - dependencies = mapFeatures features ([ num_integer_0_1_35 num_iter_0_1_34 num_traits_0_1_40 ]); - features = mkFeatures (features.num_0_1_40 or {}); + num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ { + features = mkFeatures (features.num_traits_0_2_2 or {}); }; - num_0_1_40_features = f: updateFeatures f (rec { - num_0_1_40.bigint = - (f.num_0_1_40.bigint or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_0_1_40.complex = - (f.num_0_1_40.complex or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_0_1_40.default = (f.num_0_1_40.default or true); - num_0_1_40.num-bigint = - (f.num_0_1_40.num-bigint or false) || - (f.num_0_1_40.bigint or false) || - (num_0_1_40.bigint or false); - num_0_1_40.num-complex = - (f.num_0_1_40.num-complex or false) || - (f.num_0_1_40.complex or false) || - (num_0_1_40.complex or false); - num_0_1_40.num-rational = - (f.num_0_1_40.num-rational or false) || - (f.num_0_1_40.rational or false) || - (num_0_1_40.rational or false); - num_0_1_40.rational = - (f.num_0_1_40.rational or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_0_1_40.rustc-serialize = - (f.num_0_1_40.rustc-serialize or false) || - (f.num_0_1_40.default or false) || - (num_0_1_40.default or false); - num_integer_0_1_35.default = true; - num_iter_0_1_34.default = true; - num_traits_0_1_40.default = true; - }) [ num_integer_0_1_35_features num_iter_0_1_34_features num_traits_0_1_40_features ]; - num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { - dependencies = mapFeatures features ([ num_traits_0_1_40 ]); - }; - num_integer_0_1_35_features = f: updateFeatures f (rec { - num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); - num_traits_0_1_40.default = true; - }) [ num_traits_0_1_40_features ]; - num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { - dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]); - }; - num_iter_0_1_34_features = f: updateFeatures f (rec { - num_integer_0_1_35.default = true; - num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); - num_traits_0_1_40.default = true; - }) [ num_integer_0_1_35_features num_traits_0_1_40_features ]; - num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; - num_traits_0_1_40_features = f: updateFeatures f (rec { - num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); + num_traits_0_2_2_features = f: updateFeatures f (rec { + num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true); + num_traits_0_2_2.std = + (f.num_traits_0_2_2.std or false) || + (f.num_traits_0_2_2.default or false) || + (num_traits_0_2_2.default or false); }) []; pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; pkg_config_0_3_9_features = f: updateFeatures f (rec { pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); }) []; - quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; - quote_0_3_15_features = f: updateFeatures f (rec { - quote_0_3_15.default = (f.quote_0_3_15.default or true); - }) []; - rand_0_3_18 = { features?(rand_0_3_18_features {}) }: rand_0_3_18_ { - dependencies = mapFeatures features ([ libc_0_2_33 ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_2_1 ]) else []); - features = mkFeatures (features.rand_0_3_18 or {}); + proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ { + dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); + features = mkFeatures (features.proc_macro2_0_3_6 or {}); }; - rand_0_3_18_features = f: updateFeatures f (rec { - fuchsia_zircon_0_2_1.default = true; - libc_0_2_33.default = true; - rand_0_3_18.default = (f.rand_0_3_18.default or true); - rand_0_3_18.i128_support = - (f.rand_0_3_18.i128_support or false) || - (f.rand_0_3_18.nightly or false) || - (rand_0_3_18.nightly or false); - }) [ libc_0_2_33_features fuchsia_zircon_0_2_1_features ]; - redox_syscall_0_1_32 = { features?(redox_syscall_0_1_32_features {}) }: redox_syscall_0_1_32_ {}; - redox_syscall_0_1_32_features = f: updateFeatures f (rec { - redox_syscall_0_1_32.default = (f.redox_syscall_0_1_32.default or true); + proc_macro2_0_3_6_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (f.proc_macro2_0_3_6.default or false) || + (proc_macro2_0_3_6.default or false) || + (f.proc_macro2_0_3_6.nightly or false) || + (proc_macro2_0_3_6.nightly or false); + unicode_xid_0_1_0.default = true; + }) [ unicode_xid_0_1_0_features ]; + quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {}; + quick_error_1_2_1_features = f: updateFeatures f (rec { + quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true); + }) []; + quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]); + features = mkFeatures (features.quote_0_5_1 or {}); + }; + quote_0_5_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (quote_0_5_1.proc-macro or false) || + (f.quote_0_5_1.proc-macro or false); + quote_0_5_1.default = (f.quote_0_5_1.default or true); + quote_0_5_1.proc-macro = + (f.quote_0_5_1.proc-macro or false) || + (f.quote_0_5_1.default or false) || + (quote_0_5_1.default or false); + }) [ proc_macro2_0_3_6_features ]; + rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] + ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + features = mkFeatures (features.rand_0_4_2 or {}); + }; + rand_0_4_2_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_3.default = true; + libc_0_2_40.default = true; + rand_0_4_2.default = (f.rand_0_4_2.default or true); + rand_0_4_2.i128_support = + (f.rand_0_4_2.i128_support or false) || + (f.rand_0_4_2.nightly or false) || + (rand_0_4_2.nightly or false); + rand_0_4_2.libc = + (f.rand_0_4_2.libc or false) || + (f.rand_0_4_2.std or false) || + (rand_0_4_2.std or false); + rand_0_4_2.std = + (f.rand_0_4_2.std or false) || + (f.rand_0_4_2.default or false) || + (rand_0_4_2.default or false); + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.ntsecapi = true; + winapi_0_3_4.profileapi = true; + winapi_0_3_4.winnt = true; + }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; + redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; + redox_syscall_0_1_37_features = f: updateFeatures f (rec { + redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); }) []; redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_32 ]); + dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); }; redox_termios_0_1_1_features = f: updateFeatures f (rec { - redox_syscall_0_1_32.default = true; + redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_32_features ]; - regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_2 or {}); + }) [ redox_syscall_0_1_37_features ]; + regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ { + dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]); + features = mkFeatures (features.regex_0_2_10 or {}); }; - regex_0_2_2_features = f: updateFeatures f (rec { - aho_corasick_0_6_3.default = true; - memchr_1_0_2.default = true; - regex_0_2_2.default = (f.regex_0_2_2.default or true); - regex_0_2_2.simd = - (f.regex_0_2_2.simd or false) || - (f.regex_0_2_2.simd-accel or false) || - (regex_0_2_2.simd-accel or false); - regex_syntax_0_4_1.default = true; - thread_local_0_3_4.default = true; + regex_0_2_10_features = f: updateFeatures f (rec { + aho_corasick_0_6_4.default = true; + memchr_2_0_1.default = true; + regex_0_2_10.default = (f.regex_0_2_10.default or true); + regex_0_2_10.pattern = + (f.regex_0_2_10.pattern or false) || + (f.regex_0_2_10.unstable or false) || + (regex_0_2_10.unstable or false); + regex_syntax_0_5_5.default = true; + thread_local_0_3_5.default = true; utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_3_features memchr_1_0_2_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {}; - regex_syntax_0_4_1_features = f: updateFeatures f (rec { - regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true); - }) []; + }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; + regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ { + dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); + }; + regex_syntax_0_5_5_features = f: updateFeatures f (rec { + regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true); + ucd_util_0_1_1.default = true; + }) [ ucd_util_0_1_1_features ]; + remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); + }; + remove_dir_all_0_5_0_features = f: updateFeatures f (rec { + remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true); + winapi_0_3_4.default = true; + winapi_0_3_4.errhandlingapi = true; + winapi_0_3_4.fileapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.winbase = true; + winapi_0_3_4.winerror = true; + }) [ winapi_0_3_4_features ]; rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_0 lru_cache_0_1_1 time_0_1_38 ]); + dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]); features = mkFeatures (features.rusqlite_0_13_0 or {}); }; rusqlite_0_13_0_features = f: updateFeatures f (rec { bitflags_1_0_1.default = true; - libsqlite3_sys_0_9_0.buildtime_bindgen = - (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + libsqlite3_sys_0_9_1.buildtime_bindgen = + (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || (rusqlite_0_13_0.buildtime_bindgen or false) || (f.rusqlite_0_13_0.buildtime_bindgen or false); - libsqlite3_sys_0_9_0.bundled = - (f.libsqlite3_sys_0_9_0.bundled or false) || + libsqlite3_sys_0_9_1.bundled = + (f.libsqlite3_sys_0_9_1.bundled or false) || (rusqlite_0_13_0.bundled or false) || (f.rusqlite_0_13_0.bundled or false); - libsqlite3_sys_0_9_0.default = true; - libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || + libsqlite3_sys_0_9_1.default = true; + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || (rusqlite_0_13_0.backup or false) || (f.rusqlite_0_13_0.backup or false); - libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || + libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || (rusqlite_0_13_0.trace or false) || (f.rusqlite_0_13_0.trace or false); - libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || + libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || (rusqlite_0_13_0.functions or false) || (f.rusqlite_0_13_0.functions or false); - libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 = - (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || + libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 = + (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || (rusqlite_0_13_0.blob or false) || (f.rusqlite_0_13_0.blob or false); - libsqlite3_sys_0_9_0.sqlcipher = - (f.libsqlite3_sys_0_9_0.sqlcipher or false) || + libsqlite3_sys_0_9_1.sqlcipher = + (f.libsqlite3_sys_0_9_1.sqlcipher or false) || (rusqlite_0_13_0.sqlcipher or false) || (f.rusqlite_0_13_0.sqlcipher or false); lru_cache_0_1_1.default = true; rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true); - time_0_1_38.default = true; - }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_0_features lru_cache_0_1_1_features time_0_1_38_features ]; - rustc_demangle_0_1_5 = { features?(rustc_demangle_0_1_5_features {}) }: rustc_demangle_0_1_5_ {}; - rustc_demangle_0_1_5_features = f: updateFeatures f (rec { - rustc_demangle_0_1_5.default = (f.rustc_demangle_0_1_5.default or true); + time_0_1_39.default = true; + }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ]; + rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {}; + rustc_demangle_0_1_7_features = f: updateFeatures f (rec { + rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true); }) []; - serde_1_0_21 = { features?(serde_1_0_21_features {}) }: serde_1_0_21_ { + serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_21 or {}); + features = mkFeatures (features.serde_1_0_38 or {}); }; - serde_1_0_21_features = f: updateFeatures f (rec { - serde_1_0_21.default = (f.serde_1_0_21.default or true); - serde_1_0_21.serde_derive = - (f.serde_1_0_21.serde_derive or false) || - (f.serde_1_0_21.derive or false) || - (serde_1_0_21.derive or false) || - (f.serde_1_0_21.playground or false) || - (serde_1_0_21.playground or false); - serde_1_0_21.std = - (f.serde_1_0_21.std or false) || - (f.serde_1_0_21.default or false) || - (serde_1_0_21.default or false); - serde_1_0_21.unstable = - (f.serde_1_0_21.unstable or false) || - (f.serde_1_0_21.alloc or false) || - (serde_1_0_21.alloc or false); + serde_1_0_38_features = f: updateFeatures f (rec { + serde_1_0_38.default = (f.serde_1_0_38.default or true); + serde_1_0_38.serde_derive = + (f.serde_1_0_38.serde_derive or false) || + (f.serde_1_0_38.derive or false) || + (serde_1_0_38.derive or false) || + (f.serde_1_0_38.playground or false) || + (serde_1_0_38.playground or false); + serde_1_0_38.std = + (f.serde_1_0_38.std or false) || + (f.serde_1_0_38.default or false) || + (serde_1_0_38.default or false); + serde_1_0_38.unstable = + (f.serde_1_0_38.unstable or false) || + (f.serde_1_0_38.alloc or false) || + (serde_1_0_38.alloc or false); }) []; - serde_derive_1_0_21 = { features?(serde_derive_1_0_21_features {}) }: serde_derive_1_0_21_ { - dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ]); + serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]); + features = mkFeatures (features.serde_derive_1_0_38 or {}); }; - serde_derive_1_0_21_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - serde_derive_1_0_21.default = (f.serde_derive_1_0_21.default or true); - serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or false); - syn_0_11_11.default = true; - syn_0_11_11.visit = true; - }) [ quote_0_3_15_features serde_derive_internals_0_17_0_features syn_0_11_11_features ]; - serde_derive_internals_0_17_0 = { features?(serde_derive_internals_0_17_0_features {}) }: serde_derive_internals_0_17_0_ { - dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]); + serde_derive_1_0_38_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = true; + quote_0_5_1.default = true; + serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true); + serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false); + syn_0_13_1.default = true; + syn_0_13_1.visit = true; + }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ]; + serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]); }; - serde_derive_internals_0_17_0_features = f: updateFeatures f (rec { - serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or true); - syn_0_11_11.default = (f.syn_0_11_11.default or false); - syn_0_11_11.parsing = true; - synom_0_11_3.default = true; - }) [ syn_0_11_11_features synom_0_11_3_features ]; - serde_json_1_0_6 = { features?(serde_json_1_0_6_features {}) }: serde_json_1_0_6_ { - dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_21 ]); - features = mkFeatures (features.serde_json_1_0_6 or {}); + serde_derive_internals_0_23_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = true; + serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true); + syn_0_13_1.clone-impls = true; + syn_0_13_1.default = (f.syn_0_13_1.default or false); + syn_0_13_1.derive = true; + syn_0_13_1.parsing = true; + }) [ proc_macro2_0_3_6_features syn_0_13_1_features ]; + serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]); + features = mkFeatures (features.serde_json_1_0_14 or {}); }; - serde_json_1_0_6_features = f: updateFeatures f (rec { + serde_json_1_0_14_features = f: updateFeatures f (rec { dtoa_0_4_2.default = true; - itoa_0_3_4.default = true; - num_traits_0_1_40.default = true; - serde_1_0_21.default = true; - serde_json_1_0_6.default = (f.serde_json_1_0_6.default or true); - serde_json_1_0_6.linked-hash-map = - (f.serde_json_1_0_6.linked-hash-map or false) || - (f.serde_json_1_0_6.preserve_order or false) || - (serde_json_1_0_6.preserve_order or false); - }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_1_0_21_features ]; - strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; - strsim_0_6_0_features = f: updateFeatures f (rec { - strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + itoa_0_4_1.default = true; + num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false); + serde_1_0_38.default = true; + serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true); + serde_json_1_0_14.linked-hash-map = + (f.serde_json_1_0_14.linked-hash-map or false) || + (f.serde_json_1_0_14.preserve_order or false) || + (serde_json_1_0_14.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ]; + strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; + strsim_0_7_0_features = f: updateFeatures f (rec { + strsim_0_7_0.default = (f.strsim_0_7_0.default or true); }) []; - syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { - dependencies = mapFeatures features ([ ] - ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) - ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) - ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); - features = mkFeatures (features.syn_0_11_11 or {}); + syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ { + dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ] + ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else [])); + features = mkFeatures (features.syn_0_13_1 or {}); }; - syn_0_11_11_features = f: updateFeatures f (rec { - quote_0_3_15.default = true; - syn_0_11_11.default = (f.syn_0_11_11.default or true); - syn_0_11_11.parsing = - (f.syn_0_11_11.parsing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.printing = - (f.syn_0_11_11.printing or false) || - (f.syn_0_11_11.default or false) || - (syn_0_11_11.default or false); - syn_0_11_11.quote = - (f.syn_0_11_11.quote or false) || - (f.syn_0_11_11.printing or false) || - (syn_0_11_11.printing or false); - syn_0_11_11.synom = - (f.syn_0_11_11.synom or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - syn_0_11_11.unicode-xid = - (f.syn_0_11_11.unicode-xid or false) || - (f.syn_0_11_11.parsing or false) || - (syn_0_11_11.parsing or false); - synom_0_11_3.default = true; - unicode_xid_0_0_4.default = true; - }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; - synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { - dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); + syn_0_13_1_features = f: updateFeatures f (rec { + proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); + proc_macro2_0_3_6.proc-macro = + (f.proc_macro2_0_3_6.proc-macro or false) || + (syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.proc-macro or false); + quote_0_5_1.default = (f.quote_0_5_1.default or false); + quote_0_5_1.proc-macro = + (f.quote_0_5_1.proc-macro or false) || + (syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.proc-macro or false); + syn_0_13_1.clone-impls = + (f.syn_0_13_1.clone-impls or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.default = (f.syn_0_13_1.default or true); + syn_0_13_1.derive = + (f.syn_0_13_1.derive or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.parsing = + (f.syn_0_13_1.parsing or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.printing = + (f.syn_0_13_1.printing or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.proc-macro = + (f.syn_0_13_1.proc-macro or false) || + (f.syn_0_13_1.default or false) || + (syn_0_13_1.default or false); + syn_0_13_1.quote = + (f.syn_0_13_1.quote or false) || + (f.syn_0_13_1.printing or false) || + (syn_0_13_1.printing or false); + unicode_xid_0_1_0.default = true; + }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ]; + tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { + dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]); }; - synom_0_11_3_features = f: updateFeatures f (rec { - synom_0_11_3.default = (f.synom_0_11_3.default or true); - unicode_xid_0_0_4.default = true; - }) [ unicode_xid_0_0_4_features ]; - tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ { - dependencies = mapFeatures features ([ rand_0_3_18 ]); + tempdir_0_3_7_features = f: updateFeatures f (rec { + rand_0_4_2.default = true; + remove_dir_all_0_5_0.default = true; + tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); + }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ]; + termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); }; - tempdir_0_3_5_features = f: updateFeatures f (rec { - rand_0_3_18.default = true; - tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true); - }) [ rand_0_3_18_features ]; - termcolor_0_3_3 = { features?(termcolor_0_3_3_features {}) }: termcolor_0_3_3_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_4 ]) else []); - }; - termcolor_0_3_3_features = f: updateFeatures f (rec { - termcolor_0_3_3.default = (f.termcolor_0_3_3.default or true); - wincolor_0_1_4.default = true; - }) [ wincolor_0_1_4_features ]; + termcolor_0_3_6_features = f: updateFeatures f (rec { + termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); + wincolor_0_1_6.default = true; + }) [ wincolor_0_1_6_features ]; termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_33 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 redox_termios_0_1_1 ]) else []); + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); }; termion_1_5_1_features = f: updateFeatures f (rec { - libc_0_2_33.default = true; - redox_syscall_0_1_32.default = true; + libc_0_2_40.default = true; + redox_syscall_0_1_37.default = true; redox_termios_0_1_1.default = true; termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_33_features redox_syscall_0_1_32_features redox_termios_0_1_1_features ]; + }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); }; @@ -1295,44 +1328,54 @@ rec { textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); unicode_width_0_1_4.default = true; }) [ unicode_width_0_1_4_features ]; - thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ { - dependencies = mapFeatures features ([ lazy_static_0_2_11 unreachable_1_0_0 ]); + thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { + dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); }; - thread_local_0_3_4_features = f: updateFeatures f (rec { - lazy_static_0_2_11.default = true; - thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true); + thread_local_0_3_5_features = f: updateFeatures f (rec { + lazy_static_1_0_0.default = true; + thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); unreachable_1_0_0.default = true; - }) [ lazy_static_0_2_11_features unreachable_1_0_0_features ]; - time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ { - dependencies = mapFeatures features ([ libc_0_2_33 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; + time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ { + dependencies = mapFeatures features ([ libc_0_2_40 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); }; - time_0_1_38_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - libc_0_2_33.default = true; - redox_syscall_0_1_32.default = true; - time_0_1_38.default = (f.time_0_1_38.default or true); - winapi_0_2_8.default = true; - }) [ libc_0_2_33_features redox_syscall_0_1_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - toml_0_4_5 = { features?(toml_0_4_5_features {}) }: toml_0_4_5_ { - dependencies = mapFeatures features ([ serde_1_0_21 ]); + time_0_1_39_features = f: updateFeatures f (rec { + libc_0_2_40.default = true; + redox_syscall_0_1_37.default = true; + time_0_1_39.default = (f.time_0_1_39.default or true); + winapi_0_3_4.default = true; + winapi_0_3_4.minwinbase = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.ntdef = true; + winapi_0_3_4.profileapi = true; + winapi_0_3_4.std = true; + winapi_0_3_4.sysinfoapi = true; + winapi_0_3_4.timezoneapi = true; + }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ]; + toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { + dependencies = mapFeatures features ([ serde_1_0_38 ]); }; - toml_0_4_5_features = f: updateFeatures f (rec { - serde_1_0_21.default = true; - toml_0_4_5.default = (f.toml_0_4_5.default or true); - }) [ serde_1_0_21_features ]; + toml_0_4_6_features = f: updateFeatures f (rec { + serde_1_0_38.default = true; + toml_0_4_6.default = (f.toml_0_4_6.default or true); + }) [ serde_1_0_38_features ]; + ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; + ucd_util_0_1_1_features = f: updateFeatures f (rec { + ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); + }) []; unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { features = mkFeatures (features.unicode_width_0_1_4 or {}); }; unicode_width_0_1_4_features = f: updateFeatures f (rec { unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); }) []; - unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { - features = mkFeatures (features.unicode_xid_0_0_4 or {}); + unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { + features = mkFeatures (features.unicode_xid_0_1_0 or {}); }; - unicode_xid_0_0_4_features = f: updateFeatures f (rec { - unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); + unicode_xid_0_1_0_features = f: updateFeatures f (rec { + unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); }) []; unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { dependencies = mapFeatures features ([ void_1_0_2 ]); @@ -1345,9 +1388,9 @@ rec { utf8_ranges_1_0_0_features = f: updateFeatures f (rec { utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); }) []; - vcpkg_0_2_2 = { features?(vcpkg_0_2_2_features {}) }: vcpkg_0_2_2_ {}; - vcpkg_0_2_2_features = f: updateFeatures f (rec { - vcpkg_0_2_2.default = (f.vcpkg_0_2_2.default or true); + vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; + vcpkg_0_2_3_features = f: updateFeatures f (rec { + vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); }) []; vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { dependencies = mapFeatures features ([]); @@ -1374,20 +1417,34 @@ rec { (f.void_1_0_2.default or false) || (void_1_0_2.default or false); }) []; - winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; - winapi_0_2_8_features = f: updateFeatures f (rec { - winapi_0_2_8.default = (f.winapi_0_2_8.default or true); - }) []; - winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; - winapi_build_0_1_1_features = f: updateFeatures f (rec { - winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); - }) []; - wincolor_0_1_4 = { features?(wincolor_0_1_4_features {}) }: wincolor_0_1_4_ { - dependencies = mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]); + winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); + features = mkFeatures (features.winapi_0_3_4 or {}); }; - wincolor_0_1_4_features = f: updateFeatures f (rec { - kernel32_sys_0_2_2.default = true; - winapi_0_2_8.default = true; - wincolor_0_1_4.default = (f.wincolor_0_1_4.default or true); - }) [ kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + winapi_0_3_4_features = f: updateFeatures f (rec { + winapi_0_3_4.default = (f.winapi_0_3_4.default or true); + winapi_i686_pc_windows_gnu_0_4_0.default = true; + winapi_x86_64_pc_windows_gnu_0_4_0.default = true; + }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; + winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; + winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); + }) []; + winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; + winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); + }) []; + wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { + dependencies = mapFeatures features ([ winapi_0_3_4 ]); + }; + wincolor_0_1_6_features = f: updateFeatures f (rec { + winapi_0_3_4.consoleapi = true; + winapi_0_3_4.default = true; + winapi_0_3_4.minwindef = true; + winapi_0_3_4.processenv = true; + winapi_0_3_4.winbase = true; + winapi_0_3_4.wincon = true; + wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); + }) [ winapi_0_3_4_features ]; } From 3476b4c7d7b5ad54dd92b2a3c6a75a86fead3817 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Mon, 16 Apr 2018 12:22:59 +0200 Subject: [PATCH 205/538] Remove overrides for dead emacs packages. --- .../editors/emacs-modes/melpa-packages.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 86c81cc9721e..268976179bc5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -103,9 +103,6 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; - # upstream issue: missing file header - helm-words = markBroken super.helm-words; - # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; @@ -149,9 +146,6 @@ self: # upstream issue: missing dependency org-readme = markBroken super.org-readme; - # upstream issue: missing file header - perl-completion = markBroken super.perl-completion; - # upstream issue: truncated file powershell = markBroken super.powershell; @@ -161,9 +155,6 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing file header - railgun = markBroken super.railgun; - # upstream issue: missing file footer seoul256-theme = markBroken super.seoul256-theme; @@ -198,9 +189,6 @@ self: # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - # upstream issue: missing file header - zeitgeist = markBroken super.zeitgeist; - w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = From 8e87f73e368c5dfaed0828f3f030b7a740630d7d Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Mon, 16 Apr 2018 16:07:47 +0200 Subject: [PATCH 206/538] Update to 0.7.2 --- pkgs/build-support/rust/carnix.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index cecddab22c37..5b79d607f9d5 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,4 +1,4 @@ -# Generated by carnix 0.7.0: /home/pe/.cargo/bin/cargo-generate-nixfile generate-nixfile +# Generated by carnix 0.7.2: carnix nix { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; @@ -18,7 +18,7 @@ let kernel = buildPlatform.parsed.kernel.name; ) [] (builtins.attrNames feat); in rec { - carnix = f: carnix_0_7_0 { features = carnix_0_7_0_features { carnix_0_7_0 = f; }; }; + carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; }; __all = [ (carnix {}) ]; aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "aho-corasick"; @@ -65,11 +65,11 @@ rec { sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; inherit dependencies buildDependencies features; }; - carnix_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "carnix"; - version = "0.7.0"; + version = "0.7.2"; authors = [ "pe@pijul.org " ]; - sha256 = "17b9psm7z29pwhlwgnvj0fwsy1ljyh8i86hjnwscnanjpnxbi089"; + sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5"; crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ]; inherit dependencies buildDependencies features; }; @@ -628,11 +628,11 @@ rec { (f.bitflags_1_0_1.default or false) || (bitflags_1_0_1.default or false); }) []; - carnix_0_7_0 = { features?(carnix_0_7_0_features {}) }: carnix_0_7_0_ { + carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ { dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]); }; - carnix_0_7_0_features = f: updateFeatures f (rec { - carnix_0_7_0.default = (f.carnix_0_7_0.default or true); + carnix_0_7_2_features = f: updateFeatures f (rec { + carnix_0_7_2.default = (f.carnix_0_7_2.default or true); clap_2_31_2.default = true; env_logger_0_5_7.default = true; error_chain_0_11_0.default = true; From ec40f193acbe1269fe67b05f345f9ff20ec6f295 Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Mon, 16 Apr 2018 16:16:28 +0200 Subject: [PATCH 207/538] disable parallel rustc (-C codegen-units=1) --- pkgs/build-support/rust/build-rust-crate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 99d6094891cc..e0aec6e0e18b 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -187,7 +187,7 @@ let makeDeps = dependencies: rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - extraRustcOpts; + (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; From be660b8f512f6f108fc081a6d8d587c14903f372 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 16 Apr 2018 16:49:01 +0200 Subject: [PATCH 208/538] browserpass: fix gnupg dependency issue --- pkgs/tools/security/browserpass/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index a4656b5db046..c7ed511753d4 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }: buildGoPackage rec { name = "browserpass-${version}"; @@ -16,6 +16,11 @@ buildGoPackage rec { sha256 = "0wszjpxfa0krr2zdx7a33vl1r86k74dpy5c940r6ww1zbgqzcibg"; }; + postPatch = '' + substituteInPlace browserpass.go \ + --replace /usr/local/bin/gpg ${gnupg}/bin/gpg + ''; + postInstall = '' host_file="$bin/bin/browserpass" mkdir -p "$bin/etc" From 2c1f2c0f0b7d5eecef393f792bd7dd184af7a284 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 16 Apr 2018 16:49:02 +0000 Subject: [PATCH 209/538] babelstone-han: 11.0.0 -> 11.0.2 new font version; old link answers with 404 --- pkgs/data/fonts/babelstone-han/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index acfcc9181045..fbf62e3ba386 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,19 +1,19 @@ {stdenv, fetchzip}: let - version = "11.0.0"; + version = "11.0.2"; in fetchzip { name = "babelstone-han-${version}"; - url = http://www.babelstone.co.uk/Fonts/3902/BabelStoneHan.zip; + url = http://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; - sha256 = "1w3v69lacsy0nha20rkbs6f0dskf5xm6p250qx4a1m69d4a1gx7v"; + sha256 = "003cz520riskjp729y3piqhmnzfw3jyrmb94im7jyvlc7hp14cdh"; meta = with stdenv.lib; { - description = "Unicode CJK font with over 32600 Han characters"; + description = "Unicode CJK font with over 36000 Han characters"; homepage = http://www.babelstone.co.uk/Fonts/Han.html; license = licenses.free; From 1f230af96f0e17de173e3eaa5618736c4791a8a1 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Apr 2018 19:51:57 +0200 Subject: [PATCH 210/538] mopidy-iris: 3.14.2 -> 3.16.3 --- pkgs/applications/audio/mopidy-iris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 4ba0088dd04d..a0f91c6708f4 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.14.2"; + version = "3.16.3"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "19affzk45wby50gwxwzqgwa7h7618lcs48ngdsa06sd66s8x2fza"; + sha256 = "1zdlvrqlj1hapaxnskrbp9idziy3rcxhpqhw3x4q25cjbl8m0b0d"; }; propagatedBuildInputs = [ From a4f8090fbe5de643c274046ff1f1be1cb26272d6 Mon Sep 17 00:00:00 2001 From: Thorsten Weber Date: Sun, 15 Apr 2018 18:23:41 +0200 Subject: [PATCH 211/538] fstl: init at 0.9.3 --- pkgs/applications/graphics/fstl/default.nix | 35 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/graphics/fstl/default.nix diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix new file mode 100644 index 000000000000..355acf7681a0 --- /dev/null +++ b/pkgs/applications/graphics/fstl/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}: +stdenv.mkDerivation rec { + name = "fstl-${version}"; + version = "0.9.3"; + + buildInputs = [qtbase mesa_glu]; + + prePatch = '' + sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro + ''; + + preBuild = '' + qmake qt/fstl.pro + ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv fstl.app $out/Applications + ''; + + src = fetchFromGitHub { + owner = "mkeeter"; + repo = "fstl"; + rev = "v" + version; + sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892"; + }; + + meta = with stdenv.lib; { + description = "The fastest STL file viewer"; + homepage = "https://github.com/mkeeter/fstl"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c93910bf0619..c80066a53c11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2391,6 +2391,8 @@ with pkgs; fsfs = callPackage ../tools/filesystems/fsfs { }; + fstl = qt5.callPackage ../applications/graphics/fstl { }; + fswebcam = callPackage ../os-specific/linux/fswebcam { }; fuseiso = callPackage ../tools/filesystems/fuseiso { }; From 52858e429778e90a8865e512bf81015a2de5a564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sun, 15 Apr 2018 12:13:36 +0200 Subject: [PATCH 212/538] kde_frameworks: 5.44 -> 5.45 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 624 +++++++++--------- 2 files changed, 313 insertions(+), 313 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 85a49ce6b6cd..ede76323347e 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.44/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.45/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 84cbbe798fc1..8e2187f29574 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,627 +3,627 @@ { attica = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/attica-5.44.0.tar.xz"; - sha256 = "1ac2k3rc5dd5sc9n8qdb1d6jssjpag709sfsnvif1cvp0j8s2xj3"; - name = "attica-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/attica-5.45.0.tar.xz"; + sha256 = "1vzbajj2ldhg26ssxh0vkahj7fw5v9nhrv000vbxlhsrcczq81n5"; + name = "attica-5.45.0.tar.xz"; }; }; baloo = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/baloo-5.44.0.tar.xz"; - sha256 = "0ybxl05njryk7zrdcwh4gbvxbn7n6xb51y2587d9bxiizasmbbiy"; - name = "baloo-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/baloo-5.45.0.tar.xz"; + sha256 = "0zr2pg946q3wc6bhsbngpmca0ylhw8ckfdrs6ym36v7xz3h5fhds"; + name = "baloo-5.45.0.tar.xz"; }; }; bluez-qt = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/bluez-qt-5.44.0.tar.xz"; - sha256 = "054zh3hc7wq13iks3nryzdns61wb56j2cvvfvsnv3yl9ni6i6wxv"; - name = "bluez-qt-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/bluez-qt-5.45.0.tar.xz"; + sha256 = "056xl29yf7bkqrn655c9b2wdx69021q7cz176rx4daid70i8nx49"; + name = "bluez-qt-5.45.0.tar.xz"; }; }; breeze-icons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/breeze-icons-5.44.0.tar.xz"; - sha256 = "05ndqmprwv4dd8aib3sjmvd5481znq4jg58cpk4id1xxq4dgx9gg"; - name = "breeze-icons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/breeze-icons-5.45.0.tar.xz"; + sha256 = "0nzi4wy0p7lkb76nynmwbgnrsrfbhfxn3269mkbqwakq6i4mxsj8"; + name = "breeze-icons-5.45.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/extra-cmake-modules-5.44.0.tar.xz"; - sha256 = "121gwj54f7bns386wrw6rwqmwzsny93mb00sxxzf3ic8m6mw6wis"; - name = "extra-cmake-modules-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/extra-cmake-modules-5.45.0.tar.xz"; + sha256 = "0g7njdz6bqjcswq100mb2jr4l1mdicqq24wdw3a8f63syg5rvm76"; + name = "extra-cmake-modules-5.45.0.tar.xz"; }; }; frameworkintegration = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/frameworkintegration-5.44.0.tar.xz"; - sha256 = "10rqabchldra16zb0ryynvjimc67di3r4b29fbn47wg4pwj0jn41"; - name = "frameworkintegration-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/frameworkintegration-5.45.0.tar.xz"; + sha256 = "0s300vp674rq2dinhjjsp7v4gmv6ybxsk1r3asv3x789zwz1lr3i"; + name = "frameworkintegration-5.45.0.tar.xz"; }; }; kactivities = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kactivities-5.44.0.tar.xz"; - sha256 = "1j5v03mgh0prql51hy468k2vhskg1gyddhjlb8qlyzyzqz1aj82c"; - name = "kactivities-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kactivities-5.45.0.tar.xz"; + sha256 = "0h3hym4am055f9kyhg98gabw00nb1h10b9dvbs3hs3178dyi5gjg"; + name = "kactivities-5.45.0.tar.xz"; }; }; kactivities-stats = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kactivities-stats-5.44.0.tar.xz"; - sha256 = "1p1vznw8qxdasb82cvjc35wnhvfhjhapx3r451kl3ly4cbjf39fg"; - name = "kactivities-stats-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kactivities-stats-5.45.0.tar.xz"; + sha256 = "0jcvikr7yvjik8zdz46mkrxf2c3ydns194a07njw7hd15x1czqjl"; + name = "kactivities-stats-5.45.0.tar.xz"; }; }; kapidox = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kapidox-5.44.0.tar.xz"; - sha256 = "0mn67ckxhsav70jk1wj5qci07qyy0291rm7q54qmcl6p7a7a0vj4"; - name = "kapidox-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kapidox-5.45.0.tar.xz"; + sha256 = "1996akdnhrky1bk63xraj0qawx6ar1vk6ia4rmdgq0bqjk804g1p"; + name = "kapidox-5.45.0.tar.xz"; }; }; karchive = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/karchive-5.44.0.tar.xz"; - sha256 = "00mvn9rsc4lb2kamfz2xzmm0a0s1m68ar65dcfrp0n2i8plxin5j"; - name = "karchive-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/karchive-5.45.0.tar.xz"; + sha256 = "0gl86ybjkmjz6sl4s00j8mi43admj7xnjnmv92q5lngk75k1zbhq"; + name = "karchive-5.45.0.tar.xz"; }; }; kauth = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kauth-5.44.0.tar.xz"; - sha256 = "1ph2jlbwx27g9awfvkvrynnfwyr8yqq4x7w4msn1clh8nz9c9n0k"; - name = "kauth-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kauth-5.45.0.tar.xz"; + sha256 = "1j6pgbkqjw70lnpk84wqi9m81hc55f1z4cfxkd8hhdk578pry56i"; + name = "kauth-5.45.0.tar.xz"; }; }; kbookmarks = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kbookmarks-5.44.0.tar.xz"; - sha256 = "04wwg9s3i3nj7im0cscdzb3c78lqg96k7vyg9ziyn2cpqmj6gihr"; - name = "kbookmarks-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kbookmarks-5.45.0.tar.xz"; + sha256 = "0ii0gi4vlngp0qypyn2780dnqpkg24k0wb5jpngllrvrf37132md"; + name = "kbookmarks-5.45.0.tar.xz"; }; }; kcmutils = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcmutils-5.44.0.tar.xz"; - sha256 = "1fddjg89az0gfcl9gf3r7rq7hw9j8k10mvlvzq31x89hn8h7kafs"; - name = "kcmutils-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcmutils-5.45.0.tar.xz"; + sha256 = "0w082wr9h2rpk9jyads9bwdimhqjl6f68l710miwjglzcmfy4dgq"; + name = "kcmutils-5.45.0.tar.xz"; }; }; kcodecs = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcodecs-5.44.0.tar.xz"; - sha256 = "15fv3f2akjz8n65rj6r2nd5zzc4wsz67zc80bp45kqynrb1jgcjk"; - name = "kcodecs-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcodecs-5.45.0.tar.xz"; + sha256 = "0si694a64dbb65m7gzcvz474gd61nyvj71wh77chsbsh6hvl1xzx"; + name = "kcodecs-5.45.0.tar.xz"; }; }; kcompletion = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcompletion-5.44.0.tar.xz"; - sha256 = "1fy2krnxxppax13jb82zsfxky9n01z28d3kw4jx58yw1b1jm9ha4"; - name = "kcompletion-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcompletion-5.45.0.tar.xz"; + sha256 = "0lqp0m715hqh8ci1cq7r1y00828ajjzz5y04xpxw78gk9gprakf8"; + name = "kcompletion-5.45.0.tar.xz"; }; }; kconfig = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kconfig-5.44.0.tar.xz"; - sha256 = "1vfl7jchlrw8hkf613nb9a4f0dxyppkc97506xsknxwf1z5v7cmm"; - name = "kconfig-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kconfig-5.45.0.tar.xz"; + sha256 = "00r7vh2myh518wfngfr1gmz6svmnvjfx9bxv8px5z1ap0yda181p"; + name = "kconfig-5.45.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kconfigwidgets-5.44.0.tar.xz"; - sha256 = "15a7k8ai70a061gw91aps282v1f4sric0fhyw2fysfdfv6ry92rz"; - name = "kconfigwidgets-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kconfigwidgets-5.45.0.tar.xz"; + sha256 = "0kj0a2x6f27hkzyl7pfz20b0mv4625nxr7iqdq130wdy5x0wv71l"; + name = "kconfigwidgets-5.45.0.tar.xz"; }; }; kcoreaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcoreaddons-5.44.0.tar.xz"; - sha256 = "0lwxa326gap83qjw1dsj330qd3klgm6jwr7d77f7hyhm95d7pidl"; - name = "kcoreaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcoreaddons-5.45.0.tar.xz"; + sha256 = "15zgz8yhw7z31rljgj63hd949sp48syd1ggbay5nmnsb91ly0z92"; + name = "kcoreaddons-5.45.0.tar.xz"; }; }; kcrash = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kcrash-5.44.0.tar.xz"; - sha256 = "01dcj5cyqqn2jb6mjshjcf48jdjhmjhkqxbhhx07dy7r56r4sqp1"; - name = "kcrash-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kcrash-5.45.0.tar.xz"; + sha256 = "1ny3m1jqazf7b2qrh4dlprwyf60cddk2c88dxhmzr02a8040gckv"; + name = "kcrash-5.45.0.tar.xz"; }; }; kdbusaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdbusaddons-5.44.0.tar.xz"; - sha256 = "15b7nyivkrv7s2hdahsv27p8j6q80209ayqvi3dzlhzj2b5qqzkg"; - name = "kdbusaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdbusaddons-5.45.0.tar.xz"; + sha256 = "071zr5d95j1cd1djqd5nkfz5n224dmzsbx2a446dsp9liklhqaz6"; + name = "kdbusaddons-5.45.0.tar.xz"; }; }; kdeclarative = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdeclarative-5.44.0.tar.xz"; - sha256 = "0byggaxfkna0iqlhp970fx8kp926dc6m99xihvja1765525i1lj0"; - name = "kdeclarative-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdeclarative-5.45.0.tar.xz"; + sha256 = "0h84nla5symfdyrv5dvgs8b1mz0czclipiki16xglzdsja9z9xpl"; + name = "kdeclarative-5.45.0.tar.xz"; }; }; kded = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kded-5.44.0.tar.xz"; - sha256 = "04sdsz5frwff602ls3mqwijckl3kl64lanhhpmzxc33xdniff9as"; - name = "kded-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kded-5.45.0.tar.xz"; + sha256 = "0qr4ycqqz2g5k9pzllahc7aj1b6fyh0zidvaxvbw600wjr5v3acw"; + name = "kded-5.45.0.tar.xz"; }; }; kdelibs4support = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kdelibs4support-5.44.0.tar.xz"; - sha256 = "1cyxry09qnlbc2khaqjpb598f4rscg80dmjcqhlsn6b1375iqkjn"; - name = "kdelibs4support-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kdelibs4support-5.45.0.tar.xz"; + sha256 = "0kil35fj9p8g99jmmkvch326j32wfjqrhypzwg0sa0d74vc2pv5s"; + name = "kdelibs4support-5.45.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdesignerplugin-5.44.0.tar.xz"; - sha256 = "1fh4nw8qh563yc2parqlbrjzx6avi4gi01jzclf4bxv78zs4957a"; - name = "kdesignerplugin-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdesignerplugin-5.45.0.tar.xz"; + sha256 = "0gqvga5akilmqldhzmgjyngbz2dmxmkcjq2g5diq6pijiafsx8kj"; + name = "kdesignerplugin-5.45.0.tar.xz"; }; }; kdesu = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdesu-5.44.0.tar.xz"; - sha256 = "1p6bk7cnngwqklvm6aj5xlna6c5r6rznfbvdn7zz5h3wpzs8pqz2"; - name = "kdesu-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdesu-5.45.0.tar.xz"; + sha256 = "0znncn74vmczcqffc0n6q39q3mk4vsfwj3zn5kglzzsg0x730aly"; + name = "kdesu-5.45.0.tar.xz"; }; }; kdewebkit = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdewebkit-5.44.0.tar.xz"; - sha256 = "07mr4x55pp6wvbgnkggwalrqx9z8y9q1mmn79jkyhf2q905ynsmj"; - name = "kdewebkit-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdewebkit-5.45.0.tar.xz"; + sha256 = "0jdxaaysgdgp15yn2fnxf6m22djyvnl4jcyyrjxz7mz0s0lc4pg9"; + name = "kdewebkit-5.45.0.tar.xz"; }; }; kdnssd = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdnssd-5.44.0.tar.xz"; - sha256 = "18x43l7ni7jwfpch4hngiyz5w05z48q8wmhm38gz3jw09w9npgi4"; - name = "kdnssd-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdnssd-5.45.0.tar.xz"; + sha256 = "181slqgyp7xsg6xz92zris6yjmzysglvkbiyiii4245z1ms9pf0x"; + name = "kdnssd-5.45.0.tar.xz"; }; }; kdoctools = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kdoctools-5.44.0.tar.xz"; - sha256 = "146crn9arrbi6ha7p5p0x7zmwlz86my067rif0v7j48xmmz6h5i3"; - name = "kdoctools-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kdoctools-5.45.0.tar.xz"; + sha256 = "0b2bkn9a7nxyynn5cy53kb62khfklayj8fwgfdh3sr5a15yjycm5"; + name = "kdoctools-5.45.0.tar.xz"; }; }; kemoticons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kemoticons-5.44.0.tar.xz"; - sha256 = "1ggwyzs22907kxgapqi7md3ng1ry85gccyxbqvn638inxk299mla"; - name = "kemoticons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kemoticons-5.45.0.tar.xz"; + sha256 = "1981430xbypxswayrjf5c9bvk65dd2gsima8k0rvysbcqlnyqq7s"; + name = "kemoticons-5.45.0.tar.xz"; }; }; kfilemetadata = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kfilemetadata-5.44.0.tar.xz"; - sha256 = "0v8xdl0wgp67ykw5czxzvzsqzijg0qpkm5vjc9rnai7zaymxg7bg"; - name = "kfilemetadata-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kfilemetadata-5.45.0.tar.xz"; + sha256 = "0wcgsbpkvi8pls9zh24z4c328dl7lq8km4r7dag9vw4200bncwa6"; + name = "kfilemetadata-5.45.0.tar.xz"; }; }; kglobalaccel = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kglobalaccel-5.44.0.tar.xz"; - sha256 = "16qhf6kb6q85p6y9zh72b4rz0ikmahvhyzmrx0jd1r044g4j81wn"; - name = "kglobalaccel-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kglobalaccel-5.45.0.tar.xz"; + sha256 = "1iwmwpdxrymsyryvp007n3kz2w9syhl4h9jk6x77hprnmwj62cym"; + name = "kglobalaccel-5.45.0.tar.xz"; }; }; kguiaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kguiaddons-5.44.0.tar.xz"; - sha256 = "1npl2ibk7ilsicmyvlnvf42lz6qjmqp4nl607a66ikxp3kvk3sdc"; - name = "kguiaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kguiaddons-5.45.0.tar.xz"; + sha256 = "16cgi9a9laiwzg2fbp5hl3qlxjmhq0l7dw5kjpkzm7xvlj0rm5cn"; + name = "kguiaddons-5.45.0.tar.xz"; }; }; kholidays = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kholidays-5.44.0.tar.xz"; - sha256 = "134zxnkclh16gh0qf2ak1pmhlxxwrcgzgmkn5wrynwraplf9b812"; - name = "kholidays-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kholidays-5.45.0.tar.xz"; + sha256 = "02bcybzkzp26sz6rjnsh60jmwidmjg8wnixzxs5fk7h8qfygm4ra"; + name = "kholidays-5.45.0.tar.xz"; }; }; khtml = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/khtml-5.44.0.tar.xz"; - sha256 = "1sph90cfwq0067a6ih8mx1bn715lvsspn6s9lijmm0ck9vbbixgp"; - name = "khtml-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/khtml-5.45.0.tar.xz"; + sha256 = "1ligyb5hpp53q13r9a2w1xi7b5dc1xqqi9bf3jri01n9pf5d4ynq"; + name = "khtml-5.45.0.tar.xz"; }; }; ki18n = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/ki18n-5.44.0.tar.xz"; - sha256 = "1rg24i8ks5mxryssq0zdig0q545zyj4svy9kb6r84qwag4vn7pcc"; - name = "ki18n-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ki18n-5.45.0.tar.xz"; + sha256 = "1xjwwlr46x0wr26xn4z086rlzm2bgzyi1ck91cbcc0jv6p6n43mp"; + name = "ki18n-5.45.0.tar.xz"; }; }; kiconthemes = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kiconthemes-5.44.0.tar.xz"; - sha256 = "1xkrczqw332hr667qp9pwlkypcn9d6zkx51bmi4bg9xfgpg1pwz4"; - name = "kiconthemes-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kiconthemes-5.45.0.tar.xz"; + sha256 = "0wir8drhv5lx00f4n984yh5xavpi75vg1vpyrf68dd490klwzg45"; + name = "kiconthemes-5.45.0.tar.xz"; }; }; kidletime = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kidletime-5.44.0.tar.xz"; - sha256 = "1zf8rspn603hyz1rr3rkslnij7883f4ha0ls6v5phh19jdp9hcis"; - name = "kidletime-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kidletime-5.45.0.tar.xz"; + sha256 = "0057az4a9jvn120j94jsmf78lxw03c6s534mjn4r8ns9j46c060i"; + name = "kidletime-5.45.0.tar.xz"; }; }; kimageformats = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kimageformats-5.44.0.tar.xz"; - sha256 = "1zpz3a4wghh348is2yyfs5qhhkg0261p5v2khxcgcy6vpblv1h1j"; - name = "kimageformats-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kimageformats-5.45.0.tar.xz"; + sha256 = "0kdcrlpj56sw9gy9wf6dxlrsa11k3hv6ayvv6irry3iv1akfx7yp"; + name = "kimageformats-5.45.0.tar.xz"; }; }; kinit = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kinit-5.44.0.tar.xz"; - sha256 = "1v3zmlmh3yg9333v7ha1xg3hp7ig2q8w7ixyzww5a5q4gxpzz9z5"; - name = "kinit-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kinit-5.45.0.tar.xz"; + sha256 = "0phqwp60368vynnkh0hl3kdz6p0kisa5ab6fvgvks5p9h1nb6l2h"; + name = "kinit-5.45.0.tar.xz"; }; }; kio = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kio-5.44.0.tar.xz"; - sha256 = "1dvif1779kh8d8yh6svmbs2yhvprzc38hchd4wb4l70hmzqcd3vs"; - name = "kio-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kio-5.45.0.tar.xz"; + sha256 = "05bb27jfinpfdh3vz76prkdvpp574sx1sr41b6qk267y37l14x9y"; + name = "kio-5.45.0.tar.xz"; }; }; kirigami2 = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kirigami2-5.44.0.tar.xz"; - sha256 = "1vvq3c2j9v07ngkm3c8hwvik80sfd7i20ga7hyx4i94spjcagj6h"; - name = "kirigami2-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kirigami2-5.45.0.tar.xz"; + sha256 = "00miz1zwhq5ikwyqvvl6ha8w1dra7rxgw59wfg1ac74kjpb964ng"; + name = "kirigami2-5.45.0.tar.xz"; }; }; kitemmodels = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kitemmodels-5.44.0.tar.xz"; - sha256 = "0m63i10nvgp86ajsd7aizah4g21dpwxrs2lvglv0kybhaykziwa8"; - name = "kitemmodels-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kitemmodels-5.45.0.tar.xz"; + sha256 = "08mbvs6lcfwbprk51fjswig0sprn5pcgrhy34qbbnim5ijf8gkw1"; + name = "kitemmodels-5.45.0.tar.xz"; }; }; kitemviews = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kitemviews-5.44.0.tar.xz"; - sha256 = "1vg99figpspm0p7ipbgf94j4xarcf2zicm3rijywxfcwcl0sr99h"; - name = "kitemviews-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kitemviews-5.45.0.tar.xz"; + sha256 = "19cm7vxkp7qiqhjj7ma2nx4lvp2hiffnakiic26jqzb9sb0vkq2n"; + name = "kitemviews-5.45.0.tar.xz"; }; }; kjobwidgets = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kjobwidgets-5.44.0.tar.xz"; - sha256 = "1c26vdq8sqja95scqbvm0y2zhl1qx5aapkadi44vrjf54q4kgqrv"; - name = "kjobwidgets-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kjobwidgets-5.45.0.tar.xz"; + sha256 = "1946wqa6dpi82771nw70nz123w1xa9znhn9kgb0q5ypzc89498gj"; + name = "kjobwidgets-5.45.0.tar.xz"; }; }; kjs = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kjs-5.44.0.tar.xz"; - sha256 = "1y350xgxip9qlwzanzlbyj4mb7i53msldv2wmacdp2di1hxn8ihy"; - name = "kjs-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kjs-5.45.0.tar.xz"; + sha256 = "1xmc57fv3692vk0pzmrs1wyzgd69dhp6by0i1kw4a76w8h0lh5sr"; + name = "kjs-5.45.0.tar.xz"; }; }; kjsembed = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kjsembed-5.44.0.tar.xz"; - sha256 = "0d71pnfx5fylxlpc0m08i1qasnrk0jvwmcv7zr7r8fnfagjl7gpk"; - name = "kjsembed-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kjsembed-5.45.0.tar.xz"; + sha256 = "15jlbr5nw3c3p4cylr01c6w8isf78wnljsym8fsl9513k8cfabif"; + name = "kjsembed-5.45.0.tar.xz"; }; }; kmediaplayer = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kmediaplayer-5.44.0.tar.xz"; - sha256 = "1nwpx2y8bl92m8yxk5c3sw7a0zm50hfpfrcicdqpv7nfs4n70anj"; - name = "kmediaplayer-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kmediaplayer-5.45.0.tar.xz"; + sha256 = "0p3fm448xdcw7qmpbadx9rb6q1zx8bbap0a3xm11ni27s7dpvwgf"; + name = "kmediaplayer-5.45.0.tar.xz"; }; }; knewstuff = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/knewstuff-5.44.0.tar.xz"; - sha256 = "1sd5780gpxidlc9g3dmd38ji5q5c1va49r604x5y739wjdrsgm0a"; - name = "knewstuff-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knewstuff-5.45.0.tar.xz"; + sha256 = "0jk2zsxkj558rf2ar120mljjv13f261js9p27272wr6ily55navn"; + name = "knewstuff-5.45.0.tar.xz"; }; }; knotifications = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/knotifications-5.44.0.tar.xz"; - sha256 = "137snmjix1jji1vn40vxsnigddz7xxlkkch1rag79f6dqjnswb76"; - name = "knotifications-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knotifications-5.45.0.tar.xz"; + sha256 = "0rnqlfg7n86g7fdmx32l337xjr03g1ri88dg94wci3v9rpffy839"; + name = "knotifications-5.45.0.tar.xz"; }; }; knotifyconfig = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/knotifyconfig-5.44.0.tar.xz"; - sha256 = "0122w5mklyr958284824qzxxp76hacnf8zgv58b9ihr5finc919z"; - name = "knotifyconfig-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/knotifyconfig-5.45.0.tar.xz"; + sha256 = "0qxfzrw8pmnm6jrl98d50d12x9azgj3f9bin2irim2w6zcsfqs37"; + name = "knotifyconfig-5.45.0.tar.xz"; }; }; kpackage = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kpackage-5.44.0.tar.xz"; - sha256 = "1av8m9m7by0j128779rhws0pjc3hhi37cp311nks5sa5mmpbksmz"; - name = "kpackage-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpackage-5.45.0.tar.xz"; + sha256 = "0ddmpn688dil3sdlr91iqczi52rz58nwifij00c0gvj5pgp6agvg"; + name = "kpackage-5.45.0.tar.xz"; }; }; kparts = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kparts-5.44.0.tar.xz"; - sha256 = "0bbf17y8nnd1gbhdnffhgj9xn1wjida6a7qgwi16k3zp4yjmpgac"; - name = "kparts-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kparts-5.45.0.tar.xz"; + sha256 = "0mhmy6sq21c4rgl4lfz9sr3r4zhzn2wfapm3g7qzf8554rinzs5z"; + name = "kparts-5.45.0.tar.xz"; }; }; kpeople = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kpeople-5.44.0.tar.xz"; - sha256 = "0gp602c2wq2ipbsan84r11a14xqpzyfszhb4lw3qkd7y4dpha37i"; - name = "kpeople-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpeople-5.45.0.tar.xz"; + sha256 = "1dm8nb9ckivww867541w6bfjvhg6hi64drzx61ak1ix3ha6n24g1"; + name = "kpeople-5.45.0.tar.xz"; }; }; kplotting = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kplotting-5.44.0.tar.xz"; - sha256 = "0ccgpbccfrn4c4wri80zm8ni8390jnqywh4k1z5r68hzmr3l79xw"; - name = "kplotting-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kplotting-5.45.0.tar.xz"; + sha256 = "1fdvbd57f8aikgi6xa5qb16a32398zkn83xb6vq5rjd3jrzyk4bi"; + name = "kplotting-5.45.0.tar.xz"; }; }; kpty = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kpty-5.44.0.tar.xz"; - sha256 = "08jxq693mkwxr45696nz05f2zxa16finvacif330r6s03izvwfw0"; - name = "kpty-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kpty-5.45.0.tar.xz"; + sha256 = "0g8daxvybiraax0395sb05468qfzdg0cjgq810kz78512carsg7f"; + name = "kpty-5.45.0.tar.xz"; }; }; kross = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/portingAids/kross-5.44.0.tar.xz"; - sha256 = "1gq2cg3gq40rqih0kflfxl2n5l7j4gli0w57xnfhc39xpkpd1cqv"; - name = "kross-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/portingAids/kross-5.45.0.tar.xz"; + sha256 = "1s8y36cn9nj5lqf8f667yyqdk0m4ankqb0fr3s9c7llb87ca8iqn"; + name = "kross-5.45.0.tar.xz"; }; }; krunner = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/krunner-5.44.0.tar.xz"; - sha256 = "1zr3zm528p4agw8d7krm4drs8638gfmbnm011r9kcmpjadkv0ila"; - name = "krunner-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/krunner-5.45.0.tar.xz"; + sha256 = "18rq5nzdxr8x55s3hqp5b3mibfa51sbybirhdp49igz9x2la2j9x"; + name = "krunner-5.45.0.tar.xz"; }; }; kservice = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kservice-5.44.0.tar.xz"; - sha256 = "0gzp8sbf0mk7nhy1hz9m3fz97lkwijpxwf2l2ljz375ylf374iyk"; - name = "kservice-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kservice-5.45.0.tar.xz"; + sha256 = "0qrawj6hvy6q68k278nqkmdnjqk1cwr6iym9wmiq3lphsab08nl7"; + name = "kservice-5.45.0.tar.xz"; }; }; ktexteditor = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/ktexteditor-5.44.0.tar.xz"; - sha256 = "1g0v5sax3pfkvdcvyxyz81j3ainm0n1m7nc1rxh106iz8gs0z9cn"; - name = "ktexteditor-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ktexteditor-5.45.0.tar.xz"; + sha256 = "1gp5f9v01f0824j96wmv7a48561wkcndnk75q1qdbkknxk4cmnnp"; + name = "ktexteditor-5.45.0.tar.xz"; }; }; ktextwidgets = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/ktextwidgets-5.44.0.tar.xz"; - sha256 = "1kxh39n9gzism99x1x7fpdqkppdpn7aaj6j3wp4a4y4hrn82bqwp"; - name = "ktextwidgets-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/ktextwidgets-5.45.0.tar.xz"; + sha256 = "1r76qvn02m6b1rvzmp966xfxr6ifflzd7g7ln0sxccsd9c46lh2b"; + name = "ktextwidgets-5.45.0.tar.xz"; }; }; kunitconversion = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kunitconversion-5.44.0.tar.xz"; - sha256 = "1zr7m1wmyr9phg3lq11qm0l24kkc1zh6xc3x4hcrpv1yn458qxdl"; - name = "kunitconversion-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kunitconversion-5.45.0.tar.xz"; + sha256 = "0alm5s3c6g3w66gzii7jjsb0cn4naiimsnm5dag6idhix79wa1kr"; + name = "kunitconversion-5.45.0.tar.xz"; }; }; kwallet = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwallet-5.44.0.tar.xz"; - sha256 = "01bah8rycjhgycd2bfkxj5jwfrwdbi2ba6bis79kbiaacl0q0qns"; - name = "kwallet-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwallet-5.45.0.tar.xz"; + sha256 = "1yis49k3wyk8vhmdhgjrn42jq5kah5z7dg8wgy09dhq61w50sdi9"; + name = "kwallet-5.45.0.tar.xz"; }; }; kwayland = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwayland-5.44.0.tar.xz"; - sha256 = "1pq8gikwcq6p67whhfm653xq79cdwr48br5ydism06644ikc2nlk"; - name = "kwayland-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwayland-5.45.0.tar.xz"; + sha256 = "0pk242h8ggd3szyw6jlk0zz8q4rw4ppbbidkilzv3lx340jr1qkq"; + name = "kwayland-5.45.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwidgetsaddons-5.44.0.tar.xz"; - sha256 = "11yaqwqkmwvhn9phmsfgyfl229zcrikdi3hz2w7nk8ibraagn5pi"; - name = "kwidgetsaddons-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwidgetsaddons-5.45.0.tar.xz"; + sha256 = "0ywya6fa0q7vdwj7almkvdi16m839c48ma7j9sd87rc0dhigv0p0"; + name = "kwidgetsaddons-5.45.0.tar.xz"; }; }; kwindowsystem = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kwindowsystem-5.44.0.tar.xz"; - sha256 = "0qn02c0yq1ir7vb56jhlla8j7nm6yx725hxnw31b8i62k1i7nvqy"; - name = "kwindowsystem-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kwindowsystem-5.45.0.tar.xz"; + sha256 = "0139413wk8ifyfwadln87ik55jrp5bccy3lbz6ya191fygglx16k"; + name = "kwindowsystem-5.45.0.tar.xz"; }; }; kxmlgui = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kxmlgui-5.44.0.tar.xz"; - sha256 = "1qr6j4cnndb14fdppc2mpbqgk1mkjfdxyl5pl7gjrwd8558brjg2"; - name = "kxmlgui-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kxmlgui-5.45.0.tar.xz"; + sha256 = "1vb5izjp27qb9685haidagjg2p14a335fwzagzal20z3j2a7j3hv"; + name = "kxmlgui-5.45.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/kxmlrpcclient-5.44.0.tar.xz"; - sha256 = "1r6mcwgagnskh8jiy2fyajgzqacw03d2qfk1fb3vv4lfwry4h2j3"; - name = "kxmlrpcclient-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/kxmlrpcclient-5.45.0.tar.xz"; + sha256 = "0kfkai1cc4xb7vcspbmf6zd951dfz2yxiyjdar4d21s5krvcfh5l"; + name = "kxmlrpcclient-5.45.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/modemmanager-qt-5.44.0.tar.xz"; - sha256 = "1dkbyn6y605i8xqwqvpxmspp0fh7zarc0h54k30rnvv1g9rs1dd4"; - name = "modemmanager-qt-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/modemmanager-qt-5.45.0.tar.xz"; + sha256 = "16qdvy19q5pjk82amn3mncwgvk3g2qrbdzl9wpfxhqcny18xbwdd"; + name = "modemmanager-qt-5.45.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/networkmanager-qt-5.44.0.tar.xz"; - sha256 = "0bhsminn31b8w1678im5zqixmyx1m5275szca9hh7wx6dl0sxhlw"; - name = "networkmanager-qt-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/networkmanager-qt-5.45.0.tar.xz"; + sha256 = "00ipzc92v229bz9vv6kga37qhpcnqrxn2h47v9n5myfr1p6acgw0"; + name = "networkmanager-qt-5.45.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/oxygen-icons5-5.44.0.tar.xz"; - sha256 = "0ymd9s26x2ryyw851y4yb2wl9f3syzfp0z08387h90jg6xk36si5"; - name = "oxygen-icons5-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/oxygen-icons5-5.45.0.tar.xz"; + sha256 = "1va0296118x7apb7idjf0qjx5f0flamspmzicc03znbh4hx1fxyc"; + name = "oxygen-icons5-5.45.0.tar.xz"; }; }; plasma-framework = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/plasma-framework-5.44.0.tar.xz"; - sha256 = "1lfrmrgamizfkr9jmfmf3afis0z40r1chpk854pqfr4p27j4gdmz"; - name = "plasma-framework-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/plasma-framework-5.45.0.tar.xz"; + sha256 = "1db8pyq1bdkswi59aihaqgas3xzzlfsfd9yn34g4q00gzc17ird5"; + name = "plasma-framework-5.45.0.tar.xz"; }; }; prison = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/prison-5.44.0.tar.xz"; - sha256 = "0glcifwjm50kn6fk3lvwpslmh4s6s8g5r7h208dw56n19yhpkrfm"; - name = "prison-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/prison-5.45.0.tar.xz"; + sha256 = "1g6rnyx84sz28cf427y9yp0lcbdhrlgx4ns80jz34gyzcgi4bxi0"; + name = "prison-5.45.0.tar.xz"; }; }; purpose = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/purpose-5.44.0.tar.xz"; - sha256 = "1scc2vbb5ws70kvicaay634ghgp2c7xhm7d907b36jj9gvyp4d2f"; - name = "purpose-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/purpose-5.45.0.tar.xz"; + sha256 = "0mfx2gl78w2wwkykl0zch88i7d10zq5cm2xqwxjfpkpdjwb7pflb"; + name = "purpose-5.45.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/qqc2-desktop-style-5.44.0.tar.xz"; - sha256 = "02s22xncpy988fbyjj17j5saamaf8q0sll4gd2s5xsswmalvnb51"; - name = "qqc2-desktop-style-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/qqc2-desktop-style-5.45.0.tar.xz"; + sha256 = "1dc20wkh2cfyhd7wkg1v1b5f6asz70m8ksml6r5hzs807sdqvrsa"; + name = "qqc2-desktop-style-5.45.0.tar.xz"; }; }; solid = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/solid-5.44.0.tar.xz"; - sha256 = "08xw54m5srjr5n1h689hd05ld7ssimwvhlb9dlpxdavkag1vbqq1"; - name = "solid-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/solid-5.45.0.tar.xz"; + sha256 = "175hsj2hdsdnz4wkg1l56275390nn1kjpwcyb7ryzzqabn7hdqmd"; + name = "solid-5.45.0.tar.xz"; }; }; sonnet = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/sonnet-5.44.0.tar.xz"; - sha256 = "1dip8h9frxvzy39cjc205y2szdpczyh1fldlcpcq8ckjfk8pmgdm"; - name = "sonnet-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/sonnet-5.45.0.tar.xz"; + sha256 = "0msrwxfvc4vr4xqpwavnj0w4cwkflfjql8nhgm5bvk6cpcxs92ss"; + name = "sonnet-5.45.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/syntax-highlighting-5.44.0.tar.xz"; - sha256 = "10s5m1as9c1kln8mc7zf2m8zsqrf9rxfa2rzfyff1kki1icp65nm"; - name = "syntax-highlighting-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/syntax-highlighting-5.45.0.tar.xz"; + sha256 = "1v73jzansk6z0kwq65gxvkcm7vcmgw2jvl7916aqzj8xjx8kp433"; + name = "syntax-highlighting-5.45.0.tar.xz"; }; }; threadweaver = { - version = "5.44.0"; + version = "5.45.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.44/threadweaver-5.44.0.tar.xz"; - sha256 = "135x9z1rzvlhx13nbkacmcj7g0z88rpv0c2vy8yybysfaspc1hzn"; - name = "threadweaver-5.44.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.45/threadweaver-5.45.0.tar.xz"; + sha256 = "16s1pgyxhs6v1w7pwg3rr97xkd24xmf23x24pcm15ybd9g38a5yp"; + name = "threadweaver-5.45.0.tar.xz"; }; }; } From 463a2284ce60c6050c0624f28cbaae115522a4ea Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 16 Apr 2018 20:44:21 +0000 Subject: [PATCH 213/538] mopidy-iris: add tornado to dependencies --- pkgs/applications/audio/mopidy-iris/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index a0f91c6708f4..1c8b0af70e43 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -17,8 +17,11 @@ pythonPackages.buildPythonApplication rec { pylast spotipy raven + tornado ]); + postPatch = "sed -i /tornado/d setup.py"; + # no tests implemented doCheck = false; From ee6a5296a352efef89ffaa7916780740a1ae99c0 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Tue, 17 Apr 2018 00:05:14 +0300 Subject: [PATCH 214/538] linuxPackages.exfat-nofuse: 2017-06-19 -> 2018-04-16 --- pkgs/os-specific/linux/exfat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 56da5b0f16f4..0adeac7115df 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.versi stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2017-06-19"; + version = "2018-04-16"; src = fetchFromGitHub { owner = "dorimanx"; repo = "exfat-nofuse"; - rev = "de4c760bc9a05ead83bc3ec6eec6cf1fb106f523"; - sha256 = "0v979d8sbcb70lakm4jal2ck3gspkdgq9108k127f7ph08vf8djm"; + rev = "01c30ad52625a7261e1b0d874553b6ca7af25966"; + sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6"; }; hardeningDisable = [ "pic" ]; From 9330ef4df8edc974512f0bf0a730c8362fa56043 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 16 Apr 2018 17:01:38 -0500 Subject: [PATCH 215/538] darling: darwin only for now --- pkgs/os-specific/darwin/darling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index de06c176d1da..e440f1cd7098 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { repo = pname; owner = "darlinghq"; rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b"; - sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg"; + sha256 = "1mkcnzy1cfpwghgvb9pszhy9jy6534y8krw8inwl9fqfd0w019wz"; }; # only packaging sandbox for now @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ matthewbauer ]; license = licenses.gpl3; description = "Darwin/macOS emulation layer for Linux"; - platforms = platforms.unix; + platforms = platforms.darwin; }; } From 729e3b884449cb7a9f824ee35d5b14b54960d3de Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Mon, 16 Apr 2018 23:27:30 +0100 Subject: [PATCH 216/538] vlc: drop unused onlyLibVLC argument nothing within nixpkgs uses this and the package doesn't actually build if it's supplied. --- pkgs/applications/video/vlc/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index fffbd5c0ffb4..44c4d317d36a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -7,7 +7,6 @@ , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth -, onlyLibVLC ? false , qt4 ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false @@ -68,8 +67,7 @@ stdenv.mkDerivation rec { "--enable-vdpau" "--enable-dvdnav" "--enable-samplerate" - ] - ++ optional onlyLibVLC "--disable-vlc"; + ]; enableParallelBuilding = true; From 85422c0f51e322c75b14fbf1cb9e3851eaad7123 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Apr 2018 18:58:07 -0400 Subject: [PATCH 217/538] lsof: Fix build on darwin. --- pkgs/development/tools/misc/lsof/darwin-dfile.patch | 12 ++++++++++++ pkgs/development/tools/misc/lsof/default.nix | 4 ++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/misc/lsof/darwin-dfile.patch diff --git a/pkgs/development/tools/misc/lsof/darwin-dfile.patch b/pkgs/development/tools/misc/lsof/darwin-dfile.patch new file mode 100644 index 000000000000..9952228e613a --- /dev/null +++ b/pkgs/development/tools/misc/lsof/darwin-dfile.patch @@ -0,0 +1,12 @@ +diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c +--- a/dialects/darwin/libproc/dfile.c 2018-02-14 09:28:06.000000000 -0500 ++++ b/dialects/darwin/libproc/dfile.c 2018-04-16 18:52:40.828715293 -0400 +@@ -43,7 +43,7 @@ + #include "lsof.h" + + #if defined(PROC_FP_GUARDED) +-#extern struct pff_tab Pgf_tab[]; ++extern struct pff_tab Pgf_tab[]; + #endif /* defined(PROC_FP_GUARDED) */ + + diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 53b960a7c031..ae62c8c7aaef 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -28,8 +28,12 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|lcurses|lncurses|g' Configure ''; # Stop build scripts from searching global include paths From f72a80ae697b6ae1a14cb964f63bb7e7494fc374 Mon Sep 17 00:00:00 2001 From: "Gol D. Roger" Date: Mon, 16 Apr 2018 18:15:08 -0500 Subject: [PATCH 218/538] hyper: 1.4.8 -> 2.0.0 --- pkgs/applications/misc/hyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 9349c07a62e9..75d18c7a774d 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -12,11 +12,11 @@ let ]; in stdenv.mkDerivation rec { - version = "1.4.8"; + version = "2.0.0"; name = "hyper-${version}"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51"; + sha256 = "04241kjy65pnp5q9z901910rmvcx18x0qaqfl31i0l4c2xj83ws0"; }; buildInputs = [ dpkg ]; unpackPhase = '' From 985cd571f390fd9f68de6c99916effe284d89f2c Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 16 Apr 2018 23:07:55 +0100 Subject: [PATCH 219/538] Build LASZip on unix --- pkgs/development/libraries/LASzip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index df9d126ad719..384178d2c8df 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://www.laszip.org; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From ea055a360898435e427ee76d1e389a4dea43db72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Apr 2018 18:10:02 -0700 Subject: [PATCH 220/538] xterm: 331 -> 332 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xterm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/koi8rxterm -h’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/koi8rxterm help’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/uxterm -h’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/uxterm help’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/xterm -h’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/xterm help’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/.xterm-wrapped -h’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/.xterm-wrapped help’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/.koi8rxterm-wrapped -h’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/.koi8rxterm-wrapped help’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/.uxterm-wrapped -h’ got 0 exit code - ran ‘/nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332/bin/.uxterm-wrapped help’ got 0 exit code - found 332 with grep in /nix/store/z5digwa447rm08z7y1krc13km16lqwnl-xterm-332 - directory tree listing: https://gist.github.com/d4955919bb8d06a92848a3ca009f26e9 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index d807e8eb9ed5..bcaf89797b44 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-331"; + name = "xterm-332"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s"; + sha256 = "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx"; }; buildInputs = From 4eb5bdd98299efd60b7c2ecab9066eb823e022fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Apr 2018 18:11:29 -0700 Subject: [PATCH 221/538] znapzend: 0.17.0 -> 0.18.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/znapzend/versions. These checks were done: - built on NixOS - ran ‘/nix/store/i652pzxzq638dglzqh7p7afp9dilnfsy-znapzend-0.18.0/bin/znapzendzetup help’ got 0 exit code - ran ‘/nix/store/i652pzxzq638dglzqh7p7afp9dilnfsy-znapzend-0.18.0/bin/znapzendztatz -h’ got 0 exit code - ran ‘/nix/store/i652pzxzq638dglzqh7p7afp9dilnfsy-znapzend-0.18.0/bin/znapzendztatz --help’ got 0 exit code - found 0.18.0 with grep in /nix/store/i652pzxzq638dglzqh7p7afp9dilnfsy-znapzend-0.18.0 - directory tree listing: https://gist.github.com/5bc48206cf2caa33654bb891da1fdf99 --- pkgs/tools/backup/znapzend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index cacfb8287a33..796a34c253a9 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }: let - version = "0.17.0"; - checksum = "0cncwkiw0w2am7gwi01p6ln87zgg1x6blfyxx7n7x8m1mv6704hl"; + version = "0.18.0"; + checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in stdenv.mkDerivation rec { name = "znapzend-${version}"; From d14a4760541d59f37ea6397e7616a2e6f9697779 Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Sat, 7 Apr 2018 20:27:58 -0400 Subject: [PATCH 222/538] tlaps: init at 1.4.3 --- .../science/logic/tlaplus/tlaps.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/science/logic/tlaplus/tlaps.nix diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix new file mode 100644 index 000000000000..9a78c1df8b17 --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -0,0 +1,56 @@ +{ lib +, fetchurl +, makeWrapper +, stdenv +, ocaml, gawk, isabelle, cvc3, perl, wget, which +}: + +stdenv.mkDerivation rec { + name = "tlaps-${version}"; + version = "1.4.3"; + src = fetchurl { + url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; + sha256 = "1w5z3ns5xxmhmp8r4x2kjmy3clqam935gmvx82imyxrr1bamx6gf"; + }; + + buildInputs = [ ocaml isabelle cvc3 perl wget which ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -pv "$out" + export HOME="$out" + export PATH=$out/bin:$PATH + + pushd zenon + ./configure --prefix $out + make + make install + popd + + pushd isabelle + isabelle build -b Pure + popd + + pushd tlapm + ./configure --prefix $out + make all + make install + ''; + + meta = { + description = "Mechanically check TLA+ proofs"; + longDescription = '' + TLA+ is a general-purpose formal specification language that is + particularly useful for describing concurrent and distributed + systems. The TLA+ proof language is declarative, hierarchical, + and scalable to large system specifications. It provides a + consistent abstraction over the various “backend” verifiers. + ''; + homepage = https://tla.msr-inria.inria.fr/tlaps/content/Home.html; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.badi ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb07c9b5ea36..67b3a2ec5c80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20029,6 +20029,8 @@ with pkgs; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; tlaplus = callPackage ../applications/science/logic/tlaplus {}; + tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {}; + aiger = callPackage ../applications/science/logic/aiger {}; From 27ca928dc808546050f52265459eafec391f647c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Apr 2018 18:34:43 -0700 Subject: [PATCH 223/538] xscreensaver: 5.38 -> 5.39 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xscreensaver/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 5.39 with grep in /nix/store/gbzmzb9nq2frp4q1mmz2946gzcx536v3-xscreensaver-5.39 - directory tree listing: https://gist.github.com/aa36e0385c0160a833c83693ce83be28 --- pkgs/misc/screensavers/xscreensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 8035e7da37db..d93d982924d1 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.38"; + version = "5.39"; name = "xscreensaver-${version}"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "1f58h5rgjbxr4hh40m6zkpkzbzg68l7nqzjwal0b17yysafbmsf6"; + sha256 = "09i47h4hdgwxyqgrsnshl4l5dv5mrsp37h705cc22lwby601ikj8"; }; buildInputs = From 9f7eabcc21e1a2aa1fe834193bbd20b0c1d1208f Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 17 Apr 2018 10:30:31 +0900 Subject: [PATCH 224/538] kernel: fix boot.consoleLogLevel description The current description describes the opposite influence of the setting https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt --- nixos/modules/system/boot/kernel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 3bd7d3558269..8ea05ed14687 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -77,8 +77,8 @@ in type = types.int; default = 4; description = '' - The kernel console log level. Log messages with a priority - numerically less than this will not appear on the console. + The kernel console loglevel. All Kernel Messages with a log level smaller + than this setting will be printed to the console. ''; }; From 3ea4441ce981f4cc7298bc8e43e4c3ab909719e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Apr 2018 18:55:29 -0700 Subject: [PATCH 225/538] linuxPackages.wireguard: 0.0.20180304 -> 0.0.20180413 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/a450c64fa037f3700caf3cd2b1e7eadb --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 0650bfd36f34..b88646424be5 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180304"; + version = "0.0.20180413"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "11vp6aiqxrnwqlaslxy13cpmw2l2pdm9nhs021rv4zx61lpnbcgg"; + sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1"; }; meta = with stdenv.lib; { From c4ef846c924ce35567386f7de6753511948118d9 Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Sat, 7 Apr 2018 20:28:36 -0400 Subject: [PATCH 226/538] tlaplusToolbox: init at 1.5.6 --- .../science/logic/tlaplus/toolbox.nix | 77 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/applications/science/logic/tlaplus/toolbox.nix diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix new file mode 100644 index 000000000000..5ce359dea0ec --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -0,0 +1,77 @@ +{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv +, jre, swt, gtk, libXtst, glib +}: + +let + version = "1.5.6"; + arch = "x86_64"; + + desktopItem = makeDesktopItem rec { + name = "TLA+Toolbox"; + exec = "tla-toolbox"; + icon = "tla-toolbox"; + comment = "IDE for TLA+"; + desktopName = name; + genericName = comment; + categories = "Application;Development"; + extraEntries = '' + StartupWMClass=TLA+ Toolbox + ''; + }; + + +in stdenv.mkDerivation { + name = "tla-toolbox-${version}"; + src = fetchzip { + url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; + sha256 = "1h63mcbrkf4jcg6qncpqffdi0x665z0wlfdq43d67p411xcqmbw9"; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p "$out/bin" + cp -r "$src" "$out/toolbox" + chmod +w "$out/toolbox" "$out/toolbox/toolbox" + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/toolbox/toolbox" + + makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ + --run "set -x; cd $out/toolbox" \ + --add-flags "-data ~/.tla-toolbox" \ + --prefix PATH : "${jre}/bin" \ + --prefix LD_LIBRARY_PATH : "${swt}/lib:${gtk}/lib:${libXtst}/lib:${glib}/lib" + + echo -e "\nCreating TLA Toolbox icons..." + pushd "$src" + for icon_in in $(find . -path "./plugins/*/icons/full/etool16/tla_launch_check_wiz_*.png") + do + icon_size=$(echo $icon_in | grep -Po "wiz_\K[0-9]+") + icon_out="$out/share/icons/hicolor/$icon_size""x$icon_size/apps/tla-toolbox.png" + mkdir -p "$(dirname $icon_out)" + cp "$icon_in" "$icon_out" + done + popd + + echo -e "\nCreating TLA Toolbox desktop entry..." + cp -r "${desktopItem}/share/applications"* "$out/share/applications" + ''; + + meta = { + homepage = http://research.microsoft.com/en-us/um/people/lamport/tla/toolbox.html; + description = "IDE for the TLA+ tools"; + longDescription = '' + Integrated development environment for the TLA+ tools, based on Eclipse. You can use it + to create and edit your specs, run the PlusCal translator, view the pretty-printed + versions of your modules, run the TLC model checker, and run TLAPS, the TLA+ proof system. + ''; + # http://lamport.azurewebsites.net/tla/license.html + license = with lib.licenses; [ mit ]; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.badi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67b3a2ec5c80..04b8e1fa0d0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20030,6 +20030,7 @@ with pkgs; tlaplus = callPackage ../applications/science/logic/tlaplus {}; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {}; + tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {gtk = gtk2;}; aiger = callPackage ../applications/science/logic/aiger {}; From 4807cc1a5f053547b01801ede9239885c7f54f85 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Tue, 17 Apr 2018 12:15:32 +0930 Subject: [PATCH 227/538] libraries/agg: disable building of examples to fix build Previously the build was failing with due to not being able to find libexamples.la. --- pkgs/development/libraries/agg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index c7f5ac866609..ab3098580950 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib"; + configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no"; # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' From 21059a1920f7160cd2c1419dcab2d4b4a65239b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Apr 2018 21:16:36 -0700 Subject: [PATCH 228/538] pqiv: 2.10.2 -> 2.10.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pqiv/versions. These checks were done: - built on NixOS - ran ‘/nix/store/1a0aav46qsmi791vj57cn12hlzsra59l-pqiv-2.10.3/bin/pqiv -h’ got 0 exit code - ran ‘/nix/store/1a0aav46qsmi791vj57cn12hlzsra59l-pqiv-2.10.3/bin/pqiv --help’ got 0 exit code - found 2.10.3 with grep in /nix/store/1a0aav46qsmi791vj57cn12hlzsra59l-pqiv-2.10.3 - directory tree listing: https://gist.github.com/bbde9f259adf44f69b8dfc44689b1e49 --- pkgs/applications/graphics/pqiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 9e5958871cc0..757ce52e9c4c 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "0zn7ps73lw04l9i4777c90ik07v3hkg66mnpz8vvvwjyi40i77a7"; + sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01"; }; nativeBuildInputs = [ pkgconfig ]; From fe5dbba0b3fc26b16c19759d30148ecbb7d34b85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Apr 2018 21:33:47 -0700 Subject: [PATCH 229/538] pstoedit: 3.70 -> 3.71 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pstoedit/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.71 with grep in /nix/store/3lll9l623hg5na4xvb9vbhksq1jp04ax-pstoedit-3.71 - directory tree listing: https://gist.github.com/33d6a65ee820b486f0aaff223832a0d0 --- pkgs/tools/graphics/pstoedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 9fdf0ad0465a..a31a9848c101 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pstoedit-3.70"; + name = "pstoedit-3.71"; src = fetchurl { url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; - sha256 = "130kz0ghsrggdn70kygrmsy3n533hwd948q69vyvqz44yw9n3f06"; + sha256 = "15dwrwjbixjqph2jmdqzi9fihwpqc1kz5jcv5phxw8wwrlicv285"; }; outputs = [ "out" "dev" ]; From e0c9a255882e7a9da4604aeb561f28c72046fece Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Tue, 17 Apr 2018 00:52:57 +0300 Subject: [PATCH 230/538] flow: 0.69.0 -> 0.70.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2104e532f284..042b338b2b14 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.69.0"; + version = "0.70.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "11n8g471zgazcnzsxcw45gzzn63xanw91wj5xwsx8i2cp7wg9g7g"; + sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; }; installPhase = '' From 406e20b8329b51887801879bad0896aed693aef6 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 16 Apr 2018 23:08:17 +0100 Subject: [PATCH 231/538] Fix libLAS darwin build --- pkgs/development/libraries/libLAS/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 20531adcd1c7..aafcf86e4a62 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }: +{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -9,14 +9,22 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + cmakeFlags = [ + "-DGDAL_CONFIG=${gdal}/bin/gdal-config" + ]; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib + ''; meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = http://www.liblas.org; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; }; } From 577bbdc50148686e08b507a8920cf696e855da45 Mon Sep 17 00:00:00 2001 From: Jason Hilton Date: Thu, 7 Sep 2017 09:20:55 -0700 Subject: [PATCH 232/538] grass: compile with libLAS --- pkgs/applications/gis/grass/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index d4e2043eaa75..b2404df8e56e 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS }: stdenv.mkDerivation { @@ -12,7 +12,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas + libLAS ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); # On Darwin the installer tries to symlink the help files into a system @@ -33,6 +34,7 @@ stdenv.mkDerivation { "--with-mysql-includes=${mysql.connector-c}/include/mysql" "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" + "--with-liblas=${libLAS}/bin/liblas-config" ]; # Otherwise a very confusing "Can't load GDAL library" error From 4018d44641afb0312348c0a6c846331ec5224943 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 17 Apr 2018 09:03:05 +0000 Subject: [PATCH 233/538] Revert "nixos/version: fix nixops pre 1.6 compatibility" This reverts commit 70c6f6572dda0f2516bad812857ef814ec710a12. --- nixos/modules/misc/version.nix | 15 --------------- nixos/modules/rename.nix | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 7519d9176982..b8f0a223c910 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -16,21 +16,6 @@ in options.system = { - # XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations - # XXX: Remove after nixops has been bumped to a compatible version - nixosVersion = mkOption { - readOnly = true; - internal = true; - type = types.str; - default = config.system.nixos.version; - }; - nixosVersionSuffix = mkOption { - readOnly = true; - internal = true; - type = types.str; - default = config.system.nixos.versionSuffix; - }; - nixos.version = mkOption { internal = true; type = types.str; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0c3ac054292d..ff90547b8a31 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -197,9 +197,9 @@ with lib; (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) # misc/version.nix - #(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ]) + (mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ]) (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ]) - #(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) + (mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ]) (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ]) (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ]) From b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 6 Apr 2018 02:12:49 +0000 Subject: [PATCH 234/538] nixos: rename.nix: fix bugs Introduced in 286b007bd327a1e8d6d1fe66702b951f2fd6e29a and then in 2e6b796761672e0e3ed685487007bb0d99126d91. This a proper fix for what 70c6f6572dda0f2516bad812857ef814ec710a12 tried to do. Removing the "config" prefix triggers the bug on pure nixos too, not only on nixops. --- nixos/modules/rename.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index ff90547b8a31..02ed2752cfa1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -187,22 +187,20 @@ with lib; (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ]) # Fontconfig - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "config" "fonts" "fontconfig" "allowBitmaps" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowType1" ] [ "config" "fonts" "fontconfig" "allowType1" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "config" "fonts" "fontconfig" "useEmbeddedBitmaps" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ]) - (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) + (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) # Profile splitting (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) # misc/version.nix - (mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ]) - (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ]) - (mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ]) - (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ]) - (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ]) - (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ]) + (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) + (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) + (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) + (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) # Users (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) From 4f784cd2da53dc76cfd6438013d0e94f6016fd3c Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Tue, 17 Apr 2018 18:37:44 +0900 Subject: [PATCH 235/538] jumanpp: init at 1.02 --- pkgs/tools/text/jumanpp/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/jumanpp/default.nix diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix new file mode 100644 index 000000000000..b30b33354541 --- /dev/null +++ b/pkgs/tools/text/jumanpp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, boost, libunwind, gperftools }: +stdenv.mkDerivation rec { + name = "jumanpp"; + version = "1.02"; + src = fetchurl { + url = "http://lotus.kuee.kyoto-u.ac.jp/nl-resource/jumanpp/jumanpp-${version}.tar.xz"; + sha256 = "14768b419bak8h2px8chw4cbfscb0jj012bpr769qv5nn6f53yh1"; + }; + buildInputs = [ boost libunwind gperftools ]; + meta = with stdenv.lib; { + description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; + longDescription = '' + JUMAN++ is a new morphological analyser that considers semantic + plausibility of word sequences by using a recurrent neural network + language model (RNNLM). + ''; + homepage = http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++; + license = licenses.asl20; + maintainers = with maintainers; [ mt-caret ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0345c91362e5..6d426e7c281a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3395,6 +3395,8 @@ with pkgs; ispell = callPackage ../tools/text/ispell {}; + jumanpp = callPackage ../tools/text/jumanpp {}; + kindlegen = callPackage ../tools/typesetting/kindlegen { }; latex2html = callPackage ../tools/misc/latex2html { }; From fd1ddcef00be49e92714f13bb1e2b4e1ad4c00f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 02:42:29 -0700 Subject: [PATCH 236/538] exim: 4.90.1 -> 4.91 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/exim/versions. These checks were done: - built on NixOS - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exipick --help’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exiqsumm -h’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exiqsumm --help’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exiqsumm help’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exigrep -h’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exigrep --help’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exigrep help’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exiqgrep -h’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exiqgrep help’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exinext -h’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exinext --help’ got 0 exit code - ran ‘/nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91/bin/exinext help’ got 0 exit code - found 4.91 with grep in /nix/store/8dn8r8szcjvgkaanp35ml2ms31r92jrd-exim-4.91 - directory tree listing: https://gist.github.com/a7b6b20ca1752c6525abd8e6d0cef9cc --- pkgs/servers/mail/exim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index b386fadabd46..393ce2c5cda9 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "exim-4.90.1"; + name = "exim-4.91"; src = fetchurl { url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "09ppq8l7cah6dcqwdvpa6r12i6fdcd9lvxlfp18mggj3438xz62w"; + sha256 = "066ip7a5lqfn9rcr14j4nm0kqysw6mzvbbb0ip50lmfm0fqsqmzc"; }; nativeBuildInputs = [ pkgconfig ]; From d91caac6c3e58b8a5f4721c0a6cc8f0dc3b93fd3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 17 Apr 2018 11:44:52 +0200 Subject: [PATCH 237/538] services.tt-rss: do not unnecessarily start nginx --- nixos/modules/services/web-apps/tt-rss.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 8f7a56189a07..610c6463a5eb 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -466,10 +466,10 @@ let ''; }; - services.nginx = { + # NOTE: No configuration is done if not using virtual host + services.nginx = mkIf (cfg.virtualHost != null) { enable = true; - # NOTE: No configuration is done if not using virtual host - virtualHosts = mkIf (cfg.virtualHost != null) { + virtualHosts = { "${cfg.virtualHost}" = { root = "${cfg.root}"; From 4fc0b4edca7e48755538d4436b98baff5901a752 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 3 Apr 2018 12:09:45 +0300 Subject: [PATCH 238/538] acme service: generate a CA for self-signed certificate This is needed because simp_le expects two certificates in fullchain.pem, leading to error: > Not enough PEM encoded messages were found in fullchain.pem; at least 2 were expected, found 1. We now create a CA and sign the key with it instead, providing correct fullchain.pem. Also cleanup service a bit -- use PATH and a private temporary directory (which is more suitable). --- nixos/modules/security/acme.nix | 47 ++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e9676d9dfb15..66191f6e2fbe 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -240,6 +240,7 @@ in }; selfsignedService = { description = "Create preliminary self-signed certificate for ${cert}"; + path = [ pkgs.openssl ]; preStart = '' if [ ! -d '${cpath}' ] then @@ -250,37 +251,41 @@ in ''; script = '' - # Create self-signed key - workdir="/run/acme-selfsigned-${cert}" - ${pkgs.openssl.bin}/bin/openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048 - ${pkgs.openssl.bin}/bin/openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key - ${pkgs.openssl.bin}/bin/openssl req -new -key $workdir/server.key -out $workdir/server.csr \ + workdir="$(mktemp -d)" + + # Create CA + openssl genrsa -des3 -passout pass:x -out $workdir/ca.pass.key 2048 + openssl rsa -passin pass:x -in $workdir/ca.pass.key -out $workdir/ca.key + openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \ + -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com" + openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt + + # Create key + openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048 + openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key + openssl req -new -key $workdir/server.key -out $workdir/server.csr \ -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com" - ${pkgs.openssl.bin}/bin/openssl x509 -req -days 1 -in $workdir/server.csr -signkey $workdir/server.key -out $workdir/server.crt + openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \ + -CAkey $workdir/ca.key -CAserial $workdir/ca.srl -CAcreateserial \ + -out $workdir/server.crt - # Move key to destination - mv $workdir/server.key ${cpath}/key.pem - mv $workdir/server.crt ${cpath}/fullchain.pem + # Copy key to destination + cp $workdir/server.key ${cpath}/key.pem - # Create full.pem for e.g. lighttpd (same format as "simp_le ... -f full.pem" creates) - cat "${cpath}/key.pem" "${cpath}/fullchain.pem" > "${cpath}/full.pem" + # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates) + cat $workdir/{server.crt,ca.crt} > "${cpath}/fullchain.pem" - # Clean up working directory - rm $workdir/server.csr - rm $workdir/server.pass.key + # Create full.pem for e.g. lighttpd + cat $workdir/{server.key,server.crt,ca.crt} > "${cpath}/full.pem" # Give key acme permissions - chmod ${rights} '${cpath}/key.pem' - chown '${data.user}:${data.group}' '${cpath}/key.pem' - chmod ${rights} '${cpath}/fullchain.pem' - chown '${data.user}:${data.group}' '${cpath}/fullchain.pem' - chmod ${rights} '${cpath}/full.pem' - chown '${data.user}:${data.group}' '${cpath}/full.pem' + chown '${data.user}:${data.group}' "${cpath}/"{key,fullchain,full}.pem + chmod ${rights} "${cpath}/"{key,fullchain,full}.pem ''; serviceConfig = { Type = "oneshot"; - RuntimeDirectory = "acme-selfsigned-${cert}"; PermissionsStartOnly = true; + PrivateTmp = true; User = data.user; Group = data.group; }; From bde996eaab3fb147fe74a411ee61306408f05c7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 03:10:57 -0700 Subject: [PATCH 239/538] you-get: 0.4.1040 -> 0.4.1060 (#39030) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/you-get/versions. These checks were done: - built on NixOS - ran ‘/nix/store/a7n7325307a14hwggdj0jzdj47182zma-you-get-0.4.1060/bin/.you-get-wrapped -h’ got 0 exit code - ran ‘/nix/store/a7n7325307a14hwggdj0jzdj47182zma-you-get-0.4.1060/bin/.you-get-wrapped --help’ got 0 exit code - ran ‘/nix/store/a7n7325307a14hwggdj0jzdj47182zma-you-get-0.4.1060/bin/you-get -h’ got 0 exit code - ran ‘/nix/store/a7n7325307a14hwggdj0jzdj47182zma-you-get-0.4.1060/bin/you-get --help’ got 0 exit code - found 0.4.1060 with grep in /nix/store/a7n7325307a14hwggdj0jzdj47182zma-you-get-0.4.1060 - directory tree listing: https://gist.github.com/d2773534e9b303789f531edc73f9eefb --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 795c2ab191d1..f0a8eda00285 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1040"; + version = "0.4.1060"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "fdc9021e8b1cf936aad4bd6c74b80ea8fa3573b807c41242ba781e247f8c8ca8"; + sha256 = "1c4drn6khqrjvyzzsiaracnpcvahbiya6v5p18h2lyl7xia8gk51"; }; meta = with stdenv.lib; { From 44b82c6a8efbd1faf72df271e83d3e571eb9d5c3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 17 Apr 2018 10:42:07 +0200 Subject: [PATCH 240/538] pythonPackages.django: 1.11.9 -> 1.11.12 Release notes and associated fixed CVEs: - https://docs.djangoproject.com/en/2.0/releases/1.11.10/ - CVE-2018-6188 - https://docs.djangoproject.com/en/2.0/releases/1.11.11/ - CVE-2018-7536 - CVE-2018-7537 - https://docs.djangoproject.com/en/2.0/releases/1.11.12/ --- pkgs/development/python-modules/django/1_11.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ca0322cf607c..8dead5644858 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,14 +6,13 @@ buildPythonPackage rec { pname = "Django"; - name = "${pname}-${version}"; - version = "1.11.9"; + version = "1.11.12"; disabled = pythonOlder "2.7"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0d0hh9sh2rwazi7z2lnqvz1424bq6ps6c5h6ss04klp14agi4g9m"; + url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; + sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad"; }; patches = stdenv.lib.optionals withGdal [ From 223aad2053adb88e7ada0fc94f54a97c63249cb0 Mon Sep 17 00:00:00 2001 From: xeji Date: Mon, 16 Apr 2018 23:40:48 +0200 Subject: [PATCH 241/538] kdeApplications.mbox-importer: fix hydra build build failed with "log limit exceeded", disable verbose logging --- pkgs/applications/kde/mbox-importer.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index aa637d440bd9..0704003353ae 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -14,7 +14,4 @@ mkDerivation { buildInputs = [ akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib ]; - preHook = '' - set -x - ''; } From 192221ae3f2493f1e47a77726059dc4a65a9800d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 17 Apr 2018 07:06:49 -0400 Subject: [PATCH 242/538] hydra: build against nix stable. Fixes #39001 --- pkgs/development/tools/misc/hydra/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index cf9057d35e2c..38b28ec0f607 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub +{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc @@ -54,8 +54,8 @@ let TextDiff TextTable XMLSimple - nixUnstable - nixUnstable.perl-bindings + nix + nix.perl-bindings git boehmgc ]; @@ -77,12 +77,12 @@ in releaseTools.nixBuild rec { [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt guile # optional, for Guile + Guix support - perlDeps perl nixUnstable + perlDeps perl nix postgresql # for running the tests ]; hydraPath = lib.makeBinPath ( - [ sqlite subversion openssh nixUnstable coreutils findutils pixz + [ sqlite subversion openssh nix coreutils findutils pixz gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); @@ -117,7 +117,7 @@ in releaseTools.nixBuild rec { --prefix PATH ':' $out/bin:$hydraPath \ --set HYDRA_RELEASE ${version} \ --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nixUnstable.name or "unknown"} + --set NIX_RELEASE ${nix.name or "unknown"} done ''; # */ From 3aefd6c94e2b469b3a806e71a1954516e27edd5d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 17 Apr 2018 07:02:14 -0400 Subject: [PATCH 243/538] elpa-packages: 2018-04-16 --- .../editors/emacs-modes/elpa-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 6b05e9fe28b1..958066e21066 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1507,10 +1507,10 @@ nhexl-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nhexl-mode"; - version = "0.2"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-0.2.el"; - sha256 = "0qrzpkxxdwi2b3136yj5agvaxwr9g2c58kpmjmjpfhpc6yyyx5x0"; + url = "https://elpa.gnu.org/packages/nhexl-mode-0.5.el"; + sha256 = "02z2mx39m96s7v5d8sh6hxb5p70qzbagjfa3lavfw10zjim8g9wl"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1612,10 +1612,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "9.1.9"; + version = "9.1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.1.9.tar"; - sha256 = "16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl"; + url = "https://elpa.gnu.org/packages/org-9.1.10.tar"; + sha256 = "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm"; }; packageRequires = []; meta = { From ee8b9d92b5b07b395db3d32000f28340896f71f9 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 17 Apr 2018 07:02:39 -0400 Subject: [PATCH 244/538] org-packages: 2018-04-16 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 2cf2c50bf714..c0223e17a567 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20180409"; + version = "20180416"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180409.tar"; - sha256 = "0vnyh30pqnpfwmkm2gmidw00mgrwsbvxmjv40yhrv7144392iisl"; + url = "https://orgmode.org/elpa/org-20180416.tar"; + sha256 = "05rbkrs93zd9kvldwvypb8fwwaysajy5n7b2k9c8xm2cx2nayv8m"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180409"; + version = "20180416"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180409.tar"; - sha256 = "18zb6vx06gwxgy85a5fmvjwb8fqb4cn74n1mfk64p3acnsnwikkg"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180416.tar"; + sha256 = "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij"; }; packageRequires = []; meta = { From 4ec912fc110853a37c891b5e8a1498359d82863d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 17 Apr 2018 07:03:18 -0400 Subject: [PATCH 245/538] melpa-stable-packages: 2018-04-16 Removals: - ido-ubiquitous: removed from melpa --- .../emacs-modes/melpa-stable-generated.nix | 251 +++++++++++------- 1 file changed, 157 insertions(+), 94 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 791617c2122d..ff9967e51b35 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -2597,22 +2597,22 @@ license = lib.licenses.free; }; }) {}; - beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "beeminder"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "54cc1277f2a7667a7b0d999dc49ceffcf2862b44"; - sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q"; + rev = "3e95a669474e27cd51a16caea030456377f83062"; + sha256 = "1bj9yzjvglnb0f4glh8fg478xlm5nqmd9jqm1casdj5m30i4kafn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww"; name = "beeminder"; }; - packageRequires = []; + packageRequires = [ org ]; meta = { homepage = "https://melpa.org/#/beeminder"; license = lib.licenses.free; @@ -6501,12 +6501,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "89cfbb4a3a0540abeec1703fd3ee31eba9293936"; - sha256 = "1ndabmdzqfhkg3z9zaavp5bz8l86n4g9lwi0ji0vs7q7rpsykqdw"; + rev = "93e3bb9b7558d597d10c4cb8aa1dd887ed37dc2b"; + sha256 = "1cywxcfrb2j33ncldylimqhj7r7yzlb6ghy5i8c9784vfvxd56yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6611,7 +6611,7 @@ owner = "fommil"; repo = "emacs-darcula-theme"; rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976"; - sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"; + sha256 = "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme"; @@ -6669,12 +6669,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -6690,12 +6690,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; - sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -7325,7 +7325,7 @@ owner = "xuhdev"; repo = "dired-icon"; rev = "dbace8d2250f84487d31b39050fcdc260fcde804"; - sha256 = "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki"; + sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon"; @@ -7388,7 +7388,7 @@ owner = "xuhdev"; repo = "dired-quick-sort"; rev = "fe39cfb2d4a7ba6b30f98134548b4e4bac67c469"; - sha256 = "1a9r1kz5irpvb2byabbf27sy7rjzaygfpqimpag41sj955wlgy9a"; + sha256 = "014frvpszixn8cx7rdx704glmjbslv3py3kw0pb0xqf50k4scynf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; @@ -8836,12 +8836,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd"; - sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za"; + rev = "fcf9bff0af071f5e2020ac77d9a9473325e4c5bb"; + sha256 = "1xk7k4av9hy0i7zqwpzis0rjp5myvxs52k45ah00zg8wi5hybq1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -10298,12 +10298,12 @@ erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-hl-nicks"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; @@ -11389,12 +11389,12 @@ evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "8f6fafcce901a7a588f946b26d2e21c65e36e843"; - sha256 = "0pldzwvkic9ikrgzrvmcaq6y0yjplxinvyh61iqlgw2k7k8jld1f"; + rev = "34d411715ead5829d6d8969511047feb703b067e"; + sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -13502,12 +13502,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; - sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -14129,6 +14129,27 @@ license = lib.licenses.free; }; }) {}; + fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: + melpaBuild { + pname = "fold-dwim-org"; + version = "0.6"; + src = fetchFromGitHub { + owner = "mattfidler"; + repo = "fold-dwim-org"; + rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037"; + sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org"; + sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn"; + name = "fold-dwim-org"; + }; + packageRequires = [ fold-dwim ]; + meta = { + homepage = "https://melpa.org/#/fold-dwim-org"; + license = lib.licenses.free; + }; + }) {}; fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fold-this"; @@ -14518,12 +14539,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "7b3af8ea3d4985682464bfeb174376da8f90c5da"; - sha256 = "02q6gc7wj02vmxnhh58a6yy5wdjhd2fmk935dh70dl3fs0yqr52p"; + rev = "784e3147196bfe82ea9499628467335ea1d036f9"; + sha256 = "07dqqpacvap034jzvdvnpjyryzicbvjx2imnsghsxw9m52jsb9wn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -14641,22 +14662,22 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "6.4"; + version = "6.5"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "2d6b5c29d84a42421ddc2f7f1e9c3a141d81c31c"; - sha256 = "0cri329g0b7ywqarg4jlmry574z7v15gdd9j7jnikq1s2jjgnb85"; + rev = "3022e9f8411628e6a210fb5843d858b15a7513f5"; + sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; name = "gams-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; @@ -15103,7 +15124,7 @@ license = lib.licenses.free; }; }) {}; - git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: + git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; version = "0.3.1"; @@ -15111,14 +15132,14 @@ owner = "emacs-stuff"; repo = "git-commit-insert-issue"; rev = "5f08c17bf93b17915415d435ee41923d924fe20b"; - sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas"; + sha256 = "1gffjf6byasisa9jdcv9n4n5zqalvzfsxv7z75zl0g3ph7wc7bbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue"; sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax"; name = "git-commit-insert-issue"; }; - packageRequires = [ bitbucket github-issues gitlab helm projectile s ]; + packageRequires = [ bitbucket github-issues gitlab projectile s ]; meta = { homepage = "https://melpa.org/#/git-commit-insert-issue"; license = lib.licenses.free; @@ -15552,7 +15573,7 @@ owner = "joewreschnig"; repo = "gitlab-ci-mode"; rev = "313431fa5b8b5ce4512909dfc15675bb99395f6f"; - sha256 = "0zdj3f0a5fg4vwhbv851jv4fs1dqfz2w4jsxqbri2zhzdjxc97vn"; + sha256 = "0wjz87nhcwzp201jxv3qlj88hn7p8nvq20924y06gra2d656znar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; @@ -15573,7 +15594,7 @@ owner = "joewreschnig"; repo = "gitlab-ci-mode-flycheck"; rev = "388fd05f3ea88ed3ebafb09868fc021f6ecc7625"; - sha256 = "0idpg4265rfx5i0i8cgfs6w3gncc766mbg81ldxqjhzvq3n28z39"; + sha256 = "111clb37329c7v0lv1lwypb8bv7qb9f495f2cy45j2n711vymdna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; @@ -16668,6 +16689,27 @@ license = lib.licenses.free; }; }) {}; + grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grep-context"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "grep-context"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; + sha256 = "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g"; + name = "grep-context"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/grep-context"; + license = lib.licenses.free; + }; + }) {}; grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grin"; version = "1.0"; @@ -17010,7 +17052,7 @@ owner = "iain"; repo = "hamburger-menu-mode"; rev = "fd37f013c2f2619a88d3ed5311a9d1308cc82614"; - sha256 = "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm"; + sha256 = "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu"; @@ -18306,12 +18348,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "68f01726795ca3054cfc6327dcdb22c9c83dfdfa"; - sha256 = "0vak9phqgxz5dk1zj3i4cs94y797h77qadirsf33gl073cg95l8a"; + rev = "ecf5ad53bef572e38d8c8d93b516f8eab8c4dfe5"; + sha256 = "14020ws87m64bfxqw30c9hc88zb7w4kxs5svd2a10y00lgrg2m93"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -19962,27 +20004,6 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "4.7"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-vertical-mode"; @@ -22440,12 +22461,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "1.6.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d976e4f0cadb2309b798540429558936f8f45889"; - sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -22487,7 +22508,7 @@ owner = "latex-math-preview"; repo = "latex-math-preview"; rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc"; - sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw"; + sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; @@ -23610,12 +23631,12 @@ magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-org-todos"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "danielma"; repo = "magit-org-todos.el"; - rev = "d772f5220037cb7ad049250df2671e488c65da94"; - sha256 = "19m1p8z016mqxj2b29961rnbjclxcpspx5bkmqhrwhfysyvcjqg5"; + rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55"; + sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; @@ -26056,7 +26077,7 @@ owner = "esessoms"; repo = "nofrils-theme"; rev = "7825f88cb881a84eaa5cd1689772819a18eb2943"; - sha256 = "009did3i3i8yi0virq606l02w1mw0gdyiqablqg7m368gx0gfvh5"; + sha256 = "1aslhxk5mp6khf66ac4c441vywhiqpb4kyajagb8b1p10z8hrqva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c59ddaa5e41d3c25c446b1ed1905d7f88b448e0a/recipes/nofrils-acme-theme"; @@ -27318,12 +27339,12 @@ org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-index"; - version = "5.8.7"; + version = "5.8.8"; src = fetchFromGitHub { owner = "marcihm"; repo = "org-index"; - rev = "2cbd9da2c7a6e4039e32665675370ae4e2b8e6cb"; - sha256 = "10gm329bnbzjr8d0syw90iniann46mb5mirviy9r2q9w6xqjkbd0"; + rev = "0dfe0a67979279345378ca006ab4f727df378aca"; + sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; @@ -31061,7 +31082,7 @@ owner = "elzair"; repo = "punctuality-logger"; rev = "708cae8e67dbae293c7c4be0ca5e49d76fac6714"; - sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py"; + sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/punctuality-logger"; @@ -31418,7 +31439,7 @@ owner = "python-mode-devs"; repo = "python-mode"; rev = "a0a534639bc6142c2c2f44bd7ca5878ad5f79518"; - sha256 = "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml"; + sha256 = "173i3k0nvjri1g1mkgkc2i9c9mpnsvxf1ldmm12yhadl5gl2ah07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -31543,6 +31564,27 @@ license = lib.licenses.free; }; }) {}; + ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ql"; + version = "1.0"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6"; + sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "ql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; @@ -32539,12 +32581,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "63226e8c93e55538855c9b24bfa03c86dc23b79d"; - sha256 = "1zzh2cf6lsrsh6nzlcfxqs4il9dw5fc70x5apvrvp08mpqdzcj1r"; + rev = "d50bd106275f3ef7f77d0147857412fb065eef47"; + sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -33941,7 +33983,7 @@ license = lib.licenses.free; }; }) {}; - shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: + shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "shrink-path"; version = "0.3.1"; @@ -33949,14 +33991,14 @@ owner = "bennya"; repo = "shrink-path.el"; rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b"; - sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki"; + sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path"; sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb"; name = "shrink-path"; }; - packageRequires = [ dash f s ]; + packageRequires = [ dash emacs f s ]; meta = { homepage = "https://melpa.org/#/shrink-path"; license = lib.licenses.free; @@ -35327,6 +35369,27 @@ license = lib.licenses.free; }; }) {}; + srcery-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "roosta"; + repo = "emacs-srcery"; + rev = "385809e78a2494ee617782430415048d91a11444"; + sha256 = "1r6k042jipqz04nlr9gfpq6p80k33k4aqxsn03p1sicnpakzpixg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme"; + sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn"; + name = "srcery-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -36861,12 +36924,12 @@ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "tidal"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98"; - sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z"; + rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f"; + sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -37769,12 +37832,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; - sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -38173,7 +38236,7 @@ owner = "iankelling"; repo = "visible-mark"; rev = "c1852e13b6b61982738b56977a452ec9026faf1b"; - sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv"; + sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark"; @@ -40217,7 +40280,7 @@ owner = "egh"; repo = "zotxt-emacs"; rev = "43c0c6d23b31126bac6b14bb85608180fd9c866f"; - sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp"; + sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; From 6515df02588086adfa19c054e8bda8f06be4e1c1 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 17 Apr 2018 07:04:12 -0400 Subject: [PATCH 246/538] melpa-packages: 2018-04-16 Removals: - ido-ubiquitous: removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 839 ++++++++++-------- 1 file changed, 451 insertions(+), 388 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 8fb655507d0a..aec089f43dee 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -761,8 +761,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1426,12 +1426,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20170623.958"; + version = "20180410.2106"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e"; - sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78"; + rev = "8b528fbae0e557461315bed82883275d58df41f2"; + sha256 = "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -3807,12 +3807,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20180322.1333"; + version = "20180415.1259"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "2d613eb050d94c1cdfb403da7446883ce6d35baa"; - sha256 = "1dmn94bigw5xnxbwmrlyj810iqjgcvqp3qlsgszj6cbg2pv75sqf"; + rev = "08370cdbc35ff41646461a02d6d9758dfce30c20"; + sha256 = "08pgyj3mab6iqbb029wixvvjfc634iln0ij6lxnvpvgy4298iw9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4567,12 +4567,12 @@ beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "beeminder"; - version = "20160209.1903"; + version = "20180413.1229"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; - rev = "a4e159250bac89bc25ced8523a5eac2a951cd5b6"; - sha256 = "0ki9q3ylssjabh15dr49k7dxv88snpj4564g0myp3c61qzyy82lk"; + rev = "3fcee7a7003a37171ddb59171c7f4b5dd4b34349"; + sha256 = "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/beeminder"; @@ -6712,8 +6712,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "4609ceb9d69ac274b447eadf7b70599f7426a97c"; - sha256 = "05frlvxf4dz27d50h6jdgbkfdz1g3lgy1nx2n0ci1sp9yi5n3gm0"; + rev = "fe9a5215948b3636161262b275eca8b98ff1967b"; + sha256 = "1nkqrbx86j2mj0jsap12jfihpw5lnrsxy711qn4g8n3abng4lnza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7215,8 +7215,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "94d364a917682a7331c6543bf551a6541b848cf2"; - sha256 = "12fynh61l7aza3p4r9ag04r912lzh5pspn4rsacvlsz0ypgk325v"; + rev = "bb460ccf2348873b7a84e99930feb038d0f9a95b"; + sha256 = "1wgf2lpcpplxdabz0xbzq9j5va5zhxl22ns63d4jj7v86a77cg2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7820,12 +7820,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180402.2126"; + version = "20180413.51"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "918789346ec9b06991050e5be13e70641b6add47"; - sha256 = "0z9d4ijky0pcqvdkqi9xmcl8zzvr8j0s6zbrkg934mnjhqgp6jc0"; + rev = "a01115242ba839465e16892383133c21c350d5bd"; + sha256 = "1b0p7dnrcgnjma4yk6fc3v21sxaz772wrc780sd5faa833z8wg16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8324,12 +8324,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20180406.633"; + version = "20180411.43"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "ab081b26b92f6a1c7ebe8fb7ff9803d46b07ae84"; - sha256 = "0srp9xxln9hai1pdvc53jixridzrrz6i6xsn3f96knr46abhhdp0"; + rev = "adffc6a4c61a9555744634598b47631760e91488"; + sha256 = "19bi7pnsyqaahwsy6gr55k8kgjfimrjn3lriyzjh7jkhfsmm77bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8735,12 +8735,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20180408.1140"; + version = "20180413.329"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "a584f5397df72b565a63ec53b26e93aa07e14773"; - sha256 = "0hrala1rjn9n7my56la6vd06hzdsq4ccnrlajnir6h60r4k7fvj4"; + rev = "3d4da16226e8d4e53613feeebb5e21e6a7defed5"; + sha256 = "1d0nxqhx6ssld92wlv8c40m655zpf622a0ns4v78397nfm135khq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8760,8 +8760,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "7eecf8ca50247faefe4f854aa075331f9d2dbe15"; - sha256 = "17xx5hgv2zk96i1v4r5hy9dgbbzyx7z38rk7jhzqa47g6bmxgvjy"; + rev = "ccd17a557cbf8ada18207a72eea78d2adcc9d752"; + sha256 = "1i85zb5j3ckn5b9xybczf6k42vpwsyq3xyzzarq3w775iyjlnkfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9533,12 +9533,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180329.1441"; + version = "20180415.2135"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "ddfdcb78c1f7abc25e1a2db1eb68721b20d00a95"; - sha256 = "0s0yqafd1awavlv52gzzi01mwfyjdb24iqi9jw53hw01s5823wmg"; + rev = "46680da66a3ba70c7b2371832f8b8d9734dec554"; + sha256 = "03q76dvjka0xw91gzin848virwpm9dv71y3y2p3m168y7chk4g7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9687,16 +9687,16 @@ company-box = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-box"; - version = "20180410.334"; + version = "20180413.1651"; src = fetchFromGitHub { owner = "sebastiencs"; repo = "company-box"; - rev = "1b8399075f64ccefd61bd974c2735641817da4ca"; - sha256 = "0aw33q7qscn0vkpii7ipl9pn6gw2ii3rsh303x2igwm9yav0v92l"; + rev = "a27b632c1bb92de3415cea08c7885f3dc9ce30eb"; + sha256 = "1p71yalry5linxdb5xiyig8wlb9nw0c5nmlkdxc1l0gyhr8lrzci"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fa432efc9be5e3ae8f91154a6718cdbd100bab6f/recipes/company-box"; - sha256 = "1kn4xv17rwmw31466lvjhb1hhfxsslnm4227n82s70lyswcjrinh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a54879f4dd4dcb6867680567731547d604ad02bb/recipes/company-box"; + sha256 = "0v39gja3jp8b2xfn9da93xsh8mihizwbg0gqp2yyczaxjm8ga23i"; name = "company-box"; }; packageRequires = [ company dash dash-functional emacs ]; @@ -10460,8 +10460,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10729,12 +10729,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }: melpaBuild { pname = "composer"; - version = "20180111.942"; + version = "20180415.743"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "e34ebe795d267e28965c85bd84cbb16b18165bd8"; - sha256 = "1vqjraldl2an10q1w91l7rx66mpsvqvjgg3j1k7xcvw07570aabl"; + rev = "1d43edd8079e84df5e1b46c65e6783cb3ff9debd"; + sha256 = "0k6345mc2ppckbbmji4wkynlfgy00kr945ah8j2b62hqgm73h575"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; @@ -11149,12 +11149,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180409.1120"; + version = "20180415.905"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; - sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11419,22 +11419,22 @@ license = lib.licenses.free; }; }) {}; - cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + cov = callPackage ({ elquery, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; - version = "20180407.1546"; + version = "20180415.1331"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "222d3e51f86a76a976872ff2a2bc6d3188f4ff96"; - sha256 = "1r8igz8gcb5vb4mpvlnkgzbpzc86xx5cqy9kb3dzbgvd9pn6h2lq"; + rev = "e6731ddf16be343a24449cf7dca92f382c8a831b"; + sha256 = "09p61ni7vkwl679ysl9aibw0b7qi5v9vpgvg08vj00fp5a82rzsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; sha256 = "02wk8ikanl5lcwqb9wqc8xx5vwzhn2hpqpxdchg5mdi7fifa1rni"; name = "cov"; }; - packageRequires = [ emacs f s ]; + packageRequires = [ elquery emacs f s ]; meta = { homepage = "https://melpa.org/#/cov"; license = lib.licenses.free; @@ -11569,12 +11569,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180319.2313"; + version = "20180413.938"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "383656d3cb368481594fd7a13d0395a8640afbac"; - sha256 = "1qdicqwafnhfqkl3ihvc67w4wnhyp089wbf54v1plrcw75ywdlmf"; + rev = "7f48de485c5f4ca0d55b93307763889ce2d7c5c4"; + sha256 = "1cb41f0can8mslg80v1np5wvq9c0vl0px5mgy0zyzhajf9zqszgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -12329,8 +12329,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "73e83c248c0055e85c5d517aaf01db3f63560b53"; - sha256 = "07hgqcy5zcvmwbvbpsggyj59lgqkq7fbiqsyk237dpgbprjmhncw"; + rev = "29961acc1c64710127a5191af6c039cb1fa22203"; + sha256 = "00qwi8frmhas5qgs9i8hx067d60zpycnw3pbd4xgn9nis8fjjnw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12514,12 +12514,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180224.1246"; + version = "20180414.1306"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "33c8c4afac616e6de30111f8a7f11d572496a838"; - sha256 = "0zv6vqzw299ydgwxiky8b2nlb8cyzzw9zsx44ixaqqf73f63bv1n"; + rev = "18a2c4a833f9ece01ccfb5910455fc2f0b0de986"; + sha256 = "09a8gwnh2281kjc1rk6ba5clk020hmz11pz36iy99y1bya043794"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12745,12 +12745,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20180310.1317"; + version = "20180413.30"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08"; - sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12791,8 +12791,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "87d5feac1a08ea09e55e52442dc5e497817b4f08"; - sha256 = "05rm9rs4083ccsscwi7kl094ij5lz7hgs9kvxdsrjmvxj4fqdqm7"; + rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; + sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -15032,12 +15032,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20180405.2353"; + version = "20180416.911"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "551ae639d84711acb705939a5b90f25bc01b5838"; - sha256 = "1748j4w9nzbw70vq5q2261fphpnz4a64hl1yn1yswa5rcm325i0p"; + rev = "6df5799e358cfd8714bf9aff8368865a5bcf9691"; + sha256 = "091p9wvrnhz42azg9g9ybc08s4gf1fxwjzxc3ar530wc56kdmd7p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -15418,12 +15418,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20170412.845"; + version = "20180416.652"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "62df5de68c73d34faaa0191a92ce3ebce589bf24"; - sha256 = "0wpbscqaszr2mg0hijamcz6l9nknsi12mwdbib16ghlh6y9mj4ia"; + rev = "74094e6fd5d0f15b92d82c73b3b3d9f13949d5dd"; + sha256 = "0apimfivs0g4m9qy1m3c8id6ycr2lwxdpd00crxbka284g440nzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -16173,12 +16173,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "easy-hugo"; - version = "20180403.439"; + version = "20180416.749"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "97733f78e034fd955df7871c1cf92627e329a0ea"; - sha256 = "10y5h8mj4c81mlyna801wc6ygxyix41d0hzlvvs9pja34i5zljmh"; + rev = "b01585991ca1885e9cf10dc41481116feb091c89"; + sha256 = "1nac2al4hi4lcarj325957jgkkfgfkgpw6mzmbcqzqvy02r2v7g4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16194,12 +16194,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "20180402.9"; + version = "20180416.811"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "742366a2eb8bdb3d91e108e701ca8a1e83084671"; - sha256 = "1i3pxg5mskbk2zmcavbd78sr9l45qqcjjfp3p0i8q5kbm9zjr5fm"; + rev = "670c289d7dabc9e991ba78cdde17fb659f23eb50"; + sha256 = "1myqhny6v5xdz55xi1ayfash5r3ihkyy2cykwhjkrpp339695bxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -16320,12 +16320,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20180213.531"; + version = "20180416.350"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "cbad0a51d7905712201d83e9f4f52a7bb047652f"; - sha256 = "1jmg63q4msy83nr0xzivay9n8nv48kawqj5jxlfq83fwkvnk1szm"; + rev = "22709d2b5e973b321dc8412f9a26acb156a076e1"; + sha256 = "1xh7gmshn1ra027pqbvc06qxjs49ijby0kiz37qdqz7rvq2xgl6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16983,8 +16983,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "1a95b2b6709842e6586594c08337c1e7237a9eed"; - sha256 = "0cd495wvnys6jj6s7k67mgwbrmc8203yya4j0xixhpffhq1m2km3"; + rev = "2f8f744bd0a8d1c307922c6636f1c337d45a55bc"; + sha256 = "1ds0fxi12z3cls0wavyq5anw2jfhmc2a6mx3g4mnxfr39sjr4q2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -17061,12 +17061,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20180404.1847"; + version = "20180414.1838"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "94d7c7820da3e22791707b2fe797941646a7c610"; - sha256 = "01mybxcfm34hxwkmh6wms8s4vidfny2s052786g1jlq3ny1g9afd"; + rev = "ed4ae8006ca58c39c5e09925fb51c0f3529cb199"; + sha256 = "0clww9329ysipdby8d3qwkx7pmrls075j0kpsqw3h8mm9hb48wgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17491,12 +17491,12 @@ elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elcord"; - version = "20180306.1515"; + version = "20180411.1207"; src = fetchFromGitHub { owner = "Mstrodl"; repo = "elcord"; - rev = "3071250488613d8dbd79daf81ddbe3bad4b87001"; - sha256 = "0lcs0713r4vcln2im53mkfwcibr3j7ygs467rfgf163kd979gp5c"; + rev = "0cef4ca13b00d79507292d5591be8ffb7df5a9ca"; + sha256 = "1571r8iwrf4dagjr2pv7dgs1i0f20nq6jdkxm2dlwvkblcnlx3fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord"; @@ -18254,12 +18254,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180406.217"; + version = "20180415.1232"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "e3028393e6cf744ec902120e37bd92e0f32ea4ef"; - sha256 = "1fd4zj4sqnipbwjybbp1rk65g60n8w20xg3if9nhky47nwwjanyx"; + rev = "911d1c58df1c0ff9ce8057d07b13c06759f2e0e4"; + sha256 = "0cyk2467gcxz0vf63p0db9y6rij9hb7251lv6s054mzy3kbcn7zm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18871,11 +18871,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20180409.2121"; + version = "20180412.639"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "c90a7535ff1e6552274adf3a48b777316ff8d897"; - sha256 = "0yvp0l2l3h9h879fxjml3nyg7swq47xdwk4hiigqk4fx7cxi9rs0"; + rev = "9b7b50a89bc4f9df7f9edd6e939508288f0ffa9b"; + sha256 = "0v271gk6q77zs0gdp9asbqd8alrn6ifxzzjkqb3hd4xdafv35sf3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18975,12 +18975,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20180409.1503"; + version = "20180415.1958"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "ccc0090ba1ebaad6bd3b079d6d810e9a051218b3"; - sha256 = "1jy7zc26ypwl46ag26gbspbn7p4lf3jxgb34l8blqzk8qn8fxz0c"; + rev = "c7efefd0b41fa910436a91eb3bca4db3a85ad940"; + sha256 = "0h40nhrzndzhdq3ra8bzqg3gczbmjf010n0nan6dril427qvxdjw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -19708,12 +19708,12 @@ erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-hl-nicks"; - version = "20160202.1150"; + version = "20180415.1246"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; - rev = "be181920ce6af0ab5d00d1c638e4e598b3998643"; - sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7"; + rev = "756c4438a8245ccd3e389bf6c9850ee8453783ec"; + sha256 = "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-hl-nicks"; @@ -20090,8 +20090,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "6a38655668542cebb60d5e13078b599abb3f0ec6"; - sha256 = "11ramwyy6qhqc0a6dq1n4kqzcx9r5fgshxak6d632z2f5pw504dq"; + rev = "40dc6b9fed7d51a204e0d69b7bba7e8cb6496ae5"; + sha256 = "1ndzx4alfwc437d4j0bifgc0pignxs0nvwp4i2fdrpljcf0x0nxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20107,12 +20107,12 @@ eros = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eros"; - version = "20161221.826"; + version = "20180414.2318"; src = fetchFromGitHub { owner = "xiongtx"; repo = "eros"; - rev = "a42e45c9b2397156c684330b0fc90ee0eba773f5"; - sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"; + rev = "dd8910279226259e100dab798b073a52f9b4233a"; + sha256 = "08chj3a0lw4ygi2sv7wj0i6ihfbi8jhylr8p92inif8b88r6wg3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eros"; @@ -20170,11 +20170,11 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20180406.150"; + version = "20180407.1243"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "fdf3ba7bf9f12281f1dccdae4d12449605ae4aec"; - sha256 = "0jsg4a9bf70kvpjjgs0rgdzqvwmlip91cpbhw14c2gaza48d36lf"; + rev = "8d7d703332e3a41bfc59de44fa8832435ff1633b"; + sha256 = "1mbbv18pviirf220wjzfjlig8i3jwcl1bpv5awzvyzg2lm3h1nbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -20694,12 +20694,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180410.447"; + version = "20180416.631"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "9da8612e3b3e382916d6e36a99fbbb097f4bedf5"; - sha256 = "1rkmvdl9hxvhm2q30vgn4bnifdz7kff3brkf393229b2n8k9rjws"; + rev = "27b55440d15ff532da86dfae6d030e76d1e6d518"; + sha256 = "1sjnky11lhmiqcqrmdfi8xaf40jlm43kzbnviq031apwfxrvifi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -21198,12 +21198,12 @@ evil-collection = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180409.2045"; + version = "20180416.146"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-collection"; - rev = "7afd9e5cfcdd68da738b6d812dab2ba394eec68f"; - sha256 = "0iaab4n4n53gqrn5rjrzcb1jq4zvhp95whl207xvddhf1b48dlvz"; + rev = "aca031a7f313d4380a1dbaa2158a9908a2ce9415"; + sha256 = "1mzgi8bdd767g6xfkznpm5v8gjx8wp99drlxggi0vgp1rm3zslsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection"; @@ -21450,12 +21450,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20180210.938"; + version = "20180414.2306"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "deab4966d75321a9172947ee5cdf2329eb2c5a6b"; - sha256 = "1b4w40x23kbzry80d4rxxynasmrkbry9jj5jkc4l4rcj8lk3vbbi"; + rev = "bc318ad4b7711837c21405d49a0ce4097f3a70a9"; + sha256 = "0vy6skhp6skr3hvkc0dzfn1dridwzybjm9mg2h90srvg76c8966p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21783,22 +21783,22 @@ license = lib.licenses.free; }; }) {}; - evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-nerd-commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20180408.630"; + version = "20180411.640"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "912a967fe5f3391c2a02d86b7522a89dae2d5274"; - sha256 = "1mz9h4cfwd5n6gy3wxs5w87svxn4n13qsr8cqc8ck9y9bsxf4ppw"; + rev = "34d411715ead5829d6d8969511047feb703b067e"; + sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d"; name = "evil-nerd-commenter"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/evil-nerd-commenter"; license = lib.licenses.free; @@ -22801,12 +22801,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20180410.621"; + version = "20180414.329"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "0e9067db5de334b8f4371896230eed617f236918"; - sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99"; + rev = "96595833110cd64c391e0ccd5230782a8f0a4e08"; + sha256 = "0nvwgxlrbfhchb7z2qnw1lj66xpzn2b6yb6mhx0k31xdfr173wch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -24253,12 +24253,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180326.836"; + version = "20180415.1527"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "0a588ed2aaf8ea7088ba8abdc91af47d4d41a85a"; - sha256 = "0rvhk4mi4nh66r7rch69rvi0rbmrnxwqnk2rv8d1his0i7z53rq6"; + rev = "1eecec814debc6994b1aa8b6760cbfbbdf71e219"; + sha256 = "1in3sanhyd0cmivq7c5xxqpb5frzq77zp7rdyyki9pczpf9yv58a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -25030,12 +25030,12 @@ flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-jest"; - version = "20180409.1718"; + version = "20180410.2028"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-jest"; - rev = "370efb30f0856eb83abcbe50ecdf85842e95138d"; - sha256 = "0xjj1z9svzgrmk12r85iqcj5awal8ik5xfhf02s2iwknwqssx065"; + rev = "08f27c5ed97c83c445f99fab58f0b6c826f14449"; + sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest"; @@ -25601,8 +25601,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -25702,12 +25702,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20171231.452"; + version = "20180411.652"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; - sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; + rev = "06a6f98d7e498860b345bbd03e96bfe59608f508"; + sha256 = "0h1n4x0fvqfb6jcapbab1ck6bj4d7irbn9zz2hxv2rlrkqxfsmh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -26791,6 +26791,27 @@ license = lib.licenses.free; }; }) {}; + fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: + melpaBuild { + pname = "fold-dwim-org"; + version = "20131203.551"; + src = fetchFromGitHub { + owner = "mattfidler"; + repo = "fold-dwim-org"; + rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037"; + sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org"; + sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn"; + name = "fold-dwim-org"; + }; + packageRequires = [ fold-dwim ]; + meta = { + homepage = "https://melpa.org/#/fold-dwim-org"; + license = lib.licenses.free; + }; + }) {}; fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fold-this"; @@ -27566,12 +27587,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20171026.722"; + version = "20180416.830"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "d88bd11bc81a1f4d29a7b9d6890c59e5b6ee7b6f"; - sha256 = "1pgw7hnb8f3vjmzv9sayqqprq1sjmj0r1xfhrnixibybsps7bvlc"; + rev = "314e43c80fc31e15741136e61f3ee5f793ba190c"; + sha256 = "1i9rs9cb9l7hp678rf4w9r47zqy1pakyy7alfli192mm650w07l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27710,22 +27731,22 @@ license = lib.licenses.free; }; }) {}; - gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gams-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20180326.2325"; + version = "20180416.206"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "2d6b5c29d84a42421ddc2f7f1e9c3a141d81c31c"; - sha256 = "0cri329g0b7ywqarg4jlmry574z7v15gdd9j7jnikq1s2jjgnb85"; + rev = "3022e9f8411628e6a210fb5843d858b15a7513f5"; + sha256 = "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci"; name = "gams-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/gams-mode"; license = lib.licenses.free; @@ -27879,12 +27900,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20180329.548"; + version = "20180413.1646"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "e496177c7ccdc0a36d4809113b1c1f366c1e39ab"; - sha256 = "14nka5jqakiq0i72s35b4ibnvfvd5jdsg2194ai4bh27k1sn9mpr"; + rev = "ec3d0ea34081789da44f0b11b2cf05627a1e9b8e"; + sha256 = "0g79vz9b73p7g2zy8ml0glwiivq48d64yq3kd6wmq1qpx3zflrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -28194,12 +28215,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20180409.1314"; + version = "20180414.1654"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "21c9e94abcfa464db0dd475b26cff8059ada5798"; - sha256 = "1kx1s6p2z2jdqm8dr8jxba2iyj448cnx9m2p88749xfqjgy0nw6k"; + rev = "27e7b17473d17b684ddf873e4281f2595c05ca65"; + sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; @@ -28446,12 +28467,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180405.1137"; + version = "20180411.1649"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "fb2d481e8e4a7c8dac23b82e4a008747e4ce9fab"; - sha256 = "1dxbx5qhddx56k9146sm4f9nx8j0h0cy1afx1j5d6271rjb9nm49"; + rev = "16785d7962cf84df12cf1e498b2c96519e84d235"; + sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28698,12 +28719,12 @@ git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-ps1-mode"; - version = "20170102.1944"; + version = "20180413.247"; src = fetchFromGitHub { owner = "10sr"; repo = "git-ps1-mode-el"; - rev = "e41c630f5d04cb1a4d38a4b500d7a154a96a4655"; - sha256 = "11bg953nk5x501vkr0jrz710pz3qxla27bgrd4gp503fbygnixkz"; + rev = "6a06bf57cbe614ab26032b153d3dcf4fb4bfa7ee"; + sha256 = "1lgvzla1bg7gmkj41hmzhiqcbdmdw9ycpzfvpl6xl0sm0fk3j3rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode"; @@ -29227,8 +29248,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "21c9e94abcfa464db0dd475b26cff8059ada5798"; - sha256 = "1kx1s6p2z2jdqm8dr8jxba2iyj448cnx9m2p88749xfqjgy0nw6k"; + rev = "27e7b17473d17b684ddf873e4281f2595c05ca65"; + sha256 = "00yjgz8c03l8v99gi2ly08iwp10bv5s6hhhlvw1kyg00mflgn4m9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; @@ -30256,8 +30277,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "5508c2f7dfaba43b30d413c943560476c2e5a46c"; - sha256 = "12f6zw4byx7m6v81q2szabpy0ky8cpyn1drcjyi6yvra11z6747a"; + rev = "1b206ee36263b16ec18f7b2f86a2b770b7490844"; + sha256 = "0vwx5h7b0f4yv5aqznw8zq2fnwwdmrcfa270v16dzdfr5a7n3pj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -30529,8 +30550,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "e85222dd8ace4ed0e608da847b10843c8f19a677"; - sha256 = "0am2lkz50d5ics1hyxcrj16lcjzs0h0rkr1r8madqmdlrpzy1myn"; + rev = "d3ae3004773719bcc413ff8e3396f2ce6bf0827b"; + sha256 = "0l06li4d7mppj7r7xvx4dpvi0asdcazwj3nil6kd1in2pfq3hh4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30655,8 +30676,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "e587fb73a94144ea6c8c48a615f55985eee493a5"; - sha256 = "1zqbq023wlynxdpr2qf1s2liidbwawc03bf67j0zhmvipq16hb3n"; + rev = "0aea74def58791b2343a8f0139c2f2a6a0941877"; + sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -30977,12 +30998,12 @@ grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-context"; - version = "20180409.1227"; + version = "20180415.435"; src = fetchFromGitHub { owner = "mkcms"; repo = "grep-context"; - rev = "a13929bff6a25a09678bf8922d906acefbbd8e50"; - sha256 = "0sl5g8amgxjwj0q30nvrd141hwg9xg2gqy24d96qgxzybmb7y554"; + rev = "4c63d0f2654dee1e249c2054d118d674a757bd45"; + sha256 = "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; @@ -31080,12 +31101,12 @@ groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20180410.313"; + version = "20180412.538"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "e587fb73a94144ea6c8c48a615f55985eee493a5"; - sha256 = "1zqbq023wlynxdpr2qf1s2liidbwawc03bf67j0zhmvipq16hb3n"; + rev = "0aea74def58791b2343a8f0139c2f2a6a0941877"; + sha256 = "0aih46rk2zzxhbx4k65w1lmg3ibxnkimdfpyxc5qfdcr4kyfg06i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -31290,12 +31311,12 @@ guix = callPackage ({ bui, dash, edit-indirect, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20180408.1232"; + version = "20180414.1025"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "90e028cc1f82b94614679cda2574a9d3efed2913"; - sha256 = "1l4bgfk5ir6n7k64jb3s7xplrayk7719gkl25lfcnd0i8r4ib638"; + rev = "00c87a9cafa3d74840be02efa2516286515b6f93"; + sha256 = "0mbri7p7hm5bfqw8i8wl5yc5av13sd77bs15af44nv8p5gqx7wng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -32065,12 +32086,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180410.1155"; + version = "20180413.335"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6ddc80a5ae303c275d60046358dfefc08f8f01d2"; - sha256 = "0af4ddrs70jn3v5ykr1vcymcd3ixmshqjrzicm0b1594ln535jp8"; + rev = "b72baa1183fabf5213e4d50a38358288f7af5a86"; + sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -32254,12 +32275,12 @@ helm-bbdb = callPackage ({ bbdb, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bbdb"; - version = "20180319.639"; + version = "20180412.807"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-bbdb"; - rev = "7582e93871d6ab9aeebd87f5f63c43d3207b71fe"; - sha256 = "11nv31rlf6f9aha39pgzapah3drb547gfymha3ihpdsk2xy68ij5"; + rev = "1f182900207cff383d62d91e839b48dd4874f2a5"; + sha256 = "0m08zb1i6m8i0n590f1717p8dxb7w9d4mh3wnkd829zjhycradrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7025c319fcabc64576c0c6554d0d572cef697693/recipes/helm-bbdb"; @@ -32674,12 +32695,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180409.2054"; + version = "20180414.2257"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6ddc80a5ae303c275d60046358dfefc08f8f01d2"; - sha256 = "0af4ddrs70jn3v5ykr1vcymcd3ixmshqjrzicm0b1594ln535jp8"; + rev = "b72baa1183fabf5213e4d50a38358288f7af5a86"; + sha256 = "0q89c9axk8a7w3hncl7wak0z3yg022vwf3lwfmww6xkn9daxldjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32779,12 +32800,12 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "20160916.713"; + version = "20180411.2215"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; - sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; + rev = "cc000b1bf580577d032c9f0563168b6bbdd6d290"; + sha256 = "1z5z0yfj1h3852zn4sh0p9dl3viyfiqpw28jczqgm8rcng94rvbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -33913,12 +33934,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170727.1238"; + version = "20180415.2336"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a"; - sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; + rev = "c63c27f10d0cc409ab528d20700bccc52abbab26"; + sha256 = "1xmrg49b7r3ry85gizllnll4v6wk3qxmhwrd7d0jifx5df9v13f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -34225,22 +34246,22 @@ license = lib.licenses.free; }; }) {}; - helm-pass = callPackage ({ auth-source-pass, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: + helm-pass = callPackage ({ auth-source-pass, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20180325.1453"; + version = "20180415.2038"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "c451b9739ef742df06af9d098f6b0fb48e807f66"; - sha256 = "1ndhyb796svisq5wdshxlz4nzjsphmwiwf9kp5f077bi6lx25xkn"; + rev = "ebcbef1a962795a36e3491ae926e2a4b8a8b0ebb"; + sha256 = "13far24blzmcjyxkwnsqbx0g865p233bx21885nw59rp28frg538"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia"; name = "helm-pass"; }; - packageRequires = [ auth-source-pass helm password-store ]; + packageRequires = [ auth-source-pass emacs helm password-store ]; meta = { homepage = "https://melpa.org/#/helm-pass"; license = lib.licenses.free; @@ -34673,8 +34694,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34942,12 +34963,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "20180408.555"; + version = "20180412.2325"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "5f7b1ee2f521a2cafae6c762f8f25c08c5d6a016"; - sha256 = "0qf5fg5jxwyspficyk5vac4paaqkhzr9n77wy0rn0k3agjm9f2y9"; + rev = "986b7bd360a705053500c4ce2c9bea03dd7b24a6"; + sha256 = "19iklhpxgh5xx6h4dysf58nd46lmyb46xj601lf7kbwl6yq0y61f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -36619,12 +36640,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20180328.2341"; + version = "20180412.1244"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "726c77b909f825b27e734a5460e3e2b63cfc60b0"; - sha256 = "02v14p01qkj1i38r181d6azcdj00331bkdlgcidg6brljl6jzz41"; + rev = "315a8f23cfd3e87642ff9e30ae3300c7a84244d5"; + sha256 = "0pjiid5a16xx9n5bvfff612mpli00y9nbzjapn9f1y79yl99yvxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -36808,12 +36829,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20180410.1233"; + version = "20180411.1231"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "03322cf34d94ba99aa86f8b3fa213c81a5c185b7"; - sha256 = "1z8c7nsfcb2rfimyz7vz92ac56iwr2whkzaq62gn0q6cqcrzwcb1"; + rev = "d72192e36aeeae1c7784c95569cc330981465714"; + sha256 = "1ld1q06i2srnwz1vkwf023vmcranb76xvskhclb8bmwk7gimz95s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -37601,27 +37622,6 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: - melpaBuild { - pname = "ido-ubiquitous"; - version = "20180216.949"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-completing-read-plus"; - rev = "2f4050ebd9591a3c2c73cbae1014c908226c43ec"; - sha256 = "1jg3k8ivfjfqh5gw0zzwknvpa8hq21n9p2k913wvxyazv0b1gvqx"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; - sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; - name = "ido-ubiquitous"; - }; - packageRequires = [ cl-lib ido-completing-read-plus ]; - meta = { - homepage = "https://melpa.org/#/ido-ubiquitous"; - license = lib.licenses.free; - }; - }) {}; ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-vertical-mode"; @@ -39385,12 +39385,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180402.1858"; + version = "20180415.905"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; - sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -39536,8 +39536,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; - sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39725,8 +39725,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -41542,12 +41542,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180407.400"; + version = "20180416.401"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "0a80628e083db6e9d4b4af73be5d917d7d667330"; - sha256 = "1brb0l39xkl19h9xslvmms9vcziygfp244xs5r3n4dqn43c7rr68"; + rev = "2afd1be2a431b59e82ce22353b57bb7def851da5"; + sha256 = "19y5j2jha3q3i0l06bzywgxbc8q34sc1rh76j0wfvm6r6yxq1bwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -42071,8 +42071,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "d3d517dd236da48876742fec6881d8822ac356df"; - sha256 = "1pfwnly4s6xwc5ggan5pmr7hiq4z08wr2pb0iv9d4lvbjqm044c9"; + rev = "94d623f914745aab67715356db6731860a3e37e1"; + sha256 = "1hs69p79f27rdy8v4dld46qdnsszm7f4xx0nqlvz1pgy0wm3lq71"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -42529,12 +42529,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20170917.2154"; + version = "20180409.316"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "bae4bdd240583b2253b4ff03af5295146e285103"; - sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd"; + rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; + sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -42822,12 +42822,12 @@ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lcr"; - version = "20180224.1243"; + version = "20180414.1256"; src = fetchFromGitHub { owner = "jyp"; repo = "lcr"; - rev = "6caa2bac7056dcf42c4cb88a1d5fbe1c9d71a9b4"; - sha256 = "0xvl0dqxwim6nmm6f9ddyp0r6j1n719zlgm2a3f49dskhnkn798z"; + rev = "49a59d80a4b55cc421cb55430ff8258887382c3d"; + sha256 = "1fds0s0if9m155v5hk5l0ihc6wr331qif5bc013w04hrlkn4v5jh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; @@ -42885,12 +42885,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180317.2003"; + version = "20180416.105"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "74b242f9cfd9e3a0735c4041b3941ddb65642fc9"; - sha256 = "1fyyhrr4600q706v05pnc25j4apmz8m52jdb1s7jnwph89zwm18c"; + rev = "fa09a3bdd25a532b8ee1335e22b7427eb0d231e9"; + sha256 = "0hp7p6nmxp4ass17vnlx0r73k9gc4z8aknsmpwpyw1radx26vy1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -43502,12 +43502,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180405.1200"; + version = "20180415.1117"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "a7e1cf742e72199cc75aa5e1e686991ba4a23bc4"; - sha256 = "0qg85gz5akayvhb5fmn1qx7s9847gry4g20xcnq8llr839lq28dl"; + rev = "582c9994688fcbbda454207e4112ad4a0cd80970"; + sha256 = "02frf3r2m0hfz3xf3vvcccxi4gvkl9fz5asrgrc0f6v45850mdv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43544,12 +43544,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20180408.1649"; + version = "20180414.1952"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "083f5e5a9194081e90039c367b464aa896e9f91c"; - sha256 = "13z0r09h52nw3j9vzbfpbhl18s8hxyagmq2ni3d2s8s96b7kd939"; + rev = "d2491462647fc6cffcc8f40c2a518a4948f2afcb"; + sha256 = "029jg6nggk5qvrskvlgb52ymgbakd56cnva1mgb10invr0wpswqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -44427,8 +44427,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "3f22586d23a9dbcb6fc9ab646cbe6fa25c912e07"; - sha256 = "1bfp61dbfji8ac40d4a1p38k5glclwbh1ahv2byvhkpf35qjzd0x"; + rev = "2c1f2f4cb24c30fcefb2d07dad3f40b058c90c1f"; + sha256 = "0pjzywlg981pvg4015w11b1dzrvqm1h3fjdl6qp6pv7iq2x9hxdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -44444,12 +44444,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180408.1020"; + version = "20180416.622"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "76ed991561435c8643990ea8c8b45b4210dfa5ec"; - sha256 = "18wzwplyfhr4skapsm9v3lslvxkn4ngih5pki7sw2swknkhfwzh8"; + rev = "34a669b76ac0aa45b4917f882687ca7577814249"; + sha256 = "091ph46y6mb9rf0saar0vb230z1kf8w74f3dkcm7hs7b1k7khj3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -44549,12 +44549,12 @@ lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180410.1111"; + version = "20180412.1807"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "b8d0357c21bc9e9dde46e2c4e7e16d06ab6097b9"; - sha256 = "1xydm28092ci1nrrb3viv9nnl6imsmygchns6kigdglicc2wlby5"; + rev = "146efa7414a91090c494e24fac364011bc884f31"; + sha256 = "0076kjv1wpw079mbv35v0j609xhis7xrvx6jg54hnb7y5h5rkqqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; @@ -44913,12 +44913,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180410.1528"; + version = "20180416.852"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "fb2d481e8e4a7c8dac23b82e4a008747e4ce9fab"; - sha256 = "1dxbx5qhddx56k9146sm4f9nx8j0h0cy1afx1j5d6271rjb9nm49"; + rev = "16785d7962cf84df12cf1e498b2c96519e84d235"; + sha256 = "0ifzqqsyqk5x3d8zvq0yspcfhlndl7ppv6yxzz8w27pgb4h0jqwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; @@ -45111,12 +45111,12 @@ magit-org-todos = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-org-todos"; - version = "20180319.859"; + version = "20180412.1542"; src = fetchFromGitHub { owner = "danielma"; repo = "magit-org-todos.el"; - rev = "df206287737b9671f2e36ae7b1474ebbe9940d2a"; - sha256 = "0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn"; + rev = "0bfa36bbc50e62de0a3406031cb93e2f57dcdc55"; + sha256 = "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84480cad490cab2f087a484ed7b9d3d3064bbd29/recipes/magit-org-todos"; @@ -45157,8 +45157,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "32e6da899abd6657c098534c5775fc7177047f49"; - sha256 = "0nrvs7gwd9kn4n808akrydn7zggvy9zyk38yrcmm561kw0h0h903"; + rev = "a0b22e30d135d4f83a9227b3fa13b1377f9be0df"; + sha256 = "0sn9gi0qm3q6c63f1jd67pkc54r2gqk8bzh21x48n2x2v4f84s63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -45279,12 +45279,12 @@ magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magma-mode"; - version = "20160304.408"; + version = "20180413.727"; src = fetchFromGitHub { owner = "ThibautVerron"; repo = "magma-mode"; - rev = "528c96a269980dcc6b65e2e973510ff07e6b9fc4"; - sha256 = "1pq6ckxp3dcb2f6xfsd4jwd43r9d0920m30ammp39glgc39p9lsq"; + rev = "d8e41b3c0bc7d37be78fdbcabf6c13c9e182dfaa"; + sha256 = "1wlwgbj3hslfxl21nz5s7g0p4kdpc5ph58jp7mrz0dws5cw3sj02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59764a0aab7c3f32b5a872a3d10a7e144f273a7e/recipes/magma-mode"; @@ -46662,8 +46662,8 @@ src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; - rev = "15681ddca9e96baab2983240125ed2aac5d9de27"; - sha256 = "02cyyd8hr7d9bmn3r8nbza3pb15hikmwhvjmlx1gh13iidjq5vmj"; + rev = "754480a9b6f2d62093fb7a264a5c4ac42fc57997"; + sha256 = "1z7gaij17yxk3ikxljlb54cvdcz0lhnm8wl0bpzpiycpnfkqxcy4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; @@ -48380,8 +48380,8 @@ src = fetchFromGitHub { owner = "sagarjha"; repo = "multi-run"; - rev = "87d9eed414999fd94685148d39e5308c099e65ca"; - sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; + rev = "3c5e44afd69aac2e0a5be118cf6249b757e2889a"; + sha256 = "0jknx6b973wlhmg01nymncqr2809kmjhchv75v92fas5yvn1pb3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; @@ -49844,12 +49844,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20180331.155"; + version = "20180414.503"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "b67f52072096f7e9efe98d2cc106ba39652c7545"; - sha256 = "108zjw83rh7yfrf999lx4dd7vh5281qigrnli50q75j4qhnmsfm7"; + rev = "9bffebc0f4858a06ba374f1d48a7dffd3537b93e"; + sha256 = "02dhplz597r5qp1mljy1npx2kzg07l938d2xivwy9cd6jlkj35ya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -50874,12 +50874,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20170920.2251"; + version = "20180416.822"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef"; - sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz"; + rev = "b68a0187e4f67e57891a3faae384d650a1cf31fc"; + sha256 = "0107xn1z2im8672lwsw4r7blza1gamgihy9aahxyf27jc0a2zvfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -52122,12 +52122,12 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20170724.2116"; + version = "20180413.2111"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "3b7417ac12f2710e88f8dff538670621064ef8bc"; - sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk"; + rev = "85fd01f5bde7cb3adb167a8e37e52865d49c9579"; + sha256 = "1isb6ym8c22f9y2wph6zy90x9nl4g51fal68vfklg8bq1pywzj7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; @@ -52269,12 +52269,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180409.442"; + version = "20180411.1157"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "e2e696b8bf6209272a6675f3c878d96a9c8fe643"; - sha256 = "14zlbb6l4h6h8ff3fsdlrlxs6fq96iw8hrmd4dvdg847ys3gjbld"; + rev = "6857c9dcf11135eef40b8f1f86d10a71cecc86ac"; + sha256 = "092rl3vfkbj7vcn49bibc1s3m0479l0isbhb2w7xb06dh8k8j9ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -52773,12 +52773,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20171102.556"; + version = "20180416.953"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "90a82ec72fb688ef98d1343c02dc3c6da9e4bbee"; - sha256 = "0fl9m1bgcmvxpdmb05lbna9snfrd8gbrn16c2w72b3asxx7acq94"; + rev = "4e1f949a6fb225e79e69cb8684c0629671b6b8e3"; + sha256 = "1nrcwjl50nycyraac2zwlx3346az7521icf1h718hqqw4r799ggk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -52899,12 +52899,12 @@ org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-index"; - version = "20180410.811"; + version = "20180414.208"; src = fetchFromGitHub { owner = "marcihm"; repo = "org-index"; - rev = "e319abddbdb3f0dc5ff30d6df6baaa9194db3c8f"; - sha256 = "1qxmp60x8wyb5vd06r6vcx5raxs8hmxb0l2hfq0jpdpdrcjidzlw"; + rev = "0dfe0a67979279345378ca006ab4f727df378aca"; + sha256 = "16wjzskq000grkanaw9zca2qbw9yzpndhfd2g0b0if2mf1g31mkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; @@ -54121,12 +54121,12 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20180124.229"; + version = "20180415.2219"; src = fetchFromGitHub { owner = "tesujimath"; repo = "org-wc"; - rev = "6ff202a4612fe65b4e96bd551893fe8df67b0f51"; - sha256 = "1yqiqscj7cmnqd4s1lgbf7jbhcqlf3bwr52sabz7mqfs4iwdryhl"; + rev = "d22b4cff3e1157ca468b186eb789ca62b9214abd"; + sha256 = "0ysnydpm6lviak3mrqifim4zs2lffbjiv9nvb33qs8mi1dq2igji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; @@ -55142,8 +55142,8 @@ src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "3d91d3377e43dce981606a3b878563091e219c8b"; - sha256 = "0r3c532g8bswbdqjx12s1rgbw28w7ddq090j2dwlmwmqqh7w14vc"; + rev = "15a6df059f5eac0964c075c1386ce1c83cfe979d"; + sha256 = "11vndvwq64s7kc8a706favp7x7jc59sqwgs00sknfzznmpyy0xki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -55558,12 +55558,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20180330.2032"; + version = "20180414.938"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "50c41597d15fb5f39ec65d8009e10ea8fb11d67a"; - sha256 = "0l84iilg7jmr5q16h1jjmssq68f9xz45kvhgdspvrh6j723js12l"; + rev = "cf202c0a93bd5aabea59d16ad7ddf8c292c05990"; + sha256 = "18icx58yqig4c7zdvjz8jrhilbv5ygdyl56473mz1zyhvb3q42xy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -55600,12 +55600,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20180323.1852"; + version = "20180416.100"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "5ac4122cf1e24649b387bec8630740cd4ec85b72"; - sha256 = "030jcapghpf1smmsb17q79dmgfmjqh5x3kvzlqcgmcgfdj2jvx7m"; + rev = "6929545b6c116bd3eb12d3481a78f381c759e6fc"; + sha256 = "19fj94i4ai1gzj2y2b2klw7xdsh4aki8zr4840lffn4a0f16nc7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -55852,12 +55852,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20180321.1041"; + version = "20180415.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "bc3df2f1190c773f03fdd43fac5125da37f03de9"; - sha256 = "00jdc99gm8qplhs6jwlr6daa6rkpazbs1wicbdbiag9g7h8y7q5h"; + rev = "8fa25d06fb2ae6d992e738a10d8b2150e109d9bf"; + sha256 = "0p50cfmwgwahb1czqvgx2kvnd3k46zl0pybvxlyf45y4c4kr8wjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -57066,12 +57066,12 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "20170110.546"; + version = "20180414.1044"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; - sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; + rev = "85d753a27c198cc3611845ca144150d3baf4e3d8"; + sha256 = "08iypb0pbscbqcvg6p81rmazr5b7kdavjg2z9l37jha4vcb3nbcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -57654,12 +57654,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180409.537"; + version = "20180412.1002"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "6de29235218ae2bc3d96523e454e952729a4490a"; - sha256 = "0gbg34z4rnr2gnqpk6jq8k4ajws0nniyp2001gfwalifcfqlpaq8"; + rev = "ef69a8b63f70a89694087ab0f97545d103ad952c"; + sha256 = "0njhhlpv93rkskhzj6wyxyvvx839saix6d96x0ipairxv1arcj3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -58036,8 +58036,8 @@ src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "8298daefee1b044c58390c861a6a70937cb0601b"; - sha256 = "0y084hqf0ylzayx8xbss08g5c87jg9sn1jcwy83g68cjyvxfn2k3"; + rev = "7f1fb3dd1704e535e67860c58080e55fc89e07f4"; + sha256 = "1z1hdh6m10gam86zyhdfjksj2jxjrichdcz8qs3290lxy59f7agq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; @@ -58647,12 +58647,12 @@ poet-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "poet-theme"; - version = "20180410.420"; + version = "20180415.2212"; src = fetchFromGitHub { owner = "kunalb"; repo = "poet"; - rev = "5bdc1fbe264a031706ce7a7bf012c50fe48b26c9"; - sha256 = "1xmi3155gssw06sfqfpdlki58j9bgfvsws1xhckb0x4y2qfjshin"; + rev = "70b514373ea32c20ce4e46809b3336af1a69d2c8"; + sha256 = "0jsgd4fgz6xliyfq46xn3ky7hr5ma4577h8kgshsbdidzwmp6xrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme"; @@ -61073,8 +61073,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "39338dcb1c3b7b855db9688203ad2bfc8b8bf850"; - sha256 = "0z6am73an8jlsprqp4wi0wgpq0k9xbsq3c70l886v37cgbkmjmf2"; + rev = "56b5da6efd3a7ac934adbadf4d85abfc1d324d71"; + sha256 = "09c14bsfglvlbz0y7sx0di50p1iw033g5y8f3qxbwrxba3213pkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -61370,12 +61370,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20180407.746"; + version = "20180415.614"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "37265132a393ee1d176b0f72e258e2ab996d1ee0"; - sha256 = "0ma0k33bpq02jnrnhgqmxxa3wk457qb8rrk5an5yjfjnzqiz1sk1"; + rev = "d7f89bd4fd3d3be7f6ef82caed51b4e7d1d754fa"; + sha256 = "1dmj4yfbwlp9259is8av9ggsx08dfhqj2jd18hvvpxbhfqcybi8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -61409,6 +61409,27 @@ license = lib.licenses.free; }; }) {}; + ql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ql"; + version = "20180404.943"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "ql-el"; + rev = "c885d125d8972374b408f6eddf031e44dc6fa0c6"; + sha256 = "1l1jdvz1913m03ikcf9g3dsraaajqac1kzfy9c9xhzx8w7bbl80c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303/recipes/ql"; + sha256 = "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z"; + name = "ql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ql"; + license = lib.licenses.free; + }; + }) {}; qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; @@ -62493,8 +62514,8 @@ src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "384f42481625327052af12e6a20e164765c20742"; - sha256 = "0bbary49c1c63qzg47nd4fqbvvm6y7xxbya50hf0d7pgv5b27n37"; + rev = "9ac0c71c2858b76dc5499f62c7c7fb7f9e8f16bc"; + sha256 = "0a0qf118gj2fag3j57zmli47939rn1jayvs2fwa4l280ipfvp2m7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -63500,8 +63521,8 @@ src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "943226043dc9055b282d0c035fd1e1cbdd562b22"; - sha256 = "0hm25x1zym4xdc4w1ayn1an4nrg1qwyh12vb9sxas3fplapm500k"; + rev = "d50bd106275f3ef7f77d0147857412fb065eef47"; + sha256 = "0zjhak534j1n03z6p9wjmgc48yy40icrp2x8y9vbvg4hgx8xh9lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -63941,8 +63962,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "a595d13f60c13d67a28467b3941d5ed558102e91"; - sha256 = "0yp6h6nsbji7dmc9pnf9qi7zsqxrxa1bln90bn0y71xf6z11kbp4"; + rev = "4747d5b695bee40c3b0a2e3591ac8897571edd66"; + sha256 = "1qy71bx8nki73mqslw54hq5bn1asz5qg1b2848nrsj8zb2yd85x5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -65636,12 +65657,12 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20180405.2124"; + version = "20180412.1643"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "d2d11fc296decf7701f5688d182527541ac2acf7"; - sha256 = "0vzn01jqkqgfhsn3knf5q5qxx75jd38c1lrk72cxq3yrl62c071v"; + rev = "fb7dd994f9fed518693475b2b6de67d518417783"; + sha256 = "0arg66j25ixvmbhlgdjw12gzwsa5wmif7qw1mzfzd0sghgdbmj0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme"; @@ -66305,6 +66326,27 @@ license = lib.licenses.free; }; }) {}; + show-marks = callPackage ({ fetchFromGitHub, fetchurl, fm, lib, melpaBuild }: + melpaBuild { + pname = "show-marks"; + version = "20130805.749"; + src = fetchFromGitHub { + owner = "vapniks"; + repo = "show-marks"; + rev = "97609566582e65eed0d0a854efa5c312f209115d"; + sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f2007ab49d123e324c8d7c09bca9de33468d98ab/recipes/show-marks"; + sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb"; + name = "show-marks"; + }; + packageRequires = [ fm ]; + meta = { + homepage = "https://melpa.org/#/show-marks"; + license = lib.licenses.free; + }; + }) {}; showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "showtip"; @@ -67022,12 +67064,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20180330.423"; + version = "20180413.1720"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "a83b6ececbbe77cfdb7d54d7d24870a1071fb8c2"; - sha256 = "18hdgxjng6mq2fgy2dmisnyg547l3kwk3z7069h101xwh8dji3w5"; + rev = "26695c66162dcbb9dfd083c6e3b329c468e14ed9"; + sha256 = "1fj096yhvxnj47qvc0b3pw3vf7icxv2jdfa3nvap9aksj453xndb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -67190,12 +67232,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180410.1121"; + version = "20180412.355"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "08609ed0dbce7848844dd39b1b875a295cef7821"; - sha256 = "1jm4nzq72zp2qwc16vlxknl2k9a6i5623dzyr9j4zrp92kajah6n"; + rev = "7d12c47bc573c5497487cfba60ccb30bd66514d7"; + sha256 = "15wkra725r1sqzgpqgjs6shw5njlv116xinw4di9b41ih9qg98k1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -68645,12 +68687,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20180330.1332"; + version = "20180412.526"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "efa2ebdec8bc1d8fa067f25fa54648f5a4d22aeb"; - sha256 = "1669r27rv4a7xlp2prjvl8hijnhzdw71lgsvxp65iwz7dl0912wk"; + rev = "ca85233b443216f8519c401c58af6807b6d31740"; + sha256 = "1ssbvp8xc1i7bf51rb2n0pkbhqs741dq0i0akwc3qqjg2sblckk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -69314,6 +69356,27 @@ license = lib.licenses.free; }; }) {}; + srcery-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "srcery-theme"; + version = "20180414.636"; + src = fetchFromGitHub { + owner = "roosta"; + repo = "emacs-srcery"; + rev = "6eea761e039a9511cb49b2cd3967b498b06db979"; + sha256 = "0gqh4vn8f9d1jy1z8qw6qq5lgmbqywb9nbg1c3jrffgxcn1r414b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1df48441ecf6abd272ff154722b9ce0e2546c284/recipes/srcery-theme"; + sha256 = "1r8srxhznli3sskwppk7fyapyx0qixagkwm0fllgsbm4nwkzq9pn"; + name = "srcery-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/srcery-theme"; + license = lib.licenses.free; + }; + }) {}; srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; @@ -69338,12 +69401,12 @@ ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssass-mode"; - version = "20171201.509"; + version = "20180413.2303"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ssass-mode"; - rev = "a95c4c9f99895cc582849b35e90ae13f1587ddce"; - sha256 = "1ldw72ggk22ih5j9fyb3bl0ngyfdkzfcyg97mp0mb40w8ly68qav"; + rev = "511fb0b7c41b5a479f9ea4b65f38b14454cb1401"; + sha256 = "199v7n8l9784hv2iqhqwf2na9gw20l22bf9dmi22sjmfsk8l9s7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; @@ -69422,12 +69485,12 @@ ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20180323.2320"; + version = "20180411.2201"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5a89d59a5371aac9ee9eae22996ae2065f7f2a6b"; - sha256 = "1zmlw75sdlvb99ijylan4bc2z2wm23x5zlql2bmjnfvjb1z2mh39"; + rev = "d0be94676f44078fd29668c6e1a790cc0cc02f88"; + sha256 = "0gc3pjzjgvznla5bl9n0yahsj8whs8jnicah5kv5zjgv99wslvb7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -70218,12 +70281,12 @@ sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunburn-theme"; - version = "20180317.1051"; + version = "20180414.2312"; src = fetchFromGitHub { owner = "mvarela"; repo = "Sunburn-Theme"; - rev = "63fbc5a609100e78d8304c99646ae8f689e17bf2"; - sha256 = "04dwqssci9xvcaw1wrhf45hsqskmj0s38lyc0fmbbg1vx53npnk3"; + rev = "995b389b7aa18b511718e9dcc68d7e1d9a2891a9"; + sha256 = "0skmxv4qmdncp79jd0kh5rsx7ff98r8kmzii9l9d0da3xmkvgx1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme"; @@ -70516,8 +70579,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; - sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; + rev = "1181d0f7acb9e77a15fa7e62cb1027979185c853"; + sha256 = "0vsl346axdlkcv96cxlciw7bmvxwl2ficjgw9nxrsvhsjsy7md02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -70659,12 +70722,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20180306.648"; + version = "20180412.339"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "bb02b971b06fb8e612c62bd2517b49884bc603a0"; - sha256 = "18ib707rky1k5qw5m4zfd88y1lvgqfilc336ha3v88i7fz8bbzh9"; + rev = "b76f510037eb8e0ea018272495f356c71ff5b758"; + sha256 = "0dlb7rm4adm2ccqga5a1w6m2jvs4ics9ihf76hqyx4px9m9ca1ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -70907,22 +70970,22 @@ license = lib.licenses.free; }; }) {}; - system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20180405.1002"; + version = "20180415.2039"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "1470962e6675574d740508e918831f002fdf2f3e"; - sha256 = "1lbqglk02rd96vn91bakcln3pnx580k1p5zhw8m0gxmrxxzylncs"; + rev = "9e5532bbed819e6736922d2da2615a2fa4433cea"; + sha256 = "1blncv4cdf3ayq9d5ymdiacavma23smrmwh46130pscbjb4iyppy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; name = "system-packages"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/system-packages"; license = lib.licenses.free; @@ -70952,12 +71015,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20180101.1803"; + version = "20180414.1111"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90"; - sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff"; + rev = "e97f78ee11f4d4738aaa646e48bb39565d88abd6"; + sha256 = "16ffz0m964g8j6hi1drjvzaz2nxjm1z7r1y1j0g9bmn1dksz7vl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -71266,12 +71329,12 @@ taskpaper-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "taskpaper-mode"; - version = "20180410.255"; + version = "20180416.754"; src = fetchFromGitHub { owner = "saf-dmitry"; repo = "taskpaper-mode"; - rev = "62f2f72bc49643b0c5d0c1b4ab9802bf05abe3a2"; - sha256 = "0y8cxh45xwzlzaxyvhjiy5az9z08gggzdp6dm5ci9q23iqwlgb6p"; + rev = "0e4f11d3aa07ea1602df0566f28bb2dc172f70f5"; + sha256 = "048hw8kbvdxihd9qsr16gzjlvjm3plvwlqb216mxbx60ig8vlhfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; @@ -72215,8 +72278,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "606f1ef31447526b908244933d5b716397a6bad8"; - sha256 = "0cjwfplna5y2f5wzaqn72iagy8n52fvjvhsajzn9r6yak0bgp7zf"; + rev = "c564651dd404d7e9ff6bf7e5b343f429b9e52082"; + sha256 = "19i37mhyvg80d6j2zdxi5iljv28fbx5mjnayc6p14rqhk93xm856"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -72278,8 +72341,8 @@ src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98"; - sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z"; + rev = "f8af7bdbda547ebd12cf5c0ee1327f33cd9aa93f"; + sha256 = "0y7a4bxsgpbg1sbsi4xdp4k9x3l0vh7acm5i3k87acpcpfb9aq5y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -72295,12 +72358,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20180404.957"; + version = "20180416.755"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "8e5db30596627ad250caab75cecf56c175f6542f"; - sha256 = "13zr8pzibpszw9rrizgkjxh9r72h7l1bw8mdk0grabdnjqzjimfi"; + rev = "e9a19bf500ee9c1a31d420055c159da44ada92db"; + sha256 = "0kfcllkkhknqx69h407v5v6b0p8g0xpd5ashh2smhz9zdnxwx1m8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -74440,12 +74503,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "20170830.533"; + version = "20180416.623"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "c2c1b44b16a0fd873193b17c580ef3dfdacea580"; - sha256 = "1rq4m77fydkawdwkbw8125ihmvv6aisr03nwb1857k3hxhrg0gwv"; + rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; + sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -76035,12 +76098,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180407.300"; + version = "20180416.240"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "5de834c8f47d1c5bb427c2c1113787b66010662d"; - sha256 = "1630x09kygsm25sgbqs5612almsq77w6cs51h9768hrnvq7xgvjw"; + rev = "370fba5fefc819b863909330fa17b6b0e8b20080"; + sha256 = "0rsksx6gbff2l26rcfrxjq51pnl3l61r0vsnwq9ax70djrpk804m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -76539,12 +76602,12 @@ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whizzml-mode"; - version = "20171015.938"; + version = "20180411.1636"; src = fetchFromGitHub { owner = "whizzml"; repo = "whizzml-mode"; - rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22"; - sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b"; + rev = "cfe081c957ad6e70e1fd32c7836008851198431a"; + sha256 = "1qipmr0v6l6r2ggdp7lbrc14hwfjs6j835ii53y99knmbp7cnci1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode"; @@ -77004,8 +77067,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "a3afe66da141"; - sha256 = "1qfhac73cbdvz1ghk9l2r1q5f1wf8msy3z8sig6pi1jawk5wb0sf"; + rev = "dbb4f5d19925"; + sha256 = "1ng4p0yf8lp3nhdz8l3m4zhl13x3bpb9prckw8nghqf2hc96l2dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -77042,12 +77105,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20180318.1253"; + version = "20180414.757"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "ff3e96929d4532e33422a5980a6e3ca9f2fcf032"; - sha256 = "1fhn2wd0wszbnfpvnjmlw8gxqzy8f4q7dg7r16jpa1cmk0fpcdi0"; + rev = "ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84"; + sha256 = "0hq2dy8djxf45ajk9di1grhgzly0qrijcjfdah8xj5zkwvn9cvlh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -77651,12 +77714,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20180407.1510"; + version = "20180412.2300"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "1cd2e0cf3f2e23f60d3c195e9bee04d94e728488"; - sha256 = "0l6bm60bv7n6sfy9v32h79hkz2s0wgmcz8lsivr2aaapaabkpvkd"; + rev = "e7181d40cc4bf30eed2672cb97255a8451031002"; + sha256 = "0lhakj8hr2wg7n3nqc5bqwgxb9lf6yvknryll9xw9lq4q9yha7rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -78407,12 +78470,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20180328.532"; + version = "20180415.350"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "e2ffe7d90bd5a88b794afa1b462f773d8b772db2"; - sha256 = "0a5b8bdzi0h00bk2980mp5mfm1hb7hk5i6jlijmiin89bgs19xpc"; + rev = "a804f145d17b4b68490ee62ba9a9c4fc7faad130"; + sha256 = "1m9zal19s7v6djrma1xbqwx1n271y0ik44wx9sscmrynmhdlis04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; From 529e7cf070ef99447361bab37f4f4662d63e81e3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 17 Apr 2018 07:08:00 -0400 Subject: [PATCH 247/538] fold-dwim-org: mark broken missing upstream dependency --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 +++ .../applications/editors/emacs-modes/melpa-stable-packages.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 268976179bc5..c21db447e397 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -94,6 +94,9 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; + # build timeout graphene = markBroken super.graphene; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 7592fdbcae11..33473ecad3f0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -96,6 +96,9 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; + # upstream issue: missing dependency + fold-dwim-org = markBroken super.fold-dwim-org; + # build timeout graphene = markBroken super.graphene; From 48d9754d2b110ea4b5e7248b74eec52befcd136c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 17 Apr 2018 07:15:12 -0400 Subject: [PATCH 248/538] nixUnstable: 2.0pre6137_e3cdcf89 -> 2.1pre6148_a4aac7f --- pkgs/tools/package-management/nix/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index abc93c264fc0..a2c30318072d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -95,16 +95,19 @@ let passthru = { inherit fromGit; }; }; - perl-bindings = { nix }: stdenv.mkDerivation { + perl-bindings = { nix, needsBoost ? false }: stdenv.mkDerivation { name = "nix-perl-" + nix.version; inherit (nix) src; postUnpack = "sourceRoot=$sourceRoot/perl"; + # This is not cross-compile safe, don't have time to fix right now + # but noting for future travellers. nativeBuildInputs = [ perl pkgconfig curl nix libsodium ] - ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ]; + ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ] + ++ lib.optional needsBoost boost; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" @@ -137,15 +140,18 @@ in rec { }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-2.0${suffix}"; - suffix = "pre6137_e3cdcf89"; + name = "nix-2.1${suffix}"; + suffix = "pre6148_a4aac7f"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "e3cdcf89b0ef42f81c9df5899776ea225f1ecae0"; - sha256 = "1s9w7ixc2qra3x9545f9a634654rvdqsf38jp9b7wr6xx6qqx60s"; + rev = "a4aac7f88c59c97299027c9668461c637bbc6a72"; + sha256 = "1250fg1rgzcd0qy960nhl2bw9hsc1a6pyz11rmxasr0h3j1a2z53"; }; fromGit = true; - })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; + })) // { perl-bindings = perl-bindings { + nix = nixUnstable; + needsBoost = true; + }; }; } From 622745c3bf79054f99eb8b8a835f9a542fbc36b3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 17 Apr 2018 07:23:27 -0400 Subject: [PATCH 249/538] nix-plugins: 4.0.3 -> 4.0.4 --- pkgs/development/libraries/nix-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 392d4daa0d1a..c4a30f52b050 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: -let version = "4.0.3"; in +let version = "4.0.4"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "0dkrrh94s3gvym7hhdqivxzphsjh0828c0y6w6a51xdpm8rlajzj"; + sha256 = "02lz62n55pvqin4x44qlxb5knrapyckmj9k8ggk4qxgb36368ifn"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 683e2067d796f90cb9cff5a610d436afaa395302 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 Apr 2018 13:52:29 +0200 Subject: [PATCH 250/538] haxe: Fix path to stdlib and add small test The version bump in c727e7e7d60e687be7d8def95fce5cd02cb5293b (pull request #35153) didn't actually take into account that Haxe has changed the way they search for the stdlib. Instead of a hardcoded list of paths it now searches based on a common prefix. So when running Haxe, it errored out because it couldn't find its own standard library. This is now fixed by changing the sed expression accordingly. Apart from fixing the actual issue, I've added a small test in installCheckPhase to make sure something like this won't happen again in future updates. Signed-off-by: aszlig Cc: @volth, @joachifm --- pkgs/development/compilers/haxe/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a420949711e0..afeef2b3637c 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -53,6 +53,24 @@ let dontStrip = true; + # While it might be a good idea to run the upstream test suite, let's at + # least make sure we can actually run the compiler. + doInstallCheck = true; + installCheckPhase = '' + # Get out of the source directory to make sure the stdlib from the + # sources doesn't interfere with the installed one. + mkdir installcheck + pushd installcheck > /dev/null + cat >> InstallCheck.hx < /dev/null + ''; + meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = https://haxe.org; @@ -75,7 +93,7 @@ in { version = "3.4.6"; sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if"; prePatch = '' - sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml + sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx ''; }; From d4cc20c0cc16299a3b8533bf6b37d4c0020d4e14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 05:07:21 -0700 Subject: [PATCH 251/538] frostwire-bin: 6.6.3 -> 6.6.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/frostwire/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 6.6.5 with grep in /nix/store/6cgry9k7i6ni9a7axglsm5akmibryimi-frostwire-6.6.5 - directory tree listing: https://gist.github.com/e29014b6db646e0dd934f79b2e387703 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 4f885116bd82..84ed1ff92591 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.6.3"; + version = "6.6.5"; name = "frostwire-${version}"; src = fetchurl { url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "0n1g0am3d2fxw4a4zzzyif1fal1x3xch9q7743jhkkm3mldl2grw"; + sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph"; }; nativeBuildInputs = [ makeWrapper ]; From bca80d67a065de4b875a131ef97dd11cb29c46ba Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Tue, 17 Apr 2018 14:29:07 +0200 Subject: [PATCH 252/538] Clarify installation steps w.r.t. disk partitions - mkfs.fat needs `-n` to set a partition label, not `-L`. - create /mnt/boot before mounting - leave out detailed LVM example as advanced users already how to create LVs while it is detracting for novices. Re #38674 --- nixos/doc/manual/installation/installing.xml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e20b6574b725..1f09704bce53 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -115,23 +115,17 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif UEFI systems For creating boot partitions: mkfs.fat. Again it’s recommended to assign a - label to the boot partition: . For example: -# mkfs.fat -F 32 -L boot /dev/sda3 +# mkfs.fat -F 32 -n boot /dev/sda3 For creating LVM volumes, the LVM commands, e.g., - - -# pvcreate /dev/sda1 /dev/sdb1 -# vgcreate MyVolGroup /dev/sda1 /dev/sdb1 -# lvcreate --size 2G --name bigdisk MyVolGroup -# lvcreate --size 1G --name smalldisk MyVolGroup - - + pvcreate, vgcreate, and + lvcreate. For creating software RAID devices, use mdadm. @@ -155,6 +149,7 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif Mount the boot file system on /mnt/boot, e.g. +# mkdir -p /mnt/boot # mount /dev/disk/by-label/boot /mnt/boot @@ -366,8 +361,9 @@ drive (here /dev/sda). (for UEFI systems only) +# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) # mount /dev/disk/by-label/nixos /mnt +# mkdir -p /mnt/boot # (for UEFI systems only) # mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) # nixos-generate-config --root /mnt # nano /mnt/etc/nixos/configuration.nix From 8e5088593f670cc50bbaf0dd3e11d183f7feb7fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 05:30:26 -0700 Subject: [PATCH 253/538] edbrowse: 3.7.2 -> 3.7.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/edbrowse/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.7.3 with grep in /nix/store/w057l445jk9l35d2z1pql5jwcp1p1y0y-edbrowse-3.7.3 - directory tree listing: https://gist.github.com/8e186ea226866b6eec7612e33cf13c32 --- pkgs/applications/editors/edbrowse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index a6611d2f167d..862739b4ed01 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "edbrowse-${version}"; - version = "3.7.2"; + version = "3.7.3"; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "CMB"; repo = "edbrowse"; rev = "v${version}"; - sha256 = "00wi0m91zf8p8wk4ixlz99dndgv4xqy93m2vsiwdr3khw3jwipp2"; + sha256 = "19qdxigp0qv5vyy0hpn0czcc8papvivsjrxx7p367ihizm39yzla"; }; meta = with stdenv.lib; { description = "Command Line Editor Browser"; From 287ffb695073d4fe203b1092c693c1c1b97c3bf7 Mon Sep 17 00:00:00 2001 From: "Gol D. Roger" Date: Tue, 17 Apr 2018 07:39:43 -0500 Subject: [PATCH 254/538] simplenote: 1.0.6 -> 1.1.3 Upstream release, resulting in 4 changes: 1. url 2. version 3. sha 4. xorg.libxcb (same problem and same solution as spotify. see https://github.com/NixOS/nixpkgs/issues/24448) --- pkgs/applications/misc/simplenote/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7fbf11573c49..513c5facc6b2 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "simplenote-${pkgver}"; - pkgver = "1.0.6"; + pkgver = "1.1.3"; src = fetchurl { - url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-x64.${pkgver}.tar.gz"; - sha256 = "18wj880iw92yd57w781dqaj7iv9j3bqhyh2cbikqrl4m5w9xkla8"; + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz"; + sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf"; }; buildCommand = let @@ -20,6 +20,7 @@ xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome3.gconf + xorg.libxcb ]; libPathNative = lib.makeLibraryPath packages; From bbbbbbc349550cf53c2d14318c18727fbfa9a783 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 17 Apr 2018 15:00:19 +0200 Subject: [PATCH 255/538] jasper: add patch to fix CVE-2018-9055 Part of vulnerability roundup 39 (issue #38993) --- pkgs/development/libraries/jasper/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index af543c4e1976..6c9ea32d518a 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; }; + patches = [ + # Fixes CVE-2018-9055 + (fetchpatch { + url = "http://paste.opensuse.org/view/raw/330751ce"; + sha256 = "0m798m6c4v9yyhql7x684j5kppcm6884n1rrb9ljz8p9aqq2jqnm"; + }) + ]; + + # newer reconf to recognize a multiout flag nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ libjpeg ]; From 7a732cbb30cecce76ec423631373c2bc089ccf10 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 06:39:14 -0700 Subject: [PATCH 256/538] asio: 1.12.0 -> 1.12.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/asio/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.12.1 with grep in /nix/store/k4y5rhr10i8va653gjnz3ys3i3vj052r-asio-1.12.1 - directory tree listing: https://gist.github.com/c1661a0442144f8187d8ce4d1624b908 --- pkgs/development/libraries/asio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index ad601359019e..1126b4a7f2c9 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.12.0"; + name = "asio-1.12.1"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "1bfk746kcs3cmvfvxjp3w9y6zpybjj8s002jjd3snrp2syd0nd9c"; + sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9"; }; propagatedBuildInputs = [ boost ]; From 0ebf6adcf79c25055244cddef671b5574b4dd2bc Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 17 Apr 2018 15:54:24 +0200 Subject: [PATCH 257/538] pythonPackages.scapy: remove name attribute (#39058) --- pkgs/development/python-modules/scapy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index d7b2a827f7d1..c24592ef9650 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -6,7 +6,6 @@ buildPythonPackage rec { pname = "scapy"; version = "2.4.0"; - name = pname + "-" + version; disabled = isPyPy; From 1d971b7a9f75333ace1f0e9c792a3f3c23221e8c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Tue, 17 Apr 2018 16:04:04 +0200 Subject: [PATCH 258/538] azure-agent: add option to control auto mount of resource disk. --- nixos/modules/virtualisation/azure-agent.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 201d5f71ba34..e300f78241b7 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -66,6 +66,10 @@ in default = false; description = "Whether to enable verbose logging."; }; + mountResourceDisk = mkOption { + default = true; + description = "Whether the agent should format (ext4) and mount the resource disk to /mnt/resource."; + }; }; ###### implementation @@ -112,7 +116,7 @@ in Provisioning.ExecuteCustomData=n # Format if unformatted. If 'n', resource disk will not be mounted. - ResourceDisk.Format=y + ResourceDisk.Format=${if cfg.mountResourceDisk then "y" else "n"} # File system on the resource disk # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. From 4c383cd41d7505cb62bf5125326bb66ee4874d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 17 Apr 2018 16:03:29 +0200 Subject: [PATCH 259/538] python.pkgs.praw: drop upper bound of prawcore requirement --- pkgs/development/python-modules/praw/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index de7e4e3ee12d..8f43cbfb4a8c 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,6 +14,11 @@ buildPythonPackage rec { sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; }; + postPatch = '' + # drop upper bound of prawcore requirement + sed -ri "s/'(prawcore >=.+), <.+'/'\1'/" setup.py + ''; + propagatedBuildInputs = [ requests decorator From c3cbff3a8a4f761e828e21dad912e3ce4fdd946f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Wed, 11 Apr 2018 09:42:26 +0200 Subject: [PATCH 260/538] i3pystatus: 3.35 -> unstable --- .../applications/window-managers/i3/pystatus.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 68e77a54b5ad..abf25e738a80 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }: +{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: python3Packages.buildPythonApplication rec { - name = "${pname}-${version}"; - version = "3.35"; + # i3pystatus moved to rolling release: + # https://github.com/enkore/i3pystatus/issues/584 + version = "unstable-2018-04-11"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; - src = fetchurl { - url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0g5m05rbqvq1qrspm6fyzky9xfhaz5pvc4hfzgdxrzijn8nfc860"; + src = fetchFromGitHub + { + owner = "enkore"; + repo = "i3pystatus"; + rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; + sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ From b6567229a2a43e20ff2de0189382e20135b53dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 13 Apr 2018 13:51:01 +0200 Subject: [PATCH 261/538] keyring: disable testing ref: #38483 --- pkgs/development/python-modules/keyring/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 2029eabba026..ce5bb315581d 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -17,7 +17,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; - doCheck = !stdenv.isDarwin; + # all tests with flake8 are broken right now + # https://github.com/tholo/pytest-flake8/issues/45 + doCheck = false; checkPhase = '' py.test From 493ef304a059ea3239797eb47fb312d5bca44a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 14 Apr 2018 11:12:30 +0100 Subject: [PATCH 262/538] i3pystatus: set LC_TIME by default --- pkgs/applications/window-managers/i3/pystatus.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index abf25e738a80..1fed92764c10 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec { libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\""; - makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually + # LC_TIME != C results in locale.Error: unsupported locale setting + makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ From 9131f2d005772db5e5daea1d5622dffee652e420 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 17 Apr 2018 22:10:48 +0800 Subject: [PATCH 263/538] virtmanager-qt: 0.52.80 -> 0.60.88 --- pkgs/applications/virtualization/virt-manager/qt.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 9316496a547e..c8af6a1ccf55 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,17 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtmultimedia, qtsvg, qttools +, qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.52.80"; + version = "0.60.88"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "131rs6c90vdf1j40qj7k6s939y8la9ma0q3labxb7ac3r8hvhn6a"; + sha256 = "0hd5d8zdghc5clv8pa4h9zigshdrarfpmzyvrq56rjkm13lrdz52"; }; cmakeFlags = [ @@ -20,14 +20,12 @@ mkDerivation rec { ]; buildInputs = [ - qtbase qtmultimedia qtsvg + qtbase qtmultimedia qtsvg krdc libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; - enableParallelBuilding = true; - meta = with lib; { homepage = https://f1ash.github.io/qt-virt-manager; description = "Desktop user interface for managing virtual machines (QT)"; From 28e352cff827f24d662de14c9c820d7746941689 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Tue, 17 Apr 2018 16:26:04 +0200 Subject: [PATCH 264/538] azure-agent: add bash to service path. as is often required by linux extensions. --- nixos/modules/virtualisation/azure-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index e300f78241b7..b7ab54aab7ec 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -185,7 +185,7 @@ in after = [ "network-online.target" "sshd.service" ]; wants = [ "network-online.target" ]; - path = [ pkgs.e2fsprogs ]; + path = [ pkgs.e2fsprogs pkgs.bash ]; description = "Windows Azure Agent Service"; unitConfig.ConditionPathExists = "/etc/waagent.conf"; serviceConfig = { From 15e44477b38963c5d0e0462b03a62316940608ba Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 4 Dec 2017 15:52:38 +0100 Subject: [PATCH 265/538] Add bash to jira PATH: required by health checks. --- nixos/modules/services/web-apps/atlassian/jira.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 81ee8154326c..13c5951524d9 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -155,7 +155,7 @@ in requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; - path = [ cfg.jrePackage ]; + path = [ cfg.jrePackage pkgs.bash ]; environment = { JIRA_USER = cfg.user; From f46368be6a317cdf8f6fcc918805e1096db9c0cd Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Fri, 6 Apr 2018 15:50:12 +0200 Subject: [PATCH 266/538] atlassian-jira: 7.7.0 -> 7.9.0 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index b90e68ed3bcb..fd34c1f43859 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.7.0"; + version = "7.9.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1np1zf6yxras15ambf92g8snnvph9pp2dk4yw6w58yfil5kzp70l"; + sha256 = "1xj04a78dhjzb2ms875lfg5s3qc8rw31fws92yhmbs0k1866g33b"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; From 05bebd7215b3d627bf08fe769d9dfafb5b5a47e5 Mon Sep 17 00:00:00 2001 From: mt_caret Date: Wed, 18 Apr 2018 00:06:41 +0900 Subject: [PATCH 267/538] sweep-visualizer: init at 0.15.0 (#38607) * sweep-visualizer: init at 0.15.0 * restrict platform * fix maintainers * fix license attribute --- pkgs/tools/misc/sweep-visualizer/default.nix | 60 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/misc/sweep-visualizer/default.nix diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix new file mode 100644 index 000000000000..c1f3fbea8e5c --- /dev/null +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, makeWrapper, fetchurl, + alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, + gnome2, gtk2-x11, nspr, nss, + libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, + libXi, libXrandr, libXrender, libXScrnSaver, libXtst, + libudev0-shim +}: + stdenv.mkDerivation rec { + name = "sweep-visualizer-${version}"; + version = "0.15.0"; + + src = fetchurl { + url = "https://s3.amazonaws.com/scanse/Visualizer/v${version}/sweepvisualizer_${version}_amd64.deb"; + sha256 = "1k6rdjw2340qrzafv6hjxvbvyh3s1wad6d3629nchdcrpyx9xy1c"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + sourceRoot = "."; + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + buildPhase = ":"; + + installPhase = '' + mkdir -p $out/lib $out/bin $out/share/sweep-visualizer + mv usr/share/* $out/share + mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ + mv $out/share/sweep-visualizer/*.so $out/lib/ + ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype + gdk_pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib + libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXScrnSaver libXtst + ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + in '' + for lib in $out/lib/*.so; do + patchelf --set-rpath "$out/lib:${libPath}" $lib + done + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out/lib:${libPath}" \ + $out/share/sweep-visualizer/sweep_visualizer + wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + ''; + + meta = with stdenv.lib; { + homepage = https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview; + description = "A minimal desktop application for interfacing with the Sweep device"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mt-caret ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c056b86b98e..e63b06fd317b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1358,6 +1358,8 @@ with pkgs; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; + sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syslogng = callPackage ../tools/system/syslog-ng { }; From 6c01c7fcff52b556b3ff12e2ee4ed27f42a58c21 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 17 Apr 2018 17:23:25 +0200 Subject: [PATCH 268/538] gflags: alias to google-gflags Both packages referred to the same repo (`gflags/gflags` at GitHub), both packages used almost the same version (2.2.1 and 2.2.0). Therefore I think that it's just fair to drop one of the packages to avoid duplication and reduce the maintenance overload. I decided to drop `gflags` originally packaged by @shlevy as it didn't contain testing support as `google-gflags` does. The package set refers from `gflags` to `google-gflags`, so both package names remain (to avoid any confusions), however the `gflags` expression is removed. --- pkgs/development/libraries/gflags/default.nix | 19 ------------------- .../libraries/google-gflags/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/gflags/default.nix diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix deleted file mode 100644 index f9fc4366b7e4..000000000000 --- a/pkgs/development/libraries/gflags/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, cmake }: - -stdenv.mkDerivation - { name = "gflags-2.2.1"; - src = fetchurl - { url = "https://github.com/gflags/gflags/archive/v2.2.1.tar.gz"; - sha256 = "03lxc2ah8i392kh1naq99iip34k4fpv22kwflyx3byd2ssycs9xf"; - }; - nativeBuildInputs = [ cmake ]; - # for case-insensitive filesystems - prePatch = "mv BUILD BUILD.bazel"; - - meta = with stdenv.lib; { - description = "C++ library that implements commandline flags processing"; - homepage = "https://github.com/gflags/gflags"; - license = licenses.bsd3; - platforms = platforms.unix; - }; - } diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index 1a3a16587274..dbcb0342156b 100644 --- a/pkgs/development/libraries/google-gflags/default.nix +++ b/pkgs/development/libraries/google-gflags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "google-gflags-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "gflags"; repo = "gflags"; rev = "v${version}"; - sha256 = "1y5808ky8qhjwv1nf134czz0h2p2faqvjhxa9zxf8mg8hn4ns9wp"; + sha256 = "12wkihc4f07qmhyqk3cjylj8v5xz2bjrq75p7aq1vvvj60fbp58k"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c93910bf0619..be307992d659 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8921,7 +8921,7 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gflags = callPackage ../development/libraries/gflags { }; + gflags = google-gflags; gf2x = callPackage ../development/libraries/gf2x {}; From 9b87fbb130683fb876d49c650edd1918500630a6 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 17 Apr 2018 15:24:47 +0000 Subject: [PATCH 269/538] processing3: init at 3.3.7 (#36851) * processing3: init at 3.3.7 * processing: add _JAVA_OPTIONS -Dawt.useSystemAAFontSettings=lcd it uses own ttf fonts which expect antialiasing --- .../graphics/processing3/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/graphics/processing3/default.nix diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix new file mode 100644 index 000000000000..4ef078fdbac6 --- /dev/null +++ b/pkgs/applications/graphics/processing3/default.nix @@ -0,0 +1,53 @@ +{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }: + +stdenv.mkDerivation rec { + version = "3.3.7"; + name = "processing3-${version}"; + + src = fetchFromGitHub { + owner = "processing"; + repo = "processing"; + rev = "processing-0264-3.3.7"; + sha256 = "0a20z19lmc4xarfnr7xshcmlv3xkc2dgjxknis0iv79gxnwlqhpq"; + }; + + nativeBuildInputs = [ ant rsync makeWrapper ]; + buildInputs = [ jdk ]; + + buildPhase = '' + # use compiled jogl to avoid patchelf'ing .so files inside jars + rm core/library/*.jar + cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/ + + # suppress "Not fond of this Java VM" message box + substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ + --replace 'Messages.showWarning' 'if (false) Messages.showWarning' + + ( cd build + substituteInPlace build.xml --replace "jre-download," "" # do not download jre1.8.0_144 + mkdir -p linux/jre1.8.0_144 # fake dir to avoid error + ant build ) + ''; + + installPhase = '' + mkdir $out + cp -dpR build/linux/work $out/${name} + + rmdir $out/${name}/java + ln -s ${jdk} $out/${name}/java + + makeWrapper $out/${name}/processing $out/bin/processing \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + ''; + + meta = with stdenv.lib; { + description = "A language and IDE for electronic arts"; + homepage = https://processing.org; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ece01b27ca..ae3090d45830 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17331,6 +17331,11 @@ with pkgs; qiv = callPackage ../applications/graphics/qiv { }; + processing = processing3; + processing3 = callPackage ../applications/graphics/processing3 { + jdk = oraclejdk8; + }; + # perhaps there are better apps for this task? It's how I had configured my preivous system. # And I don't want to rewrite all rules procmail = callPackage ../applications/misc/procmail { }; From e6128488936cd2df0c3dc28a58a9b615707124d0 Mon Sep 17 00:00:00 2001 From: mt_caret Date: Wed, 18 Apr 2018 00:35:23 +0900 Subject: [PATCH 270/538] glbinding: init at 2.1.4 (#36752) * glbinding: init at 2.1.4 * fix meta attribute --- .../libraries/glbinding/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/glbinding/default.nix diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix new file mode 100644 index 000000000000..339e0d8d60b9 --- /dev/null +++ b/pkgs/development/libraries/glbinding/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "glbinding"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "cginternals"; + repo = pname; + rev = "v${version}"; + sha256 = "1yic3p2iqzxc7wrjnqclx7vcaaqx5fiysq9rqbi6v390jqkg3zlz"; + }; + + buildInputs = [ cmake libGLU xlibsWrapper ]; + + meta = with stdenv.lib; { + homepage = https://github.com/cginternals/glbinding/; + description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; + license = licenses.mit; + maintainers = [ maintainers.mt-caret ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae3090d45830..92afcfa4221e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8968,6 +8968,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + glbinding = callPackage ../development/libraries/glbinding { }; + gle = callPackage ../development/libraries/gle { }; glew = callPackage ../development/libraries/glew { }; From 4d3cec0a579c59cda452771b9d4b39d41e4e6ec5 Mon Sep 17 00:00:00 2001 From: Adam Copp Date: Tue, 17 Apr 2018 16:41:47 +0100 Subject: [PATCH 271/538] ffmpeg-full: Enable vo-amrwbenc (#37432) --- pkgs/development/libraries/ffmpeg-full/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 67e364715f09..db39be465485 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -119,7 +119,7 @@ #, utvideo ? null # Ut Video de/encoder , vid-stab ? null # Video stabilization #, vo-aacenc ? null # AAC encoder -#, vo-amrwbenc ? null # AMR-WB encoder +, vo-amrwbenc ? null # AMR-WB encoder , wavpack ? null # Wavpack encoder , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder @@ -380,7 +380,7 @@ stdenv.mkDerivation rec { #(enableFeature (utvideo != null && gplLicensing) "libutvideo") (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") - #(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") + (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") (enableFeature (wavpack != null) "libwavpack") (enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x265 != null && gplLicensing) "libx265") @@ -405,7 +405,8 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr - samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib + samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + zeromq4 zlib ] ++ optional openglExtlib libGLU_combined ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva From 0f239f6557faa7c26aebf1cefef5cf872aa89ef2 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 17 Apr 2018 08:43:58 -0700 Subject: [PATCH 272/538] fs-uae: 2.8.3 -> 2.8.4 (#37295) Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae --help` got 0 exit code - ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae --version` and found version 2.8.4 - ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae --help` and found version 2.8.4 - ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae-device-helper -h` got 0 exit code - ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae-device-helper --help` got 0 exit code - ran `/nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4/bin/fs-uae-device-helper help` got 0 exit code - found 2.8.4 with grep in /nix/store/4n2cnrh2bq910wk4rlk1v7swjwhgq9jq-fs-uae-2.8.4 - directory tree listing: https://gist.github.com/6996324bf1e34d7108f74089af68c981 --- pkgs/misc/emulators/fs-uae/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 27abe5fd470d..6d462c0e3797 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fs-uae-${version}"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; - sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2"; + sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj"; }; nativeBuildInputs = [ pkgconfig ]; From 085e894de55d71a463c1ff08420e025ad39e87ea Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 17 Apr 2018 18:02:18 +0200 Subject: [PATCH 273/538] androidStudioPackages.{dev,canary}: 3.2.0.9 -> 3.2.0.10 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 41f0e9914327..e18235024df4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8"; }; latestVersion = { - version = "3.2.0.9"; # "Android Studio 3.2 Canary 10" - build = "181.4705630"; - sha256Hash = "07xf00f0wvrk576iaqn7qpcpgar432n6q3jlgpslhm4m1cww3sww"; + version = "3.2.0.10"; # "Android Studio 3.2 Canary 11" + build = "181.4720098"; + sha256Hash = "00cd7qdznspi69cgs1a13a3fnkvsc7zjfl517jgp32vdygkb0qxw"; }; in rec { # Old alias From c69eae9a919190d9229b5ae55b82299b74979176 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 17 Apr 2018 12:08:38 -0400 Subject: [PATCH 274/538] zsh: 5.5 -> 5.5.1 --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index c68a1bb2784d..3259dbbd9bc6 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre }: let - version = "5.5"; + version = "5.5.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "1k56ancx1xxniih8i1gmfhhmmk965jk8wfjdfkynnxfi4pkqy2gc"; + sha256 = "0bm9n7lycdzvw5hmgi4a920pqbb5yxvmyhfxx8jbign2hzgf7g01"; }; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "0nf1cwjgdncz9bln1fdz7m6rlgf8qjy2v01871ifhak78njhcmnh"; + sha256 = "10705qnnr3p416bwfjaip9r7yw187vczzjrk60yg79dfwy4slk3p"; }; buildInputs = [ ncurses pcre ]; From 8e52dc1028909d8d670645f4675c41665cc340b1 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Tue, 17 Apr 2018 11:50:48 -0400 Subject: [PATCH 275/538] partclone: add support for various filesystems Adds support for ext2/3/4, fat, hfs+, minix, nilfs, ntfs, and xfs Closes #39079 --- pkgs/tools/backup/partclone/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 681999e35d07..758146fcc00b 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, pkgconfig, libuuid, e2fsprogs +, pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g }: stdenv.mkDerivation rec { @@ -15,10 +15,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - e2fsprogs libuuid stdenv.cc.libc + e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g (stdenv.lib.getOutput "static" stdenv.cc.libc) ]; + configureFlags = [ + "--enable-xfs" + "--enable-extfs" + "--enable-hfsp" + "--enable-fat" + "--enable-exfat" + "--enable-ntfs" + "--enable-btrfs" + "--enable-minix" + "--enable-f2fs" + "--enable-nilfs2" + ]; + enableParallelBuilding = true; meta = { From b500edc44ca91bbedef9f14b37807422dcb8bd30 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 17 Apr 2018 18:09:15 +0200 Subject: [PATCH 276/538] quiterss: 0.18.9 -> 0.18.10 --- pkgs/applications/networking/newsreaders/quiterss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index d527279ab775..7bd50a47f813 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.9"; + version = "0.18.10"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "0n2rgzyxw6m29i8m8agri3cp5dbpjblhhyklvxsyzmkksnsxpw58"; + sha256 = "1bv5aw6fscrwlycirvzm6fvbwmg8lbd1ycldkwbvybhjyfjaxkpm"; }; nativeBuildInputs = [ pkgconfig qmake ]; From 9cb0b496737341faf19ea62d81583ece52617a69 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 17 Apr 2018 18:26:53 +0200 Subject: [PATCH 277/538] signal-desktop-beta: Mark as broken (really outdated) --- .../networking/instant-messengers/signal-desktop/beta.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix index f627479a3c04..7d6854460d63 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix @@ -83,5 +83,10 @@ in platforms = [ "x86_64-linux" ]; + # Marked as broken on 2018-04-17. Reason: The most recent version is + # 1.8.0-beta.1, while this is still 1.1.0-beta.5 (2017-12-09). The stable + # package (signal-desktop) should be used instead (currently at version + # 1.7.1, i.e. up-to-date). + broken = true; }; } From d8b32a1dcf279da1ade0b3f9a58977e80e1ca879 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Apr 2018 00:02:02 -0700 Subject: [PATCH 278/538] libsigrokdecode: 0.5.0 -> 0.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsigrokdecode/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.5.1 with grep in /nix/store/bzy46mv9yqpqap2swy9gc25x0hdbq1ny-libsigrokdecode-0.5.1 - directory tree listing: https://gist.github.com/4794e65a1bf494e590272e83866d9e95 --- pkgs/development/tools/libsigrokdecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 0099e574e4ae..9fd70cb60c96 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.0"; + name = "libsigrokdecode-0.5.1"; src = fetchurl { url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a"; + sha256 = "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9"; }; nativeBuildInputs = [ pkgconfig ]; From 10f02ad446d8c452ddd9c4c0314cef4eca11b782 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 16 Apr 2018 23:23:57 -0700 Subject: [PATCH 279/538] munin: 2.0.34 -> 2.0.37 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/munin/versions. These checks were done: - built on NixOS - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-check-wrapped -h’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-check-wrapped --help’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-check-wrapped help’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-check -h’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-check --help’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-check help’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-cron-wrapped --help’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-cron --help’ got 0 exit code - ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-node-configure help’ got 0 exit code - found 2.0.37 with grep in /nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37 - directory tree listing: https://gist.github.com/44aa9c5969938bba7e7a4e9710568ae9 --- pkgs/servers/monitoring/munin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 98e86bf8e36f..62fc3c6f8f55 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.34"; + version = "2.0.37"; name = "munin-${version}"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "0mb5m0nc3nr9781d3s99sjdssmvkv37gxyplzr6d73i4hi31m7fr"; + sha256 = "10niyzckx90dwdr4d7vj07d1qjy3nk7xzp30nqnlxzbaww7n5v78"; }; buildInputs = [ From 9029ed933c69287c64a30d40b6b4f9f1ace7dd94 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 17 Apr 2018 20:06:44 +0300 Subject: [PATCH 280/538] nixos/gitweb: add gitwebTheme option --- nixos/modules/services/misc/gitweb.nix | 8 ++++ .../services/web-servers/lighttpd/gitweb.nix | 7 +++- .../services/web-servers/nginx/gitweb.nix | 12 +++--- .../git-and-tools/default.nix | 1 - .../git-and-tools/git/default.nix | 17 +++------ .../git-and-tools/gitweb/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 7 files changed, 65 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/gitweb/default.nix diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index b0e34a690ca5..ca21366b7796 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -32,6 +32,14 @@ in ''; }; + gitwebTheme = mkOption { + default = false; + type = types.bool; + description = '' + Use an alternative theme for gitweb, strongly inspired by GitHub. + ''; + }; + gitwebConfigFile = mkOption { default = pkgs.writeText "gitweb.conf" '' # path to git projects (.git) diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index 37128d90401d..c494d6966a7f 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); in { @@ -34,8 +37,8 @@ in "^/gitweb$" => "/gitweb/" ) alias.url = ( - "/gitweb/static/" => "${pkgs.git}/share/gitweb/static/", - "/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi" + "/gitweb/static/" => "${package}/static/", + "/gitweb/" => "${package}/gitweb.cgi" ) setenv.add-environment = ( "GITWEB_CONFIG" => "${cfg.gitwebConfigFile}", diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix index 3dc3ebc7e4c2..272fd1480185 100644 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.gitweb; + package = pkgs.gitweb.override (optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + }); in { @@ -24,7 +27,7 @@ in systemd.services.gitweb = { description = "GitWeb service"; - script = "${pkgs.git}/share/gitweb/gitweb.cgi --fastcgi --nproc=1"; + script = "${package}/gitweb.cgi --fastcgi --nproc=1"; environment = { FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; }; @@ -38,11 +41,10 @@ in services.nginx = { virtualHosts.default = { - locations."/gitweb/" = { - root = "${pkgs.git}/share"; - tryFiles = "$uri @gitweb"; + locations."/gitweb/static/" = { + alias = "${package}/static/"; }; - locations."@gitweb" = { + locations."/gitweb/" = { extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index cd969ff81d0b..73659a32f4bf 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -15,7 +15,6 @@ let perlPackages.MIMEBase64 perlPackages.AuthenSASL perlPackages.DigestHMAC ]; - gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; }; in diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b336f72c7ac1..cf44cf5ef981 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,9 +1,9 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc -, gzip, openssh, pcre2 +, openssh, pcre2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv -, svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs +, svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport , withManual ? true , pythonSupport ? true @@ -25,6 +25,8 @@ stdenv.mkDerivation { sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; + outputs = [ "out" "gitweb" ]; + hardeningDisable = [ "format" ]; patches = [ @@ -131,15 +133,8 @@ stdenv.mkDerivation { substituteInPlace $out/libexec/git-core/git-sh-i18n \ --subst-var-by gettext ${gettext} - # gzip (and optionally bzip2, xz, zip) are runtime dependencies for - # gitweb.cgi, need to patch so that it's found - sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ - $out/share/gitweb/gitweb.cgi - # Give access to CGI.pm and friends (was removed from perl core in 5.22) - for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do - sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \ - "$out/share/gitweb/gitweb.cgi" - done + # put in separate package for simpler maintenance + mv $out/share/gitweb $gitweb/ # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix new file mode 100644 index 000000000000..0358f850c9ab --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -0,0 +1,37 @@ +{ stdenv, git, gzip, perlPackages, fetchFromGitHub +, gitwebTheme ? false }: + +let + gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; + gitwebThemeSrc = fetchFromGitHub { + owner = "kogakure"; + repo = "gitweb-theme"; + rev = "049b88e664a359f8ec25dc6f531b7e2aa60dd1a2"; + sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p"; + }; +in stdenv.mkDerivation { + name = "gitweb"; + + src = git.gitweb; + + installPhase = '' + mkdir $out + mv * $out + + # gzip (and optionally bzip2, xz, zip) are runtime dependencies for + # gitweb.cgi, need to patch so that it's found + sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ + $out/gitweb.cgi + # Give access to CGI.pm and friends (was removed from perl core in 5.22) + for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do + sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \ + "$out/gitweb.cgi" + done + + ${stdenv.lib.optionalString gitwebTheme "cp ${gitwebThemeSrc}/* $out/static"} + ''; + + meta = git.meta // { + maintainers = with stdenv.lib.maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27636fb8c186..3dbe8b860b0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15613,6 +15613,8 @@ with pkgs; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; + gitweb = callPackage ../applications/version-management/git-and-tools/gitweb/default.nix { }; + gksu = callPackage ../applications/misc/gksu { }; gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; From 6c182dd14dea6a68dd80e780c763b76dfceae0a2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 12:40:16 -0500 Subject: [PATCH 281/538] Revert "hfsprogs: init at 332.25" This reverts commit d0dcad3b91212179a27987ad17b1cbbfceb71a9a. diskdev_cmds is now packaged as darwin.diskdev_cmds. Linux support is unknown right now (but PRs are accepted). --- pkgs/tools/filesystems/hfsprogs/default.nix | 45 --------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 47 deletions(-) delete mode 100644 pkgs/tools/filesystems/hfsprogs/default.nix diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix deleted file mode 100644 index 25ec31ea698a..000000000000 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, openssl, libbsd }: - -let version = "332.25"; - package_name = "hfsprogs"; in -stdenv.mkDerivation rec { - name = "${package_name}-${version}"; - srcs = [ - (fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz"; - sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; - }) - (fetchurl { - url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; - sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; - }) - ]; - - sourceRoot = "diskdev_cmds-" + version; - patches = [ "../debian/patches/*.patch" ]; - - buildInputs = [ openssl libbsd ]; - makefile = "Makefile.lnx"; - - # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/ - installPhase = '' - # Create required package directories - install -m 755 -d "$out/bin" - install -m 755 -d "$out/share/${package_name}" - install -m 755 -d "$out/share/man/man8/" - # Copy executables - install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" - install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" - # Copy shared data - install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata" - # Copy man pages - install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" - install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" - ''; - - meta = { - description = "HFS/HFS+ user space utils"; - license = stdenv.lib.licenses.apsl20; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95a0b1ca9e33..4ce580e1589b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2888,8 +2888,6 @@ with pkgs; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; - hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight ({ lua = lua5; } // lib.optionalAttrs stdenv.isDarwin { From 5aa3dd119f5e3e8fba9c445f497483a56825f0bc Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 18 Apr 2018 03:15:40 +0900 Subject: [PATCH 282/538] oraclejdk: 8u161, 8u162 -> 8u171, 8u172 --- pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++----- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 5bafa70af9fc..bdd367ef3523 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "161"; + patchVersion = "171"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "1p6p93msn3bsg9775rq171kd4160w4w8z57p0qpjdjycfix62sfg"; - sha256.x86_64-linux = "07h2wah80qr78y0f821z12lbdmsv90xbckdn3glnj2riwfh5dg3d"; - sha256.armv7l-linux = "0mngw2lnhx3hzgp444advybhjn5hjk3mi14y72km4kp03gh82a7x"; - sha256.aarch64-linux = "18l5fny7yxhpj5c935rnlq4pvwadyr5zkid6yh9x87frl401shy7"; + sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; + sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; + sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; + sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 78d5a6f2c40c..901eea0f8f15 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "162"; + patchVersion = "172"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "097vlvvj1vr7815rgarf5x97lagi4q0kai0x4lvd4y3wrzdqikzf"; - sha256.x86_64-linux = "0mq2d0lj53gzn4qqdjdgbwl0h857k2rnsnr2hkmvihnrgza85v38"; - sha256.armv7l-linux = "0xzsgdmpgs1n1g70hgly0mpxflhjrmq3vxwx8gl0kmqdiv4hqwjp"; - sha256.aarch64-linux = "19ykcsmvkf7sdq2lqwvyi60nhb8v7f88dqjycimrsar9y4r7skf8"; + sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; + sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; + sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; + sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; From 4dc3b713772ba955276fb4e17aeb15335b401bf0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 17 Apr 2018 20:40:51 +0200 Subject: [PATCH 283/538] vim-plugins: update --- pkgs/misc/vim-plugins/default.nix | 281 +++++++++++++++--------------- 1 file changed, 141 insertions(+), 140 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a06b090bb6df..649723952323 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -208,6 +208,7 @@ rec { }; # --- generated packages bellow this line --- + vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-auto-save-2017-11-08"; src = fetchgit { @@ -256,6 +257,17 @@ rec { ''; }; + julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "julia-vim-2018-03-27"; + src = fetchgit { + url = "https://github.com/JuliaEditorSupport/julia-vim"; + rev = "4593c8b1ffe20022677e524487c8554d96cf8f84"; + sha256 = "0yrdzkxyg6cg2i4bd6bqbq0w63hssh3nd0f0qnfl7v5pkq9yba4w"; + }; + dependencies = []; + + }; + zeavim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "zeavim-vim-2018-03-22"; src = fetchgit { @@ -268,11 +280,11 @@ rec { }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-03-27"; + name = "vim-nix-2018-04-15"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "397df60e143e26418ed08a9a984013d62442cad6"; - sha256 = "0s0sclf01m4jjql8r10s9277yrpwkn18zn2dk62nz3dvhcvd26ai"; + rev = "bf5779180bf0e3cb6c967f87d6262a976e055e32"; + sha256 = "023c932vybycj8zasvgvp7xhp42i2iy26msjgjsgzfwmdf5w877y"; }; dependencies = []; @@ -531,22 +543,22 @@ rec { }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-04-07"; + name = "deoplete-nvim-2018-04-16"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "34ca8838dfd9600b0a777ecaafafb1e61c8f385b"; - sha256 = "0zca5sm05lix94jmwl88i89d7w7sbd5bz01vfaqq42g2w6yqz4x4"; + rev = "0d48792663437d81bdfa195c676d5c37ef10c89a"; + sha256 = "1zqrxxi7ci1mp5ml7nayj3crzpqgdl09q20wilp68kf2mvll28xi"; }; dependencies = []; }; ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ultisnips-2018-04-08"; + name = "ultisnips-2018-04-16"; src = fetchgit { url = "https://github.com/SirVer/ultisnips"; - rev = "1e35bb3802f4b381b3ec067148f4868bf7536492"; - sha256 = "1qxzvpz7dp8786wfzrm837gy27ig1s8w6i1va29arns16wnhil3f"; + rev = "905e5249246169b6db2bb060e0a2b06eac1890e6"; + sha256 = "025b2f4gs04qb6wnxa0yclwm5jysdj6q10i2zkbiclvblfbxxv19"; }; dependencies = []; @@ -564,11 +576,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-03-26"; + name = "vim-gitgutter-2018-04-11"; src = fetchgit { url = "https://github.com/airblade/vim-gitgutter"; - rev = "3724e1c207c980b5de914b4857e8b44dc3551506"; - sha256 = "0p9jnsvm59cddcklx5rv5x87pifhxphdcc892ip4vj7pb3mlppmh"; + rev = "5481318fc1b97e7c04eab5496ec45c63335d6bc1"; + sha256 = "1jwqxkaqvkmdqi9k9nx25xz28av374a70izs0534hx12crgg8g3w"; }; dependencies = []; @@ -685,11 +697,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-03-17"; + name = "clighter8-2018-04-15"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "4313362e34fd3ba8fe224879cf6b7d19220e21f3"; - sha256 = "1h7qpa8i1phnyvflzfnlmv7xz3gssr1n2rqgz24p1c15dyls2p7w"; + rev = "6d325abd043fd1bc31bea821f751996541bfc944"; + sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq"; }; dependencies = []; preFixup = '' @@ -699,11 +711,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-04-08"; + name = "neomake-2018-04-17"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "2363dc4141930ad1bc3ddbdaf76fc22bd4b7568b"; - sha256 = "1navsxwfws5acc96mhfqfk7vkns3a6r7ms21qp77ry20v57r0yxl"; + rev = "df72c7a2f1bdcc08b5dbcd86f165fe7cd5eb6e1f"; + sha256 = "1vlc0irqkl27dyh52wci36fcj80a67fcb9q9cpcbr94lwh4l7l26"; }; dependencies = []; @@ -798,11 +810,11 @@ rec { }; csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-vim-2018-03-14"; + name = "csv-vim-2018-04-15"; src = fetchgit { url = "https://github.com/chrisbra/csv.vim"; - rev = "0b4c23fde82443ed4015ec90953d5a64e7c26266"; - sha256 = "0718vnccs6flla713f8mrwpw6r56w3rr5yr544rsc97p4p4m2vvg"; + rev = "5ca39450e6d40265086d929ff82ca2c9566fdc68"; + sha256 = "0i6j6c6027vpdcjq6znmkbdbbsdgwqb89jswkyhyx7ff3lwmzryq"; }; dependencies = []; @@ -853,11 +865,11 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-04-03"; + name = "ctrlp-vim-2018-04-10"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "c13c1249fd3bf99c44eb80dfabd7eb7ea0fe09bd"; - sha256 = "1x5ykqx9g1hxi7fk7cg9hnh9778fpr65bkinbykqc306dbnrdy4g"; + rev = "4b9e7cac612902a25498cca49f13475fe1a821a4"; + sha256 = "1wa2kxiwipnxwd19gyv6grgqn0ms6zdxsj2xg80whkk3namlgg7m"; }; dependencies = []; @@ -941,11 +953,11 @@ rec { }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-04-08"; + name = "vim-2018-04-13"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "2d7c4af46938d01192ea35899467ebbdf8dbcf3f"; - sha256 = "0wfj5g0vnn3fnz793sllsbm30h6wzyb57g14b7wzfc9s2mxjlw05"; + rev = "7668d800a20c1f180bb49655d98378f2605ad616"; + sha256 = "07xcqickvw22yx5b91blvb463jn5dpn3drzf8y0nmpz08kfs4qfc"; }; dependencies = []; @@ -1018,11 +1030,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2018-03-30"; + name = "vim-elixir-2018-04-16"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "0d5f2b472fe4abb8b34de9f099f2ef770b449fc9"; - sha256 = "1afr4iwrzpmrjca0vxkk2zx1nsndp1fhprikdhhanr8060nhbmyy"; + rev = "36e54e1cf965d92f251ead359207d4a7b04cfdf2"; + sha256 = "0y296falc5l6k52vpw1f0bwzxgdbdjiljjg394s472228mnb2r3p"; }; dependencies = []; @@ -1106,11 +1118,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-04-08"; + name = "vim-go-2018-04-11"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "0724aaa33ce33229e2c86e436596d31bb69ab292"; - sha256 = "15mkzhnphisrgn4r150q186hlnplwjmmxlk3pgr52fh1qxmk374y"; + rev = "7491209072ed4aa746e6fe7894f976ecd251801e"; + sha256 = "1a7fy8n9h383776jixlwxl8y3h8h5mixi0bcv4lv61x0g3xxh8gx"; }; dependencies = []; @@ -1205,22 +1217,22 @@ rec { }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2017-04-06"; + name = "vim-jsonnet-2018-04-10"; src = fetchgit { url = "https://github.com/google/vim-jsonnet"; - rev = "2637e273713322befc476760809d46500e6088f3"; - sha256 = "0fxmqasznb3ra49r4j3fmksik7narnd3b6j1j4najp4l61x27ip2"; + rev = "1425166887329363381194adc457b02b663b1354"; + sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; }; dependencies = []; }; vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-maktaba-2017-12-29"; + name = "vim-maktaba-2018-04-09"; src = fetchgit { url = "https://github.com/google/vim-maktaba"; - rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982"; - sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm"; + rev = "77a4dcecd7d65ae2bf362bd7d9055d2806a8edf3"; + sha256 = "0fvspd6q0dj9bqnv8xavfx7xwmg5g68r1kksfv54bbzckkhkw28w"; }; dependencies = []; @@ -1271,11 +1283,11 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-04-02"; + name = "vim-snippets-2018-04-16"; src = fetchgit { url = "https://github.com/honza/vim-snippets"; - rev = "3733ca9f1dae9b38d68eb9aaadf41dc9a9c9a01c"; - sha256 = "0jxbh3y262m7zs2hzbz5vjd5aqch3fzcnpgkvp8zfj3jyg3mwdsp"; + rev = "d081fa5117acdd972bd0a3ec1c0424e79ef6121e"; + sha256 = "0wrm5f15lf6hlyv9ca2a8jil14647acicsmaq34nr11gd375bvvc"; }; dependencies = []; @@ -1326,11 +1338,11 @@ rec { }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2018-01-31"; + name = "lightline-vim-2018-04-14"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "78c43c144643e49c529a93b9eaa4eda12614f923"; - sha256 = "1g1s8bi6pzjc9kbqd1mn1d2ym6c90xf22dv2wfli0nyp6dsja2v2"; + rev = "e54d2ae512c9c081bfff9303cb22ffa94ed48ba3"; + sha256 = "042sfdwj46yv0bmf0cm5vm24j197isc3asdj4ymxzh5d6jy2i5qb"; }; dependencies = []; @@ -1381,11 +1393,11 @@ rec { }; vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-03-25"; + name = "vim-test-git-2018-04-16"; src = fetchgit { url = "https://github.com/janko-m/vim-test.git"; - rev = "b62628512d57059af40d29edaec09716f947ac98"; - sha256 = "0c6yf5sk12gyn39jdpg26fsnb996fmiwmqs2p9mry93f4xsb6ciq"; + rev = "61dbd5621bcf0fe74c1008083d7f103f041fc7c7"; + sha256 = "0r5nxspznniviy0j89pmvksgvyzrzvx1qivabbcds7i62vqrxyw0"; }; dependencies = []; @@ -1501,23 +1513,12 @@ rec { postInstall = false; }; - julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "julia-vim-2018-03-27"; - src = fetchgit { - url = "https://github.com/JuliaEditorSupport/julia-vim"; - rev = "4593c8b1ffe20022677e524487c8554d96cf8f84"; - sha256 = "0yrdzkxyg6cg2i4bd6bqbq0w63hssh3nd0f0qnfl7v5pkq9yba4w"; - }; - dependencies = []; - - }; - fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-03-09"; + name = "fzf-vim-2018-04-17"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "a362bc58f1fbbfbbbef749851006e46155979c7d"; - sha256 = "187d7aw5g7nr6cg5la86kdplb32zy58w1mfm3npb47qm9sydgql6"; + rev = "bbda33b402d92d43c75827bd54ee1932cf03a7b6"; + sha256 = "02f16kdgs1ahsja84ls1zpjidcg1yx1bhpp39fd7zqqvzw16mf1q"; }; dependencies = []; @@ -1711,11 +1712,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-04-07"; + name = "vimtex-2018-04-15"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "0c0b44198407a861d2ad42eaed9e81f76e1a537f"; - sha256 = "0cs3vfvzvs5h9b0w1wziapcl2dfcmgyysrspz41wddaz68v1lqn0"; + rev = "a7fc6f62e8234fc0696cfe4325153e922e2fddd5"; + sha256 = "0bvv9k3zqdmvh80mwhrzxwjacrfq1x56ba7yqndggygfxb3l17mf"; }; dependencies = []; @@ -1781,11 +1782,11 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2018-03-29"; + name = "vim-highlightedyank-2018-04-17"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "c519c67245f6d15f18d3cd6550cc2c2471e357dc"; - sha256 = "002s015rn4n02xg8fwd8kklbprjx7aibmgrnikvgsvs9g1rj3wq4"; + rev = "6387f7cc3b768300d1fcf82d367dbcb8d16b6230"; + sha256 = "1ldyiy3qlxnxqkqa9yv39y5xkm7gma5gjy6nccqxxxjpjlyj39hb"; }; dependencies = []; @@ -1891,33 +1892,33 @@ rec { }; vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grepper-git-2018-03-26"; + name = "vim-grepper-git-2018-04-13"; src = fetchgit { url = "https://github.com/mhinz/vim-grepper.git"; - rev = "635c14284aea79117f2cc9d07c18c8f6da23d85b"; - sha256 = "09qg5x36dl9z2hdrbw85kwldfhkgcvw6rpzar380v2a3l762l2nl"; + rev = "27e73cfa7970bf38fe9037c0053a2edbb622b000"; + sha256 = "1hy9rjvfgry9426gflw4k5qmwzmijwg3gzmmzavf7m7sagl101kd"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-03-26"; + name = "vim-signify-2018-04-17"; src = fetchgit { url = "https://github.com/mhinz/vim-signify"; - rev = "e76d00ccc00beb58d2278e6c63213ef4d365cace"; - sha256 = "018z1bgjil4is8rxxmxwvnbamhdnrir0big0giw7a7qf224z04bv"; + rev = "8351e5212f9415ccc1d9696518e1ec4337ad539f"; + sha256 = "12gix280mmsgn1z1ihbvzh67xqribrc39h670fzyn6302dzb05p0"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-04-03"; + name = "vim-startify-2018-04-10"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "113655717e3ee1c4bc39e5d1093719a8e5750ee0"; - sha256 = "16bga9xrz4wga7h7spc9rsdj7m7hh2fqr23xnqflw1rx95c18avr"; + rev = "532f3db6be8c6e123abb3f6523c419b6b19436da"; + sha256 = "19inxsafsivdwgdvw59x3dbx65xkb09q0k2p66q4n57fj60bajmb"; }; dependencies = []; @@ -2026,11 +2027,11 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2018-01-25"; + name = "haskell-vim-2018-04-13"; src = fetchgit { url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "430b529224c5f9ae53b148f814b7b1fc82b8b525"; - sha256 = "15z259b9b3wbklc8rndsq2rlhgccvxhfgd76yy80jqjmfmzib8kg"; + rev = "e027b314df128979dbd00dd94c9db080db156b5c"; + sha256 = "13dx1ifwa444q8zkwda4qha74xjm4jfhhk9lbgbj9p1mj7gvbl7f"; }; dependencies = []; @@ -2126,11 +2127,11 @@ rec { }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-03-31"; + name = "python-mode-2018-04-09"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "339945dc9232aaa336324a473a162d74c8d349e0"; - sha256 = "1h6znlxagvhv9k0vzaspp9ddq7kbdd3c9gscs12y15qxsz5rcali"; + rev = "5308d0cc241080057a58c1772ebd254f2922998d"; + sha256 = "1pkwhl9ab1fybc4sp5721xzlrzhzigf34w8zlmxby8v4nvmb8ggq"; }; dependencies = []; @@ -2181,22 +2182,22 @@ rec { }; committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "committia-vim-git-2018-03-01"; + name = "committia-vim-git-2018-04-11"; src = fetchgit { url = "https://github.com/rhysd/committia.vim.git"; - rev = "78d5aceaeed3ba7d6ed503df7ae54a5e7505eed0"; - sha256 = "1wpvjkb62vb70yg7x3k84rk6fv0ykxms7bpn511z8dbs5v8xzzjg"; + rev = "02a317cb49689b2424232d607d218511f921f2e4"; + sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5"; }; dependencies = []; }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-04-08"; + name = "vim-grammarous-2018-04-16"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "42193a96aca0bcb4cd6ae1cb6fb2cc815ea92138"; - sha256 = "1fkjcc13v734bmgdimhkaf69xs8maqf0xylcbq424y4wfc8xhirq"; + rev = "fc7e73f2af96fb1745887dabde9bf8b945d0273d"; + sha256 = "0zfnbdsva140hc50s4fr1as5c1mn3hfm43x53sk50fylb51r9hr7"; }; dependencies = []; # use `:GrammarousCheck` to initialize checking @@ -2223,11 +2224,11 @@ rec { }; vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2018-03-26"; + name = "vim-puppet-2018-04-12"; src = fetchgit { url = "https://github.com/rodjek/vim-puppet"; - rev = "e3eae632cf7f585fef2ede61fa7c5eb36fa94a6a"; - sha256 = "1dsr5rfmhz73dksxc8r2z6k881fmili9bb9a8hlbymm5xsq25a6a"; + rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; + sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; }; dependencies = []; @@ -2300,22 +2301,22 @@ rec { }; nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdtree-2018-04-02"; + name = "nerdtree-2018-04-10"; src = fetchgit { url = "https://github.com/scrooloose/nerdtree"; - rev = "a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8"; - sha256 = "16ib92gfh87kgbk3z6dwgha1szjgpmcp15b5pajzzq9s7hrqfbp1"; + rev = "727770147a7589ab3a06722f4852c0237c8b3549"; + sha256 = "105vgwy7qs6l92dm6kfby7lmxv35v2hbpjk9z5sr0qak5rad4m6c"; }; dependencies = []; }; syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "syntastic-2018-04-08"; + name = "syntastic-2018-04-17"; src = fetchgit { url = "https://github.com/scrooloose/syntastic"; - rev = "e3a819c7cb3bf4397b0693303a247439668726f1"; - sha256 = "150bzrp738pdasss98x543fafqs3dvdfsj00m1lg3dzrb35vb79d"; + rev = "d31e270cc8affc6338a9ed44e2efcaec0ca4cd34"; + sha256 = "121a1mxgfng2y5zmivyyk02mca8pyw72crivf4f1q9nhn0barf57"; }; dependencies = []; @@ -2355,11 +2356,11 @@ rec { }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-04-07"; + name = "denite-nvim-2018-04-14"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "0f8d216b6bcb4be708dce1adfe1a789fff57ca07"; - sha256 = "0bjz13gfzngcgabhnrd34zqg45wwjlgwkchv88p37k92pjgym063"; + rev = "c0c75a752577399be53aa7a7e235e6ff5387494c"; + sha256 = "1zbf2f0w02q8jwr824l6v0pxbc620rwfsah6mxyqbr5mxddcf1v6"; }; dependencies = []; @@ -2432,11 +2433,11 @@ rec { }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2018-04-04"; + name = "neosnippet-snippets-2018-04-15"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "04458823b3d1c4ffdb6c49a2fd25a36d55ed4dc4"; - sha256 = "095zfy6c11ddcrrpv48g1n39lcrnnkivyz66rbk36hy6kwjqqs5q"; + rev = "f453635c60998071299c3239c3d881f2be0c248e"; + sha256 = "1df6mzk5yjhjlmzgz7lr9aa69a973mzfxmwldqnpi6yjfnmjn04c"; }; dependencies = []; @@ -2476,11 +2477,11 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2018-01-12"; + name = "unite-vim-2018-04-14"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "cc0af4798f91e1c3a4a78ae028a3ac3e61d25eb3"; - sha256 = "1vj3bpdyv7wq0xnk9ladacy1giz5x92a62akasbd84bkd79gaxwv"; + rev = "7252fc334ed24722ad70867ba9e4aba125b611d7"; + sha256 = "0r2na9i15qfmshzk0wr845nyn8h8mpbkz5xanjibsch2xz6fps76"; }; dependencies = []; @@ -2571,11 +2572,11 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-04-08"; + name = "vim-multiple-cursors-2018-04-09"; src = fetchgit { url = "https://github.com/terryma/vim-multiple-cursors"; - rev = "f019fcd0d8c5d8a6c3a5993e476ce3be420cdc6e"; - sha256 = "1x3x20lhz9ficzspab5wphavh9kap3h3z1880n99rg3wdf3x9nry"; + rev = "8ae5dd3f4f344cc2abe79783a8b808e4093bf084"; + sha256 = "0zj5dm86daqzl6f76prlfalpsb3vxxl7x1k6kza8hcbyicaxsi49"; }; dependencies = []; @@ -2615,11 +2616,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-04-09"; + name = "vim-quickrun-2018-04-16"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "852986606abdf34c8bfc0d7c60ac7d6811bcf723"; - sha256 = "0j36b20wp7r2yjpmhxjbblw2zq6s3vjdz0nagy32wcf7q6vnkx5h"; + rev = "630ddff167e30c55d21985713ad6729adeb8e40b"; + sha256 = "0r2gg3a8q5627n28xgyhmb6275xwvg76ghc1wdy38xdszvykh024"; }; dependencies = []; @@ -2659,11 +2660,11 @@ rec { }; vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-solidity-2018-03-12"; + name = "vim-solidity-2018-04-17"; src = fetchgit { url = "https://github.com/tomlion/vim-solidity"; - rev = "2484882da8f2b73336c45c534e407053254a273d"; - sha256 = "0v3r6k3dirfs726301hy693y274hc8adi6nkpavmaqgy16k31v8d"; + rev = "569bbbedc3898236d5912fed0caf114936112ae4"; + sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; }; dependencies = []; @@ -2692,11 +2693,11 @@ rec { }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-04-01"; + name = "vim-dispatch-2018-04-15"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "b80fd418082471e5b1150a97e8cab53035ffe502"; - sha256 = "0yvvm5sdv6vji3xn6x0cci5d0mcv3srgfw2bgrszbkdr0r02xs5s"; + rev = "f6b3e7799e6dce08869d7744aa7faa6528f065f5"; + sha256 = "1zn6c54hlygkx348vd7kgkfpdj93vsijhc2ma42k6s7vhwqfyylg"; }; dependencies = []; @@ -2714,11 +2715,11 @@ rec { }; vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-04-06"; + name = "vim-fugitive-2018-04-15"; src = fetchgit { url = "https://github.com/tpope/vim-fugitive"; - rev = "b680699450805e01960184b60a2cf0d3a71088cf"; - sha256 = "1ixsmdn2yarb8yz5n0kdcjsif94r3myhv03l5a3f2lasly6hlk6m"; + rev = "40d78f07dee2ffab68abb9d6d1a9e27843df0fe0"; + sha256 = "16fh3n8sr57cfhfpilqhz9f3svhj4swa9yqjf4wicbw9zn40hrir"; }; dependencies = []; @@ -2868,11 +2869,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-04-03"; + name = "youcompleteme-2018-04-16"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "e8477c16b604303383d36793dfb7e8bbe22097bf"; - sha256 = "07pycgjzykncmwm7cj394gw6l9zxmjcd6nr21hirbkw1a7g4r3r3"; + rev = "6975efddc1a90514db7c8ee882ccac91f70ff4cc"; + sha256 = "1zmbb91fc0axavxln4milmn95d9szx8zwdiiwqjdyybkm29nxhc9"; }; dependencies = []; buildPhase = '' @@ -2894,11 +2895,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-04-08"; + name = "vim-airline-2018-04-17"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline"; - rev = "d66b507b020b1f14f08bc7a6503573930b28a476"; - sha256 = "1cdw628gs547p41yqyf3liy4i03czw9cgfbcq85w3ad2v2c9cc3p"; + rev = "3ad4a18d858bb80d45a1c054b845021abe5c8f0d"; + sha256 = "1sgf9czgajba8nf7xbfa2dm26vw356ca55m1myaxlkqrlcckcvav"; }; dependencies = []; @@ -3136,33 +3137,33 @@ rec { }; vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimoutliner-2018-03-21"; + name = "vimoutliner-2018-04-09"; src = fetchgit { url = "https://github.com/vimoutliner/vimoutliner"; - rev = "85975d25863d860d6e84e4980b7551618b527536"; - sha256 = "0m8v6m4gi1643wh4x434yx440sa58h9fsv9ffz1my8syc412f7jx"; + rev = "4f12628247940d98eedd594961695dc504261058"; + sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78"; }; dependencies = []; }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-04-08"; + name = "vimwiki-2018-04-17"; src = fetchgit { url = "https://github.com/vimwiki/vimwiki"; - rev = "86a8604c4e127fa397c513471250c05b305244d3"; - sha256 = "195sysniq25azydxlahik9ybgg7gz9w7z7yc4fwr0s2hzlnk6ir0"; + rev = "90dc1e58717bd25798bb16d3badab8908b619912"; + sha256 = "01a2gy1r4k5gw7vrdn6p0vmybb2s0gf9q0w07qps5cnxapsggxk9"; }; dependencies = []; }; ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-04-08"; + name = "ale-2018-04-17"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "2f2dcb84444f440ceb4b35010b861738216525f6"; - sha256 = "1yrqlg44wqhsnrrbp6f3j2v8fi4sg2hv4j8c1sb1grqj1f306gca"; + rev = "f9ba3d924fc445ceea6ab7a6700b95dd12d268ca"; + sha256 = "12905gq95xif3963720yqywvzpvxz7j8qyk0i6pnmzjf92xnk8xm"; }; dependencies = []; @@ -3289,11 +3290,11 @@ rec { }; zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2018-03-16"; + name = "zig-vim-2018-04-15"; src = fetchgit { url = "https://github.com/zig-lang/zig.vim"; - rev = "7d2905a945308cc5ac4e0c32d9f5be86edf08399"; - sha256 = "1afy9md2xb7acrphwmplyrln8h6cckbfd6a6ls0hlmb3jybzk0zy"; + rev = "eba14b79890b674432a78291ff0f16de4da2ed08"; + sha256 = "1yj7gijwbsc1vrxlb158pf083ahrpgg5g7j3gjrkrazdcmmx5d2j"; }; dependencies = []; From 7d80c755e8b66ebfded9034a604c4660ee1c25c0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 17 Apr 2018 20:44:49 +0200 Subject: [PATCH 284/538] vim-plugins: disable pager in example command Fixes #38748 --- pkgs/misc/vim-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 649723952323..a48f9943779a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -20,7 +20,7 @@ in # TL;DR # Add your plugin to ./vim-plugin-names -# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix Date: Tue, 17 Apr 2018 13:49:19 -0500 Subject: [PATCH 285/538] treewide: move "extensions" drvs to dir This cleans up the tree for pkgs/applications somewhat. Should not change any hashes. --- .../default.nix => mopidy/gmusic.nix} | 0 .../default.nix => mopidy/iris.nix} | 0 .../default.nix => mopidy/local-images.nix} | 0 .../default.nix => mopidy/local-sqlite.nix} | 0 .../default.nix => mopidy/moped.nix} | 0 .../default.nix => mopidy/mopify.nix} | 0 .../musicbox-webclient.nix} | 0 .../default.nix => mopidy/soundcloud.nix} | 0 .../default.nix => mopidy/spotify-tunigo.nix} | 0 .../default.nix => mopidy/spotify.nix} | 0 .../default.nix => mopidy/youtube.nix} | 0 .../default.nix => lightdm/gtk-greeter.nix} | 0 .../with-extensions.nix} | 0 .../default.nix => electrum/dash.nix} | 0 .../default.nix => electrum/ltc.nix} | 0 .../default.nix => gnuradio/ais.nix} | 0 .../default.nix => gnuradio/gsm.nix} | 0 .../default.nix => gnuradio/nacl.nix} | 0 .../default.nix => gnuradio/osmosdr.nix} | 0 .../default.nix => gnuradio/rds.nix} | 0 .../default.nix => slic3r/prusa3d.nix} | 0 .../default.nix => xmrig/proxy.nix} | 0 .../default.nix => dropbox/cli.nix} | 0 .../default.nix => docker/distribution.nix} | 0 pkgs/top-level/all-packages.nix | 48 +++++++++---------- 25 files changed, 24 insertions(+), 24 deletions(-) rename pkgs/applications/audio/{mopidy-gmusic/default.nix => mopidy/gmusic.nix} (100%) rename pkgs/applications/audio/{mopidy-iris/default.nix => mopidy/iris.nix} (100%) rename pkgs/applications/audio/{mopidy-local-images/default.nix => mopidy/local-images.nix} (100%) rename pkgs/applications/audio/{mopidy-local-sqlite/default.nix => mopidy/local-sqlite.nix} (100%) rename pkgs/applications/audio/{mopidy-moped/default.nix => mopidy/moped.nix} (100%) rename pkgs/applications/audio/{mopidy-mopify/default.nix => mopidy/mopify.nix} (100%) rename pkgs/applications/audio/{mopidy-musicbox-webclient/default.nix => mopidy/musicbox-webclient.nix} (100%) rename pkgs/applications/audio/{mopidy-soundcloud/default.nix => mopidy/soundcloud.nix} (100%) rename pkgs/applications/audio/{mopidy-spotify-tunigo/default.nix => mopidy/spotify-tunigo.nix} (100%) rename pkgs/applications/audio/{mopidy-spotify/default.nix => mopidy/spotify.nix} (100%) rename pkgs/applications/audio/{mopidy-youtube/default.nix => mopidy/youtube.nix} (100%) rename pkgs/applications/display-managers/{lightdm-gtk-greeter/default.nix => lightdm/gtk-greeter.nix} (100%) rename pkgs/applications/editors/{vscode-with-extensions/default.nix => vscode/with-extensions.nix} (100%) rename pkgs/applications/misc/{electrum-dash/default.nix => electrum/dash.nix} (100%) rename pkgs/applications/misc/{electrum-ltc/default.nix => electrum/ltc.nix} (100%) rename pkgs/applications/misc/{gnuradio-ais/default.nix => gnuradio/ais.nix} (100%) rename pkgs/applications/misc/{gnuradio-gsm/default.nix => gnuradio/gsm.nix} (100%) rename pkgs/applications/misc/{gnuradio-nacl/default.nix => gnuradio/nacl.nix} (100%) rename pkgs/applications/misc/{gnuradio-osmosdr/default.nix => gnuradio/osmosdr.nix} (100%) rename pkgs/applications/misc/{gnuradio-rds/default.nix => gnuradio/rds.nix} (100%) rename pkgs/applications/misc/{slic3r-prusa3d/default.nix => slic3r/prusa3d.nix} (100%) rename pkgs/applications/misc/{xmrig-proxy/default.nix => xmrig/proxy.nix} (100%) rename pkgs/applications/networking/{dropbox-cli/default.nix => dropbox/cli.nix} (100%) rename pkgs/applications/virtualization/{docker-distribution/default.nix => docker/distribution.nix} (100%) diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy/gmusic.nix similarity index 100% rename from pkgs/applications/audio/mopidy-gmusic/default.nix rename to pkgs/applications/audio/mopidy/gmusic.nix diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy/iris.nix similarity index 100% rename from pkgs/applications/audio/mopidy-iris/default.nix rename to pkgs/applications/audio/mopidy/iris.nix diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy/local-images.nix similarity index 100% rename from pkgs/applications/audio/mopidy-local-images/default.nix rename to pkgs/applications/audio/mopidy/local-images.nix diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix similarity index 100% rename from pkgs/applications/audio/mopidy-local-sqlite/default.nix rename to pkgs/applications/audio/mopidy/local-sqlite.nix diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy/moped.nix similarity index 100% rename from pkgs/applications/audio/mopidy-moped/default.nix rename to pkgs/applications/audio/mopidy/moped.nix diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy/mopify.nix similarity index 100% rename from pkgs/applications/audio/mopidy-mopify/default.nix rename to pkgs/applications/audio/mopidy/mopify.nix diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix similarity index 100% rename from pkgs/applications/audio/mopidy-musicbox-webclient/default.nix rename to pkgs/applications/audio/mopidy/musicbox-webclient.nix diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy/soundcloud.nix similarity index 100% rename from pkgs/applications/audio/mopidy-soundcloud/default.nix rename to pkgs/applications/audio/mopidy/soundcloud.nix diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix similarity index 100% rename from pkgs/applications/audio/mopidy-spotify-tunigo/default.nix rename to pkgs/applications/audio/mopidy/spotify-tunigo.nix diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy/spotify.nix similarity index 100% rename from pkgs/applications/audio/mopidy-spotify/default.nix rename to pkgs/applications/audio/mopidy/spotify.nix diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy/youtube.nix similarity index 100% rename from pkgs/applications/audio/mopidy-youtube/default.nix rename to pkgs/applications/audio/mopidy/youtube.nix diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix similarity index 100% rename from pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix rename to pkgs/applications/display-managers/lightdm/gtk-greeter.nix diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode/with-extensions.nix similarity index 100% rename from pkgs/applications/editors/vscode-with-extensions/default.nix rename to pkgs/applications/editors/vscode/with-extensions.nix diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum/dash.nix similarity index 100% rename from pkgs/applications/misc/electrum-dash/default.nix rename to pkgs/applications/misc/electrum/dash.nix diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum/ltc.nix similarity index 100% rename from pkgs/applications/misc/electrum-ltc/default.nix rename to pkgs/applications/misc/electrum/ltc.nix diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio/ais.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-ais/default.nix rename to pkgs/applications/misc/gnuradio/ais.nix diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio/gsm.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-gsm/default.nix rename to pkgs/applications/misc/gnuradio/gsm.nix diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio/nacl.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-nacl/default.nix rename to pkgs/applications/misc/gnuradio/nacl.nix diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio/osmosdr.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-osmosdr/default.nix rename to pkgs/applications/misc/gnuradio/osmosdr.nix diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio/rds.nix similarity index 100% rename from pkgs/applications/misc/gnuradio-rds/default.nix rename to pkgs/applications/misc/gnuradio/rds.nix diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r/prusa3d.nix similarity index 100% rename from pkgs/applications/misc/slic3r-prusa3d/default.nix rename to pkgs/applications/misc/slic3r/prusa3d.nix diff --git a/pkgs/applications/misc/xmrig-proxy/default.nix b/pkgs/applications/misc/xmrig/proxy.nix similarity index 100% rename from pkgs/applications/misc/xmrig-proxy/default.nix rename to pkgs/applications/misc/xmrig/proxy.nix diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox/cli.nix similarity index 100% rename from pkgs/applications/networking/dropbox-cli/default.nix rename to pkgs/applications/networking/dropbox/cli.nix diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker/distribution.nix similarity index 100% rename from pkgs/applications/virtualization/docker-distribution/default.nix rename to pkgs/applications/virtualization/docker/distribution.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ce580e1589b..44e6877090f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15227,7 +15227,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; }; - docker-distribution = callPackage ../applications/virtualization/docker-distribution { }; + docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; @@ -15293,9 +15293,9 @@ with pkgs; electrum = callPackage ../applications/misc/electrum { }; - electrum-dash = callPackage ../applications/misc/electrum-dash { }; + electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = callPackage ../applications/misc/electrum-ltc { }; + electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; elinks = callPackage ../applications/networking/browsers/elinks { }; @@ -15643,15 +15643,15 @@ with pkgs; extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ]; }; - gnuradio-nacl = callPackage ../applications/misc/gnuradio-nacl { }; + gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/misc/gnuradio-gsm { }; + gnuradio-gsm = callPackage ../applications/misc/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/misc/gnuradio-ais { }; + gnuradio-ais = callPackage ../applications/misc/gnuradio/ais.nix { }; - gnuradio-rds = callPackage ../applications/misc/gnuradio-rds { }; + gnuradio-rds = callPackage ../applications/misc/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; + gnuradio-osmosdr = callPackage ../applications/misc/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; @@ -16762,7 +16762,7 @@ with pkgs; xmrig = callPackage ../applications/misc/xmrig { }; - xmrig-proxy = callPackage ../applications/misc/xmrig-proxy { }; + xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; @@ -16782,27 +16782,27 @@ with pkgs; mopidy = callPackage ../applications/audio/mopidy { }; - mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-gmusic = callPackage ../applications/audio/mopidy/gmusic.nix { }; - mopidy-local-images = callPackage ../applications/audio/mopidy-local-images { }; + mopidy-local-images = callPackage ../applications/audio/mopidy/local-images.nix { }; - mopidy-local-sqlite = callPackage ../applications/audio/mopidy-local-sqlite { }; + mopidy-local-sqlite = callPackage ../applications/audio/mopidy/local-sqlite.nix { }; - mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + mopidy-spotify = callPackage ../applications/audio/mopidy/spotify.nix { }; - mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mopidy-moped = callPackage ../applications/audio/mopidy/moped.nix { }; - mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; + mopidy-mopify = callPackage ../applications/audio/mopidy/mopify.nix { }; - mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy-spotify-tunigo { }; + mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy/spotify-tunigo.nix { }; - mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { }; + mopidy-youtube = callPackage ../applications/audio/mopidy/youtube.nix { }; - mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { }; + mopidy-soundcloud = callPackage ../applications/audio/mopidy/soundcloud.nix { }; - mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { }; + mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy/musicbox-webclient.nix { }; - mopidy-iris = callPackage ../applications/audio/mopidy-iris { }; + mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { }; motif = callPackage ../development/libraries/motif { }; @@ -17749,7 +17749,7 @@ with pkgs; dropbox = callPackage ../applications/networking/dropbox { }; - dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; + dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; insync = callPackage ../applications/networking/insync { }; @@ -17760,13 +17760,13 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; - lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) exo; }; slic3r = callPackage ../applications/misc/slic3r { }; - slic3r-prusa3d = callPackage ../applications/misc/slic3r-prusa3d { }; + slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; cura_stable = callPackage ../applications/misc/cura/stable.nix { @@ -18312,7 +18312,7 @@ with pkgs; vscode = callPackage ../applications/editors/vscode { }; - vscode-with-extensions = callPackage ../applications/editors/vscode-with-extensions {}; + vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; vscode-utils = callPackage ../misc/vscode-extensions/vscode-utils.nix {}; From 7e31e4554fccf5ea891bbad6f19b56866c27cd99 Mon Sep 17 00:00:00 2001 From: Anton Latukha Date: Tue, 17 Apr 2018 22:00:23 +0300 Subject: [PATCH 286/538] handbrake: switch to libav_12 (#38811) --- pkgs/applications/video/handbrake/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 1c97f9531f79..904401c5e913 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -14,12 +14,14 @@ autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, - lame, ffmpeg, libdvdread, libdvdnav, libbluray, + lame, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, fontconfig, freetype, hicolor-icon-theme, glib, gtk3, intltool, libnotify, gst_all_1, dbus-glib, udev, libgudev, libvpx, - useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, useFdk ? false, fdk_aac ? null + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, + useFfmpeg ? false, libav_12 ? null, ffmpeg ? null, + useFdk ? false, fdk_aac ? null }: stdenv.mkDerivation rec { @@ -35,20 +37,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 - ] ++ (lib.optionals useGtk [ + ] ++ lib.optionals useGtk [ intltool wrapGAppsHook - ]); + ]; buildInputs = [ fribidi fontconfig freetype jansson zlib libass libiconv libsamplerate libxml2 bzip2 libogg libopus libtheora libvorbis libdvdcss a52dec libmkv lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx - ] ++ (lib.optionals useGtk [ + ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev - ]) ++ (lib.optionals useFdk [fdk_aac]); + ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ]) + ++ lib.optional useFdk fdk_aac; dontUseCmakeConfigure = true; From ddaea6ac77177c91576568af4b6f6d85195559af Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 14:03:07 -0500 Subject: [PATCH 287/538] pkgs/shells: move extensions to subdirs These are not reaal shells and should go into their parent shell directory. --- .../{ => bash}/bash-completion/default.nix | 0 .../nix-bash-completions/default.nix | 0 .../{ => fish}/fish-foreign-env/default.nix | 0 .../suppress-harmless-warnings.patch | 0 pkgs/shells/{ => zsh}/antigen/default.nix | 0 .../{ => zsh}/grml-zsh-config/default.nix | 0 .../lambda-mod-zsh-theme/default.nix | 0 .../{ => zsh}/nix-zsh-completions/default.nix | 0 pkgs/shells/{ => zsh}/oh-my-zsh/default.nix | 0 .../{ => zsh}/zsh-autosuggestions/default.nix | 0 .../{ => zsh}/zsh-command-time/default.nix | 0 .../{ => zsh}/zsh-completions/default.nix | 0 pkgs/shells/{ => zsh}/zsh-deer/default.nix | 0 pkgs/shells/{ => zsh}/zsh-deer/realpath.patch | 0 .../{ => zsh}/zsh-git-prompt/default.nix | 0 .../{ => zsh}/zsh-powerlevel9k/default.nix | 0 pkgs/shells/{ => zsh}/zsh-prezto/default.nix | 0 .../zsh-syntax-highlighting/default.nix | 0 pkgs/top-level/all-packages.nix | 32 +++++++++---------- 19 files changed, 16 insertions(+), 16 deletions(-) rename pkgs/shells/{ => bash}/bash-completion/default.nix (100%) rename pkgs/shells/{ => bash}/nix-bash-completions/default.nix (100%) rename pkgs/shells/{ => fish}/fish-foreign-env/default.nix (100%) rename pkgs/shells/{ => fish}/fish-foreign-env/suppress-harmless-warnings.patch (100%) rename pkgs/shells/{ => zsh}/antigen/default.nix (100%) rename pkgs/shells/{ => zsh}/grml-zsh-config/default.nix (100%) rename pkgs/shells/{ => zsh}/lambda-mod-zsh-theme/default.nix (100%) rename pkgs/shells/{ => zsh}/nix-zsh-completions/default.nix (100%) rename pkgs/shells/{ => zsh}/oh-my-zsh/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-autosuggestions/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-command-time/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-completions/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-deer/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-deer/realpath.patch (100%) rename pkgs/shells/{ => zsh}/zsh-git-prompt/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-powerlevel9k/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-prezto/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-syntax-highlighting/default.nix (100%) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix similarity index 100% rename from pkgs/shells/bash-completion/default.nix rename to pkgs/shells/bash/bash-completion/default.nix diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix similarity index 100% rename from pkgs/shells/nix-bash-completions/default.nix rename to pkgs/shells/bash/nix-bash-completions/default.nix diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix similarity index 100% rename from pkgs/shells/fish-foreign-env/default.nix rename to pkgs/shells/fish/fish-foreign-env/default.nix diff --git a/pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch similarity index 100% rename from pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch rename to pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch diff --git a/pkgs/shells/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix similarity index 100% rename from pkgs/shells/antigen/default.nix rename to pkgs/shells/zsh/antigen/default.nix diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix similarity index 100% rename from pkgs/shells/grml-zsh-config/default.nix rename to pkgs/shells/zsh/grml-zsh-config/default.nix diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix similarity index 100% rename from pkgs/shells/lambda-mod-zsh-theme/default.nix rename to pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix similarity index 100% rename from pkgs/shells/nix-zsh-completions/default.nix rename to pkgs/shells/zsh/nix-zsh-completions/default.nix diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix similarity index 100% rename from pkgs/shells/oh-my-zsh/default.nix rename to pkgs/shells/zsh/oh-my-zsh/default.nix diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix similarity index 100% rename from pkgs/shells/zsh-autosuggestions/default.nix rename to pkgs/shells/zsh/zsh-autosuggestions/default.nix diff --git a/pkgs/shells/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix similarity index 100% rename from pkgs/shells/zsh-command-time/default.nix rename to pkgs/shells/zsh/zsh-command-time/default.nix diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix similarity index 100% rename from pkgs/shells/zsh-completions/default.nix rename to pkgs/shells/zsh/zsh-completions/default.nix diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix similarity index 100% rename from pkgs/shells/zsh-deer/default.nix rename to pkgs/shells/zsh/zsh-deer/default.nix diff --git a/pkgs/shells/zsh-deer/realpath.patch b/pkgs/shells/zsh/zsh-deer/realpath.patch similarity index 100% rename from pkgs/shells/zsh-deer/realpath.patch rename to pkgs/shells/zsh/zsh-deer/realpath.patch diff --git a/pkgs/shells/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix similarity index 100% rename from pkgs/shells/zsh-git-prompt/default.nix rename to pkgs/shells/zsh/zsh-git-prompt/default.nix diff --git a/pkgs/shells/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix similarity index 100% rename from pkgs/shells/zsh-powerlevel9k/default.nix rename to pkgs/shells/zsh/zsh-powerlevel9k/default.nix diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix similarity index 100% rename from pkgs/shells/zsh-prezto/default.nix rename to pkgs/shells/zsh/zsh-prezto/default.nix diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix similarity index 100% rename from pkgs/shells/zsh-syntax-highlighting/default.nix rename to pkgs/shells/zsh/zsh-syntax-highlighting/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e6877090f8..6b0423de0f43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1424,7 +1424,7 @@ with pkgs; utillinux = utillinuxMinimal; }; - antigen = callPackage ../shells/antigen { }; + antigen = callPackage ../shells/zsh/antigen { }; apparix = callPackage ../tools/misc/apparix { }; @@ -1888,7 +1888,7 @@ with pkgs; debootstrap = callPackage ../tools/misc/debootstrap { }; - deer = callPackage ../shells/zsh-deer { }; + deer = callPackage ../shells/zsh/zsh-deer { }; detox = callPackage ../tools/misc/detox { }; @@ -4026,7 +4026,7 @@ with pkgs; offlineimap = callPackage ../tools/networking/offlineimap { }; - oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { }; @@ -5790,17 +5790,17 @@ with pkgs; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; - zsh-git-prompt = callPackage ../shells/zsh-git-prompt { }; + zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; - zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { }; + zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; - zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { }; + zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; - zsh-powerlevel9k = callPackage ../shells/zsh-powerlevel9k { }; + zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { }; - zsh-command-time = callPackage ../shells/zsh-command-time { }; + zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; zssh = callPackage ../tools/networking/zssh { }; @@ -5827,9 +5827,9 @@ with pkgs; interactive = true; }); - bash-completion = callPackage ../shells/bash-completion { }; + bash-completion = callPackage ../shells/bash/bash-completion { }; - nix-bash-completions = callPackage ../shells/nix-bash-completions { }; + nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { }; dash = callPackage ../shells/dash { }; @@ -5837,7 +5837,7 @@ with pkgs; fish = callPackage ../shells/fish { }; - fish-foreign-env = callPackage ../shells/fish-foreign-env { }; + fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { }; ion = callPackage ../shells/ion { }; @@ -5859,13 +5859,13 @@ with pkgs; zsh = callPackage ../shells/zsh { }; - nix-zsh-completions = callPackage ../shells/nix-zsh-completions { }; + nix-zsh-completions = callPackage ../shells/zsh/nix-zsh-completions { }; - zsh-completions = callPackage ../shells/zsh-completions { }; + zsh-completions = callPackage ../shells/zsh/zsh-completions { }; - zsh-prezto = callPackage ../shells/zsh-prezto { }; + zsh-prezto = callPackage ../shells/zsh/zsh-prezto { }; - grml-zsh-config = callPackage ../shells/grml-zsh-config { }; + grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { }; ### DEVELOPMENT / COMPILERS @@ -11278,7 +11278,7 @@ with pkgs; haskellLib = haskell.lib; }; - lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { }; + lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; leksah = callPackage ../development/tools/haskell/leksah { inherit (haskellPackages) ghcWithPackages; From 3955b846984201b190ee72bbd0c65ba5c4067d91 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 9 Apr 2018 06:23:31 -0400 Subject: [PATCH 288/538] meta: Don't bypass unsupported platforms with allowBroken. Our platforms are open-world oriented these days, and anyway there's allowUnsupportedSystem. --- pkgs/stdenv/generic/check-meta.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 26522ad6045e..24b5205ffe6f 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -75,6 +75,7 @@ let remediation = { unfree = remediate_whitelist "Unfree"; broken = remediate_whitelist "Broken"; + unsupported = remediate_whitelist "UnsupportedSystem"; blacklisted = x: ""; insecure = remediate_insecure; unknown-meta = x: ""; @@ -192,8 +193,8 @@ let { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowUnsupportedSystem && !allowBroken && !(checkPlatform attrs) then - { valid = false; reason = "broken"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } + else if !allowUnsupportedSystem && !(checkPlatform attrs) then + { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } else let res = checkMeta (attrs.meta or {}); in if res != [] then From cb212cf549a0a92d3416805a149c0a277eba1fcf Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 17 Apr 2018 16:02:50 -0400 Subject: [PATCH 289/538] meta: Add `NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM` for consistency --- pkgs/stdenv/generic/check-meta.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 24b5205ffe6f..11c11b5d77b0 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -8,7 +8,8 @@ let # for why this defaults to false, but I (@copumpkin) want to default it to true soon. shouldCheckMeta = config.checkMeta or false; - allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; + allowUnfree = config.allowUnfree or false + || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; whitelist = config.whitelistedLicenses or []; blacklist = config.blacklistedLicenses or []; @@ -35,9 +36,11 @@ let hasBlacklistedLicense = assert areLicenseListsValid; attrs: hasLicense attrs && builtins.elem attrs.meta.license blacklist; - allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + allowBroken = config.allowBroken or false + || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; - allowUnsupportedSystem = config.allowUnsupportedSystem or false; + allowUnsupportedSystem = config.allowUnsupportedSystem or false + || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; isUnfree = licenses: lib.lists.any (l: !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; From c66440c1048387599e002a1c2d17ba5cbaebf3f8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 17 Apr 2018 16:08:21 -0400 Subject: [PATCH 290/538] doc: Document `config.allowUnsupportedSystem` and its env var --- doc/configuration.xml | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/doc/configuration.xml b/doc/configuration.xml index 55c5ea809d35..5370265c53ad 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -14,6 +14,8 @@ true: its meta.broken set to true. + The package isn't intended to run on the given system, as none of its meta.platforms match the given system. + The package's meta.license is set to a license which is considered to be unfree. @@ -88,6 +90,42 @@ distributing the software.
+
+ Installing packages on unsupported systems + + + + There are also two ways to try compiling a package which has been marked as unsuported for the given system. + + + + + For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: + + $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 + + + + + For permanently allowing broken packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: + + +{ + allowUnsupportedSystem = true; +} + + + + + + + The difference between an a package being unsupported on some system and being broken is admittedly a bit fuzzy. + If a program ought to work on a certain platform, but doesn't, the platform should be included in meta.platforms, but marked as broken with e.g. meta.broken = !hostPlatform.isWindows. + Of course, this begs the question of what "ought" means exactly. + That is left to the package maintainer. + +
+
Installing unfree packages @@ -397,7 +435,7 @@ fi
- +
GNU info setup From 1592e03abaed9be050e1546fb6dd28d2436f9c39 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 15:40:30 -0500 Subject: [PATCH 291/538] treewide: rename bad filenames Most of these can easily be moved to subdirectories of other directories. This helps reduce clutter in the main trees. --- .../log-applet}/default.nix | 0 .../log-applet}/fix-paths.patch | 0 .../fastcomp}/default.nix | 0 .../fastcomp}/emscripten-fastcomp.nix | 0 .../{openjdk-darwin => openjdk/darwin}/8.nix | 0 .../darwin}/default.nix | 0 .../{ => misc}/stm32/betaflight/default.nix | 0 .../{ => tools}/qtcreator/default.nix | 0 pkgs/tools/{ => misc}/nagstamon/default.nix | 0 .../{ => connman}/connman-gtk/default.nix | 0 .../{ => connman}/connman-ncurses/default.nix | 0 .../{ => connman}/connman-notify/default.nix | 0 .../{ => connman}/connman_dmenu/default.nix | 0 .../{ => connman}/connmanui/default.nix | 0 .../applet.nix} | 0 .../default.nix => network-manager/dmenu.nix} | 0 .../default.nix => keybase/gui.nix} | 0 .../default.nix => pinentry/mac.nix} | 0 pkgs/top-level/all-packages.nix | 34 +++++++++---------- 19 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/applications/window-managers/{xmonad-log-applet => xmonad/log-applet}/default.nix (100%) rename pkgs/applications/window-managers/{xmonad-log-applet => xmonad/log-applet}/fix-paths.patch (100%) rename pkgs/development/compilers/{emscripten-fastcomp => emscripten/fastcomp}/default.nix (100%) rename pkgs/development/compilers/{emscripten-fastcomp => emscripten/fastcomp}/emscripten-fastcomp.nix (100%) rename pkgs/development/compilers/{openjdk-darwin => openjdk/darwin}/8.nix (100%) rename pkgs/development/compilers/{openjdk-darwin => openjdk/darwin}/default.nix (100%) rename pkgs/development/{ => misc}/stm32/betaflight/default.nix (100%) rename pkgs/development/{ => tools}/qtcreator/default.nix (100%) rename pkgs/tools/{ => misc}/nagstamon/default.nix (100%) rename pkgs/tools/networking/{ => connman}/connman-gtk/default.nix (100%) rename pkgs/tools/networking/{ => connman}/connman-ncurses/default.nix (100%) rename pkgs/tools/networking/{ => connman}/connman-notify/default.nix (100%) rename pkgs/tools/networking/{ => connman}/connman_dmenu/default.nix (100%) rename pkgs/tools/networking/{ => connman}/connmanui/default.nix (100%) rename pkgs/tools/networking/{network-manager-applet/default.nix => network-manager/applet.nix} (100%) rename pkgs/tools/networking/{networkmanager_dmenu/default.nix => network-manager/dmenu.nix} (100%) rename pkgs/tools/security/{keybase-gui/default.nix => keybase/gui.nix} (100%) rename pkgs/tools/security/{pinentry-mac/default.nix => pinentry/mac.nix} (100%) diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix similarity index 100% rename from pkgs/applications/window-managers/xmonad-log-applet/default.nix rename to pkgs/applications/window-managers/xmonad/log-applet/default.nix diff --git a/pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch similarity index 100% rename from pkgs/applications/window-managers/xmonad-log-applet/fix-paths.patch rename to pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix similarity index 100% rename from pkgs/development/compilers/emscripten-fastcomp/default.nix rename to pkgs/development/compilers/emscripten/fastcomp/default.nix diff --git a/pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix similarity index 100% rename from pkgs/development/compilers/emscripten-fastcomp/emscripten-fastcomp.nix rename to pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix similarity index 100% rename from pkgs/development/compilers/openjdk-darwin/8.nix rename to pkgs/development/compilers/openjdk/darwin/8.nix diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk-darwin/default.nix rename to pkgs/development/compilers/openjdk/darwin/default.nix diff --git a/pkgs/development/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix similarity index 100% rename from pkgs/development/stm32/betaflight/default.nix rename to pkgs/development/misc/stm32/betaflight/default.nix diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix similarity index 100% rename from pkgs/development/qtcreator/default.nix rename to pkgs/development/tools/qtcreator/default.nix diff --git a/pkgs/tools/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix similarity index 100% rename from pkgs/tools/nagstamon/default.nix rename to pkgs/tools/misc/nagstamon/default.nix diff --git a/pkgs/tools/networking/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix similarity index 100% rename from pkgs/tools/networking/connman-gtk/default.nix rename to pkgs/tools/networking/connman/connman-gtk/default.nix diff --git a/pkgs/tools/networking/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix similarity index 100% rename from pkgs/tools/networking/connman-ncurses/default.nix rename to pkgs/tools/networking/connman/connman-ncurses/default.nix diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix similarity index 100% rename from pkgs/tools/networking/connman-notify/default.nix rename to pkgs/tools/networking/connman/connman-notify/default.nix diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix similarity index 100% rename from pkgs/tools/networking/connman_dmenu/default.nix rename to pkgs/tools/networking/connman/connman_dmenu/default.nix diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix similarity index 100% rename from pkgs/tools/networking/connmanui/default.nix rename to pkgs/tools/networking/connman/connmanui/default.nix diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager/applet.nix similarity index 100% rename from pkgs/tools/networking/network-manager-applet/default.nix rename to pkgs/tools/networking/network-manager/applet.nix diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu.nix similarity index 100% rename from pkgs/tools/networking/networkmanager_dmenu/default.nix rename to pkgs/tools/networking/network-manager/dmenu.nix diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase/gui.nix similarity index 100% rename from pkgs/tools/security/keybase-gui/default.nix rename to pkgs/tools/security/keybase/gui.nix diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry/mac.nix similarity index 100% rename from pkgs/tools/security/pinentry-mac/default.nix rename to pkgs/tools/security/pinentry/mac.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b0423de0f43..aa99d8a65810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1637,15 +1637,15 @@ with pkgs; connman = callPackage ../tools/networking/connman { }; - connman-gtk = callPackage ../tools/networking/connman-gtk { }; + connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; - connman-ncurses = callPackage ../tools/networking/connman-ncurses { }; + connman-ncurses = callPackage ../tools/networking/connman/connman-ncurses { }; - connman-notify = callPackage ../tools/networking/connman-notify { }; + connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - connmanui = callPackage ../tools/networking/connmanui { }; + connmanui = callPackage ../tools/networking/connman/connmanui { }; - connman_dmenu = callPackage ../tools/networking/connman_dmenu { }; + connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; convertlit = callPackage ../tools/text/convertlit { }; @@ -2107,7 +2107,7 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = callPackage ../development/compilers/emscripten-fastcomp { }; + emscriptenfastcompPackages = callPackage ../development/compilers/emscripten/fastcomp { }; emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; @@ -3164,7 +3164,7 @@ with pkgs; kbfs = callPackage ../tools/security/kbfs { }; - keybase-gui = callPackage ../tools/security/keybase-gui { }; + keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; keychain = callPackage ../tools/misc/keychain { }; @@ -3305,7 +3305,7 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; - nagstamon = callPackage ../tools/nagstamon { + nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; }; @@ -3886,9 +3886,9 @@ with pkgs; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; - networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager/applet.nix { }; - networkmanager_dmenu = callPackage ../tools/networking/networkmanager_dmenu { }; + networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; @@ -4318,7 +4318,7 @@ with pkgs; qt = qt5.qtbase; }; - pinentry_mac = callPackage ../tools/security/pinentry-mac { + pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -6428,7 +6428,7 @@ with pkgs; openjdk8 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk-darwin/8.nix { } + callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; @@ -7376,7 +7376,7 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/stm32/betaflight { }; + betaflight = callPackage ../development/misc/stm32/betaflight { }; sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; @@ -8110,7 +8110,7 @@ with pkgs; pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt5.callPackage ../development/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; @@ -18667,21 +18667,21 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome2"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome3"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet { + xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; From 0743c349ce21d2939766a577ba891d49bd795191 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Tue, 17 Apr 2018 23:24:49 +0200 Subject: [PATCH 292/538] rstudio: 1.1.423 -> 1.1.442 --- pkgs/applications/editors/rstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 6b7881c490cf..0943513a4d12 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -6,7 +6,7 @@ let verMajor = "1"; verMinor = "1"; - verPatch = "423"; + verPatch = "442"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "02kpmzh0vr0gb5dhiwcm4gwjbc3biwz0km655mgzmx9j64cyd3nf"; + sha256 = "0drqh2brfs9w8dfh4r7j3fsqdsg63s6pvj2bbg5xwwc0yf220ahs"; }; # Hack RStudio to only use the input R. From 8d1089611138384f2af9bbcf9a1c8941287c87f6 Mon Sep 17 00:00:00 2001 From: Oscar Carlsson Date: Tue, 17 Apr 2018 23:33:52 +0200 Subject: [PATCH 293/538] hunspell-dicts: add support for swedish dictionary (#39061) --- .../libraries/hunspell/dictionaries.nix | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index f30ec1872bae..ee8a5107b341 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -61,6 +61,51 @@ let ''; }; + mkDictFromDSSO = + { shortName, shortDescription, dictFileName }: + mkDict rec { + inherit dictFileName; + version = "2.40"; + # Should really use a string function or something + _version = "2-40"; + name = "hunspell-dict-${shortName}-dsso-${version}"; + _name = "ooo_swedish_dict_${_version}"; + readmeFile = "LICENSE_en_US.txt"; + src = fetchurl { + url = "https://extensions.libreoffice.org/extensions/swedish-spelling-dictionary-den-stora-svenska-ordlistan/${version}/@@download/file/${_name}.oxt"; + sha256 = "b982881cc75f5c4af1199535bd4735ee476bdc48edf63e3f05fb4f715654a7bc"; + }; + meta = with stdenv.lib; { + longDescription = '' + Svensk ordlista baserad på DSSO (den stora svenska ordlistan) och Göran + Anderssons (goran@init.se) arbete med denna. Ordlistan hämtas från + LibreOffice då dsso.se inte längre verkar vara med oss. + ''; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = licenses.lgpl3; + platforms = platforms.all; + }; + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase"; + sourceRoot = "."; + unpackCmd = '' + unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile + ''; + installPhase = '' + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 dictionaries/${dictFileName}.dic "$out/share/hunspell/" + install -m644 dictionaries/${dictFileName}.aff "$out/share/hunspell/" + # myspell dicts symlinks + install -dm755 "$out/share/myspell/dicts" + ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/" + ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" + # docs + install -dm755 "$out/share/doc" + install -m644 ${readmeFile} $out/share/doc/${name}.txt + ''; + }; + mkDictFromDicollecte = { shortName, shortDescription, longDescription, dictFileName }: mkDict rec { @@ -464,6 +509,21 @@ in { ]; }; + /* SWEDISH */ + + sv-se = mkDictFromDSSO rec { + shortName = "sv-se"; + dictFileName = "sv_SE"; + shortDescription = "Swedish (Sweden)"; + }; + + # Finlandian Swedish (hello Linus Torvalds) + sv-fi = mkDictFromDSSO rec { + shortName = "sv-fi"; + dictFileName = "sv_FI"; + shortDescription = "Swedish (Finland)"; + }; + /* GERMAN */ de-de = mkDictFromJ3e { From 390abceb2b02a528890d68712f04dc2cd0219c74 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 7 Mar 2018 23:17:02 +0100 Subject: [PATCH 294/538] elk5: 5.6.6 -> 5.6.8 --- pkgs/development/tools/misc/kibana/5.x.nix | 6 +++--- pkgs/misc/logging/beats/5.x.nix | 2 +- pkgs/servers/search/elasticsearch/5.x.nix | 2 +- pkgs/tools/misc/logstash/5.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 78b5df21fdea..d8ab49fc4e21 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "1a9n7s9r0klqvpyr5d3a410cchbsb0syx6cqwbhhnihqyw8dcx1i"; - "i686-linux" = "0snnm5jwynvk6ahgl42yzl2jhld0ykn79rlcq9dsv2gpqnjb2mmv"; - "x86_64-darwin" = "0qw3xkj3n3aja8s8n9r4hbr65jm9m6dgfjhhnrln434648rx7z4v"; + "x86_64-linux" = "0hhgpi32168kfzqkp0bjpn7k145ii0s3nkxs3v1n3rgykyyid19d"; + "i686-linux" = "1s7h0s8jzxl3nyfklhlk9aadg0wb8x5rbnwlmi6lkw4l5kmlrijv"; + "x86_64-darwin" = "014bcghb4bin4d8p7k1k251riqa7snc3l5zlm6f1k8nvdfh6wkzr"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index ba2a8b2448ef..a6446e685458 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0ri2l8pyl1fnx0zypliwprkk1wkaxz8ywkgz8h2f08v7h1zgq1m6"; + sha256 = "0d1ijhhk7qwsjmjric4z39npj3i3qzdvrg2h45s76aad1847q0xz"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index f46ca9c0cb3f..50123e160e91 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0wjjvzjbdgdv9qznk1b8dx63zgs7s6jnrrbrnd5dn27lhymxiwpl"; + sha256 = "036rcdmkgkh7qi8pvlx9jnbsnb27fc2gkdj9vilyg152mvg0k3c9"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index e528e3e0285f..4be8af00193e 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "0cpim121ydxdjr251by9jw6pidh5b52jl5ldcm7gp015q49x1nl7"; + sha256 = "1xac5jfgnqfg2sbnh4g7v040ly7kjw0klvp6cpimxcjci5j0sqnr"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa99d8a65810..83f298065d53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2122,7 +2122,7 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.6"; + elk5Version = "5.6.8"; elk6Version = "6.1.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; From b3e94a2385ddbb5c8a55746a110a92fb9a9352c5 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 7 Mar 2018 23:18:21 +0100 Subject: [PATCH 295/538] elk6: 6.1.2 -> 6.2.2 --- pkgs/development/tools/misc/kibana/6.x.nix | 4 ++-- pkgs/misc/logging/beats/6.x.nix | 2 +- pkgs/servers/search/elasticsearch/6.x.nix | 2 +- pkgs/tools/misc/logstash/6.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index d7013ef46eb2..d136bac336f3 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "0kgsafjn8wzrmiklfc8jg0h3cx25lhlkby8yz35wgpx4wbk3vfjx"; - "x86_64-darwin" = "0i2kq9vyjv151kk7h3dl3hjrqqgxsg0qqxdqwjwlz9ja5axzlxhd"; + "x86_64-linux" = "1gkswrcvqkblazmhybz0pslafacy0fs2lzyrydrfiirkwdr5qnr2"; + "x86_64-darwin" = "16lyg7xmiprd7ibj37ajpsw7vfn34z4rfxck5x43zd0jvvn8cchd"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 2883604491c6..a4fc1e35c588 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "05ay6hdc1jgi6b00bd998zc39ca8jhnk7i6m3mw70s0baqv1scik"; + sha256 = "0qmwg3c3p8nmvnrx55kzka8c3w6h5w8ak5iipc3hv71xl4y4kavx"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 5594fe35b737..acca0ebc991a 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "03xwd8r0l0a29wl6wrp4bh7xr1b79q2rqfmsq3d5k35pv85sw3lw"; + sha256 = "10vrj354wa5vx5j31nmwcibpqhnsibk12161mhzcwfabg133avmj"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 3eb2648a4412..11cba2c47fe3 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "18680qpdvhr16dx66jfia1zrg52005sgdy9yhl7vdhm4gcr7pxwc"; + sha256 = "17ab1hgmz8w0yr5k6da2pc5dicckkl6l2pv299kf9p8l9v8k1v20"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83f298065d53..5a251bef074d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2123,7 +2123,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.8"; - elk6Version = "6.1.2"; + elk6Version = "6.2.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; From 54e6c0e7aef31ff545815e9e0af320b72381b852 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 26 Mar 2018 11:37:54 +0200 Subject: [PATCH 296/538] elk6: 6.2.2 -> 6.2.3 --- pkgs/development/tools/misc/kibana/6.x.nix | 4 ++-- pkgs/misc/logging/beats/6.x.nix | 2 +- pkgs/servers/search/elasticsearch/6.x.nix | 2 +- pkgs/tools/misc/logstash/6.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index d136bac336f3..b718f30c1755 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "1gkswrcvqkblazmhybz0pslafacy0fs2lzyrydrfiirkwdr5qnr2"; - "x86_64-darwin" = "16lyg7xmiprd7ibj37ajpsw7vfn34z4rfxck5x43zd0jvvn8cchd"; + "x86_64-linux" = "15iykvbqgqj9lk764rkl52f47b6v59kvfiqfvdp3n3anszyqcc5d"; + "x86_64-darwin" = "04fgazl5rzb4vw8xn5s46w44f2rdpki81q2rch2jiq9hf8bqm55m"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index a4fc1e35c588..8040b5d20db9 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0qmwg3c3p8nmvnrx55kzka8c3w6h5w8ak5iipc3hv71xl4y4kavx"; + sha256 = "0nx29cv64q44wyf3ph8486rf78sgsamkia8njkwn10gpw8b5wnjs"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index acca0ebc991a..60705920d47f 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "10vrj354wa5vx5j31nmwcibpqhnsibk12161mhzcwfabg133avmj"; + sha256 = "0xnap88wmdfvvjgjm7xfmjipamh79nzh9r11cwrh9kqabzn8vp81"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 11cba2c47fe3..15f27611654b 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "17ab1hgmz8w0yr5k6da2pc5dicckkl6l2pv299kf9p8l9v8k1v20"; + sha256 = "1rybcjwkdckmwbdi9x8rj5dhzy76s9151sa283j46m83rqbnjchc"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a251bef074d..6eb4bcca0017 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2123,7 +2123,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.8"; - elk6Version = "6.2.2"; + elk6Version = "6.2.3"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; From ae94825b4a1aa3c5a8344beb91a139467352f53b Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 8 Apr 2018 01:43:47 +0200 Subject: [PATCH 297/538] elasticsearch6: fix startup due to missing jvm.options --- nixos/modules/services/search/elasticsearch.nix | 7 +++++-- pkgs/servers/search/elasticsearch/6.x.nix | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index adef500b7b5c..d61f588205af 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -32,8 +32,11 @@ let (if es5 then (pkgs.writeTextDir "log4j2.properties" cfg.logging) else (pkgs.writeTextDir "logging.yml" cfg.logging)) ]; - # Elasticsearch 5.x won't start when the scripts directory does not exist - postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/scripts" else ""; + postBuild = concatStringsSep "\n" (concatLists [ + # Elasticsearch 5.x won't start when the scripts directory does not exist + (optional es5 "${pkgs.coreutils}/bin/mkdir -p $out/scripts") + (optional es6 "ln -s ${cfg.package}/config/jvm.options $out/jvm.options") + ]); }; esPlugins = pkgs.buildEnv { diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 60705920d47f..c54cd3800451 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/elasticsearch \ --prefix PATH : "${utillinux}/bin/" \ - --set JAVA_HOME "${jre_headless}" \ - --set ES_JVM_OPTIONS "$out/config/jvm.options" + --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" ''; From baf5d4d537bbd7d79a82c88c9e768bd15bfc264d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 8 Apr 2018 01:44:38 +0200 Subject: [PATCH 298/538] logstash6: fix startup due to unpatched shebangs --- pkgs/tools/misc/logstash/6.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 15f27611654b..50e5beaa8b23 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { mkdir -p $out cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin + wrapProgram $out/bin/logstash \ --set JAVA_HOME "${jre}" From 1593ff3f51ed09483e71f3dd4cd99c92ebcbec94 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 18 Apr 2018 00:13:16 +0200 Subject: [PATCH 299/538] elk5: 5.6.8 -> 5.6.9 --- pkgs/development/tools/misc/kibana/5.x.nix | 6 +++--- pkgs/misc/logging/beats/5.x.nix | 2 +- pkgs/servers/search/elasticsearch/5.x.nix | 2 +- pkgs/tools/misc/logstash/5.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index d8ab49fc4e21..4aa9dc8b89a0 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "0hhgpi32168kfzqkp0bjpn7k145ii0s3nkxs3v1n3rgykyyid19d"; - "i686-linux" = "1s7h0s8jzxl3nyfklhlk9aadg0wb8x5rbnwlmi6lkw4l5kmlrijv"; - "x86_64-darwin" = "014bcghb4bin4d8p7k1k251riqa7snc3l5zlm6f1k8nvdfh6wkzr"; + "x86_64-linux" = "1rg4j5jm8mkscrwlbx5qk3qjnblyr8z9x5npvyi73zm0ism0gv4j"; + "i686-linux" = "14swgx9sf23pns2pj30yyhd0p0rnykdimdrnj8rb0r1pqszw57qx"; + "x86_64-darwin" = "10l13r47nx74xicnjgb56nvgvx2al1zx1p8f09pjldaa2gjlll2k"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index a6446e685458..94d5449100db 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0d1ijhhk7qwsjmjric4z39npj3i3qzdvrg2h45s76aad1847q0xz"; + sha256 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 50123e160e91..c80bbbcfde91 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "036rcdmkgkh7qi8pvlx9jnbsnb27fc2gkdj9vilyg152mvg0k3c9"; + sha256 = "0sm99m4m4mmigj6ll22kyaw7zkp1s2i0mhzx15fzidnybdnlifb4"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 4be8af00193e..058a8472bf26 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "1xac5jfgnqfg2sbnh4g7v040ly7kjw0klvp6cpimxcjci5j0sqnr"; + sha256 = "0qcq4c4nysdscbjrikhw653xwbi4dwscynjzyndsp8l21vl81x7p"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eb4bcca0017..b0eeb54dfdb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2122,7 +2122,7 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.8"; + elk5Version = "5.6.9"; elk6Version = "6.2.3"; elasticsearch = callPackage ../servers/search/elasticsearch { }; From 9c8fa9729cf8d4b3791a1f7339393fcbff26be52 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 18 Apr 2018 00:18:12 +0200 Subject: [PATCH 300/538] elk6: 6.2.3 -> 6.2.4 --- pkgs/development/tools/misc/kibana/6.x.nix | 4 ++-- pkgs/misc/logging/beats/6.x.nix | 2 +- pkgs/servers/search/elasticsearch/6.x.nix | 2 +- pkgs/tools/misc/logstash/6.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index b718f30c1755..17620c9df6c8 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "15iykvbqgqj9lk764rkl52f47b6v59kvfiqfvdp3n3anszyqcc5d"; - "x86_64-darwin" = "04fgazl5rzb4vw8xn5s46w44f2rdpki81q2rch2jiq9hf8bqm55m"; + "x86_64-linux" = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk"; + "x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 8040b5d20db9..ce911ae40d5e 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0nx29cv64q44wyf3ph8486rf78sgsamkia8njkwn10gpw8b5wnjs"; + sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index c54cd3800451..06caf191587c 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0xnap88wmdfvvjgjm7xfmjipamh79nzh9r11cwrh9kqabzn8vp81"; + sha256 = "13hf00khq33yw6zv022vcrsf6vm43isx40x7ww8r1lqx3vmg3rli"; }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 50e5beaa8b23..6aa3fd836965 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "1rybcjwkdckmwbdi9x8rj5dhzy76s9151sa283j46m83rqbnjchc"; + sha256 = "07j3jjg5ik4gjgvcx15qqqas9p1m3815jml82a5r1ip9l6vc4h20"; }; dontBuild = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0eeb54dfdb3..86eb873174c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2123,7 +2123,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.9"; - elk6Version = "6.2.3"; + elk6Version = "6.2.4"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; From f8665f18fb066d1cc59e729d64e1b9976080d030 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 17 Apr 2018 20:28:11 -0400 Subject: [PATCH 301/538] linux: 4.16-rc7 -> 4.17-rc1 --- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++++-- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f8c4b95bb618..4d9ec389f44e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -115,7 +115,6 @@ with stdenv.lib; # Enable various subsystems. ACCESSIBILITY y # Accessibility support AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support HIPPI y MTD_COMPLEX_MAPPINGS y # needed for many devices SCSI_LOWLEVEL y # enable lots of SCSI devices @@ -124,6 +123,9 @@ with stdenv.lib; SPI y # needed for many devices SPI_MASTER y WAN y + ${optionalString (versionOlder version "4.17") '' + DONGLE y # Serial dongle support + ''} # Networking options. NET y @@ -420,7 +422,9 @@ with stdenv.lib; ${optionalString (versionAtLeast version "4.3") '' IDLE_PAGE_TRACKING y ''} - IRDA_ULTRA y # Ultra (connectionless) protocol + ${optionalString (versionOlder version "4.17") '' + IRDA_ULTRA y # Ultra (connectionless) protocol + ''} JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5e8e861af258..6c0f01fb8ad7 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.16-rc7"; - modDirVersion = "4.16.0-rc7"; - extraMeta.branch = "4.16"; + version = "4.17-rc1"; + modDirVersion = "4.17.0-rc1"; + extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "13zpfjxd38202afjl6flc9brjw3sp4sfq3wls0v90k1i2b308qfi"; + sha256 = "0a3lrax6f8f98lj65aawpqkzkmxcl2x4h20kr0cr7wf0jvpnn5y3"; }; # Should the testing kernels ever be built on Hydra? From 7a424800a0428f3ed66b43a24c790814533637e6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 17 Apr 2018 20:41:08 -0400 Subject: [PATCH 302/538] rkt: 1.29.0 -> 1.30.0 --- pkgs/applications/virtualization/rkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 947f4454362b..777dc6fe9304 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.29.0"; + version = "1.30.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda"; + sha256 = "0dqf83b7iin1np8k8k1m8i99ybga8vx932q7n2q64yghkw7p6i00"; }; stage1BaseImage = fetchurl { From f8bf6a9c3fcbff4988635287f0be760906995a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 17 Apr 2018 21:08:13 +0100 Subject: [PATCH 303/538] oraclejdk8: 8.161 -> 8.171 --- pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 5bafa70af9fc..bdd367ef3523 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "161"; + patchVersion = "171"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "1p6p93msn3bsg9775rq171kd4160w4w8z57p0qpjdjycfix62sfg"; - sha256.x86_64-linux = "07h2wah80qr78y0f821z12lbdmsv90xbckdn3glnj2riwfh5dg3d"; - sha256.armv7l-linux = "0mngw2lnhx3hzgp444advybhjn5hjk3mi14y72km4kp03gh82a7x"; - sha256.aarch64-linux = "18l5fny7yxhpj5c935rnlq4pvwadyr5zkid6yh9x87frl401shy7"; + sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; + sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; + sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; + sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; From 8eee607df446d00ee6f89ad737c5272482096783 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Wed, 18 Apr 2018 10:47:07 +0900 Subject: [PATCH 304/538] disable aarch64 --- pkgs/tools/text/jumanpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index b30b33354541..f651b03c0b03 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++; license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; + platforms = platforms.x86_64; }; } From 5ffdcd32ef64ec433245e569227ca6b60f34314f Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Thu, 22 Mar 2018 11:55:19 -0700 Subject: [PATCH 305/538] docbook-xsl-ns: Add patch to avoid infinite recursion. Fixes #39090 --- .../stylesheets/xslt/docbook-xsl/default.nix | 3 +- .../docbook-xsl/docbook-xsl-ns-infinite.patch | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index e965882a9c3c..ef7b1f93d74e 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -60,6 +60,7 @@ in { docbook_xsl_ns = common { pname = "docbook-xsl-ns"; sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"; - }; + patches = [ ./docbook-xsl-ns-infinite.patch ]; + }; } diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch new file mode 100644 index 000000000000..a0f5eff14dbc --- /dev/null +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch @@ -0,0 +1,31 @@ +Description: Remove infinite recursion +Attribute: docbook5_xsl +Version: 1.79.1 +URL: https://github.com/NixOS/nixpkgs/issues/39090 +diff -ru a/lib/lib.xsl b/lib/lib.xsl +--- a/lib/lib.xsl 2015-12-26 15:15:37.000000000 -0800 ++++ b/lib/lib.xsl 2018-03-22 11:52:45.311949264 -0700 +@@ -11,8 +11,11 @@ + + ******************************************************************** --> + ++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns:d="http://docbook.org/ns/docbook" ++ xmlns:str="http://exslt.org/strings" ++ exclude-result-prefixes="str" ++ version="1.0"> + + + +@@ -58,6 +61,9 @@ + + + ++ ++ ++ + + + From e3239a266d158a58aa090c55c3cece0460265e9e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 21:13:31 -0500 Subject: [PATCH 306/538] docbook-xsl-ns: cleanup last patch Doh. --- .../stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch index a0f5eff14dbc..5729f9b43c80 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/docbook-xsl-ns-infinite.patch @@ -5,7 +5,7 @@ URL: https://github.com/NixOS/nixpkgs/issues/39090 diff -ru a/lib/lib.xsl b/lib/lib.xsl --- a/lib/lib.xsl 2015-12-26 15:15:37.000000000 -0800 +++ b/lib/lib.xsl 2018-03-22 11:52:45.311949264 -0700 -@@ -11,8 +11,11 @@ +@@ -11,8 +11,10 @@ ******************************************************************** --> From 9e88c01d8934d8e49be794e23511884edd627a67 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Wed, 18 Apr 2018 11:24:20 +0900 Subject: [PATCH 307/538] jumanpp: 1.02 -> 2.0.0-rc2 --- pkgs/tools/text/jumanpp/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index f651b03c0b03..9d1bfcb35eaa 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, boost, libunwind, gperftools }: +{ stdenv, fetchurl, cmake, protobuf }: stdenv.mkDerivation rec { name = "jumanpp"; - version = "1.02"; + version = "2.0.0-rc2"; + src = fetchurl { - url = "http://lotus.kuee.kyoto-u.ac.jp/nl-resource/jumanpp/jumanpp-${version}.tar.xz"; - sha256 = "14768b419bak8h2px8chw4cbfscb0jj012bpr769qv5nn6f53yh1"; + url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}-${version}.tar.xz"; + sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; }; - buildInputs = [ boost libunwind gperftools ]; + buildInputs = [ cmake protobuf ]; + meta = with stdenv.lib; { description = "A Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; longDescription = '' From f44c79e27370fbc59835402035140ad80b79c971 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Wed, 18 Apr 2018 11:25:23 +0900 Subject: [PATCH 308/538] relax platform restriction --- pkgs/tools/text/jumanpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 9d1bfcb35eaa..c4cb12cb6938 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++; license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.x86_64; + platforms = platforms.all; }; } From b50e628b153abcd141d43ec547e1c9fe9cdb86a6 Mon Sep 17 00:00:00 2001 From: Jason Legler Date: Tue, 17 Apr 2018 20:16:08 -0600 Subject: [PATCH 309/538] bitwigstudio2: 2.3.1 -> 2.3.2 --- pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 922acf9e3e00..5d9fe0edece5 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "18gghx0ygwh01cidj8mkf82l9qhq2dy1b3yc4ajksvj762yg6cf2"; + sha256 = "10ji4jqnnlhv4bgvhqwysprax6jcjk4759jskr9imwj6qjnj3vzn"; }; buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; From 20c035b9067562ef72bf66cd3b053e9a6d121af0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 11 Apr 2018 17:54:19 +0000 Subject: [PATCH 310/538] ocamlPackages.js_of_ocaml-tyxml: init at 3.1.0 --- .../tools/ocaml/js_of_ocaml/tyxml.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix new file mode 100644 index 000000000000..041fd71f92fa --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler +, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned +, js_of_ocaml, reactivedata, tyxml +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-tyxml-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + + propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; + + buildPhase = "jbuilder build -p js_of_ocaml-tyxml"; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f101a883df3c..72bcc45c48e6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -334,6 +334,8 @@ let js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {}; + js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; + jsonm = callPackage ../development/ocaml-modules/jsonm { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; From f00221d0eb755a22531adc3b5b5536555a7c0f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 18 Apr 2018 09:37:42 +0200 Subject: [PATCH 311/538] home-assistant: 0.67.0 -> 0.67.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 718fd3cc6a91..3a74a43d14d5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.67.0"; + version = "0.67.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0f5e59918aac..0f15b21e4685 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -58,7 +58,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.67.0"; + hassVersion = "0.67.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "00y7sm6nsyxxl98izxxmg2nwi76kxb7p47hv07y04fs45lnvr61s"; + sha256 = "02czbqdsdar8rjkr0r5g6j1x9caazcir2w1hp595z4cn90c0342f"; }; propagatedBuildInputs = [ From 5bd12c694bfebaef1d03eb7f74a6eca01b86f546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 18 Apr 2018 09:42:45 +0200 Subject: [PATCH 312/538] nixos/tor: use RuntimeDirectory, StateDirectory (#39083) --- nixos/modules/services/security/tor.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 2c727de21027..806252f49b8d 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -703,14 +703,10 @@ in after = [ "network.target" ]; restartTriggers = [ torRcFile ]; - # Translated from the upstream contrib/dist/tor.service.in - preStart = '' - install -o tor -g tor -d ${torDirectory}/onion ${torRunDirectory} - ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config - ''; - serviceConfig = { Type = "simple"; + # Translated from the upstream contrib/dist/tor.service.in + ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; @@ -725,6 +721,8 @@ in # DeviceAllow /dev/urandom r # .. but we can't specify DeviceAllow multiple times. 'closed' # is close enough. + RuntimeDirectory = "tor"; + StateDirectory = [ "tor" "tor/onion" ]; PrivateTmp = "yes"; DevicePolicy = "closed"; InaccessibleDirectories = "/home"; From fd8ff3b7af7e80de5d76ed9d7aeab4938574f411 Mon Sep 17 00:00:00 2001 From: Elmar Athmer Date: Wed, 18 Apr 2018 09:53:52 +0200 Subject: [PATCH 313/538] hcloud: 1.3.0 -> 1.4.0 --- pkgs/development/tools/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index e56502a4ad05..c4f6e2565f67 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.3.0"; + version = "1.4.0"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "1216qz1kk38vkvfrznjwb65vsbhscqvvrsbp2i6pnf0i85p00pqm"; + sha256 = "1mysw091ddi3abijvciyy73ff31vqq7zb37w30sp3vhm5vq38nn2"; }; buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ]; From 44c48fe752ab2eb7f6912bb590dc31eda0b5e445 Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 17 Apr 2018 22:42:53 +0100 Subject: [PATCH 314/538] network-manager-applet: add runtime dependency on gnome3.keyring Closes #38967 --- pkgs/tools/networking/network-manager/applet.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index dd32cebea111..ecd10a139766 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -32,7 +32,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; - propagatedUserEnvPkgs = [ hicolor-icon-theme ]; + propagatedUserEnvPkgs = [ + hicolor-icon-theme + gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967 + ]; NIX_CFLAGS = [ ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' From f3cc6672c72dee8259446c8af9f0ca2160b7ac85 Mon Sep 17 00:00:00 2001 From: John Children Date: Wed, 18 Apr 2018 12:42:06 +0100 Subject: [PATCH 315/538] xxHash: 0.6.3.20171018 -> 0.6.4.20171222 Updated version of xxHash features a library target that may be useful for some packages. --- pkgs/development/libraries/xxHash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index d702500bf719..cbe32da64457 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xxHash-${version}"; - version = "0.6.3.20171018"; + version = "0.6.4.20171222"; src = fetchFromGitHub { - sha256 = "0061ivxpx0p24m4vg7kfx9fs9f0jxvv4g76bmyss5gp90p05hc18"; - rev = "333804ccf0c0339451accac023deeab9e5f7c002"; + sha256 = "1az5vm14rdc3pa3l0wj180wpii14if16diril3gz8q9ip1215gwj"; + rev = "7caf8bd76440c75dfe1070d3acfbd7891aea8fca"; repo = "xxHash"; owner = "Cyan4973"; }; From 76a43d765cc9d5ed31d275abfe28b52f842f6b15 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Apr 2018 07:52:49 +0000 Subject: [PATCH 316/538] coq: 8.8+beta1 -> 8.8.0 --- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/top-level/coq-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2c785472114a..b989b1eb9748 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -22,7 +22,7 @@ let "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; - "8.8+beta1" = "19ipmx6bf8wjpk8y29hcginxk7hps4jh1bbihn5icx4qysm81165"; + "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 43d6d8d2dd5e..e21445b423d0 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -72,7 +72,7 @@ in rec { version = "8.7.2"; }; coq_8_8 = callPackage ../applications/science/logic/coq { - version = "8.8+beta1"; + version = "8.8.0"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; From 0f329141640459f722ed24a4d04968bf08b7b1e4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 11 Apr 2018 23:22:23 +0200 Subject: [PATCH 317/538] dashing: init at 2018-02-15 --- pkgs/tools/misc/dashing/default.nix | 26 +++++++++++++++++++ pkgs/tools/misc/dashing/deps.nix | 39 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 67 insertions(+) create mode 100644 pkgs/tools/misc/dashing/default.nix create mode 100644 pkgs/tools/misc/dashing/deps.nix diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix new file mode 100644 index 000000000000..673e5c4c321f --- /dev/null +++ b/pkgs/tools/misc/dashing/default.nix @@ -0,0 +1,26 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "dashing-unstable-${version}"; + version = "2018-02-15"; + rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49"; + + goPackagePath = "github.com/technosophos/dashing"; + + src = fetchgit { + inherit rev; + url = "https://github.com/technosophos/dashing"; + sha256 = "066njyk3c1fqqr0v6aa6knp3dnksmh6hnl9d84fgd4wzyw3ma2an"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "A Dash Generator Script for Any HTML"; + homepage = https://github.com/technosophos/dashing; + license = licenses.mit; + maintainers = [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/dashing/deps.nix b/pkgs/tools/misc/dashing/deps.nix new file mode 100644 index 000000000000..4ad5a10149ec --- /dev/null +++ b/pkgs/tools/misc/dashing/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "901648c87902174f774fac311d7f176f8647bdaa"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; + sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "d896508f87298565da02ed92730e7065c3de10b8"; + sha256 = "19q0rv171wx73rwdp81rkj9ys3r5jaav94b3j06gprg59phb98bs"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; + sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a16b2e5d58cb..7cf235626d8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5824,6 +5824,8 @@ with pkgs; dash = callPackage ../shells/dash { }; + dashing = callPackages ../tools/misc/dashing { }; + es = callPackage ../shells/es { }; fish = callPackage ../shells/fish { }; From 39ba6636eb99250abc9672c5a51a1c9ab6f8f4de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Wed, 18 Apr 2018 18:55:58 +0200 Subject: [PATCH 318/538] ki18n: Adds patch that fixes infinite loop in po files generation --- pkgs/development/libraries/kde-frameworks/ki18n.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 3b9ca74bbd07..ee7d13af5b1e 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, gettext, python, qtbase, qtdeclarative, qtscript, }: @@ -13,4 +13,10 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python ]; buildInputs = [ qtdeclarative qtscript ]; + patches = [ + (fetchpatch { + url = "https://phabricator.kde.org/D12216?download=true"; + sha256 = "04gpyb11vlgivqjx3lqdwgqb4ss5bphy5zmh65k57bbv4rnlsm15"; + }) + ]; } From dc48e682212267b3bc79223581e703383afe35fd Mon Sep 17 00:00:00 2001 From: LightDiscord Date: Wed, 18 Apr 2018 19:07:05 +0200 Subject: [PATCH 319/538] vscode: fix files with space(s) #39112 --- pkgs/misc/vscode-extensions/vscode-utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 83cb559dca12..4c095278f918 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -37,7 +37,7 @@ let installPhase = '' mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}" - find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" + find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/" ''; }); From 1eddfaffb1bb847ddda91d9c844078c6163b14f5 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 18 Apr 2018 22:07:42 +0200 Subject: [PATCH 320/538] zfs: patch exportfs path for sharenfs functionality --- pkgs/os-specific/linux/zfs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d4b312ad6d54..a467b457f236 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -5,6 +5,7 @@ # Userspace dependencies , zlib, libuuid, python, attr, openssl , libtirpc +, nfs-utils # Kernel dependencies , kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null @@ -66,6 +67,7 @@ let substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" + substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${nfs-utils}/bin/exportfs" substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" From 6026e43bceb66355f657e3d97bcbe7df173d2c79 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 18 Apr 2018 22:11:28 +0200 Subject: [PATCH 321/538] dust: init at 0.2.3 --- pkgs/tools/misc/dust/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/dust/default.nix diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix new file mode 100644 index 000000000000..f34d05758cf4 --- /dev/null +++ b/pkgs/tools/misc/dust/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cargo, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "dust-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "bootandy"; + repo = "dust"; + rev = "v${version}"; + sha256 = "1l8z1daiq2x92449p2ciblcwl0ddgr3vqj2dsd3z8jj3y0z8j51s"; + }; + + cargoSha256 = "0x3ay440vbc64y3pd8zhd119sw8fih0njmkzpr7r8wdw3k48v96m"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "du + rust = dust. Like du but more intuitive"; + homepage = https://github.com/bootandy/dust; + license = licenses.asl20; + maintainers = [ maintainers.infinisil ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86eb873174c6..19be6e2e23e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15245,6 +15245,8 @@ with pkgs; dunst = callPackage ../applications/misc/dunst { }; + du-dust = callPackage ../tools/misc/dust { }; + devede = callPackage ../applications/video/devede { }; denemo = callPackage ../applications/audio/denemo { From 059a2a8c7b82c37e7cb5e0dc2492bdfc8f3dfd7e Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 20 Mar 2018 15:03:03 +0100 Subject: [PATCH 322/538] prometheus-dovecot-exporter: 2018-01-18 -> 0.1.1 --- .../prometheus/dovecot-exporter-deps.nix | 16 ++++++++-------- .../monitoring/prometheus/dovecot-exporter.nix | 9 ++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix index d19d595f0668..c2dea18ee815 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "c65a0412e71e8b9b3bfd22925720d23c0f054237"; - sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; + sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada"; - sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26"; + rev = "c3324c1198cf3374996e9d3098edd46a6b55afc9"; + sha256 = "19qcz5bpzj5kqyhmbq5kxr8nrqqlszazzq6w0wldis1yk1wwww00"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "89604d197083d4781071d3c65855d24ecfb0a563"; - sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn"; + rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0"; + sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "cb4147076ac75738c9a7d279075a253c0cc5acbd"; - sha256 = "0zhlrik0f9q1lj6cisgnxgbz4darbcix52hm5abi24l2ahchf5ca"; + rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349"; + sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr"; }; } { diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index e7cdfa616b46..86f43116f746 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,17 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dovecot_exporter-unstable-${version}"; - version = "2018-01-18"; - rev = "4e831356533e2321031df73ebd25dd55dbd8d385"; + name = "dovecot_exporter-${version}"; + version = "0.1.1"; goPackagePath = "github.com/kumina/dovecot_exporter"; src = fetchFromGitHub { owner = "kumina"; repo = "dovecot_exporter"; - inherit rev; - sha256 = "0iky1i7m5mlknkhlpsxpjgigssg5m02nx5y7i4biddkqilfic74n"; + rev = version; + sha256 = "0i7nfgkb5jqdbgr16i29jdsvh69dx9qgn6nazpw78k0lgy7mpidn"; }; goDeps = ./dovecot-exporter-deps.nix; From 01af3014432744e928de3b8ab5c58fb390ee8c19 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 28 Mar 2018 17:21:09 +0200 Subject: [PATCH 323/538] prometheus-exporters: add dovecot exporter module --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/dovecot.nix | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 8d6ca1e40a19..180b273d177e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -20,6 +20,7 @@ let exporterOpts = { blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; + dovecot = import ./exporters/dovecot.nix { inherit config lib pkgs; }; fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; json = import ./exporters/json.nix { inherit config lib pkgs; }; minio = import ./exporters/minio.nix { inherit config lib pkgs; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix new file mode 100644 index 000000000000..4ca6d4e5f8b6 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.dovecot; +in +{ + port = 9166; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + socketPath = mkOption { + type = types.path; + default = "/var/run/dovecot/stats"; + example = "/var/run/dovecot2/stats"; + description = '' + Path under which the stats socket is placed. + The user/group under which the exporter runs, + should be able to access the socket in order + to scrape the metrics successfully. + ''; + }; + scopes = mkOption { + type = types.listOf types.str; + default = [ "user" ]; + example = [ "user" "global" ]; + description = '' + Stats scopes to query. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-dovecot-exporter}/bin/dovecot_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + --dovecot.socket-path ${cfg.socketPath} \ + --dovecot.scopes ${concatStringsSep "," cfg.scopes} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} From ff3e3fb39dea682574f3dde798af96001543d104 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 19 Apr 2018 00:02:25 +0200 Subject: [PATCH 324/538] fileshelter: enable parallel building This greatly reduced the build duration. --- pkgs/servers/web-apps/fileshelter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 1adb3a70ccf1..d0be4f575dd6 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1n9hrls3l9gf8wfz6m9bylma1b1hdvdqsksv2dlp1zdgjdzv200b"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libzip boost wt3 libconfig ]; From 1c09a7cd4f2caa61f0ac9b2cf7ecaae78c4ad93d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 18 Apr 2018 23:48:11 +0200 Subject: [PATCH 325/538] wt: 3.3.9 -> 3.3.10, 4.0.2 -> 4.0.3 This also removes the boost version pinning which became unnecessary and uses the updated github username for the source repo. --- pkgs/development/libraries/wt/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 37819c2a98e3..99f73add795a 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, doxygen, qt48Full, libharu +{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu , pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pcre }: @@ -10,7 +10,7 @@ let name = "wt-${version}"; src = fetchFromGitHub { - owner = "kdeforche"; + owner = "emweb"; repo = "wt"; rev = version; inherit sha256; @@ -20,7 +20,7 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost165 doxygen qt48Full libharu + cmake boost doxygen qt48Full libharu pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew openssl pcre ]; @@ -43,14 +43,12 @@ let }; in { wt3 = generic { - # with the next version update the version pinning of boost should be omitted - version = "3.3.9"; - sha256 = "1mkflhvzzzxkc5yzvr6nk34j0ldpwxjxb6n7xml59h3j3px3ixjm"; + version = "3.3.10"; + sha256 = "1y25mhghgbgjgycpny0x4z95xn98q0wraab1c5gkwnay097bgwdy"; }; wt4 = generic { - # with the next version update the version pinning of boost should be omitted - version = "4.0.2"; - sha256 = "0r729gjd1sy0pcmir2r7ga33mp5cr5b4gvf44852q65hw2577w1x"; + version = "4.0.3"; + sha256 = "01xch5dkpcanwhr515236wa9mdmnq2a2j13dn7smyhwzqgbpknsg"; }; } From bdc295556f7e66590b3cfd909f2b8ec3034647f5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 18 Apr 2018 23:51:17 +0200 Subject: [PATCH 326/538] pythonPackages.raven: 6.6.0 -> 6.7.0 --- pkgs/development/python-modules/raven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 33d199ad274a..2052d4421e5e 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "raven"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "raven-python"; rev = version; - sha256 = "184wpr0zdcm260pxqll9kpmp2ywisn75k8pdm8gc6xmk740in1hj"; + sha256 = "0vb6zczfgrrh0qw5wlbvk703r11y091k6r53fbbhpbwh4hva30nx"; }; # way too many dependencies to run tests From 85cadf9a9bba36ecd0ebcb000ed09a5ec29769c8 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Wed, 18 Apr 2018 18:35:21 -0500 Subject: [PATCH 327/538] darling: fixup hash --- pkgs/os-specific/darwin/darling/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index e440f1cd7098..b9d806cded23 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { repo = pname; owner = "darlinghq"; rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b"; - sha256 = "1mkcnzy1cfpwghgvb9pszhy9jy6534y8krw8inwl9fqfd0w019wz"; + sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg"; }; # only packaging sandbox for now From a6ddd639500f6cd24f1451277fb54510e5b507c6 Mon Sep 17 00:00:00 2001 From: John Mercier Date: Tue, 17 Apr 2018 22:01:39 -0400 Subject: [PATCH 328/538] visualvm: 1.3.9 -> 1.4 --- .../tools/java/visualvm/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index a71ee53dced9..2eeefb23e042 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2, gawk }: +{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }: stdenv.mkDerivation rec { - name = "visualvm-1.3.9"; + version = "1.4"; + name = "visualvm-${version}"; src = fetchzip { - url = "https://github.com/visualvm/visualvm.src/releases/download/1.3.9/visualvm_139.zip"; - sha256 = "1gkdkxssh51jczhgv680i42jjrlia1vbpcqhxvf45xcq9xj95bm5"; + url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; + sha256 = "0qpkal3yc8c8di4dmdglq54a4m7hciqximn5n6hwx2zqnfwx909z"; + }; + + desktopItem = makeDesktopItem { + name = "visualvm"; + exec = "visualvm"; + comment = "Java Troubleshooting Tool"; + desktopName = "VisualVM"; + genericName = "Java Troubleshooting Tool"; + categories = "Application;Development;"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - rm bin/visualvm.exe - rm platform/lib/nbexec64.exe - rm platform/lib/nbexec.exe - rm profiler/lib/deployed/jdk15/windows-amd64/profilerinterface.dll - rm profiler/lib/deployed/jdk15/windows/profilerinterface.dll - rm profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll - rm profiler/lib/deployed/jdk16/windows/profilerinterface.dll - rm platform/modules/lib/amd64/jnidispatch-410.dll - rm platform/modules/lib/x86/jnidispatch-410.dll - rm platform/lib/nbexec.dll - rm platform/lib/nbexec64.dll + find . -type f -name "*.dll" -o -name "*.exe" -delete; substituteInPlace etc/visualvm.conf \ --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://visualvm.java.net/; license = licenses.gpl2ClasspathPlus; platforms = platforms.all; - maintainers = with maintainers; [ michalrus ]; + maintainers = with maintainers; [ michalrus moaxcp ]; }; } From 13bce289b6de2ec44280ae1026b97191d1c57f84 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Thu, 19 Apr 2018 09:30:05 +0800 Subject: [PATCH 329/538] all-cabal-hashes: bump to 2018-04-19T00:28:09Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 781f57610e0b..e7dbf947815b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b35023f435e7713e5053d3dcd16691e3aff48227.tar.gz"; - sha256 = "1mnh1bhr8caszxrl44l3iig8kshq7djibnmy0sx0q7inj260xcs7"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz"; + sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12"; } From da4695009c85281ddf3903e73f40168a121d47b4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 13 Apr 2018 09:32:27 +0800 Subject: [PATCH 330/538] freerdp: 2.0.0-rc1 -> 2.0.0-rc2 --- .../networking/remote/freerdp/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 59ae225210ca..872d9b018ff7 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib +, alsaLib, ffmpeg, glib, openssl, pcre, zlib , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv , libxkbcommon, libxkbfile , wayland -, gstreamer, gst-plugins-base, gst-plugins-good +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc , libpulseaudio ? null , cups ? null , pcsclite ? null @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { name = "freerdp-${version}"; - version = "2.0.0-rc1"; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn"; + sha256 = "01cm9g4xqihnnc5d2w1zs8gabkv59p7fyjwi1cwpzv6s198xwbfs"; }; # outputs = [ "bin" "out" "dev" ]; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; buildInputs = with lib; [ - alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib - gstreamer gst-plugins-base gst-plugins-good + alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib + gstreamer gst-plugins-base gst-plugins-good libunwind orc libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libxkbcommon libxkbfile wayland From 50d39f10115bca092b75f599388cfd26ae2a0396 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 13:10:38 +0800 Subject: [PATCH 331/538] maintainers: sort --- maintainers/maintainer-list.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 839458dbfc9a..8c5fdec0bd7e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3461,6 +3461,11 @@ github = "spwhitt"; name = "Spencer Whitt"; }; + srghma = { + email = "srghma@gmail.com"; + github = "srghma"; + name = "Sergei Khoma"; + }; srhb = { email = "sbrofeldt@gmail.com"; github = "srhb"; @@ -4145,9 +4150,4 @@ github = "zzamboni"; name = "Diego Zamboni"; }; - srghma = { - email = "srghma@gmail.com"; - github = "srghma"; - name = "Sergei Khoma"; - }; } From 6dd9819df04263c6f4016f32ce530c10da26f784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Apr 2018 08:20:40 +0200 Subject: [PATCH 332/538] spectre-meltdown-checker: 0.36 -> 0.37 --- pkgs/tools/security/spectre-meltdown-checker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 0baa1538ea15..ba5defbe2151 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.36"; + version = "0.37"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0pcw300hizzm130d0ip7j0ivf53sjlv6qzsdk9l68bj2lpx9n3kd"; + sha256 = "0g1p12jbraj0q5qpvqnbg5v1jwlcx6h04xz5s7jds51l7gf5f9np"; }; prePatch = '' @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = with stdenv.lib; '' - install -Dt $out/lib spectre-meltdown-checker.sh - makeWrapper $out/lib/spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker \ + install -D spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker + wrapProgram $out/bin/spectre-meltdown-checker \ --prefix PATH : ${makeBinPath [ binutils-unwrapped ]} ''; From ddb7c0e9308e2bb287d7953e18d9117cc5cfe381 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 19 Apr 2018 08:42:06 +0200 Subject: [PATCH 333/538] lrcalc: init at 1.2 (#38755) --- .../science/math/lrcalc/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/science/math/lrcalc/default.nix diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix new file mode 100644 index 000000000000..9e02b08c8ad0 --- /dev/null +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromBitbucket +, fetchpatch +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.2"; + pname = "lrcalc"; + name = "${pname}-${version}"; + + src = fetchFromBitbucket { + owner = "asbuch"; + repo = "lrcalc"; + rev = "lrcalc-${version}"; + sha256 = "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss"; + }; + + doCheck = true; + + nativeBuildInputs = [ + autoreconfHook + ]; + + patches = [ + # Fix include syntax: + # For private includes, use `#include "..."` instead of `#include <...>` + (fetchpatch { + url = "https://bitbucket.org/asbuch/lrcalc/commits/226981a0/raw/"; + sha256 = "02kaqx5s3l642rhh28kn2wg9wr098vzpknxyl4pv627lqa3lv9vm"; + }) + ]; + + meta = with stdenv.lib; { + description = "Littlewood-Richardson calculator"; + homepage = http://math.rutgers.edu/~asbuch/lrcalc/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dc8582dde48..e92097c6647c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19850,6 +19850,8 @@ with pkgs; docs = true; }; + lrcalc = callPackage ../applications/science/math/lrcalc { }; + lie = callPackage ../applications/science/math/LiE { }; magma = callPackage ../development/libraries/science/math/magma { }; From d8e5160b232775850b933a2ba5948d0cc0c1e918 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 19 Apr 2018 08:43:44 +0200 Subject: [PATCH 334/538] planarity: init at 3.0.0.5 (#38800) --- .../science/math/planarity/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/science/math/planarity/default.nix diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix new file mode 100644 index 000000000000..7394fb9e1b41 --- /dev/null +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "planarity"; + version = "3.0.0.5"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "graph-algorithms"; + repo = "edge-addition-planarity-suite"; + rev = "Version_${version}"; + sha256 = "01cm7ay1njkfsdnmnvh5zwc7wg7x189hq1vbfhh9p3ihrbnmqzh8"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + doCheck = true; + + patches = [ + # declare variables declared in headers as extern, not yet merged upstream + (fetchpatch { + url = "https://github.com/graph-algorithms/edge-addition-planarity-suite/pull/3.patch"; + sha256 = "1nqjc4clr326imz4jxqxcxv2hgh1sjgzll27k5cwkdin8lnmmil8"; + }) + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/graph-algorithms/edge-addition-planarity-suite; + description = "A library for implementing graph algorithms"; + license = licenses.bsd3; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e92097c6647c..b074a5572dd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19843,6 +19843,8 @@ with pkgs; openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; + planarity = callPackage ../development/libraries/science/math/planarity { }; + fenics = callPackage ../development/libraries/science/math/fenics { inherit (python3Packages) numpy ply pytest python six sympy; pythonPackages = python3Packages; From 8886cadda9a40bf6eef9ce7386849a7af36a4da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Apr 2018 08:51:07 +0200 Subject: [PATCH 335/538] appdaemon: 3.0.0 -> 3.0.1 --- pkgs/servers/home-assistant/appdaemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index a6119e58d7cf..493131795034 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -33,11 +33,11 @@ let in python.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "3.0.0"; + version = "3.0.1"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "ed925d3cb25db2c3f57304a0bca8fd0d9072d7ffe347ac5fcf68c4a30b7f1721"; + sha256 = "ad16773da21e34e258970bf5740d1634a36c8202ac72c6925d960308ef1c58cf"; }; propagatedBuildInputs = with python.pkgs; [ From a2787b701f032fbb870f5d0b1691689bd89c5508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Apr 2018 08:55:15 +0200 Subject: [PATCH 336/538] abcmidi: 2018.04.01 -> 2018.04.18 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 6d8376b60357..dc5a010ec741 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.04.01"; + version = "2018.04.18"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "1ffr358q663qgcjzg2l50isp8hybxp60r99xma2qhhy7lvyv57x4"; + sha256 = "0kbval5ckan8vvrlpyz1mkb1ifvr149gxpb7ljbcm890p8hpaxff"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 12ce0db1bffb048fbf81a852aed7240aedc31757 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 16:10:57 +0800 Subject: [PATCH 337/538] beep: fix for CVE-2018-0492 --- pkgs/misc/beep/cve-2018-0492.patch | 106 +++++++++++++++++++++++++++++ pkgs/misc/beep/default.nix | 28 +++++--- 2 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 pkgs/misc/beep/cve-2018-0492.patch diff --git a/pkgs/misc/beep/cve-2018-0492.patch b/pkgs/misc/beep/cve-2018-0492.patch new file mode 100644 index 000000000000..533fc6c15578 --- /dev/null +++ b/pkgs/misc/beep/cve-2018-0492.patch @@ -0,0 +1,106 @@ +diff --git a/beep.c b/beep.c +index 7da2e70..4323d31 100644 +--- a/beep.c ++++ b/beep.c +@@ -109,6 +109,7 @@ void do_beep(int freq) { + /* BEEP_TYPE_EVDEV */ + struct input_event e; + ++ memset(&e, 0, sizeof(e)); + e.type = EV_SND; + e.code = SND_TONE; + e.value = freq; +@@ -124,10 +125,6 @@ void do_beep(int freq) { + /* If we get interrupted, it would be nice to not leave the speaker beeping in + perpetuity. */ + void handle_signal(int signum) { +- +- if(console_device) +- free(console_device); +- + switch(signum) { + case SIGINT: + case SIGTERM: +@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { + result->verbose = 1; + break; + case 'e' : /* also --device */ +- console_device = strdup(optarg); ++ console_device = optarg; + break; + case 'h' : /* notice that this is also --help */ + default : +@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) { + "%d delay after) @ %.2f Hz\n", + parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); + +- /* try to snag the console */ +- if(console_device) +- console_fd = open(console_device, O_WRONLY); +- else +- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) +- console_fd = open("/dev/vc/0", O_WRONLY); +- +- if(console_fd == -1) { +- fprintf(stderr, "Could not open %s for writing\n", +- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("open"); +- exit(1); +- } +- +- if (ioctl(console_fd, EVIOCGSND(0)) != -1) +- console_type = BEEP_TYPE_EVDEV; +- else +- console_type = BEEP_TYPE_CONSOLE; +- + /* Beep */ + for (i = 0; i < parms.reps; i++) { /* start beep */ + do_beep(parms.freq); +@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) { + if(parms.end_delay || (i+1 < parms.reps)) + usleep(1000*parms.delay); /* wait... */ + } /* repeat. */ +- +- close(console_fd); + } + + +@@ -328,6 +303,26 @@ int main(int argc, char **argv) { + signal(SIGTERM, handle_signal); + parse_command_line(argc, argv, parms); + ++ /* try to snag the console */ ++ if(console_device) ++ console_fd = open(console_device, O_WRONLY); ++ else ++ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) ++ console_fd = open("/dev/vc/0", O_WRONLY); ++ ++ if(console_fd == -1) { ++ fprintf(stderr, "Could not open %s for writing\n", ++ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); ++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ perror("open"); ++ exit(1); ++ } ++ ++ if (ioctl(console_fd, EVIOCGSND(0)) != -1) ++ console_type = BEEP_TYPE_EVDEV; ++ else ++ console_type = BEEP_TYPE_CONSOLE; ++ + /* this outermost while loop handles the possibility that -n/--new has been + used, i.e. that we have multiple beeps specified. Each iteration will + play, then free() one parms instance. */ +@@ -365,8 +360,8 @@ int main(int argc, char **argv) { + parms = next; + } + +- if(console_device) +- free(console_device); ++ close(console_fd); ++ console_fd = -1; + + return EXIT_SUCCESS; + } diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index ce097bd5f231..762b8d65a841 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -1,25 +1,33 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: # this package is working only as root # in order to work as a non privileged user you would need to suid the bin stdenv.mkDerivation { name = "beep-1.3"; - src = fetchurl { - url = http://www.johnath.com/beep/beep-1.3.tar.gz; - sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; + + src = fetchFromGitHub { + owner = "johnath"; + repo = "beep"; + rev = "0d790fa45777896749a885c3b93b2c1476d59f20"; + sha256 = "0dxz58an0sz5r82al5sc935y2z2k60rz12ikjvx7sz39rfirgfpc"; }; - makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; + patches = [ ./cve-2018-0492.patch ]; + + makeFlags = [ + "INSTALL_DIR=${placeholder "out"}/bin/" + "MAN_DIR=${placeholder "out"}/man/man1/" + ]; preInstall = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 + mkdir -p $out/{bin,man/man1} ''; - meta = { + + meta = with stdenv.lib; { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 06a9f14c17a340189545950699e43170b77ff652 Mon Sep 17 00:00:00 2001 From: geistesk Date: Thu, 19 Apr 2018 11:13:52 +0200 Subject: [PATCH 338/538] et: 0.1 -> 0.1.1 --- pkgs/applications/misc/et/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 40631b0a0dbf..4aaaa3339982 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "et-${version}"; - version = "0.1"; + version = "0.1.1"; src = fetchFromGitHub { owner = "geistesk"; repo = "et"; rev = "${version}"; - sha256 = "1d2hq6p1y2ynk0a3l35lwbm1fcl9kg7rpjcin8bx4xcdpbw42y94"; + sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc"; }; buildInputs = [ libnotify gdk_pixbuf ]; From 7abfefaaf43853e48ae9ab52a1eedc5b3cf4db36 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Thu, 19 Apr 2018 17:23:20 +0800 Subject: [PATCH 339/538] haskellPackages.vulkan: Fix dependency for vulkan --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a3efc1e373b5..3935089cb798 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1020,6 +1020,8 @@ self: super: { preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }); + # This package refers to the wrong library (itself in fact!) + vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; } // From fa3f62025624185bdf7243c1c788d98004be2c76 Mon Sep 17 00:00:00 2001 From: geistesk Date: Thu, 19 Apr 2018 11:51:06 +0200 Subject: [PATCH 340/538] farbfeld, sent: wrap PATH for 2ff and sent --- pkgs/applications/misc/sent/default.nix | 8 ++++++-- pkgs/development/libraries/farbfeld/default.nix | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index 24e76500a6a5..9bbae33b3e41 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, farbfeld, libX11, libXft +{ stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper , patches ? [] }: stdenv.mkDerivation rec { @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; - buildInputs = [ farbfeld libX11 libXft ]; + buildInputs = [ libX11 libXft ]; + nativeBuildInputs = [ makeWrapper ]; # unpacking doesn't create a directory sourceRoot = "."; @@ -17,6 +18,9 @@ stdenv.mkDerivation rec { inherit patches; installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin" + ''; meta = with stdenv.lib; { description = "A simple plaintext presentation tool"; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index 7c0addea5e8b..c23fc0bc59f6 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libpng, libjpeg }: +{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { name = "farbfeld-${version}"; @@ -11,8 +11,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpng libjpeg ]; + nativeBuildInputs = [ makeWrapper ]; installFlags = "PREFIX=/ DESTDIR=$(out)"; + postInstall = '' + wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" + ''; meta = with stdenv.lib; { description = "Suckless image format with conversion tools"; From cd79136c06a58643b19db253bf041e167ce239cb Mon Sep 17 00:00:00 2001 From: geistesk Date: Thu, 19 Apr 2018 11:58:25 +0200 Subject: [PATCH 341/538] slstatus: unstable-2018-03-21 -> unstable-2018-04-16 --- pkgs/applications/misc/slstatus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index bc855db29ecc..f4a2e889cd43 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "slstatus-${version}"; - version = "unstable-2018-03-28"; + version = "unstable-2018-04-16"; src = fetchgit { url = https://git.suckless.org/slstatus; - rev = "faa52bdcc0221de2d8fae950e409a8ac5e05bfcd"; - sha256 = "0i8k7gjvx51y0mwxjlqhyk2dpvkb2d3y8x4l6ckdnyiy5632pn76"; + rev = "97ef7c2a1d67bb2c9c379e657fbc8e35acd6aafb"; + sha256 = "1777hgl10imk0l2sgnqgbkfchv1mpxrd82ninzwp7f1rgwchz36v"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); From 2aff3da773af0fbf3307d149ec0492fe9d277400 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Apr 2018 07:42:36 -0500 Subject: [PATCH 342/538] rw: init at 1.0 --- pkgs/tools/misc/rw/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/rw/default.nix diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix new file mode 100644 index 000000000000..3082b7491e73 --- /dev/null +++ b/pkgs/tools/misc/rw/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "rw-${version}"; + version = "1.0"; + + src = fetchurl { + url = "https://sortix.org/rw/release/rw-portable-${version}.tar.gz"; + # Use hash provided by upstream + sha256 = "50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://sortix.org/rw; + description = "Block device and byte copying program similar to dd"; + longDescription = '' + rw is a command line program which copies information between files + or byte streams. The rw command is designed to be a replacement for + dd with standard style command line flags. + ''; + license = licenses.isc; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86eb873174c6..d6d027723c2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4699,6 +4699,8 @@ with pkgs; runzip = callPackage ../tools/archivers/runzip { }; + rw = callPackage ../tools/misc/rw { }; + rxp = callPackage ../tools/text/xml/rxp { }; rzip = callPackage ../tools/compression/rzip { }; From e821f40c26b4477a2dba682d2b465654c9667ed1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 19 Apr 2018 09:20:18 -0400 Subject: [PATCH 343/538] rdkafka: Build with openssl support. --- pkgs/development/libraries/rdkafka/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index b0e43e08653f..a1af43748430 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }: +{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: stdenv.mkDerivation rec { name = "rdkafka-${version}"; @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib perl python ]; + buildInputs = [ zlib perl python openssl ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ]; - postPatch = '' patchShebangs . ''; From 6f4a114538f3f9a06ddeaca6ada2403f3577e138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= Date: Thu, 19 Apr 2018 15:33:21 +0200 Subject: [PATCH 344/538] xmr-stak: 2.3.0 -> 2.4.3 --- pkgs/applications/misc/xmr-stak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 98b3af52d6ee..c24e1b0c2f1f 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.3.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1iisy73pi4xx3vmqvy6whdzb566jqyjx4pdyx0g35qjj8giflpc8"; + sha256 = "0plks4yyd9gjnfg7sfsgsvdgczkbghf5xjwb8bzv01f0fndn10r1"; }; NIX_CFLAGS_COMPILE = "-O3"; From 7042807f0ebe68baf749091d29f771583818eedb Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 19 Apr 2018 23:42:59 +0900 Subject: [PATCH 345/538] oraclejdk: 10 -> 10.0.1 --- pkgs/development/compilers/oraclejdk/jdk10-linux.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index 1d06f122b235..642c17dc6d3f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -29,7 +29,7 @@ assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let - version = "10"; + version = "10.0.1"; downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; @@ -52,19 +52,19 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; - sha256 = "0338m0x5lka0xjsbcll70r1i308bjw3m42cm9dx9zmfk70kplj5c"; + sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre10-downloads-4417026.html"; - sha256 = "1clawcahkla1h9pxnqfqzcgv51aqgq78v1ws5jygbk6fbbi7l54w"; + sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; - sha256 = "0kiyg33fv29ad0nyl35r7y0bhyxivb2hxlds44m9l0259s55nwhw"; + sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw"; } else abort "unknown package Type ${packageType}"; From ebc224377853eb2a67f59aa68d95d94fc8770a77 Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Sun, 15 Apr 2018 19:22:08 -0400 Subject: [PATCH 346/538] binutils: Add iOS as a supported platform --- .../tools/misc/binutils/default.nix | 10 +- .../tools/misc/binutils/support-ios.patch | 112 ++++++++++++++++++ 2 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/misc/binutils/support-ios.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 5c88902a68c4..123f679d779d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, zlib +, fetchurl, zlib, autoreconfHook264 , buildPlatform, hostPlatform, targetPlatform , noSysDirs, gold ? true, bison ? null }: @@ -64,12 +64,16 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch - ]; + ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ + bison + ] ++ stdenv.lib.optionals targetPlatform.isiOS [ + autoreconfHook264 + ]; buildInputs = [ zlib ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch new file mode 100644 index 000000000000..919a3920727f --- /dev/null +++ b/pkgs/development/tools/misc/binutils/support-ios.patch @@ -0,0 +1,112 @@ +diff --git a/bfd/config.bfd b/bfd/config.bfd +index f04a993f06..3357022f35 100644 +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -238,7 +238,7 @@ case "${targ}" in + + # START OF targmatch.h + #ifdef BFD64 +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + targ_defvec=aarch64_mach_o_vec + targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +@@ -358,7 +358,7 @@ case "${targ}" in + targ_selvecs=arc_elf32_be_vec + ;; + +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + targ_defvec=arm_mach_o_vec + targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec" + targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch" +diff --git a/configure.ac b/configure.ac +index aae94501e4..4b1121e0d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then + ;; + *-*-solaris2* | *-*-hpux11*) + ;; +- *-*-darwin* | *-*-aix*) ++ *-*-darwin* | *-*-ios* | *-*-aix*) + ;; + nvptx*-*-*) + ;; +@@ -706,7 +706,7 @@ case "${target}" in + ;; + x86_64-*-darwin[[912]]*) + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs target-libffi" + ;; + *-*-netware*) +@@ -788,7 +788,7 @@ esac + # Disable the go frontend on systems where it is known to not work. Please keep + # this in sync with contrib/config-list.mk. + case "${target}" in +-*-*-darwin* | *-*-cygwin* | *-*-mingw*) ++*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*) + unsupported_languages="$unsupported_languages go" + ;; + esac +@@ -797,7 +797,7 @@ esac + # For testing, you can easily override this with --enable-libgo. + if test x$enable_libgo = x; then + case "${target}" in +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + # PR 46986 + noconfigdirs="$noconfigdirs target-libgo" + ;; +@@ -916,11 +916,11 @@ esac + case "${target}" in + *-*-chorusos) + ;; +- aarch64-*-darwin*) ++ aarch64-*-darwin* | aarch64-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- arm-*-darwin*) ++ arm-*-darwin* | arm-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -936,7 +936,7 @@ case "${target}" in + noconfigdirs="$noconfigdirs ld gas gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +@@ -1226,7 +1226,7 @@ case "${host}" in + hppa*-*) + host_makefile_frag="config/mh-pa" + ;; +- *-*-darwin*) ++ *-*-darwin* | *-*-ios*) + host_makefile_frag="config/mh-darwin" + ;; + powerpc-*-aix*) +@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + # warn during gcc/ subconfigure; unless you're bootstrapping with + # -flto it won't be needed until after installation anyway. + case $target in +- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; ++ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;; + *) if test x"$enable_lto" = x"yes"; then + AC_MSG_ERROR([LTO support is not enabled for this target.]) + fi +@@ -2590,7 +2590,7 @@ rm -f conftest* + # Decide which environment variable is used to find dynamic libraries. + case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; +- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; ++ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; + *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; + esac From 60771af5b6fc183aa354ed95e4df32c497382414 Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Sun, 15 Apr 2018 19:22:17 -0400 Subject: [PATCH 347/538] cctools-port: Use old version for iOS to support TBD linking --- .../darwin/cctools/ld-tbd-v2.patch | 98 +++++++++++++++++++ pkgs/os-specific/darwin/cctools/port.nix | 37 ++++++- .../darwin/cctools/support-ios.patch | 13 +++ .../darwin/cctools/undo-unknown-triple.patch | 17 ++++ 4 files changed, 160 insertions(+), 5 deletions(-) create mode 100644 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch create mode 100644 pkgs/os-specific/darwin/cctools/support-ios.patch create mode 100644 pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 000000000000..9aae2be1d033 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector _allowedClients; ++ std::vector _allowableClients; + std::vector _reexportedLibraries; + std::vector _symbols; + std::vector _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 55995c1592d1..d8abdc2c6f84 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2 +{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook , llvm, libcxx, libcxxabi, clang, libuuid , libobjc ? null, maloader ? null, xctoolchain ? null , hostPlatform, targetPlatform @@ -6,6 +6,14 @@ }: let + + # We need to use an old version of cctools-port to support linking TBD files + # in the iOS SDK. Note that this only provides support for SDK versions up to + # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the + # default version here, which can support the new TBD format via Apple's + # libtapi. + useOld = targetPlatform.isiOS; + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = stdenv.lib.optionalString @@ -16,10 +24,12 @@ in # Non-Darwin alternatives assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null); +assert enableDumpNormalizedLibArgs -> (!useOld); + let baseParams = rec { name = "${targetPrefix}cctools-port-${version}"; - version = "895"; + version = if useOld then "886" else "895"; src = fetchFromGitHub (if enableDumpNormalizedLibArgs then { owner = "tpoechtrager"; @@ -27,6 +37,11 @@ let # master with https://github.com/tpoechtrager/cctools-port/pull/34 rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df"; sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f"; + } else if useOld then { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; + sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; } else { owner = "tpoechtrager"; repo = "cctools-port"; @@ -36,7 +51,11 @@ let outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake libtool_2 ]; + nativeBuildInputs = [ + autoconf automake libtool_2 + ] ++ stdenv.lib.optionals useOld [ + autoreconfHook + ]; buildInputs = [ libuuid ] ++ # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++ @@ -44,9 +63,14 @@ let patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch + ] ++ stdenv.lib.optionals useOld [ + # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. + ./undo-unknown-triple.patch + ./ld-tbd-v2.patch + ./support-ios.patch ]; - __propagatedImpureHostDeps = [ + __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [ # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them "/usr/lib/libobjc.A.dylib" "/usr/lib/libobjc.dylib" @@ -86,12 +110,15 @@ let EOF '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh + '' + stdenv.lib.optionalString useOld '' + cd cctools ''; # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather # hairy to handle during bootstrap. Perhaps it could be optional? - preConfigure = '' + preConfigure = stdenv.lib.optionalString (!useOld) '' cd cctools + '' + '' sh autogen.sh ''; diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch new file mode 100644 index 000000000000..f78c6b63ac80 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/support-ios.patch @@ -0,0 +1,13 @@ +diff --git a/cctools/configure.ac b/cctools/configure.ac +index 56e8f24..0b4b3ff 100644 +--- a/cctools/configure.ac ++++ b/cctools/configure.ac +@@ -39,7 +39,7 @@ EXTRACXXFLAGS="" + WARNINGS="" + + case $host_os in +- darwin* ) ++ darwin* | ios*) + isdarwin=yes + AM_CONDITIONAL([ISDARWIN], [true]) + ;; diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch new file mode 100644 index 000000000000..7df9bdd16dab --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch @@ -0,0 +1,17 @@ +diff --git a/cctools/as/driver.c b/cctools/as/driver.c +index b06d085..c03397a 100644 +--- a/cctools/as/driver.c ++++ b/cctools/as/driver.c +@@ -363,12 +363,6 @@ char **envp) + /* Add -c or clang will run ld(1). */ + new_argv[j] = "-c"; + j++; +- /* cctools-port start */ +- new_argv[j] = "-target"; +- j++; +- new_argv[j] = "unknown-apple-darwin"; +- j++; +- /* cctools-port end */ + new_argv[j] = NULL; + if(execute(new_argv, verbose)) + exit(0); From b1a8894a1cd386319f771998de417ce0a4a75b7c Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Mon, 16 Apr 2018 19:55:33 -0400 Subject: [PATCH 348/538] wrapBintoolsWith: Allow overriding extraBuildCommands --- pkgs/top-level/all-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b074a5572dd0..56064138ac11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6916,15 +6916,14 @@ with pkgs; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; }; - wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun { + wrapBintoolsWith = { bintools, libc, extraBuildCommands ? "" }: bintoolsWrapperFun { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; noLibc = (libc == null); - inherit bintools libc; - extraBuildCommands = ""; + inherit bintools libc extraBuildCommands; }; # prolog From 4f273627a1c51355d5c779d04a134a845adc4d18 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Apr 2018 10:41:12 -0500 Subject: [PATCH 349/538] tree-wide: fix instance of "meta.maintainer" -> "meta.maintainers" Encountered one of these when using check-meta, did a quick search to find other instances. --- doc/languages-frameworks/python.section.md | 2 +- pkgs/development/python-modules/yolk/default.nix | 2 +- pkgs/development/python-modules/zipfile36/default.nix | 4 ++-- pkgs/misc/vscode-extensions/cpptools/default.nix | 4 ++-- pkgs/misc/vscode-extensions/python/default.nix | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 0f871395854c..23ceb82eb31e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -374,7 +374,7 @@ and `CFLAGS`. description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = http://hgomersall.github.com/pyFFTW/; license = with licenses; [ bsd2 bsd3 ]; - maintainer = with maintainers; [ fridh ]; + maintainers = with maintainers; [ fridh ]; }; }; } diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 958fcd72f84a..6e05b6ced043 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; homepage = https://github.com/cakebread/yolk; - maintainer = with maintainers; []; + maintainers = with maintainers; []; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix index 0915eb002b79..2929afed1cd3 100644 --- a/pkgs/development/python-modules/zipfile36/default.nix +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; homepage = https://gitlab.com/takluyver/zipfile36; license = lib.licenses.psfl; - maintainer = lib.maintainers.fridh; + maintainers = lib.maintainers.fridh; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 87c782222fc5..c537aa8a1f92 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -120,9 +120,9 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with stdenv.lib; { license = licenses.unfree; - maintainer = [ maintainers.jraygauthier ]; + maintainers = [ maintainers.jraygauthier ]; # A 32 bit linux would also be possible with some effort (specific download of binaries + # patching of the elf files with 32 bit interpreter). platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 4e28de871b84..430ce192ed0d 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -36,6 +36,6 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with lib; { license = licenses.mit; - maintainer = [ maintainers.jraygauthier ]; + maintainers = [ maintainers.jraygauthier ]; }; -} \ No newline at end of file +} From 9e5e51d07f4d11335d0d55ff847e0300e7a90849 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Apr 2018 12:16:13 -0400 Subject: [PATCH 350/538] linux: 4.4.127 -> 4.4.128 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index b59748541123..b14418964da5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.127"; + version = "4.4.128"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gscsvijik24p0skhjnhqxlvzj3kfy5cmn3x9wn6ka687hwjb3qa"; + sha256 = "1c5nlxazn2ijfra1bn3x4fdz3fx02j76hg430jgyij61vndgi5ka"; }; } // (args.argsOverride or {})) From dd72b6cb421ee2fabe07d0fa997161a9448c7cfe Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Apr 2018 12:16:36 -0400 Subject: [PATCH 351/538] linux: 4.9.93 -> 4.9.94 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 86ddcf99dbe8..569f472545eb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.93"; + version = "4.9.94"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00srda6plvirmrr0bjgiksf00ssiigf5cqi4giy4mij5r6v8mxsq"; + sha256 = "15rd1rmvwx6wyqp857bdl77ijd233svm5wxyjyj8dy8n36yivk39"; }; } // (args.argsOverride or {})) From da788ed80bcbf9640137a654f910f663eb3afed7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Apr 2018 12:16:57 -0400 Subject: [PATCH 352/538] linux: 4.14.34 -> 4.14.35 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ba589b70b6b3..e064dbfd85bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.34"; + version = "4.14.35"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f9bl4qw61xw49y5xz1wyilg8gh0wv9k868fh8n3hp17hm66qavq"; + sha256 = "01zfbd766y8hfsd248lffaj6d4ghl4j918m3yvl892p84xsp5aq2"; }; } // (args.argsOverride or {})) From 69353cdf575627ebc15b4d85193b3d04252c9ae1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Apr 2018 12:17:15 -0400 Subject: [PATCH 353/538] linux: 4.15.17 -> 4.15.18 --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index 63bfc79e62d2..07f408027d8e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.17"; + version = "4.15.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f20h22rrchvqd653a3ih8q6l13zl47bp6k2339x9ihq40rg5m9g"; + sha256 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z"; }; } // (args.argsOverride or {})) From f99c283f5093a3fb6f4bd608f08338418306fa78 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Apr 2018 12:17:30 -0400 Subject: [PATCH 354/538] linux: 4.16.2 -> 4.16.3 --- pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index aa225c8e7c79..343d7c9f9dac 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.2"; + version = "4.16.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "157q43px707nizqwzi5nk87c0nvdif9fbi751f71wpgfp3iiy2s7"; + sha256 = "18w1dhq5dnmcqc3d8imwm90zwfw0fhda7sy5fjwkhzm93nl72s8d"; }; } // (args.argsOverride or {})) From 8a5b1425452e94db51398d0e31ec96a6e1817538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 19 Apr 2018 18:57:17 +0200 Subject: [PATCH 355/538] shutter: add missing dependencies for Screenshot->Export (Ctrl+U) support However, none of the exporters I tried actually _worked_, but now shutter at least returns an error to the user (pop-up UI element) instead of silently hanging and only leaving messages on stdout/stderr about the missing deps. AFAICS, this changes the failure of Screenshot->Export functionality from a packaging bug to an application bug (upstream). --- pkgs/applications/graphics/shutter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index a8b4973203d1..2cc127a3fc6f 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -8,6 +8,7 @@ let ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo + EncodeLocale TryTiny TypesSerialiser LWPMediaTypes ]; in stdenv.mkDerivation rec { From 305b75d3383d788098316da0fab0002892922b65 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Apr 2018 12:08:10 -0500 Subject: [PATCH 356/538] rw: mark as broken on darwin for now For more info, see discussion starting here: https://github.com/NixOS/nixpkgs/pull/39150#issuecomment-382725177 --- pkgs/tools/misc/rw/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix index 3082b7491e73..345f26852dcb 100644 --- a/pkgs/tools/misc/rw/default.nix +++ b/pkgs/tools/misc/rw/default.nix @@ -22,5 +22,7 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; maintainers = with maintainers; [ dtzWill ]; + + broken = stdenv.hostPlatform.isDarwin; }; } From b3d50c7afa10858894d49a153fdb0b922f3b20e6 Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 5 Apr 2018 22:53:34 +0200 Subject: [PATCH 357/538] shogun: disable paralllel building ... to avoid sporadic failures --- pkgs/applications/science/machine-learning/shogun/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index e33b55503bd6..0ac40b1e7d42 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { ++ (optional (opencvSupport) "-DOpenCV=ON") ; + # Previous attempts to fix parallel builds (see patch above) were not entirely successful. + # Sporadic build failures still exist. Dislable parallel builds for now. + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; From 3a47c7e8f67c6ece266f570d6db9598856512ede Mon Sep 17 00:00:00 2001 From: Ihor Antonov Date: Thu, 19 Apr 2018 08:47:10 -0400 Subject: [PATCH 358/538] growPartition: fix volume resizing on EC2 NVME instances The previous code for this accidentally picked up a "p" when computing the partition number. This logic should be more robust --- nixos/modules/system/boot/grow-partition.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix index c4c6d82dc5c8..1e6f9e442b67 100644 --- a/nixos/modules/system/boot/grow-partition.nix +++ b/nixos/modules/system/boot/grow-partition.nix @@ -32,8 +32,15 @@ with lib; rootDevice="${config.fileSystems."/".device}" if [ -e "$rootDevice" ]; then rootDevice="$(readlink -f "$rootDevice")" - parentDevice="$(lsblk -npo PKNAME "$rootDevice")" - TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" + parentDevice="$rootDevice" + while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do + parentDevice="''${parentDevice%[0-9]}"; + done + partNum="''${rootDevice#''${parentDevice}}" + if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then + parentDevice="''${parentDevice%p}" + fi + TMPDIR=/run sh $(type -P growpart) "$parentDevice" "$partNum" udevadm settle fi ''; From f45acb6b472ed772a70d5fbd113d4ae907a481a0 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 20 Mar 2018 14:58:34 +0100 Subject: [PATCH 359/538] prometheus-postfix-exporter: 2017-06-01 -> 0.1.1 --- .../prometheus/postfix-exporter-deps.nix | 38 ++++++++++++++----- .../prometheus/postfix-exporter.nix | 18 ++++++--- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix index ff35c0334275..194651f43326 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix @@ -5,8 +5,26 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78"; + sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"; + sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21"; }; } { @@ -14,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "c65a0412e71e8b9b3bfd22925720d23c0f054237"; - sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + rev = "e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"; + sha256 = "1acnmalkqwrq6k3l71c4pyws0zn18r2609kqaq55lhbdcjgzid31"; }; } { @@ -32,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada"; - sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26"; + rev = "82f5ff156b29e276022b1a958f7d385870fb9814"; + sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz"; }; } { @@ -50,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "89604d197083d4781071d3c65855d24ecfb0a563"; - sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn"; + rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6"; + sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx"; }; } { @@ -59,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "cb4147076ac75738c9a7d279075a253c0cc5acbd"; - sha256 = "0zhlrik0f9q1lj6cisgnxgbz4darbcix52hm5abi24l2ahchf5ca"; + rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; + sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; }; } ] diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 5438f8271d91..ccf41f5f4962 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,21 +1,27 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper }: buildGoPackage rec { - name = "postfix_exporter-unstable-${version}"; - version = "2017-06-01"; - rev = "a8b4bed735a03f234fcfffba85302f51025e6b1d"; + name = "postfix_exporter-${version}"; + version = "0.1.1"; goPackagePath = "github.com/kumina/postfix_exporter"; src = fetchFromGitHub { owner = "kumina"; repo = "postfix_exporter"; - inherit rev; - sha256 = "0rxvjpyjcvr1y8k8skq5f1bnl0mpgvaa04dn8c44v7afqnv78riy"; + rev = version; + sha256 = "1p2j66jzzgyv2w832pw57g02vrac6ldrblqllgwyy0i8krb3ibyz"; }; + buildInputs = [ systemd makeWrapper ]; + goDeps = ./postfix-exporter-deps.nix; + postInstall = '' + wrapProgram $bin/bin/postfix_exporter \ + --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A Prometheus exporter for Postfix"; From c3d46165dbfcce221ce2ca2a835051e20e56041e Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 28 Mar 2018 17:22:06 +0200 Subject: [PATCH 360/538] nixos/prometheus-postfix-exporter: update module --- .../prometheus/exporters/postfix.nix | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index 1e909aa27d83..efe78ebcba86 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -32,6 +32,33 @@ in Path where Postfix places it's showq socket. ''; }; + systemd = { + enable = mkEnableOption '' + reading metrics from the systemd-journal instead of from a logfile + ''; + unit = mkOption { + type = types.str; + default = "postfix.service"; + description = '' + Name of the postfix systemd unit. + ''; + }; + slice = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Name of the postfix systemd slice. + This overrides the . + ''; + }; + journalPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to the systemd journal. + ''; + }; + }; }; serviceOpts = { serviceConfig = { @@ -39,7 +66,15 @@ in ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - ${concatStringsSep " \\\n " cfg.extraFlags} + --postfix.showq_path ${cfg.showqPath} \ + ${concatStringsSep " \\\n " (cfg.extraFlags + ++ optional cfg.systemd.enable "--systemd.enable" + ++ optional cfg.systemd.enable (if cfg.systemd.slice != null + then "--systemd.slice ${cfg.systemd.slice}" + else "--systemd.unit ${cfg.systemd.unit}") + ++ optional (cfg.systemd.enable && (cfg.systemd.journalPath != null)) + "--systemd.jounal_path ${cfg.systemd.journalPath}" + ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${cfg.logfilePath}")} ''; }; }; From 754b30ef0016409477ff5fc86f65515e3ce9ce67 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 11 Apr 2018 14:46:23 -0400 Subject: [PATCH 361/538] wire-desktop: init at 3.0.2816 --- .../wire-desktop/default.nix | 104 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 106 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix new file mode 100644 index 000000000000..9e946152c192 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -0,0 +1,104 @@ +{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, atk, cairo, gdk_pixbuf, glib +, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage +, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver +, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell +}: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + hunspell + libnotify + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXScrnSaver + libXtst + nspr + nss + stdenv.cc.cc + udev + xdg_utils + xorg.libxcb + ]; + + version = "3.0.2816"; + + plat = { + "i686-linux" = "i386"; + "x86_64-linux" = "amd64"; + }.${stdenv.system}; + + sha256 = { + "i686-linux" = "1ds807j1b8dk9hrnzbg4g9mvn44abw24pxrqns9ai62mh3hvi65p"; + "x86_64-linux" = "13pyyp2c8q0v0ni2hzh2jnbd3i96q68314glbmy4kyh7vm9427lc"; + }.${stdenv.system}; + +in + stdenv.mkDerivation rec { + name = "wire-desktop-${version}"; + + src = fetchurl { + url = "https://wire-app.wire.com/linux/debian/pool/main/wire_${version}_${plat}.deb"; + inherit sha256; + }; + + desktopItem = makeDesktopItem { + name = "Wire"; + exec = "wire-desktop %U"; + icon = "wire-desktop"; + comment = "Secure messenger for everyone"; + desktopName = "Wire Desktop"; + genericName = "Secure messenger"; + categories = "Network;InstantMessaging;Chat;VideoConference"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + cp -R usr/share $out/share + + chmod -R g-w $out + + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/opt/wire-desktop" \ + "$out/opt/wire-desktop/wire-desktop" + + # Symlink to bin + mkdir -p $out/bin + ln -s "$out/opt/wire-desktop/wire-desktop" $out/bin/wire-desktop + + # Desktop file + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + meta = { + description = "A modern, secure messenger"; + homepage = https://wire.com/; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ worldofpeace ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdcabc0f51e0..c0f309e8e1a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21242,6 +21242,8 @@ with pkgs; mmark = callPackage ../tools/typesetting/mmark { }; + wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { }; + # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject modprobe umount From 3cf0012da4de787fc9dcadcfba8dd4feb4b867f9 Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 19 Apr 2018 19:55:36 +0200 Subject: [PATCH 362/538] gede: 2.0.4 -> 2.6.1, fix ctags dependency --- pkgs/development/tools/misc/gede/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 9e2f35875583..ce02b4763009 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.0.4"; + version = "2.6.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; + sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r"; }; nativeBuildInputs = [ makeWrapper python ]; - buildInputs = [ qt4 ]; + buildInputs = [ qt4 ctags ]; postPatch = '' sed -i build.py -e 's,qmake-qt4,qmake,' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildPhase = ":"; installPhase = '' - python build.py install --prefix="$out" + python build.py install --verbose --prefix="$out" wrapProgram $out/bin/gede \ --prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]} ''; From 48fba15ae84ece91f06bcbf1c6cbd0e24783f7c8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 17 Apr 2018 19:30:39 -0500 Subject: [PATCH 363/538] metabase: 0.28.1 -> 0.28.6 Signed-off-by: Austin Seipp --- pkgs/servers/metabase/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 90bd5b614dd8..d36810b9f5c1 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.28.1"; + version = "0.28.6"; - jar = fetchurl { + src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1nv3y4pnvzd7lwyj14nmhr3k52qd8hilcjxvd7qr3hb7kzmjvbzk"; + sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq"; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,13 +14,14 @@ stdenv.mkDerivation rec { unpackPhase = "true"; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $jar" + makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" ''; meta = with stdenv.lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data."; - homepage = https://metabase.com; - license = licenses.agpl3; - maintainers = with maintainers; [ schneefux ]; + homepage = https://metabase.com; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ schneefux thoughtpolice ]; }; } From 19bc90f91111f9d02e5e68fcdb4135913b9569eb Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 20 Apr 2018 02:07:16 +0800 Subject: [PATCH 364/538] bazaar: Fix CVE-2017-14176 --- .../version-management/bazaar/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 47d667a0c067..72e010fd283c 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, python2Packages +, fetchpatch , withSFTP ? true }: @@ -17,8 +18,15 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [] ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; - # Bazaar can't find the certificates alone - patches = [ ./add_certificates.patch ]; + patches = [ + # Bazaar can't find the certificates alone + ./add_certificates.patch + (fetchpatch { + url = "https://bazaar.launchpad.net/~brz/brz/trunk/revision/6754"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + name = "CVE-2017-14176.patch"; + }) + ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt From ef3db7d14c90e1876d38ebc25428b4f65962ffbc Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Sun, 15 Apr 2018 19:21:45 -0400 Subject: [PATCH 365/538] ios-sdk-pkgs: Init from iOS SDK from XCode --- lib/systems/default.nix | 2 + pkgs/os-specific/darwin/ios-cross/default.nix | 61 ----------------- .../darwin/ios-sdk-pkgs/default.nix | 68 +++++++++++++++++++ pkgs/stdenv/cross/default.nix | 4 +- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/darwin-packages.nix | 20 ++++-- 6 files changed, 87 insertions(+), 69 deletions(-) delete mode 100644 pkgs/os-specific/darwin/ios-cross/default.nix create mode 100644 pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix diff --git a/lib/systems/default.nix b/lib/systems/default.nix index bd408e00bb14..e7346a538d35 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -44,6 +44,8 @@ rec { }; # Misc boolean options useAndroidPrebuilt = false; + useiOSPrebuilt = false; + isiPhoneSimulator = false; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix deleted file mode 100644 index 175e9738ef9e..000000000000 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ runCommand -, lib -, llvm -, clang -, binutils -, stdenv -, coreutils -, gnugrep -, buildPackages -, hostPlatform -, targetPlatform -}: - -/* As of this writing, known-good prefix/arch/simulator triples: - * aarch64-apple-darwin14 | arm64 | false - * arm-apple-darwin10 | armv7 | false - * i386-apple-darwin11 | i386 | true - * x86_64-apple-darwin14 | x86_64 | true - */ - -# Apple uses somewhat non-standard names for this. We could fall back on -# `targetPlatform.parsed.cpu.name`, but that would be a more standard one and -# likely to fail. Better just to require something manual. -assert targetPlatform ? arch; - -let - - prefix = targetPlatform.config; - inherit (targetPlatform) arch; - simulator = targetPlatform.isiPhoneSimulator or false; - - sdkType = if simulator then "Simulator" else "OS"; - - sdkVer = "10.2"; - - sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk"; - -in (import ../../../build-support/cc-wrapper { - inherit stdenv coreutils gnugrep runCommand buildPackages; - nativeTools = false; - nativeLibc = false; - inherit binutils; - libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; - inherit (clang) cc; - inherit hostPlatform targetPlatform; - extraBuildCommands = '' - if ! [ -d ${sdk} ]; then - echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2 - exit 1 - fi - # ugh - tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp - mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags - - # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust - echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before - ''; - }) // { - inherit sdkType sdkVer sdk; - } diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix new file mode 100644 index 000000000000..5b9f30b62c39 --- /dev/null +++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix @@ -0,0 +1,68 @@ +{ lib, hostPlatform, targetPlatform +, clang-unwrapped +, binutils-unwrapped +, runCommand +, stdenv +, wrapBintoolsWith +, wrapCCWith +, buildIosSdk, targetIosSdkPkgs +}: + +let + +minSdkVersion = "9.0"; + +iosPlatformArch = { parsed, ... }: { + "arm" = "armv7"; + "aarch64" = "arm64"; + "x86_64" = "x86_64"; +}.${parsed.cpu.name}; + +in + +rec { + # TODO(kmicklas): Make a pure version of this for each supported SDK version. + sdk = rec { + name = "ios-sdk"; + type = "derivation"; + outPath = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk"; + + sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS"; + version = targetPlatform.sdkVer; + }; + + binutils = wrapBintoolsWith { + libc = targetIosSdkPkgs.libraries; + bintools = binutils-unwrapped; + extraBuildCommands = '' + echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags + ''; + }; + + clang = (wrapCCWith { + cc = clang-unwrapped; + bintools = binutils; + libc = targetIosSdkPkgs.libraries; + extraBuildCommands = '' + tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp + mv cc-cflags.tmp $out/nix-support/cc-cflags + echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags + echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags + echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags + ''; + }) // { + inherit sdk; + }; + + libraries = let sdk = buildIosSdk; in runCommand "libSystem-prebuilt" { + passthru = { + inherit sdk; + }; + } '' + if ! [ -d ${sdk} ]; then + echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2 + exit 1 + fi + ln -s ${sdk}/usr $out + ''; +} diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 6e3065718532..973be9831861 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -39,8 +39,8 @@ in lib.init bootStages ++ [ buildPlatform = localSystem; hostPlatform = crossSystem; targetPlatform = crossSystem; - cc = if crossSystem.useiOSCross or false - then buildPackages.darwin.ios-cross + cc = if crossSystem.useiOSPrebuilt or false + then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56064138ac11..bb80c5494f17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9008,6 +9008,7 @@ with pkgs; else if name == "uclibc" then uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 + else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index d1d5aa470bca..d2d41792c461 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -1,4 +1,6 @@ -{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }: +{ buildPackages, pkgs, targetPackages +, darwin, stdenv, callPackage, callPackages, newScope +}: let apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; @@ -10,19 +12,23 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; + binutils-unwrapped = callPackage ../os-specific/darwin/binutils { + inherit (darwin) cctools; + inherit (pkgs) binutils-unwrapped; + }; + binutils = pkgs.wrapBintoolsWith { libc = if pkgs.targetPlatform != pkgs.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc; - bintools = callPackage ../os-specific/darwin/binutils { - inherit (darwin) cctools; - }; + bintools = darwin.binutils-unwrapped; }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { inherit (darwin) libobjc maloader; stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; + libcxxabi = pkgs.libcxxabi; xctoolchain = darwin.xcode.toolchain; }; @@ -39,8 +45,10 @@ in insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; - ios-cross = callPackage ../os-specific/darwin/ios-cross { - inherit (darwin) binutils; + iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs { + buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; + targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; + inherit (pkgs.llvmPackages) clang-unwrapped; }; libobjc = apple-source-releases.objc4; From 5131977f1bcc7d4c84108496f8a3149c170d3163 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 19 Apr 2018 22:31:27 +0200 Subject: [PATCH 366/538] gns3Packages.{server,gui}{Stable,Preview}: 2.1.4 -> 2.1.5 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 66bf843865e6..74287dc6af4e 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.4"; + stableVersion = "2.1.5"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93"; - serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f"; + guiSrcHash = "1d7pwm36bqjm0d021z5qnx49v8zf4yi9jn5hn6zlbiqbz53l1x7l"; + serverSrcHash = "002pqm4jcm5qbbw1vnhjdrgysh7d6xmdl66605wz1vbp7xn5s961"; in { guiStable = mkGui { stable = true; From 3dd676c1af5c673b1cb3ea6dc2f61054ccdcd6e1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 19 Apr 2018 22:42:45 +0200 Subject: [PATCH 367/538] pythonPackages.mysql-connector: 8.0.6 -> 8.0.11 --- .../development/python-modules/mysql-connector/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 6a2b3de00165..78069d49246c 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,17 +4,20 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.6"; + version = "8.0.11"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1ygr7va56da12yp3gr7kzss9zgbs28q2lmdkw16rpxj108id4rkp"; + sha256 = "0w5sxy0zdkdj5cj35wwfjy9y8yn5yzk9biwwsglvhkqlkrms8fw1"; }; propagatedBuildInputs = [ protobuf ]; + # Tests are failing (TODO: unknown reason) + # TypeError: __init__() missing 1 required positional argument: 'string' + # But the library should be working as expected. doCheck = false; meta = { From 582774828a3a6449035ac5ca4b5177e512d3b81e Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 19 Apr 2018 22:58:21 +0200 Subject: [PATCH 368/538] gede: switch to qt5 --- pkgs/development/tools/misc/gede/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index ce02b4763009..bcd5b02d30b8 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: +{ stdenv, fetchurl, makeWrapper, python, qmake, ctags, gdb }: stdenv.mkDerivation rec { name = "gede-${version}"; @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r"; }; - nativeBuildInputs = [ makeWrapper python ]; + nativeBuildInputs = [ qmake makeWrapper python ]; - buildInputs = [ qt4 ctags ]; + buildInputs = [ ctags ]; + + dontUseQmakeConfigure = true; postPatch = '' - sed -i build.py -e 's,qmake-qt4,qmake,' + sed -i build.py -e 's,qmake-qt5,qmake,' ''; buildPhase = ":"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05bb159a5f77..d5369c15d5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7823,7 +7823,7 @@ with pkgs; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = callPackage ../development/tools/misc/gede { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = callPackage ../development/tools/misc/gdbgui { }; From 7c8200811b2e706a62b31c6b87ced7de6c2844bf Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 19 Apr 2018 23:11:09 +0200 Subject: [PATCH 369/538] jekyll: 3.7.3 -> 3.8.0 And add an update script. --- .../misc/jekyll/basic/Gemfile.lock | 10 +++---- .../applications/misc/jekyll/basic/gemset.nix | 20 ++++++------- .../misc/jekyll/full/Gemfile.lock | 14 +++++----- pkgs/applications/misc/jekyll/full/gemset.nix | 28 +++++++++---------- pkgs/applications/misc/jekyll/update.sh | 15 ++++++++++ 5 files changed, 51 insertions(+), 36 deletions(-) create mode 100755 pkgs/applications/misc/jekyll/update.sh diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index d18546cb36f8..f231df3d8e76 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -23,7 +23,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.8.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -36,9 +36,9 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.5.0) + jekyll-avatar (0.6.0) jekyll (~> 3.0) - jekyll-mentions (1.2.0) + jekyll-mentions (1.3.0) activesupport (~> 4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) @@ -69,13 +69,13 @@ GEM pathutil (0.16.1) forwardable-extended (~> 2.6) public_suffix (3.0.2) - rb-fsevent (0.10.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index b5b21dec4382..7c6ac55c2012 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -104,28 +104,28 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; + sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf"; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; jekyll-mentions = { dependencies = ["activesupport" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd"; + sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; jekyll-sass-converter = { dependencies = ["sass"]; @@ -250,10 +250,10 @@ rb-fsevent = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; rb-inotify = { dependencies = ["ffi"]; @@ -292,10 +292,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 190f1d66479d..45bd34187ca9 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -22,7 +22,7 @@ GEM http_parser.rb (~> 0.6.0) eventmachine (1.2.5) execjs (2.7.0) - faraday (0.14.0) + faraday (0.15.0) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) ffi (1.9.23) @@ -34,7 +34,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.3) + jekyll (3.8.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -47,7 +47,7 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.5.0) + jekyll-avatar (0.6.0) jekyll (~> 3.0) jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) @@ -56,7 +56,7 @@ GEM jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.2.0) + jekyll-mentions (1.3.0) activesupport (~> 4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) @@ -101,16 +101,16 @@ GEM public_suffix (3.0.2) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rb-fsevent (0.10.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdiscount (2.2.0.1) - rdoc (6.0.1) + rdoc (6.0.3) redcarpet (3.4.0) rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 3a115f8a4b0e..b45ea5b9d079 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -96,10 +96,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; + sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.0"; }; fast-stemmer = { source = { @@ -163,19 +163,19 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k8pz95yiwxj6h645sxwckl227lah97lshv9xxrddhldxwf0n0ff"; + sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as"; type = "gem"; }; - version = "3.7.3"; + version = "3.8.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf"; + sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; @@ -208,10 +208,10 @@ dependencies = ["activesupport" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd"; + sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; jekyll-paginate = { source = { @@ -413,10 +413,10 @@ rb-fsevent = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; rb-inotify = { dependencies = ["ffi"]; @@ -438,10 +438,10 @@ rdoc = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzhv04lp76iax258dh47zsxhjg34r9sg76vgikbyfywjzflvfyj"; + sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; redcarpet = { source = { @@ -479,10 +479,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; type = "gem"; }; - version = "3.5.5"; + version = "3.5.6"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh new file mode 100755 index 000000000000..528f1062c733 --- /dev/null +++ b/pkgs/applications/misc/jekyll/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bundix zlib + +set -o errexit +set -o nounset + +readonly BASEDIR="$(dirname $(readlink -f $0))" + +for directory in "basic" "full"; do + pushd "$BASEDIR/$directory" + rm -f Gemfile.lock gemset.nix + bundix --magic + rm -rf .bundle vendor + popd +done From cd5dfa1f883c9e7183e493f4dc35cbe624082676 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Apr 2018 16:36:28 -0500 Subject: [PATCH 370/538] gede: drop unnecessary postPatch Thanks to @jtojnar for noticing and pointing it out! https://github.com/NixOS/nixpkgs/pull/39174#pullrequestreview-113783769 --- pkgs/development/tools/misc/gede/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index bcd5b02d30b8..9e8ce3d93314 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; - postPatch = '' - sed -i build.py -e 's,qmake-qt5,qmake,' - ''; - buildPhase = ":"; installPhase = '' From 820da05d785a47d01521bfb46c65c0b28b3534a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 00:50:19 +0200 Subject: [PATCH 371/538] xorg.xorgcffiles: Don't use darwin's /usr/bin All imake (xmkmf) based builds use the lib/X11/config/darwin.cf file to define locations of cpp, cc, c++ (in /usr/bin by default). We remove the directoy part to force darwin builds to search the $PATH for those commands. --- pkgs/servers/x11/xorg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0d09d523b524..74e2b301e70f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2570,6 +2570,9 @@ let url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" + ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; From 4f7941406e410cfa2213681c8b563a05b85b97b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 00:55:08 +0200 Subject: [PATCH 372/538] xskat: enable darwin build --- pkgs/games/xskat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index bd41531d9236..383bdb882844 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Famous german card game''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; homepage = http://www.xskat.de/; From ac02a1348f58cd5f1edb8fcff6e117c7ee160a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:08:23 +0200 Subject: [PATCH 373/538] oneko: enable darwin build --- pkgs/applications/misc/oneko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 4655b059b339..58e80e7f7264 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "http://www.daidouji.com/oneko/"; license = licenses.publicDomain; maintainers = [ maintainers.xaverdh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 7637894bf230d00aa05b02f10394d6c2aad2061a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:15:31 +0200 Subject: [PATCH 374/538] Xaw3d: enable darwin build --- pkgs/development/libraries/Xaw3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 07d256f4f571..eea18cd56385 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "3D widget set based on the Athena Widget set"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 625fa4dfe8b74642e411298ace91fdec57cef18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:20:05 +0200 Subject: [PATCH 375/538] gv: enable darwin build --- pkgs/applications/misc/gv/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 3fad634b18b7..b13e7ae5232c 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: +{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: let name = "gv-3.7.4"; @@ -11,7 +11,18 @@ stdenv.mkDerivation { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - buildInputs = [ Xaw3d ghostscriptX perl ]; + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--enable-SIGCHLD-fallback" + ]; + + buildInputs = [ + Xaw3d + ghostscriptX + perl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + pkgconfig + libiconv + ]; patchPhase = '' sed 's|\|${ghostscriptX}/bin/gs|g' -i "src/"*.in @@ -32,6 +43,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } From 48382349186e1ed8a502b40f69635d327fb00113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:37:54 +0200 Subject: [PATCH 376/538] xsok: enable darwin build --- pkgs/games/xsok/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index e683e96d206d..0aa0c97f07d2 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { sed -e '/chown /d' -i src/Imakefile sed -e '/chmod /d' -i src/Imakefile sed -e '/InstallAppDefaults/d' -i src/Imakefile + sed -e 's/CC = gcc/CC = cc/g' -i src/Imakefile ''; makeFlags = ["BINDIR=$(out)/bin"]; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { description = "A generic Sokoban game for X11"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://tracker.debian.org/pkg/xsok; }; } From cf7a3a70de3888cd5fc21ac270e4845cd4af691f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 20 Apr 2018 08:48:06 +0800 Subject: [PATCH 377/538] Revert "beep: fix for CVE-2018-0492" This reverts commit 12ce0db1bffb048fbf81a852aed7240aedc31757. --- pkgs/misc/beep/cve-2018-0492.patch | 106 ----------------------------- pkgs/misc/beep/default.nix | 28 +++----- 2 files changed, 10 insertions(+), 124 deletions(-) delete mode 100644 pkgs/misc/beep/cve-2018-0492.patch diff --git a/pkgs/misc/beep/cve-2018-0492.patch b/pkgs/misc/beep/cve-2018-0492.patch deleted file mode 100644 index 533fc6c15578..000000000000 --- a/pkgs/misc/beep/cve-2018-0492.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/beep.c b/beep.c -index 7da2e70..4323d31 100644 ---- a/beep.c -+++ b/beep.c -@@ -109,6 +109,7 @@ void do_beep(int freq) { - /* BEEP_TYPE_EVDEV */ - struct input_event e; - -+ memset(&e, 0, sizeof(e)); - e.type = EV_SND; - e.code = SND_TONE; - e.value = freq; -@@ -124,10 +125,6 @@ void do_beep(int freq) { - /* If we get interrupted, it would be nice to not leave the speaker beeping in - perpetuity. */ - void handle_signal(int signum) { -- -- if(console_device) -- free(console_device); -- - switch(signum) { - case SIGINT: - case SIGTERM: -@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { - result->verbose = 1; - break; - case 'e' : /* also --device */ -- console_device = strdup(optarg); -+ console_device = optarg; - break; - case 'h' : /* notice that this is also --help */ - default : -@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) { - "%d delay after) @ %.2f Hz\n", - parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); - -- /* try to snag the console */ -- if(console_device) -- console_fd = open(console_device, O_WRONLY); -- else -- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) -- console_fd = open("/dev/vc/0", O_WRONLY); -- -- if(console_fd == -1) { -- fprintf(stderr, "Could not open %s for writing\n", -- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -- perror("open"); -- exit(1); -- } -- -- if (ioctl(console_fd, EVIOCGSND(0)) != -1) -- console_type = BEEP_TYPE_EVDEV; -- else -- console_type = BEEP_TYPE_CONSOLE; -- - /* Beep */ - for (i = 0; i < parms.reps; i++) { /* start beep */ - do_beep(parms.freq); -@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) { - if(parms.end_delay || (i+1 < parms.reps)) - usleep(1000*parms.delay); /* wait... */ - } /* repeat. */ -- -- close(console_fd); - } - - -@@ -328,6 +303,26 @@ int main(int argc, char **argv) { - signal(SIGTERM, handle_signal); - parse_command_line(argc, argv, parms); - -+ /* try to snag the console */ -+ if(console_device) -+ console_fd = open(console_device, O_WRONLY); -+ else -+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) -+ console_fd = open("/dev/vc/0", O_WRONLY); -+ -+ if(console_fd == -1) { -+ fprintf(stderr, "Could not open %s for writing\n", -+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); -+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ perror("open"); -+ exit(1); -+ } -+ -+ if (ioctl(console_fd, EVIOCGSND(0)) != -1) -+ console_type = BEEP_TYPE_EVDEV; -+ else -+ console_type = BEEP_TYPE_CONSOLE; -+ - /* this outermost while loop handles the possibility that -n/--new has been - used, i.e. that we have multiple beeps specified. Each iteration will - play, then free() one parms instance. */ -@@ -365,8 +360,8 @@ int main(int argc, char **argv) { - parms = next; - } - -- if(console_device) -- free(console_device); -+ close(console_fd); -+ console_fd = -1; - - return EXIT_SUCCESS; - } diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 762b8d65a841..ce097bd5f231 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -1,33 +1,25 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl }: # this package is working only as root # in order to work as a non privileged user you would need to suid the bin stdenv.mkDerivation { name = "beep-1.3"; - - src = fetchFromGitHub { - owner = "johnath"; - repo = "beep"; - rev = "0d790fa45777896749a885c3b93b2c1476d59f20"; - sha256 = "0dxz58an0sz5r82al5sc935y2z2k60rz12ikjvx7sz39rfirgfpc"; + src = fetchurl { + url = http://www.johnath.com/beep/beep-1.3.tar.gz; + sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; - patches = [ ./cve-2018-0492.patch ]; - - makeFlags = [ - "INSTALL_DIR=${placeholder "out"}/bin/" - "MAN_DIR=${placeholder "out"}/man/man1/" - ]; + makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; preInstall = '' - mkdir -p $out/{bin,man/man1} + mkdir -p $out/bin + mkdir -p $out/man/man1 ''; - - meta = with stdenv.lib; { + meta = { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; - license = licenses.gpl2; - platforms = platforms.linux; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } From 8cd80f3871f58fdfa7ffe342723d05f356cbad4e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Apr 2018 21:36:55 -0400 Subject: [PATCH 378/538] ansible: 2.5.0 -> 2.5.1 --- pkgs/tools/admin/ansible/2.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/2.5.nix b/pkgs/tools/admin/ansible/2.5.nix index 9c8a143d0d9b..32d83861cd8c 100644 --- a/pkgs/tools/admin/ansible/2.5.nix +++ b/pkgs/tools/admin/ansible/2.5.nix @@ -6,12 +6,12 @@ pythonPackages.buildPythonPackage rec { pname = "ansible"; - version = "2.5.0"; + version = "2.5.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "1p76d1pv89yhi8q05jas5gskkd1anjmqqvaks8nynmal1x5xwkki"; + sha256 = "06h0cmz0cgj1xszzn6rsypfc8lkazgh5g1yxyss1yx242d0wkw2i"; }; prePatch = '' From 4631fde2ab23b4f2d28d15de00566f80c141a7a0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 19 Apr 2018 21:37:29 -0400 Subject: [PATCH 379/538] linux-copperhead: 4.15.17.a -> 4.15.18.a --- pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index 0075cfbe165c..5685e6dd904d 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.17"; + version = "4.15.18"; revision = "a"; - sha256 = "0rm5dlfj3ryz879p04px1y3hvlfgh3ryk13ihldnl2j1dzl2046i"; + sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 65d5a8272977afdad7d7f5115fdbad7644c72035 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 21:50:46 -0700 Subject: [PATCH 380/538] python27Packages.youtube-dl: 2018.03.26.1 -> 2018.04.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/youtube-dl/versions. These checks were done: - built on NixOS - ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped -h’ got 0 exit code - ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped --help’ got 0 exit code - ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped --version’ and found version 2018.04.16 - ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl -h’ got 0 exit code - ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl --help’ got 0 exit code - ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl --version’ and found version 2018.04.16 - found 2018.04.16 with grep in /nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16 - directory tree listing: https://gist.github.com/359ce5add8ebf04a1dfe79aecb499137 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index cbfbf77739ba..1f7d8c549e42 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { pname = "youtube-dl"; - version = "2018.03.26.1"; + version = "2018.04.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1sbapwx2zdhprvmljqs6rzxnhiyfpxgin7qyjdrg6h25hhq63vss"; + sha256 = "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d"; }; nativeBuildInputs = [ makeWrapper ]; From 42f2bd3a5d2d4a16db1fcb248a387e3dc5011c31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 22:07:39 -0700 Subject: [PATCH 381/538] xmr-stak: 2.3.0 -> 2.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmr-stak/versions. These checks were done: - built on NixOS - ran ‘/nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3/bin/xmr-stak -h’ got 0 exit code - ran ‘/nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3/bin/xmr-stak --help’ got 0 exit code - found 2.4.3 with grep in /nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3 - directory tree listing: https://gist.github.com/ba044f08ae439ad36ac7e143f14e0fb0 --- pkgs/applications/misc/xmr-stak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 98b3af52d6ee..c24e1b0c2f1f 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.3.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1iisy73pi4xx3vmqvy6whdzb566jqyjx4pdyx0g35qjj8giflpc8"; + sha256 = "0plks4yyd9gjnfg7sfsgsvdgczkbghf5xjwb8bzv01f0fndn10r1"; }; NIX_CFLAGS_COMPILE = "-O3"; From 9b40680d466677e4fc77c6e8a40f7b4c0a191053 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 22:43:14 -0700 Subject: [PATCH 382/538] uftp: 4.9.5 -> 4.9.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uftp/versions. These checks were done: - built on NixOS - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftpd help’ got 0 exit code - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt -h’ got 0 exit code - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt --help’ got 0 exit code - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt help’ got 0 exit code - found 4.9.6 with grep in /nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6 - directory tree listing: https://gist.github.com/c08d432d7a238559a904561aa46161bd --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 40bcbc50f0ca..d1ec31d6b856 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.5"; + version = "4.9.6"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "1alsha0mhscp0jha2wlb5mqqkx2967s7rpm0x8c2v7jws1d0m1w3"; + sha256 = "0byg7ff39i32ljzqxn6rhiz3zs1b04y50xpvzmjx5v8pmdajn0sz"; }; buildInputs = [ openssl ]; From f110d54c72468d9fc594753c18daa38b2e36bd95 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 23:15:07 -0700 Subject: [PATCH 383/538] safeeyes: 2.0.2 -> 2.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/safeeyes/versions. These checks were done: - built on NixOS - ran ‘/nix/store/gzc1ivdll8xp7mx7ii0l9xkhfjzw872a-safeeyes-2.0.5/bin/safeeyes -h’ got 0 exit code - ran ‘/nix/store/gzc1ivdll8xp7mx7ii0l9xkhfjzw872a-safeeyes-2.0.5/bin/safeeyes --help’ got 0 exit code - found 2.0.5 with grep in /nix/store/gzc1ivdll8xp7mx7ii0l9xkhfjzw872a-safeeyes-2.0.5 - directory tree listing: https://gist.github.com/748ac5c50858dc7c1d5736104b8970b3 --- pkgs/applications/misc/safeeyes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 7c3bda8c06de..d216a695a3c5 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { name = "${pname}-${version}"; pname = "safeeyes"; - version = "2.0.2"; + version = "2.0.5"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1fx6zd4hnbc7gdpac6r7smxwdl1bifaxx3mnx0wrqfvhpnwr1ybv"; + sha256 = "1q52ncqn18wb3d42dzsm7lh301w6g053a685i1cnismvp86amvfl"; }; buildInputs = [ From 84a0338c5ce46e723dcb9269b9f5cc606ac8e565 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 23:22:45 -0700 Subject: [PATCH 384/538] renpy: 6.99.14.2 -> 6.99.14.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/renpy/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 6.99.14.3 with grep in /nix/store/cjp6nqbn7ni65awiwhdgy6z36vwixpag-renpy-6.99.14.3 - directory tree listing: https://gist.github.com/b6c16d6f78583a3c4c384e043a57b07d --- pkgs/development/interpreters/renpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 392b4bf36051..a992717d94f3 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "6.99.14.2"; + version = "6.99.14.3"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "1cjaly5igks18lmmssph4d6b5q1b8qfav2s7x2agx1gybxyghv9n"; + sha256 = "15n29ybblcpnfbmhc31gm5vj7cpqd8cwrcqxlwnxy0gjpbc50x73"; }; patches = [ From 8defac9e454ecdae8b5e18b7f732289a20c20186 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 23:55:53 -0700 Subject: [PATCH 385/538] qmmp: 1.2.0 -> 1.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qmmp/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.2.1 with grep in /nix/store/bdsg5rzda3rj5k535f56rkbjwsqy4h07-qmmp-1.2.1 - directory tree listing: https://gist.github.com/fed0e3b824b6157facab85accd329d15 --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 6b816cdeec10..e2218f477a59 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.0"; + name = "qmmp-1.2.1"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "17kci7srgbkk62dgxlmg3lv2y7z04jsinpgx6jmxjpnpblpcj840"; + sha256 = "1ag8wh11dq394zjqdyz5g1srjnm4fnq4cwlhpb9k89gpmlk42cdr"; }; buildInputs = From 8929690cd1d4cf41a24e8b8bb67847e0b8694d11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 00:28:23 -0700 Subject: [PATCH 386/538] singularity: 2.4.5 -> 2.4.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/singularity/versions. These checks were done: - built on NixOS - ran ‘/nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6/bin/singularity -h’ got 0 exit code - ran ‘/nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6/bin/singularity --help’ got 0 exit code - ran ‘/nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6/bin/singularity help’ got 0 exit code - found 2.4.6 with grep in /nix/store/0rcn1kn4j7rmr0qn314g28vpa4xf230d-singularity-2.4.6 - directory tree listing: https://gist.github.com/e2f21872e885760acf461b07dd5b4f86 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 0a45b4d5d90d..d6913a94432b 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.4.5"; + version = "2.4.6"; enableParallelBuilding = true; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "0wz2in07197n5c2csww864nn2qmr925lqcjsd1kmlwwnrhq6lzl3"; + sha256 = "0bs1jqm7v7wv1kdxq8kyqn3gl5m76j0wwwgjyjnndrhczlsh5m1d"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From 7d22bbe6718fe2299842cd1e97e432d690f4225a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 00:44:45 -0700 Subject: [PATCH 387/538] picard-tools: 2.18.1 -> 2.18.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/picard-tools/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.18.2 with grep in /nix/store/sp6gc6c6knpvpsmfdx8074qclcsgs931-picard-tools-2.18.2 - directory tree listing: https://gist.github.com/114857d15222eccda94501b5a871fb24 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 3fc84228efe9..7af1669dc45e 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.1"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0wcihlgaif79r0fa47kq77igxzq0lpyn74414v9n6k9rl5nj8x1a"; + sha256 = "0w3b2jz4n9irslsg85r4x9dc3y4ziykn8fs4iqqiq4sfdcz259fz"; }; buildInputs = [ jre makeWrapper ]; From 651239d5ee66d6fe8e5e8c7b7a0eb54d2f4d8621 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Apr 2018 07:37:34 +0200 Subject: [PATCH 388/538] ghc: version 8.4.2 is now a proper release --- pkgs/development/compilers/ghc/8.4.2.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index e381c411925b..296c10b9346c 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 +, autoconf, automake, coreutils, fetchurl, perl, python3 , libffi, libiconv ? null, ncurses @@ -68,13 +68,11 @@ let in stdenv.mkDerivation rec { inherit version; - inherit (src) rev; name = "${targetPrefix}ghc-${version}"; - src = fetchgit { - url = "git://git.haskell.org/ghc.git"; - rev = "6d7eecff7948ad77854f834f55b4d4f942276ad3"; - sha256 = "0aqy5x0b6qxhyvxw1q9pssf1xvhbyviglqkjrx4gvhbr3nax3wxp"; + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01"; }; enableParallelBuilding = true; @@ -102,9 +100,6 @@ stdenv.mkDerivation rec { export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk - echo ${version} >VERSION - echo ${src.rev} >GIT_COMMIT_ID - ./boot sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" From 0ffe5fac72f232113935f45341a9e8af4dd581c7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:02:01 -0700 Subject: [PATCH 389/538] playerctl: 0.5.0 -> 0.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/playerctl/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p0qhcjwl78w4rwdqwkh7zzifpc2v60p3-playerctl-0.6.0/bin/playerctl -h’ got 0 exit code - ran ‘/nix/store/p0qhcjwl78w4rwdqwkh7zzifpc2v60p3-playerctl-0.6.0/bin/playerctl --help’ got 0 exit code - ran ‘/nix/store/p0qhcjwl78w4rwdqwkh7zzifpc2v60p3-playerctl-0.6.0/bin/playerctl -v’ and found version 0.6.0 - ran ‘/nix/store/p0qhcjwl78w4rwdqwkh7zzifpc2v60p3-playerctl-0.6.0/bin/playerctl --version’ and found version 0.6.0 - found 0.6.0 with grep in /nix/store/p0qhcjwl78w4rwdqwkh7zzifpc2v60p3-playerctl-0.6.0 - directory tree listing: https://gist.github.com/0d015359b346703f7434ab698e4ad496 --- pkgs/tools/audio/playerctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index b04e449835d4..b8f39a03083c 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "0b4pg5pwblgbf6kvvynzh9dshfikxy5c2ks7733n7wza5wkpgmng"; + sha256 = "1sxy87syrfk485f2x556rl567j6rph4ss0xahf04bv26bzj3mqrp"; }; nativeBuildInputs = [ pkgconfig ]; From e128d300a95962fb2bdf2b9d8d87841d8dc94ecc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:04:45 -0700 Subject: [PATCH 390/538] mate.pluma: 1.20.1 -> 1.21.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pluma/versions. These checks were done: - built on NixOS - ran ‘/nix/store/fb3vkl4s4sx82pld3anv8pfmb5axv05a-pluma-1.21.0/bin/pluma -h’ got 0 exit code - ran ‘/nix/store/fb3vkl4s4sx82pld3anv8pfmb5axv05a-pluma-1.21.0/bin/pluma --help’ got 0 exit code - ran ‘/nix/store/fb3vkl4s4sx82pld3anv8pfmb5axv05a-pluma-1.21.0/bin/.pluma-wrapped -h’ got 0 exit code - ran ‘/nix/store/fb3vkl4s4sx82pld3anv8pfmb5axv05a-pluma-1.21.0/bin/.pluma-wrapped --help’ got 0 exit code - found 1.21.0 with grep in /nix/store/fb3vkl4s4sx82pld3anv8pfmb5axv05a-pluma-1.21.0 - directory tree listing: https://gist.github.com/82bb4a3eafe7fd90b442f992b51bab3c --- pkgs/desktops/mate/pluma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index bbff7d246978..c1b57504317d 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pluma-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "09arzypdz6q1zpxd1qqnsn1ykvhmzlf7nylkz2vpwlvnnd3x8ip3"; + sha256 = "1y3zl0rzp069pix1vgrhzkkfc3lvhq9ahfgbmc88cwqw9aw3mgk0"; }; nativeBuildInputs = [ From fc7a9977f3df62cb4ac4b9f0d6b2c83e861c5efe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:05:46 -0700 Subject: [PATCH 391/538] pgroonga: 2.0.4 -> 2.0.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pgroonga/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.0.5 with grep in /nix/store/k3jk6bdh9z57nngzfi737j30y146msb2-pgroonga-2.0.5 - directory tree listing: https://gist.github.com/480386761e3d0a9251dceaf4f5707651 --- pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 1f612116ae3a..eb6f5f94810e 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0hx7bzxmjv0rsvv6b77gpmwhw4ajy8sgjbmrg7hj3dc51kiyiai0"; + sha256 = "1c4m1rg3122y8rndgz7sj9a49l3v9nm0qbpa04pls20pxzx21g5a"; }; nativeBuildInputs = [ pkgconfig ]; From 93e9b73b3aec06f563ba01c50676d846c2328dbb Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Fri, 20 Apr 2018 10:10:51 +0200 Subject: [PATCH 392/538] fetchFromGitLab: Fixes #39200 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2618fce479d..89a7ff6c5fe3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -288,7 +288,7 @@ with pkgs; ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}"; + url = "https://gitlab.com/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.tar.gz"; meta.homepage = "https://gitlab.com/${owner}/${repo}/"; } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }; From a037b5744d48fa39f56783b6b96e95e5b5c60223 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:16:25 -0700 Subject: [PATCH 393/538] osinfo-db: 20180325 -> 20180416 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osinfo-db/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 20180416 with grep in /nix/store/nwpn0sz1yrnya6fy9i1akyc1k0viqxmm-osinfo-db-20180416 - directory tree listing: https://gist.github.com/1a5a860f2b7b5bae8fab95a8735b6528 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 93676b790890..09c677c35bda 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180325"; + name = "osinfo-db-20180416"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0lma4szxwg5vzb23p3hplllz9yi77x57dzijsz6n4qa399wzv8rs"; + sha256 = "0qam3qbrwzrz40pikhb8y11lidpb6snsa80ym8s6hp5kh4icr1h6"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From 558464b8cb73b5de51054cf2c8144582e04458a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:18:54 -0700 Subject: [PATCH 394/538] peek: 1.3.0 -> 1.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/peek/versions. These checks were done: - built on NixOS - ran ‘/nix/store/6qsj0hw5vl2i0398i0y2n9jjg0l28mz5-peek-1.3.1/bin/peek -h’ got 0 exit code - ran ‘/nix/store/6qsj0hw5vl2i0398i0y2n9jjg0l28mz5-peek-1.3.1/bin/peek --help’ got 0 exit code - ran ‘/nix/store/6qsj0hw5vl2i0398i0y2n9jjg0l28mz5-peek-1.3.1/bin/.peek-wrapped -h’ got 0 exit code - ran ‘/nix/store/6qsj0hw5vl2i0398i0y2n9jjg0l28mz5-peek-1.3.1/bin/.peek-wrapped --help’ got 0 exit code - found 1.3.1 with grep in /nix/store/6qsj0hw5vl2i0398i0y2n9jjg0l28mz5-peek-1.3.1 - directory tree listing: https://gist.github.com/d9ae1da7a87a6e5703b8ef273d0bab8a --- pkgs/applications/video/peek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 6a84154818b0..493cc66b8b39 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "peek-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "phw"; repo = "peek"; rev = version; - sha256 = "0yizf55rzkm88bfjzwr8yyhm33yqp1mbih2ifwhvnjd1911db0x9"; + sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb"; }; nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; From f8fbe0f1571e242330b0f7e86a82d5bc26b6b157 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 21:03:45 +0200 Subject: [PATCH 395/538] sympow: init at 1.018.1 --- .../libraries/science/math/sympow/default.nix | 89 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/development/libraries/science/math/sympow/default.nix diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix new file mode 100644 index 000000000000..fd677f5c0b7b --- /dev/null +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchurl +, fetchpatch +, makeWrapper +}: + +stdenv.mkDerivation rec { + version = "1.018.1"; + name = "sympow-${version}"; + + src = fetchurl { + # Original website no longer reachable + url = "http://mirrors.mit.edu/sage/spkg/upstream/sympow/sympow-${version}.tar.bz2"; + sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c"; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + configurePhase = '' + runHook preConfigure + ./Configure # doesn't take any options + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + install -d datafiles "$out/share/sympow/datafiles" + install *.gp "$out/share/sympow/" + install -Dm755 sympow "$out/share/sympow/sympow" + install -D new_data "$out/bin/new_data" + + makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ + --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ + --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then + mkdir -p "$SYMPOW_LOCAL" + cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL" + chmod -R +xw "$SYMPOW_LOCAL" + fi' \ + --run 'cd "$SYMPOW_LOCAL"' + runHook postInstall + ''; + + patches = [ + # don't hardcode paths + (fetchpatch { + name = "do_not_hardcode_paths.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/Configure.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1611p8ra8zkxvmxn3gm2l64bd4ma4m6r4vd6vwswcic91k1fci04"; + }) + + # bug on some platforms in combination with a newer gcc: + # https://trac.sagemath.org/ticket/11920 + (fetchpatch { + name = "fix_newer_gcc1.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/fpu.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "14gfa56w3ddfmd4d5ir9a40y2zi43cj1i4d2l2ij9l0qlqdy9jyx"; + }) + (fetchpatch { + name = "fix_newer_gcc2.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/execlp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "190gqhgz9wgw4lqwz0nwb1izc9zffx34bazsiw2a2sz94bmgb54v"; + }) + + # fix pointer initialization bug (https://trac.sagemath.org/ticket/22862) + (fetchpatch { + name = "fix_pointer_initialization1.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympow/patches/initialize-tacks.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "02341vdbbidfs39s26vi4n5wigz619sw8fdbl0h9qsmwwhscgf85"; + }) + (fetchpatch { + name = "fix_pointer_initialization2.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow"; + sha256 = "1m0vz048layb47r1jjf7fplw650ccc9x0w3l322iqmppzmv3022a"; + }) + ]; + + meta = with stdenv.lib; { + description = "A package to compute special values of symmetric power elliptic curve L-functions"; + license = { + shortName = "sympow"; + fullName = "Custom, BSD-like. See COPYING file."; + free = true; + }; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 199f6e878ff5..7764aad59f8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19828,6 +19828,8 @@ with pkgs; symmetrica = callPackage ../applications/science/math/symmetrica {}; + sympow = callPackage ../development/libraries/science/math/sympow { }; + ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; }; gmsh = callPackage ../applications/science/math/gmsh { }; From 448624323950b6649218def0b62c6aa1eae3b7d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:32:36 -0700 Subject: [PATCH 396/538] oniguruma: 6.7.1 -> 6.8.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/onig/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 6.8.2 with grep in /nix/store/ns5crqr9hb3l0p1l9865va71sv2xg6cz-onig-6.8.2 - directory tree listing: https://gist.github.com/fef8043e3042d40389d1a1b025204060 --- pkgs/development/libraries/oniguruma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 974c2e482ea5..3989ab42468d 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.7.1"; + version = "6.8.2"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "07xbx4f3h1aqvy6587xbr8fgcn679ph3bd86pp144y0agzw0d0q2"; + sha256 = "00ly5i26n7wajhyhq3xadsc7dxrf7qllhwilk8dza2qj5dhld4nd"; }; nativeBuildInputs = [ cmake ]; From 31797abd55bdfe6add3c4c0b3e100b055bcb00d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:40:08 -0700 Subject: [PATCH 397/538] pam_u2f: 1.0.4 -> 1.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pam_u2f/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w4zrfq02p2ssbk391n380g8bm1fy8ai7-pam_u2f-1.0.5/bin/pamu2fcfg -h’ got 0 exit code - ran ‘/nix/store/w4zrfq02p2ssbk391n380g8bm1fy8ai7-pam_u2f-1.0.5/bin/pamu2fcfg --help’ got 0 exit code - ran ‘/nix/store/w4zrfq02p2ssbk391n380g8bm1fy8ai7-pam_u2f-1.0.5/bin/pamu2fcfg -V’ and found version 1.0.5 - ran ‘/nix/store/w4zrfq02p2ssbk391n380g8bm1fy8ai7-pam_u2f-1.0.5/bin/pamu2fcfg --version’ and found version 1.0.5 - found 1.0.5 with grep in /nix/store/w4zrfq02p2ssbk391n380g8bm1fy8ai7-pam_u2f-1.0.5 - directory tree listing: https://gist.github.com/63aa3c566fe3d6ad7704e45ee7e969fc --- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index f58dadfd10ce..0f0b6ebb37a6 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "189j0wgx6fs146vfp88djqpl1flpfb3962l1a2marlp6d12jwm3i"; + sha256 = "0bbwy9k3002anhkv67zwck3dry7blqnnp291dc4qsjrca0blw217"; }; nativeBuildInputs = [ pkgconfig ]; From 47eef9cd0377b11def27739b0685a8d50c458ee1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 01:48:59 -0700 Subject: [PATCH 398/538] opendht: 1.6.1 -> 1.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opendht/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtnode -h’ got 0 exit code - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtnode --help’ got 0 exit code - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtnode help’ got 0 exit code - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtchat -h’ got 0 exit code - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtchat --help’ got 0 exit code - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtchat help’ got 0 exit code - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtscanner -h’ got 0 exit code - ran ‘/nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0/bin/dhtscanner --help’ got 0 exit code - found 1.7.0 with grep in /nix/store/ac60nh12x3j2w6fscdy36fq2dnj2df3r-opendht-1.7.0 - directory tree listing: https://gist.github.com/85cbaa537ed4b43693fdedad31dc6f0f --- pkgs/development/libraries/opendht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 68486fca54d6..fc2068ca02ca 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "13sxcg2sdhnzdkrjqmhg16p4001w3rd048p71k74pbmi8qpd0bw2"; + sha256 = "14pdih09h3bmgimmj9sa917x7kld49m91gvh0lcncink8rmbxvf1"; }; buildInputs = [ From 5be6943696ab515c85bec82870a15766a2b4afdd Mon Sep 17 00:00:00 2001 From: xeji Date: Fri, 20 Apr 2018 11:05:50 +0200 Subject: [PATCH 399/538] qemu: add separate output for qemu-ga guest agent --- pkgs/applications/virtualization/qemu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7b246df01a93..f5cd661fbecb 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + outputs = [ "out" "ga" ]; + patches = [ ./no-etc-install.patch ./statfs-flags.patch (fetchpatch { name = "glibc-2.27-memfd.patch"; url = "https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0"; @@ -122,6 +124,9 @@ stdenv.mkDerivation rec { for exe in $out/bin/qemu-system-* ; do paxmark m $exe done + # copy qemu-ga (guest agent) to separate output + mkdir -p $ga/bin + cp $out/bin/qemu-ga $ga/bin/ ''; # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. From 42d543d3294bd15059f5285a1feb6525c5173d53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 02:28:58 -0700 Subject: [PATCH 400/538] mediainfo: 18.03 -> 18.03.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mediainfo/versions. These checks were done: - built on NixOS - ran ‘/nix/store/jw7xbadzlavx5k13ij9686f8cyylbhyz-mediainfo-18.03.1/bin/mediainfo -h’ got 0 exit code - ran ‘/nix/store/jw7xbadzlavx5k13ij9686f8cyylbhyz-mediainfo-18.03.1/bin/mediainfo --help’ got 0 exit code - ran ‘/nix/store/jw7xbadzlavx5k13ij9686f8cyylbhyz-mediainfo-18.03.1/bin/mediainfo --version’ and found version 18.03.1 - found 18.03.1 with grep in /nix/store/jw7xbadzlavx5k13ij9686f8cyylbhyz-mediainfo-18.03.1 - directory tree listing: https://gist.github.com/1f4582abcedfafe5a1c8e26b5a4af4f9 --- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 18eb1800a7b1..dcc2a1bf43ce 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "18.03"; + version = "18.03.1"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "171xv1qn6lbzybhx471j5a3rdqdj3xn0xc7gs181624r1kslxyn1"; + sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 0307ce3d0e7a2d82348c7edea52d1e7e8338c498 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 02:38:35 -0700 Subject: [PATCH 401/538] multimon-ng: 1.1.4 -> 1.1.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/multimon-ng/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.1.5 with grep in /nix/store/x3cfglkwjspjg0gv4vlalwzw7wykp2p3-multimon-ng-1.1.5 - directory tree listing: https://gist.github.com/f266692b50ec442e1bb40052b1440be8 --- pkgs/applications/misc/multimon-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index 953c4c1d9a94..99d511d413c0 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qt4, qmake4Hook, libpulseaudio }: let - version = "1.1.4"; + version = "1.1.5"; in stdenv.mkDerivation { name = "multimon-ng-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "EliasOenal"; repo = "multimon-ng"; rev = "${version}"; - sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga"; + sha256 = "00h884hn5afrx5i52xmngpsv3204hgb7xpw9my3lm8sajmfrjj1g"; }; buildInputs = [ qt4 libpulseaudio ]; From 308d18f14f46d33bdceaa21c52f503aaa5f4a2bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 02:50:26 -0700 Subject: [PATCH 402/538] qmapshack: 1.10.0 -> 1.11.1 (#39193) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qmapshack/versions. These checks were done: - built on NixOS - ran ‘/nix/store/wddp26cbiivr7sfvh7r36bqj8wlvr5gx-qmapshack-1.11.1/bin/qmt_rgb2pct -h’ got 0 exit code - ran ‘/nix/store/wddp26cbiivr7sfvh7r36bqj8wlvr5gx-qmapshack-1.11.1/bin/qmt_rgb2pct --help’ got 0 exit code - ran ‘/nix/store/wddp26cbiivr7sfvh7r36bqj8wlvr5gx-qmapshack-1.11.1/bin/qmt_map2jnx -h’ got 0 exit code - ran ‘/nix/store/wddp26cbiivr7sfvh7r36bqj8wlvr5gx-qmapshack-1.11.1/bin/qmt_map2jnx --help’ got 0 exit code - ran ‘/nix/store/wddp26cbiivr7sfvh7r36bqj8wlvr5gx-qmapshack-1.11.1/bin/qmt_map2jnx help’ got 0 exit code - found 1.11.1 with grep in /nix/store/wddp26cbiivr7sfvh7r36bqj8wlvr5gx-qmapshack-1.11.1 - directory tree listing: https://gist.github.com/1823f811dd1c8c3b648af3fc29d40605 --- pkgs/applications/misc/qmapshack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index bc09d0b4d0ac..3b9e76aee4b8 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qmapshack-${version}"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz"; - sha256 = "10qk6c5myw5dhkbw7pcrx3900kiqhs32vy47xl2844nzb4fq2liw"; + sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y"; }; nativeBuildInputs = [ cmake ]; From 095d578f226d8b79bcd267f3aa24f5af70915bd8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 02:52:33 -0700 Subject: [PATCH 403/538] mypy: 0.580 -> 0.590 (#39211) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mypy/versions. These checks were done: - built on NixOS - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.dmypy-wrapped -h’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.dmypy-wrapped --help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.dmypy-wrapped help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/dmypy -h’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/dmypy --help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/dmypy help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.mypy-wrapped -h’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.mypy-wrapped --help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.mypy-wrapped -V’ and found version 0.590 - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.mypy-wrapped --version’ and found version 0.590 - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/mypy -h’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/mypy --help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/mypy -V’ and found version 0.590 - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/mypy --version’ and found version 0.590 - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.stubgen-wrapped -h’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.stubgen-wrapped --help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/.stubgen-wrapped help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/stubgen -h’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/stubgen --help’ got 0 exit code - ran ‘/nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590/bin/stubgen help’ got 0 exit code - found 0.590 with grep in /nix/store/949glp2ll51fziqzy2xnma6zvvn6ihlq-mypy-0.590 - directory tree listing: https://gist.github.com/28a5c2600f864ea85373e565ced612c6 --- pkgs/development/tools/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index e0288b686efe..fd21a8a23d34 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy"; - version = "0.580"; + version = "0.590"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "3bd95a1369810f7693366911d85be9f0a0bd994f6cb7162b7a994e5ded90e3d9"; + sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4"; }; propagatedBuildInputs = [ lxml typed-ast psutil ]; From 0d4cf266dc646d6805780aa7abd29f96afa8a79d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 03:01:40 -0700 Subject: [PATCH 404/538] mcelog: 156 -> 157 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mcelog/versions. These checks were done: - built on NixOS - ran ‘/nix/store/8dyjjqwjjhzsdfzk8sk0v2qj8b72gc5l-mcelog-157/bin/mcelog --help’ got 0 exit code - ran ‘/nix/store/8dyjjqwjjhzsdfzk8sk0v2qj8b72gc5l-mcelog-157/bin/mcelog --version’ and found version 157 - found 157 with grep in /nix/store/8dyjjqwjjhzsdfzk8sk0v2qj8b72gc5l-mcelog-157 - directory tree listing: https://gist.github.com/cc3e7a088b51c408fc98ae7bba0d57c3 --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 30c2b05b8e1e..4ebc1c00f7af 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "156"; + version = "157"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0mv4sxcysl3m9wqybg6b363mawr9amzhc9v53775p4p2a47z774r"; + sha256 = "1965axyfizv2jg412a4wrrghgswwvvgymk7mbwaraw3xl9p21wgv"; }; postPatch = '' From a9cd8ef23e0ff0af88c2ed547f8ce1e32b3de74d Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 20 Apr 2018 12:22:40 +0200 Subject: [PATCH 405/538] nixos/tests/containers-imperative: Fix eval The commit c6f7d4367894047592cc412740f0c1f5b2ca2b59 changed the system attribute to be below config.nixpkgs.localSystem, but the test still uses the old attribute. I have not tested whether the test actually succeeds but just checked whether evaluation works and it evaluates successfully now. Signed-off-by: aszlig --- nixos/tests/containers-imperative.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 20902913e9a7..015b79b1cee6 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { # container available within the VM, because we don't have network access. virtualisation.pathsInNixDB = let emptyContainer = import ../lib/eval-config.nix { - inherit (config.nixpkgs) system; + inherit (config.nixpkgs.localSystem) system; modules = lib.singleton { containers.foo.config = {}; }; From 3e49b097ce02d2ec745d75d3734f731b6b14ad73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 03:46:45 -0700 Subject: [PATCH 406/538] libpqxx: 6.1.1 -> 6.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libpqxx/versions. These checks were done: - built on NixOS - ran ‘/nix/store/hzcqfnjvh2k4zdqzqd4wpqwcm07ykfj1-libpqxx-6.2.2/bin/pqxx-config -h’ got 0 exit code - ran ‘/nix/store/hzcqfnjvh2k4zdqzqd4wpqwcm07ykfj1-libpqxx-6.2.2/bin/pqxx-config --help’ got 0 exit code - ran ‘/nix/store/hzcqfnjvh2k4zdqzqd4wpqwcm07ykfj1-libpqxx-6.2.2/bin/pqxx-config help’ got 0 exit code - found 6.2.2 with grep in /nix/store/hzcqfnjvh2k4zdqzqd4wpqwcm07ykfj1-libpqxx-6.2.2 - directory tree listing: https://gist.github.com/1762ec20b50f90dcc2837560c260d785 --- pkgs/development/libraries/libpqxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index eb70677b3e95..a6dd719a3812 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libpqxx-${version}"; - version = "6.1.1"; + version = "6.2.2"; src = fetchFromGitHub { owner = "jtv"; repo = "libpqxx"; rev = version; - sha256 = "0yw0wvnpw0j560f5zv4gvmafi19d9hrknwjzl7qrss926aqx65jq"; + sha256 = "0f7mkl29v6d47kkdpl2gkb9xc5lnih2pq9pk3cq6nc2j6w758yp5"; }; nativeBuildInputs = [ gnused python2 ]; From 2446ff2aacdd559e9787d9dabe6026d410fd2503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Apr 2018 13:00:23 +0200 Subject: [PATCH 407/538] python.pkgs.portend: actually run tests --- .../python-modules/portend/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index bd13c63c4043..3559053481e1 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,20 +1,25 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytest-sugar, pytest-warnings, setuptools_scm -, tempora }: +, pytest, setuptools_scm, tempora }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "portend"; version = "2.2"; - buildInputs = [ pytest pytest-sugar pytest-warnings setuptools_scm ]; - propagatedBuildInputs = [ tempora ]; - src = fetchPypi { inherit pname version; sha256 = "bc48d3d99e1eaf2e9406c729f8848bfdaf87876cd3560dc3ec6c16714f529586"; }; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ tempora ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "Monitor TCP ports for bound or unbound states"; homepage = https://github.com/jaraco/portend; From 610ca3b95a73393cb896e8558335dda657d75664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Apr 2018 13:08:45 +0200 Subject: [PATCH 408/538] python.pkgs.cheroot: clean up checkInputs --- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index d1ecfcc5c89c..7aa01623b085 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage , more-itertools, six -, coverage, codecov, pytest, pytestcov, pytest-sugar, portend +, pytest, pytestcov, portend , backports_unittest-mock, setuptools_scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; - checkInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock ]; + checkInputs = [ pytest pytestcov portend backports_unittest-mock ]; checkPhase = '' py.test cheroot From a141b15e970f4c96041f6957409b6fa84ac4ec31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Apr 2018 13:11:35 +0200 Subject: [PATCH 409/538] python.pkgs.cherrypy: clean up checkInputs --- pkgs/development/python-modules/cherrypy/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 18c0ab826b3a..bb97a3a7e678 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,11 +1,10 @@ { lib, buildPythonPackage, fetchPypi , cheroot, portend, routes, six , setuptools_scm -, backports_unittest-mock, codecov, coverage, objgraph, pathpy, pytest, pytest-sugar, pytestcov +, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "CherryPy"; version = "14.0.1"; @@ -18,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; - checkInputs = [ backports_unittest-mock codecov coverage objgraph pathpy pytest pytest-sugar pytestcov ]; + checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ]; checkPhase = '' LANG=en_US.UTF-8 pytest From 5d4af08b23836b2fe5c56b9c17aa9f570a93bbc8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 04:12:53 -0700 Subject: [PATCH 410/538] ircdHybrid: 8.2.22 -> 8.2.24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ircd-hybrid/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ggb89l411451a7f99590qx4l374kjgbr-ircd-hybrid-8.2.24/bin/mkpasswd -h’ got 0 exit code - ran ‘/nix/store/ggb89l411451a7f99590qx4l374kjgbr-ircd-hybrid-8.2.24/bin/mkpasswd --help’ got 0 exit code - ran ‘/nix/store/ggb89l411451a7f99590qx4l374kjgbr-ircd-hybrid-8.2.24/bin/ircd help’ got 0 exit code - found 8.2.24 with grep in /nix/store/ggb89l411451a7f99590qx4l374kjgbr-ircd-hybrid-8.2.24 - directory tree listing: https://gist.github.com/f272ead9b6591f5ffe113885b6151952 --- pkgs/servers/irc/ircd-hybrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 656f0aa02233..c73c69e6ee5a 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "ircd-hybrid-8.2.22"; + name = "ircd-hybrid-8.2.24"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; - sha256 = "1i5iv5hc8gbaw74mz18zdjzv3dsvyvr8adldj8p1726h4i2xzn6p"; + sha256 = "03nmzrhqfsxwry316nm80m9p285v65fz75ns7fg623hcy65jv97a"; }; buildInputs = [ openssl zlib ]; From 09b71cf7a3e49ddfe2edc4ef311b288239739abb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 04:16:30 -0700 Subject: [PATCH 411/538] jbake: 2.6.0 -> 2.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jbake/versions. These checks were done: - built on NixOS - ran ‘/nix/store/l85kq1n5mv8shw19rd26vx1qh2q2xj98-jbake-2.6.1/bin/jbake -h’ got 0 exit code - ran ‘/nix/store/l85kq1n5mv8shw19rd26vx1qh2q2xj98-jbake-2.6.1/bin/jbake --help’ got 0 exit code - ran ‘/nix/store/l85kq1n5mv8shw19rd26vx1qh2q2xj98-jbake-2.6.1/bin/jbake help’ got 0 exit code - found 2.6.1 with grep in /nix/store/l85kq1n5mv8shw19rd26vx1qh2q2xj98-jbake-2.6.1 - directory tree listing: https://gist.github.com/27e3a60a9041b9898ce150344a6c3db4 --- pkgs/development/tools/jbake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 70b8e7f26638..058ed1c82b96 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, jre }: stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.6.1"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "1k71rz82fwyi51xhyghg8laz794xyz06d5apmxa9psy7yz184ylk"; + sha256 = "0zlh2azmv8gj3c4d4ndivar31wd42nmvhxq6xhn09cib9kffxbc7"; }; buildInputs = [ jre ]; From 8a28784618d68deac42801c9dfee2d3edaf7032d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 04:23:49 -0700 Subject: [PATCH 412/538] leatherman: 1.4.0 -> 1.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/leatherman/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.4.1 with grep in /nix/store/9wbh0aq3a46hkm7ybz7mi5ns2s1hwsp9-leatherman-1.4.1 - directory tree listing: https://gist.github.com/478abe4c1470eb6b45919b8e1eca9538 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 44d527e1304b..7b6834166d8c 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { - sha256 = "0whlyzz0imv4lm69xkwhcd6jzh3s0rzlqjmwimbqz96p4771ivpd"; + sha256 = "0n516gqv501ymj99bickbr2cbhr109azh9hc1hn7flbcjzz3aljc"; rev = version; repo = "leatherman"; owner = "puppetlabs"; From f3b049330fc4f91dbbcb3dd874508795780cbe13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 04:30:43 -0700 Subject: [PATCH 413/538] kotlin: 1.2.31 -> 1.2.40 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kotlin/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w1k17lqv3cc8sszxnmzg8g6lcc1pxkk8-kotlin-1.2.40/bin/kotlin -h’ got 0 exit code - ran ‘/nix/store/w1k17lqv3cc8sszxnmzg8g6lcc1pxkk8-kotlin-1.2.40/bin/.kotlin-wrapped -h’ got 0 exit code - found 1.2.40 with grep in /nix/store/w1k17lqv3cc8sszxnmzg8g6lcc1pxkk8-kotlin-1.2.40 - directory tree listing: https://gist.github.com/886158de7b36d9a61fcbc13d2638779a --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 62c1c2c96708..d5ce240b4a5f 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.31"; + version = "1.2.40"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "09l0vjff9kkiprf5irgq1sb9cils8plbzbrf55ajj8m5fyxcd6fs"; + sha256 = "0n4na0ddnjgc573szk5bpd34v5gib71pah62xq7vwdf34q8mg61l"; }; propagatedBuildInputs = [ jre ] ; From 2061eefc388cbfdef426b350f282c7ed4a0354be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 04:42:42 -0700 Subject: [PATCH 414/538] j: 806 -> 808 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/j/versions. These checks were done: - built on NixOS - ran ‘/nix/store/s4j1rrnwdrrqdaiyqci4c0cqy3azlnl2-j-808/bin/jconsole -h’ got 0 exit code - ran ‘/nix/store/s4j1rrnwdrrqdaiyqci4c0cqy3azlnl2-j-808/bin/jconsole --help’ got 0 exit code - ran ‘/nix/store/s4j1rrnwdrrqdaiyqci4c0cqy3azlnl2-j-808/bin/jconsole help’ got 0 exit code - found 808 with grep in /nix/store/s4j1rrnwdrrqdaiyqci4c0cqy3azlnl2-j-808 - directory tree listing: https://gist.github.com/3c6f38056c15de42a7496ff1f576064e --- pkgs/development/interpreters/j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 698986e6b402..cb351446301d 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "j-${version}"; - version = "806"; + version = "808"; jtype = "release"; src = fetchFromGitHub { owner = "jsoftware"; repo = "jsource"; rev = "j${version}-${jtype}"; - sha256 = "0b9sbd5hbyr5454k0p53f03lpf03sz8mqwszaqi0vcs73bsprdjs"; + sha256 = "1sshm04p3yznlhfp6vyc7g8qxw95y67vhnh92cmz3lfy69n2q6bf"; }; buildInputs = [ readline libedit ]; From 8539dec47a5e2370c69995aa32f355bdceb29b18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 04:51:53 -0700 Subject: [PATCH 415/538] ibus-engines.libpinyin: 1.9.3 -> 1.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ibus-libpinyin/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.10.0 with grep in /nix/store/4ya0a61mnwzvlphi2a39q3wz8srak0g5-ibus-libpinyin-1.10.0 - directory tree listing: https://gist.github.com/920acb2f5a3bfd5b8d50bff07772754e --- .../inputmethods/ibus-engines/ibus-libpinyin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index bd22aefe2a95..3bdb69391cc4 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-libpinyin-${version}"; - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "02rwddv1lxzk70946v3rjsx1p7hx1d9bnwb7cx406cbws73yb2r9"; + sha256 = "0zkzz6ig74nws8phqxbsggnpf5g5f2hxi0mdyn2m3s4nm14q3ma6"; }; buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; From bbedc9871362c776b6c473377013be52edef2c03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 05:03:57 -0700 Subject: [PATCH 416/538] grails: 3.3.3 -> 3.3.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grails/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.3.5 with grep in /nix/store/cy2fxxg1yjiksfkg4y3wn7r3dsdlijcz-grails-3.3.5 - directory tree listing: https://gist.github.com/71c11340ad3d455500fb5228ea57ed71 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 80731de84fb2..a0d8a0b84bac 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "grails-${version}"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "087bd1vjpg0wghqbkyldmzma7ziqi7hf745chfr31x8cn5ys0jji"; + sha256 = "0796jbcblr3vxdf6sngzcfs1m24d1ra1n8jc7cnfrfxpf8r0z15m"; }; buildInputs = [ unzip ]; From 412476a105e4fcf7e1ded9fa06a5f46c7fa2749e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 05:14:00 -0700 Subject: [PATCH 417/538] gzdoom: 3.3.0 -> 3.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gzdoom/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.3.2 with grep in /nix/store/zv856axqy6bna0vpgramgaglz02nb8rh-gzdoom-3.3.2 - directory tree listing: https://gist.github.com/66372cbd8e865e89ab9749a99b308ea7 --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index d622299cf0f3..3964eefb9b33 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.3.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1q1hjfxhksny236a058ys36mpdl434vbmgapqr51n82pia838h2l"; + sha256 = "0zlkja0jcqi3s4iw5h076iwqxa3haradqksjnx9jxcbkvaw75p3k"; }; nativeBuildInputs = [ cmake makeWrapper ]; From 93c8af6a1b8cbeb5cc646ae0965b9194e832aa07 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 05:18:03 -0700 Subject: [PATCH 418/538] gnome3.gpaste: 3.28.1 -> 3.28.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gpaste/versions. These checks were done: - built on NixOS - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/gpaste-client -h’ got 0 exit code - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/gpaste-client --help’ got 0 exit code - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/gpaste-client help’ got 0 exit code - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/gpaste-client -v’ and found version 3.28.2 - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/gpaste-client --version’ and found version 3.28.2 - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/gpaste-client version’ and found version 3.28.2 - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/.gpaste-client-wrapped -h’ got 0 exit code - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/.gpaste-client-wrapped --help’ got 0 exit code - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/.gpaste-client-wrapped help’ got 0 exit code - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/.gpaste-client-wrapped -v’ and found version 3.28.2 - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/.gpaste-client-wrapped --version’ and found version 3.28.2 - ran ‘/nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2/bin/.gpaste-client-wrapped version’ and found version 3.28.2 - found 3.28.2 with grep in /nix/store/qaadzk12f4bcqas0x09h89w74r6s740z-gpaste-3.28.2 - directory tree listing: https://gist.github.com/528b9d74e22700cfa3bb92a21baa9f09 --- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 361b1ac97f62..a01820578733 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.28.1"; + version = "3.28.2"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "19rdi2syshrk32hqnjh63fm0wargw546j5wlsnsg1axml0x1xww9"; + sha256 = "1zfx73qpw976hyzp5k569lywsq2b6dbnnzf2cvhjvn3mvkw8pin2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; From 143bc7f9d7f033a8fded74a28b395d0d44bb66c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 05:23:11 -0700 Subject: [PATCH 419/538] gqrx: 2.11.2 -> 2.11.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gqrx/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2.11.4 with grep in /nix/store/2gi018m21h77clr23y8a294baz3fq5ka-gqrx-2.11.4 - directory tree listing: https://gist.github.com/303e59b969c4ee9b391f0431db675b0a --- pkgs/applications/misc/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 0092dac754a3..5c449451e704 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.11.2"; + version = "2.11.4"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0sndhzz2gnhsz41cp0zrsw3z10rqm1j3mvkzs1g1lsndrk12bcgy"; + sha256 = "0a5w9b3fi4f95j34cqsbzxks0d9hmrz4cznc8pi9b0pwvx13hqhm"; }; nativeBuildInputs = [ cmake ]; From ef433059a023f5351afac41f641e049852feb359 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 05:49:44 -0700 Subject: [PATCH 420/538] flacon: 4.0.0 -> 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flacon/versions. These checks were done: - built on NixOS - ran ‘/nix/store/0m9jr6wv7w3imscxq1lha4q9nrajj7xx-flacon-4.1.0/bin/flacon -h’ got 0 exit code - ran ‘/nix/store/0m9jr6wv7w3imscxq1lha4q9nrajj7xx-flacon-4.1.0/bin/flacon --help’ got 0 exit code - ran ‘/nix/store/0m9jr6wv7w3imscxq1lha4q9nrajj7xx-flacon-4.1.0/bin/.flacon-wrapped -h’ got 0 exit code - ran ‘/nix/store/0m9jr6wv7w3imscxq1lha4q9nrajj7xx-flacon-4.1.0/bin/.flacon-wrapped --help’ got 0 exit code - found 4.1.0 with grep in /nix/store/0m9jr6wv7w3imscxq1lha4q9nrajj7xx-flacon-4.1.0 - directory tree listing: https://gist.github.com/5db6cc1fd7c7f049d13a305eb9ab5199 --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index cc453347aea4..a16593d4d1b0 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0l0xbzpy4nnr08z7gqvb4ngrjwzpspa382cbcrpkya3nd40987kr"; + sha256 = "1sw2v2w3s79lbzhkf96m8lwvag824am7rwfzzsi8bz6sa6krmj0m"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; From 6c1ed68d656372c7ae5c90ddf0adbbceace165e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 06:02:07 -0700 Subject: [PATCH 421/538] fio: 3.5 -> 3.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fio/versions. These checks were done: - built on NixOS - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fio -h’ got 0 exit code - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fio --help’ got 0 exit code - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fio -v’ and found version 3.6 - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fio --version’ and found version 3.6 - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/genfio -h’ got 0 exit code - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/genfio --help’ got 0 exit code - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fiologparser.py -h’ got 0 exit code - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fiologparser.py --help’ got 0 exit code - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fio_jsonplus_clat2csv -h’ got 0 exit code - ran ‘/nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6/bin/fio_jsonplus_clat2csv --help’ got 0 exit code - found 3.6 with grep in /nix/store/vh0z8j2hhmcf5xwhhn0jagc2d213761g-fio-3.6 - directory tree listing: https://gist.github.com/0c7cb321a972c3e3e020645972a2d9f4 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 9e2bd1a2e2c4..ee7c70240b0a 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libaio, python, zlib }: let - version = "3.5"; - sha256 = "1h6qwvn0h3xz98420a19v8isfjkfnac9vvx8hsw8q4ycb35r8n3h"; + version = "3.6"; + sha256 = "1dilsn6r958skq1kpknm13fdzw7whb3bqa3wwnn2j9gba28599pq"; in stdenv.mkDerivation rec { From 1617fa98c70458cb0afda65dbb2001e604a0a1c4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 15 Apr 2018 19:35:33 -0500 Subject: [PATCH 422/538] postgresql93: 9.3.21 -> 9.3.22 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index f7b894111e46..2ef57f9a67fb 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -93,9 +93,9 @@ let in { postgresql93 = common { - version = "9.3.21"; + version = "9.3.22"; psqlSchema = "9.3"; - sha256 = "1q2038rvqa00rpk8sjbnwb19x64fcyjphw9x087432hq918vrfmr"; + sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v"; }; postgresql94 = common { From 1e3e134b0423687fb8d561ad7eb6e7ba7ef6205e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 15 Apr 2018 19:35:35 -0500 Subject: [PATCH 423/538] postgresql94: 9.4.16 -> 9.4.17 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2ef57f9a67fb..3f979c791d6e 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -99,9 +99,9 @@ in { }; postgresql94 = common { - version = "9.4.16"; + version = "9.4.17"; psqlSchema = "9.4"; - sha256 = "10ay2cy3m4g66jwvxknc0f0w6mv2v7vm0dzkq92s9n7446v65g6w"; + sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks"; }; postgresql95 = common { From 7c9f817abec39804177bbd70e6231a09d2d242f2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 15 Apr 2018 19:35:37 -0500 Subject: [PATCH 424/538] postgresql95: 9.5.11 -> 9.5.12 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 3f979c791d6e..1e8f1b6f7994 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -105,9 +105,9 @@ in { }; postgresql95 = common { - version = "9.5.11"; + version = "9.5.12"; psqlSchema = "9.5"; - sha256 = "1pf8fwx8a6vn344b80a1bf2p4hjg06sh69kb2qwswxbsw9scv0l1"; + sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02"; }; postgresql96 = common { From 371721a57b9e227c5752febe4c0c68ab2ca4c166 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 15 Apr 2018 19:35:39 -0500 Subject: [PATCH 425/538] postgresql96: 9.6.7 -> 9.6.8 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 1e8f1b6f7994..6b871ab287f9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -111,9 +111,9 @@ in { }; postgresql96 = common { - version = "9.6.7"; + version = "9.6.8"; psqlSchema = "9.6"; - sha256 = "1ii4lrw8sncnz5g0fss1011shjhmbajzzhxx4f0bgsniq7rkvgif"; + sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga"; }; postgresql100 = common { From 7e21fd72ce682c35c78c513a1d2d5336c177a0e1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 15 Apr 2018 19:35:41 -0500 Subject: [PATCH 426/538] postgresql100: 10.2 -> 10.3 Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6b871ab287f9..a2093962ea93 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -117,9 +117,9 @@ in { }; postgresql100 = common { - version = "10.2"; + version = "10.3"; psqlSchema = "10.0"; - sha256 = "1bav2iyi93h866skrrlqlvsp4sfv1sfww1s305zpzffxcadh0cpy"; + sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf"; }; } From 4e57d0928d46ff33bf50e138d584d4dbb8c1e098 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 06:07:14 -0700 Subject: [PATCH 427/538] folly: 2018.03.26.00 -> 2018.04.16.00 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/folly/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 2018.04.16.00 with grep in /nix/store/482k5y2ij070kildxy60p23wk1dm525y-folly-2018.04.16.00 - directory tree listing: https://gist.github.com/4564853405edf5ad8e8b9bc7c2f68c9d --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index c4dc57300446..d3ba4b889094 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.03.26.00"; + version = "2018.04.16.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "137d9b9k2m02r8f2w31qj3gc18hpm5g51bcl60g6vzdqzwzizzyr"; + sha256 = "10wivnszpqcbg2hbvfal94lcjw20pjz0d8p0m4qa7i4v4z90q37p"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From 18053a4593c84bcfa72b0861fe9cecc8bb5575b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Apr 2018 12:35:02 +0200 Subject: [PATCH 428/538] LTS Haskell 11.5 --- .../configuration-hackage2nix.yaml | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7b982cb7781b..5a0cb9f214b0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 11.4 + # LTS Haskell 11.5 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -72,7 +72,7 @@ default-package-overrides: - aeson-generic-compat ==0.0.1.1 - aeson-injector ==1.1.0.0 - aeson-picker ==0.1.0.4 - - aeson-pretty ==0.8.5 + - aeson-pretty ==0.8.7 - aeson-qq ==0.8.2 - aeson-typescript ==0.1.0.6 - aeson-utils ==0.3.0.2 @@ -140,8 +140,8 @@ default-package-overrides: - auto-update ==0.1.4 - avwx ==0.3.0.2 - axiom ==0.4.6 - - b9 ==0.5.43 - - backprop ==0.1.5.0 + - b9 ==0.5.44 + - backprop ==0.1.5.1 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 @@ -157,6 +157,9 @@ default-package-overrides: - basic-prelude ==0.7.0 - bbdb ==0.8 - bcrypt ==0.0.11 + - beam-core ==0.7.2.0 + - beam-migrate ==0.3.1.0 + - beam-sqlite ==0.3.2.0 - bench ==1.0.9 - benchpress ==0.2.2.10 - bencode ==0.6.0.0 @@ -178,7 +181,7 @@ default-package-overrides: - binary-shared ==0.8.3 - binary-tagged ==0.1.4.2 - bindings-DSL ==1.0.24 - - bindings-GLFW ==3.1.2.3 + - bindings-GLFW ==3.1.2.4 - bindings-libzip ==1.0.1 - bindings-uname ==0.1 - bioace ==0.0.1 @@ -207,7 +210,7 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - blaze-html ==0.9.0.1 - - blaze-markup ==0.8.2.0 + - blaze-markup ==0.8.2.1 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bloodhound ==0.15.0.2 @@ -462,7 +465,7 @@ default-package-overrides: - data-serializer ==0.3.4 - datasets ==0.2.5 - data-textual ==0.3.0.2 - - data-tree-print ==0.1.0.0 + - data-tree-print ==0.1.0.1 - dataurl ==0.1.0.0 - DAV ==1.3.2 - dawg-ord ==0.5.1.0 @@ -551,8 +554,8 @@ default-package-overrides: - ekg ==0.4.0.15 - ekg-core ==0.1.1.4 - ekg-json ==0.1.0.6 - - ekg-statsd ==0.2.2.0 - - ekg-wai ==0.1.0.2 + - ekg-statsd ==0.2.3.0 + - ekg-wai ==0.1.0.3 - elerea ==2.9.0 - eliminators ==0.3 - elm-core-sources ==1.0.0 @@ -755,7 +758,7 @@ default-package-overrides: - glaze ==0.3.0.1 - glazier ==0.11.0.1 - glazier-pipes ==0.1.5.1 - - GLFW-b ==1.4.8.1 + - GLFW-b ==1.4.8.3 - glib ==0.13.5.0 - Glob ==0.9.2 - glob-posix ==0.1.0.1 @@ -768,7 +771,7 @@ default-package-overrides: - GLURaw ==2.0.0.4 - GLUT ==2.7.0.13 - gluturtle ==0.0.58.1 - - gnuplot ==0.5.5.1 + - gnuplot ==0.5.5.2 - goggles ==0.3.2 - google-cloud ==0.0.4 - google-oauth2-jwt ==0.2.2 @@ -802,7 +805,7 @@ default-package-overrides: - hamilton ==0.1.0.2 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.3 + - hapistrano ==0.3.5.4 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.1 - happstack-server-tls ==7.1.6.5 @@ -855,7 +858,7 @@ default-package-overrides: - HDBC-mysql ==0.7.1.0 - HDBC-session ==0.1.1.1 - hdevtools ==0.1.6.1 - - heap ==1.0.3 + - heap ==1.0.4 - heaps ==0.3.6 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 @@ -983,7 +986,7 @@ default-package-overrides: - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.0 + - http-conduit ==2.3.1 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - http-media ==0.7.1.2 @@ -1050,7 +1053,7 @@ default-package-overrides: - indexed-list-literals ==0.1.0.1 - inflections ==0.4.0.1 - influxdb ==1.3.0.1 - - ini ==0.3.5 + - ini ==0.3.6 - inline-c ==0.6.0.5 - inline-c-cpp ==0.2.1.0 - inline-java ==0.8.2 @@ -1201,7 +1204,7 @@ default-package-overrides: - llvm-hs-pure ==5.1.2 - lmdb ==0.2.5 - load-env ==0.1.2 - - loch-th ==0.2.1 + - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - log ==0.9.0.1 - log-base ==0.7.4.0 @@ -1241,8 +1244,8 @@ default-package-overrides: - markov-chain ==0.0.3.4 - markup ==4.0.4 - marvin-interpolate ==1.1.2 - - massiv ==0.1.4.0 - - massiv-io ==0.1.1.0 + - massiv ==0.1.6.1 + - massiv-io ==0.1.2.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 - matplotlib ==0.6.0 @@ -1282,7 +1285,7 @@ default-package-overrides: - mime-mail-ses ==0.4.0.0 - mime-types ==0.1.0.7 - minimorph ==0.1.6.1 - - miniutter ==0.4.6.0 + - miniutter ==0.4.7.0 - mintty ==0.1.1 - misfortune ==0.1.1.2 - miso ==0.14.0.0 @@ -1309,7 +1312,7 @@ default-package-overrides: - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.28.3 + - monad-logger ==0.3.28.4 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.9 - monad-logger-syslog ==0.1.4.0 @@ -1335,7 +1338,7 @@ default-package-overrides: - monad-unlift-ref ==0.2.1 - mongoDB ==2.3.0.5 - monoidal-containers ==0.3.1.0 - - monoid-extras ==0.4.3 + - monoid-extras ==0.4.4 - monoid-subclasses ==0.4.6 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.8.1 @@ -1378,7 +1381,7 @@ default-package-overrides: - nettle ==0.2.0 - netwire ==5.0.3 - netwire-input ==0.0.7 - - netwire-input-glfw ==0.0.8 + - netwire-input-glfw ==0.0.10 - network ==2.6.3.5 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 @@ -1505,7 +1508,7 @@ default-package-overrides: - perfect-hash-generator ==0.2.0.6 - persistable-record ==0.6.0.3 - persistable-types-HDBC-pg ==0.0.1.5 - - persistent ==2.8.1 + - persistent ==2.8.2 - persistent-mongoDB ==2.8.0 - persistent-mysql ==2.8.1 - persistent-mysql-haskell ==0.4.0 @@ -1554,7 +1557,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 - - pomaps ==0.0.0.3 + - pomaps ==0.0.0.4 - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - posix-paths ==0.2.1.5 @@ -1595,7 +1598,7 @@ default-package-overrides: - prim-uniq ==0.1.0.1 - probability ==0.2.5.1 - process-extras ==0.7.4 - - product-isomorphic ==0.0.3.1 + - product-isomorphic ==0.0.3.2 - product-profunctors ==0.9.0.0 - profiterole ==0.1 - profunctors ==5.2.2 @@ -1715,7 +1718,7 @@ default-package-overrides: - req-url-extra ==0.1.0.0 - reroute ==0.4.1.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.0 + - resourcet ==1.2.1 - rest-core ==0.39 - rest-snap ==0.3.0.0 - rest-stringmap ==0.2.0.7 @@ -1750,8 +1753,8 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.13 - sbv ==7.5 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1776,16 +1779,16 @@ default-package-overrides: - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - sendfile ==0.7.9 - - sensu-run ==0.4.0.4 + - sensu-run ==0.4.0.5 - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 - sequence ==0.9.8 - serf ==0.1.1.0 - - servant ==0.13 + - servant ==0.13.0.1 - servant-blaze ==0.8 - servant-cassava ==0.10 - - servant-client ==0.13 - - servant-client-core ==0.13 + - servant-client ==0.13.0.1 + - servant-client-core ==0.13.0.1 - servant-docs ==0.11.2 - servant-elm ==0.4.0.1 - servant-exceptions ==0.1.1 @@ -1800,7 +1803,7 @@ default-package-overrides: - servant-pandoc ==0.5.0.0 - servant-purescript ==0.9.0.2 - servant-ruby ==0.7.0.0 - - servant-server ==0.13 + - servant-server ==0.13.0.1 - servant-static-th ==0.2.0.1 - servant-subscriber ==0.6.0.1 - servant-swagger ==1.1.5 @@ -2055,8 +2058,7 @@ default-package-overrides: - th-to-exp ==0.0.1.1 - th-utilities ==0.2.0.1 - tibetan-utils ==0.1.1.5 - - tidal ==0.9.6 - - tidal-midi ==0.9.5.2 + - tidal ==0.9.8 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2138,8 +2140,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - unique ==0 - Unique ==0.4.7.2 + - unique ==0 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2261,8 +2263,8 @@ default-package-overrides: - weigh ==0.0.7 - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 - - wild-bind ==0.1.1.1 - - wild-bind-x11 ==0.2.0.1 + - wild-bind ==0.1.2.0 + - wild-bind-x11 ==0.2.0.2 - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 @@ -2336,11 +2338,11 @@ default-package-overrides: - yeshql ==3.0.1.3 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.2 + - yesod-auth ==1.6.3 - yesod-auth-fb ==1.9.0 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0 - - yesod-core ==1.6.2 + - yesod-core ==1.6.3 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2385,7 +2387,7 @@ default-package-overrides: - zlib-lens ==0.1.2.1 - zot ==0.0.3 - zstd ==0.1.0.0 - - ztail ==1.2.0.1 + - ztail ==1.2.0.2 extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier From 657f3e099c8c7aff6ad014cbc9d545863a483c4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Apr 2018 10:07:20 +0200 Subject: [PATCH 429/538] hackage2nix: disable failing Hydra builds --- .../configuration-hackage2nix.yaml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5a0cb9f214b0..06b5c7b1a647 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2701,6 +2701,7 @@ dont-distribute-packages: AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-diff-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2741,6 +2742,7 @@ dont-distribute-packages: algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] + AlgoRhythm: [ i686-linux, x86_64-linux, x86_64-darwin ] AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2756,6 +2758,7 @@ dont-distribute-packages: alternative-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] alternative-io: [ i686-linux, x86_64-linux, x86_64-darwin ] altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] + alto: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3082,6 +3085,7 @@ dont-distribute-packages: barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-compat-batteries: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3100,6 +3104,7 @@ dont-distribute-packages: bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-core: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] beam: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3267,6 +3272,7 @@ dont-distribute-packages: bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ] braid: [ i686-linux, x86_64-linux, x86_64-darwin ] brain-bleep: [ i686-linux, x86_64-linux, x86_64-darwin ] + brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] breve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3279,6 +3285,7 @@ dont-distribute-packages: brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] browscap: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3596,6 +3603,7 @@ dont-distribute-packages: coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinat-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3711,6 +3719,7 @@ dont-distribute-packages: convert: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3744,6 +3753,7 @@ dont-distribute-packages: cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] + cpython: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4238,6 +4248,7 @@ dont-distribute-packages: eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] eros-http: [ i686-linux, x86_64-linux, x86_64-darwin ] eros: [ i686-linux, x86_64-linux, x86_64-darwin ] + error-context: [ i686-linux, x86_64-linux, x86_64-darwin ] error-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] error-list: [ i686-linux, x86_64-linux, x86_64-darwin ] error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4334,6 +4345,7 @@ dont-distribute-packages: fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4663,6 +4675,7 @@ dont-distribute-packages: gf: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-core-smallstep: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5021,6 +5034,7 @@ dont-distribute-packages: gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-strut: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5577,6 +5591,7 @@ dont-distribute-packages: HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5690,6 +5705,8 @@ dont-distribute-packages: hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] + hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5751,6 +5768,7 @@ dont-distribute-packages: hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsaml2: [ i686-linux, x86_64-linux, x86_64-darwin ] hsass: [ i686-linux, x86_64-linux, x86_64-darwin ] hsay: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5938,6 +5956,7 @@ dont-distribute-packages: hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5945,6 +5964,9 @@ dont-distribute-packages: hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6349,6 +6371,7 @@ dont-distribute-packages: language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6373,9 +6396,11 @@ dont-distribute-packages: latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + layered-state: [ i686-linux, x86_64-linux, x86_64-darwin ] layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + layouting: [ i686-linux, x86_64-linux, x86_64-darwin ] lazy-hash-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] lazy-hash: [ i686-linux, x86_64-linux, x86_64-darwin ] lazy-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6441,6 +6466,7 @@ dont-distribute-packages: libstackexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] + libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6621,6 +6647,7 @@ dont-distribute-packages: mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ] mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ] + main-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] majority: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6788,12 +6815,14 @@ dont-distribute-packages: MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-abort-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-finally: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-http: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7101,6 +7130,7 @@ dont-distribute-packages: numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7233,6 +7263,7 @@ dont-distribute-packages: pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] + pam: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7377,6 +7408,7 @@ dont-distribute-packages: picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] + pig: [ i686-linux, x86_64-linux, x86_64-darwin ] pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] pinpon: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7430,6 +7462,7 @@ dont-distribute-packages: plat: [ i686-linux, x86_64-linux, x86_64-darwin ] platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ] + plex: [ i686-linux, x86_64-linux, x86_64-darwin ] plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8131,6 +8164,7 @@ dont-distribute-packages: servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-client-core: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8514,6 +8548,7 @@ dont-distribute-packages: stats: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] + status-notifier-item: [ i686-linux, x86_64-linux, x86_64-darwin ] stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8741,6 +8776,7 @@ dont-distribute-packages: tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ] termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8915,6 +8951,8 @@ dont-distribute-packages: travis: [ i686-linux, x86_64-linux, x86_64-darwin ] trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] + tree-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + tree-traversals: [ i686-linux, x86_64-linux, x86_64-darwin ] TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8997,6 +9035,7 @@ dont-distribute-packages: type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ] type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9137,6 +9176,7 @@ dont-distribute-packages: vector-space-map: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-text: [ i686-linux, x86_64-linux, x86_64-darwin ] Verba: [ i686-linux, x86_64-linux, x86_64-darwin ] verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] From 86e65430f6da0b3343283c9160884128f0bda805 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Apr 2018 02:30:39 +0200 Subject: [PATCH 430/538] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-6-g7882850 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/452dc1872aee3ab299cc3a018761e6ffff0f724a. --- .../haskell-modules/hackage-packages.nix | 2821 +++++++++++------ 1 file changed, 1931 insertions(+), 890 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a28a0b7674aa..bf7838b2b21b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -866,6 +866,7 @@ self: { homepage = "http://github.com/omelkonian/AlgoRhythm/"; description = "Algorithmic music composition"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AlgorithmW" = callPackage @@ -6093,16 +6094,17 @@ self: { }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage - ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework - , test-framework-hunit + ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit + , test-framework, test-framework-hunit }: mkDerivation { pname = "GLFW-b"; - version = "1.4.8.1"; - sha256 = "1sca2wzkqw77jdj9mxnswx7zaicj1dsl5k3gjsaxmjznbkn4k2j3"; - libraryHaskellDepends = [ base bindings-GLFW ]; + version = "1.4.8.3"; + sha256 = "01dp6akv70wq9c5qib5f8cmrva9xmqrmdcf30k9y4kklrvbk599z"; + libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ - base bindings-GLFW HUnit test-framework test-framework-hunit + base bindings-GLFW deepseq HUnit test-framework + test-framework-hunit ]; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; @@ -8192,14 +8194,14 @@ self: { }: mkDerivation { pname = "HMap"; - version = "1.2.7"; - sha256 = "0xq5qr1v74z9bppcgl4g06cpnmyrqmc41kvcyx58272pw70vlv40"; + version = "1.3.0"; + sha256 = "01y8mspmf7k0mxafyanfirbjp46x54wnm4n6lwc2jczw5bb48yx7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default hashable mtl unordered-containers ]; homepage = "https://github.com/atzeus/HMap"; - description = "Fast heterogeneous maps and unconstrained typeable like functionality"; + description = "Fast heterogeneous maps and unconstrained typeable-like functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -9537,8 +9539,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.3.1"; - sha256 = "0z8ph9frrad5nn23hi3qr2gj7lh7p2qpcmx4rdyv8vlqal38zdv1"; + version = "0.3.2"; + sha256 = "0qdq23mg1nszsf3ldbdawdkcmbv18cmny6529k9kwlfq9fhdm83x"; libraryHaskellDepends = [ aeson base bytestring http-client http-conduit http-types mime-types MissingH text @@ -13800,13 +13802,13 @@ self: { }) {}; "OddWord" = callPackage - ({ mkDerivation, base, criterion, QuickCheck }: + ({ mkDerivation, base, criterion, hspec, QuickCheck }: mkDerivation { pname = "OddWord"; - version = "1.0.1.1"; - sha256 = "0sb0hmvvp6cdxf8siqfp7wvcxq8rbiz7h9mxmbkcksscjp8m02mm"; + version = "1.0.2.0"; + sha256 = "14hd7dd3dyfd9cs9kgxjippi2awpambn2ia7s3kxcvinnfbigj3r"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "http://www.gekkou.co.uk/"; description = "Provides a wrapper for deriving word types with fewer bits"; @@ -15141,6 +15143,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "PyF" = callPackage + ({ mkDerivation, base, containers, formatting, haskell-src-meta + , hspec, megaparsec, process, template-haskell, text + }: + mkDerivation { + pname = "PyF"; + version = "0.5.0.0"; + sha256 = "0i0ir7i17r7lzk6c58yybsvz4s9131d1xc3jz3m3lhl3hsvyrgz5"; + libraryHaskellDepends = [ + base containers formatting haskell-src-meta megaparsec + template-haskell text + ]; + testHaskellDepends = [ + base formatting hspec process template-haskell text + ]; + description = "Quasiquotations for a python like interpolated string formater"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "QIO" = callPackage ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { @@ -21715,8 +21736,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "3"; - editedCabalFile = "0jm8kkqa5k9nppis3jdx11nmds6w0x62rmnv5bn5q3b75llhnlc1"; + revision = "4"; + editedCabalFile = "1p2gaazj7r98v45d57hshgv6nxam5l47dl6y9iq65z5zqylmz7q2"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -22329,21 +22350,22 @@ self: { "aeson-diff-generic" = callPackage ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring - , containers, dlist, hashable, scientific, tagged, template-haskell - , text, th-abstraction, time, unordered-containers, uuid-types - , vector + , containers, dlist, hashable, lens, scientific, tagged + , template-haskell, text, th-abstraction, time + , unordered-containers, uuid-types, vector }: mkDerivation { pname = "aeson-diff-generic"; - version = "0.0.2"; - sha256 = "0dm2rzww9rc6l3ql42px96fpsfjvw9g0w13j0y02dq33qb0w7a1v"; + version = "0.0.3"; + sha256 = "12vilqp1v49pchfq8xk8k1f3m8kgl7s5n5m1w680cbh5flj050w2"; libraryHaskellDepends = [ aeson aeson-diff base base-compat bytestring containers dlist - hashable scientific tagged template-haskell text th-abstraction - time unordered-containers uuid-types vector + hashable lens scientific tagged template-haskell text + th-abstraction time unordered-containers uuid-types vector ]; description = "Apply a json-patch to any haskell datatype"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-extra" = callPackage @@ -22377,6 +22399,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-extra_0_4_1_1" = callPackage + ({ mkDerivation, aeson, aeson-compat, attoparsec + , attoparsec-iso8601, base, base-compat-batteries, bytestring + , containers, deepseq, exceptions, hashable, parsec + , quickcheck-instances, recursion-schemes, scientific, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, these + , time, time-parsers, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-extra"; + version = "0.4.1.1"; + sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; + libraryHaskellDepends = [ + aeson aeson-compat attoparsec attoparsec-iso8601 base + base-compat-batteries bytestring containers deepseq exceptions + hashable parsec recursion-schemes scientific template-haskell text + these time unordered-containers vector + ]; + testHaskellDepends = [ + base containers quickcheck-instances tasty tasty-hunit + tasty-quickcheck these time time-parsers unordered-containers + vector + ]; + homepage = "https://github.com/phadej/aeson-extra#readme"; + description = "Extra goodies for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-filthy" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, text , unordered-containers @@ -22458,6 +22509,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-generic-compat_0_0_1_2" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "aeson-generic-compat"; + version = "0.0.1.2"; + sha256 = "08h4r8ni7i9x0fqx5gizv6fpwrq84lv8m4c3w6g2hirs0iscw233"; + libraryHaskellDepends = [ aeson base ]; + description = "Compatible generic class names of Aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-injector" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, deepseq , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific @@ -22629,28 +22692,6 @@ self: { }) {}; "aeson-pretty" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , cmdargs, scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-pretty"; - version = "0.8.5"; - sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring scientific text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring cmdargs - ]; - homepage = "http://github.com/informatikr/aeson-pretty"; - description = "JSON pretty-printing library and command-line tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-pretty_0_8_7" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , cmdargs, scientific, text, unordered-containers, vector }: @@ -22670,7 +22711,6 @@ self: { homepage = "http://github.com/informatikr/aeson-pretty"; description = "JSON pretty-printing library and command-line tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-qq" = callPackage @@ -23299,16 +23339,16 @@ self: { }) {}; "aivika" = callPackage - ({ mkDerivation, array, base, binary, containers, deepseq, mtl - , mwc-random, random, semigroups, vector + ({ mkDerivation, array, base, binary, containers, deepseq + , exceptions, mtl, mwc-random, random, semigroups, vector }: mkDerivation { pname = "aivika"; - version = "5.6"; - sha256 = "0gri5kwzw2a9fjcr7924kdaxgs9zl4j8brgknwyxrky0p93a8zry"; + version = "5.7"; + sha256 = "1zhzb9pchpj9vk0zc3wb9bpxbw7zfn63m7ng37z46lwyv5s55d5m"; libraryHaskellDepends = [ - array base binary containers deepseq mtl mwc-random random - semigroups vector + array base binary containers deepseq exceptions mtl mwc-random + random semigroups vector ]; homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; @@ -23338,8 +23378,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "1.2"; - sha256 = "092jril2vfi90bbi9wc2ir4gidqzq0w84mgbgz72icx63nni1ah0"; + version = "1.3"; + sha256 = "1sm56b6z8ajkap3nlcrsl592m40vgb5zmhhnc8al6arrra2j21pc"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -23471,16 +23511,16 @@ self: { }) {}; "aivika-transformers" = callPackage - ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random - , random, semigroups, vector + ({ mkDerivation, aivika, array, base, containers, exceptions, mtl + , mwc-random, random, semigroups, vector }: mkDerivation { pname = "aivika-transformers"; - version = "5.6"; - sha256 = "0vy3d4vldifiwc12j6746axhb1k3ir703wzgycvk4xn60qhjp4g9"; + version = "5.7"; + sha256 = "1nwffb0x7lzl52xqki415dgmag9dg66jv45qirdnmkjs33x0by3r"; libraryHaskellDepends = [ - aivika array base containers mtl mwc-random random semigroups - vector + aivika array base containers exceptions mtl mwc-random random + semigroups vector ]; homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; @@ -23816,14 +23856,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "algebraic-graphs_0_1_1" = callPackage + "algebraic-graphs_0_1_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, containers , criterion, deepseq, extra, QuickCheck }: mkDerivation { pname = "algebraic-graphs"; - version = "0.1.1"; - sha256 = "085yb222gh5chlpa4xylvf1wfnsdhrm1fha4jvj5bsjlx9kyr4ah"; + version = "0.1.1.1"; + sha256 = "0c8jrp0z3ibla7isbn1v5nhfka56hwq8h10r7h3vca53yzbafiw7"; libraryHaskellDepends = [ array base base-compat containers deepseq ]; @@ -24161,6 +24201,27 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; + "alsa-pcm_0_6_1" = callPackage + ({ mkDerivation, alsa-core, alsaLib, array, base + , extensible-exceptions, sample-frame, semigroups, storable-record + }: + mkDerivation { + pname = "alsa-pcm"; + version = "0.6.1"; + sha256 = "0pafjds9xrhzwv3xz9qcknm9f2plz3bvqqjlznss1alhgf7pcga5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alsa-core array base extensible-exceptions sample-frame semigroups + storable-record + ]; + libraryPkgconfigDepends = [ alsaLib ]; + homepage = "http://www.haskell.org/haskellwiki/ALSA"; + description = "Binding to the ALSA Library API (PCM audio)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) alsaLib;}; + "alsa-pcm-tests" = callPackage ({ mkDerivation, alsa, base }: mkDerivation { @@ -24313,6 +24374,7 @@ self: { homepage = "https://oss.xkcd.com/"; description = "Implement a menu experience fit for web users"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alure" = callPackage @@ -29529,6 +29591,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "asset-bundle" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "asset-bundle"; + version = "0.1.0.0"; + sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/deech/asset-bundle#readme"; + description = "A build-time Cabal library that bundles executables with assets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "assimp" = callPackage ({ mkDerivation, assimp, base, c2hs, haskell98, vect }: mkDerivation { @@ -30367,27 +30441,27 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, dependency , dhall, directory, file-embed, filemanip, hashable, http-client - , http-client-tls, lzma, microlens, microlens-th, mtl - , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-ext, tar, temporary, text, unix, zip-archive, zlib + , http-client-tls, lens, lzma, mtl, optparse-applicative + , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary + , text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.10.0.2"; - sha256 = "1rafsa2xc47hgkn6hwyr5bph21xl16i8ajl14pkckwhrs21bk255"; + version = "2.10.0.8"; + sha256 = "159nf1dfb4zh7kbk534xxhvap3gi6943j9vrp7k6lkyvp3p2s1q9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filemanip hashable http-client http-client-tls lzma - microlens microlens-th mtl parallel-io process shake shake-ats - shake-ext tar text unix zip-archive zlib + file-embed filemanip hashable http-client http-client-tls lens lzma + mtl parallel-io process shake shake-ats shake-ext tar text unix + zip-archive zlib ]; executableHaskellDepends = [ - base composition-prelude directory microlens optparse-applicative - shake shake-ats temporary text + base composition-prelude directory lens optparse-applicative shake + shake-ats temporary text ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; @@ -30843,6 +30917,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "audacity_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory + , explicit-exception, filepath, non-empty, semigroups + , storable-record, storablevector, tagchup, transformers + , utility-ht, xml-basic + }: + mkDerivation { + pname = "audacity"; + version = "0.0.2"; + sha256 = "1916phnj3m12apyjarmda48xr2bq19rfn7sn6nskkbg6qjqxzlnr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq directory explicit-exception filepath + non-empty semigroups storable-record storablevector tagchup + transformers utility-ht xml-basic + ]; + homepage = "http://hub.darcs.net/thielema/audacity"; + description = "Interchange with the Audacity sound signal editor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "audiovisual" = callPackage ({ mkDerivation, base, boundingboxes, colors, deepseq, directory , filepath, free, freetype2, hashable, JuicyPixels @@ -31398,15 +31495,15 @@ self: { "avro" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, containers, data-binary-ieee754, entropy, extra, fail - , hashable, hspec, lens, lens-aeson, mtl, pure-zlib, QuickCheck - , scientific, semigroups, tagged, template-haskell, text - , transformers, unordered-containers, vector + , bytestring, containers, data-binary-ieee754, directory, entropy + , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib + , QuickCheck, scientific, semigroups, tagged, template-haskell + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "avro"; - version = "0.2.1.1"; - sha256 = "1y70ir44kg5awgf3x1sl584ag9ddw0mhgqniwar6lgry2ag4vz9f"; + version = "0.3.0.0"; + sha256 = "0sfi6jc7pcigpwgkfqq9ckwm7bzhfc9kf2rhznrrsy9qw5i7xrll"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -31414,11 +31511,11 @@ self: { ]; testHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers - entropy extra fail hashable hspec lens lens-aeson mtl pure-zlib - QuickCheck scientific semigroups tagged template-haskell text - transformers unordered-containers vector + directory entropy extra fail hashable hspec lens lens-aeson mtl + pure-zlib QuickCheck scientific semigroups tagged template-haskell + text transformers unordered-containers vector ]; - homepage = "https://github.com/GaloisInc/avro.git"; + homepage = "https://github.com/GaloisInc/avro.git#readme"; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31576,23 +31673,24 @@ self: { }) {}; "aws-cloudfront-signed-cookies" = callPackage - ({ mkDerivation, aeson, asn1-encoding, asn1-types, base - , base64-bytestring, bytestring, cookie, cryptonite - , optparse-applicative, pem, text, time, unordered-containers - , vector + ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types + , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog + , lens, lens-aeson, neat-interpolation, optparse-applicative, pem + , text, time, unordered-containers, vector }: mkDerivation { pname = "aws-cloudfront-signed-cookies"; - version = "0.1.0.1"; - sha256 = "0321c5pjd6bhvnnn8zzqk23fb14jl89vj1frvikb65iw9f60v7dl"; + version = "0.2.0.0"; + sha256 = "0cbhlxrdx09050pblca1p8f0f7n51p4nifp1xk48203ap435dnpj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson asn1-encoding asn1-types base base64-bytestring bytestring - cookie cryptonite optparse-applicative pem text time - unordered-containers vector + aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring + bytestring cookie cryptonite lens lens-aeson optparse-applicative + pem text time unordered-containers vector ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog neat-interpolation ]; homepage = "https://github.com/typeclasses/aws-cloudfront-signed-cookies"; description = "Generate signed cookies for AWS CloudFront"; license = stdenv.lib.licenses.mit; @@ -32334,8 +32432,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.43"; - sha256 = "168rgqqnxi8f39dg510nxlh813ch4dkdxxd4rymf09dkn87w1snk"; + version = "0.5.44"; + sha256 = "0fr9s2s4gwh6l80s9j4jj5s10mp92dkxs5fwjlk8vbyg6xi6sgza"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32357,6 +32455,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "b9_0_5_47" = callPackage + ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes + , bytestring, conduit, conduit-extra, ConfigFile, directory + , filepath, free, hashable, hspec, hspec-expectations, lens, mtl + , optparse-applicative, parallel, parsec, pretty, pretty-show + , process, QuickCheck, random, shake, syb, template, text, time + , transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "b9"; + version = "0.5.47"; + sha256 = "1jnfci7px5hf6i729mz1fbx5sfg35q8l3663ls6pkf6b4kx8qfyz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bifunctors binary boxes bytestring conduit + conduit-extra ConfigFile directory filepath free hashable lens mtl + parallel parsec pretty pretty-show process QuickCheck random shake + syb template text time transformers unordered-containers vector + yaml + ]; + executableHaskellDepends = [ + base bytestring directory lens optparse-applicative + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations QuickCheck text + unordered-containers vector yaml + ]; + homepage = "https://github.com/sheyll/b9-vm-image-builder"; + description = "A tool and library for building virtual machine images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "babl" = callPackage ({ mkDerivation, babl, base }: mkDerivation { @@ -32407,28 +32539,6 @@ self: { }) {}; "backprop" = callPackage - ({ mkDerivation, base, bifunctors, criterion, deepseq, directory - , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive - , reflection, time, transformers, type-combinators, vector - }: - mkDerivation { - pname = "backprop"; - version = "0.1.5.0"; - sha256 = "0b99krw1l574bcqxck1bqj5sb0slbm24hd85finv3v725ddy8k7f"; - libraryHaskellDepends = [ - base deepseq microlens primitive reflection transformers - type-combinators vector - ]; - benchmarkHaskellDepends = [ - base bifunctors criterion deepseq directory hmatrix lens mnist-idx - mwc-random time transformers vector - ]; - homepage = "https://github.com/mstksg/backprop#readme"; - description = "Heterogeneous automatic differentation (backpropagation)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "backprop_0_1_5_1" = callPackage ({ mkDerivation, base, bifunctors, binary, criterion, deepseq , directory, hmatrix, lens, microlens, mnist-idx, mwc-random , primitive, reflection, time, transformers, type-combinators @@ -32449,7 +32559,6 @@ self: { homepage = "https://github.com/mstksg/backprop#readme"; description = "Heterogeneous automatic differentation (backpropagation)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backtracking-exceptions" = callPackage @@ -32941,6 +33050,24 @@ self: { testToolDepends = [ hspec-discover ]; description = "base-compat with extra batteries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "base-compat-migrate" = callPackage + ({ mkDerivation, base, base-compat }: + mkDerivation { + pname = "base-compat-migrate"; + version = "0.1.0.0"; + sha256 = "1xppwdkg347k1qq4pibivv89y4k8q70bmj9fmq6qwsbkizp7hsym"; + revision = "1"; + editedCabalFile = "047zifghyzjg7c0pdbjg1r5w3d6v0pz5miifam1jrzp2pp9a2jai"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base base-compat ]; + doHaddock = false; + homepage = "https://github.com/bergmark/base-compat-migrate#readme"; + description = "Helps migrating projects to base-compat(-batteries)"; + license = stdenv.lib.licenses.bsd3; }) {}; "base-encoding" = callPackage @@ -33623,8 +33750,8 @@ self: { }: mkDerivation { pname = "bdcs"; - version = "0.3.0"; - sha256 = "1sx5kcb85gyd59lkyjn0wq6nakz68mkwi33n4hwizzw9n9ijllv0"; + version = "0.4.0"; + sha256 = "008rd17zfg63w9szp4jrbd9z9sg4zjf4j4a5gm3skhn2nq7qaw9i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33730,8 +33857,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.7.1.0"; - sha256 = "1k4b8a1p9ky6w5b8iwlx7pm57sdy9mj5mxinsazawc0ss3760bjh"; + version = "0.7.2.0"; + sha256 = "1m3jyz1wh9g14cv5nyklqi6v8rqxi73xnppk308lrjh00iwrvgvb"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri tagged text time vector-sized @@ -33749,16 +33876,17 @@ self: { ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text - , time, unordered-containers, uuid, vector + , time, unordered-containers, uuid-types, vector }: mkDerivation { pname = "beam-migrate"; - version = "0.3.0.0"; - sha256 = "05j051l8zpyzdzm8w9087wj5c6yxv6mmy05asvlw2jhcjxx3j23b"; + version = "0.3.1.0"; + sha256 = "03chg3xbsvpcq4m4vvmr1jwslaj9ik8v3x8fiw8b5r6x401pf8za"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel - pqueue pretty scientific text time unordered-containers uuid vector + pqueue pretty scientific text time unordered-containers uuid-types + vector ]; homepage = "https://travis.athougies.net/projects/beam.html"; description = "SQL DDL support and migrations support library for Beam"; @@ -33786,6 +33914,7 @@ self: { homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres"; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beam-sqlite" = callPackage @@ -33795,8 +33924,8 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.3.1.0"; - sha256 = "1frbic90nwxk8mr8s1agvx5s1v5aqfnr7sijb602spdz4hhsqsvy"; + version = "0.3.2.0"; + sha256 = "06lmsajdlqc2178p4lkgwv2hh49dmjygrfjk081sr2xbhgnslr9s"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable mtl network-uri scientific sqlite-simple text time unix @@ -35268,14 +35397,13 @@ self: { "bindings-GLFW" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr - , libXxf86vm, template-haskell, test-framework - , test-framework-hunit + , libXxf86vm, test-framework, test-framework-hunit }: mkDerivation { pname = "bindings-GLFW"; - version = "3.1.2.3"; - sha256 = "1xmmwxbjpxwndiacrh2mk3lih6cs8d83ax07vg5sgyp5d7qigvik"; - libraryHaskellDepends = [ base bindings-DSL template-haskell ]; + version = "3.1.2.4"; + sha256 = "0d8fjckqykvxy9fs6b7k1fb5161wfbnif5ghrc1q1nlx9ngiykkr"; + libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ libGL libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr libXxf86vm @@ -37576,24 +37704,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.8.2.0"; - sha256 = "0m3h3ryxj5r74mv5g5dnfq5jbbwmvkl7ray18vi20d5vd93sydj4"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_8_2_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -37609,7 +37719,6 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -38992,6 +39101,7 @@ self: { homepage = "https://github.com/vmchale/brainheck#readme"; description = "Brainh*ck interpreter in haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "break" = callPackage @@ -39398,6 +39508,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {broker = null;}; + "bronyradiogermany-common" = callPackage + ({ mkDerivation, aeson, base, bytestring, network-uri, text, time + , tz, uuid-types + }: + mkDerivation { + pname = "bronyradiogermany-common"; + version = "1.0.0.1"; + sha256 = "1hwqif1jnwjhkb22j7rsc7fznvd7373gbfsl46196bb6489bbcvy"; + libraryHaskellDepends = [ + aeson base bytestring network-uri text time tz uuid-types + ]; + description = "Common types and URIs for the BronyRadioGermany API bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "bronyradiogermany-streaming" = callPackage + ({ mkDerivation, aeson, base, bronyradiogermany-common, bytestring + , case-insensitive, http-types, mtl, streaming + , streaming-bytestring, streaming-utils, text, time, uuid + }: + mkDerivation { + pname = "bronyradiogermany-streaming"; + version = "1.0.0.1"; + sha256 = "1a2yz2cbjpcywis7fy5l1w3pipirh6rjfcgs1mdyhgza12qnbx09"; + libraryHaskellDepends = [ + aeson base bronyradiogermany-common bytestring case-insensitive + http-types mtl streaming streaming-bytestring streaming-utils text + time uuid + ]; + description = "Streaming interface for the BronyRadioGermany API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "browscap" = callPackage ({ mkDerivation, base, bytestring, deepseq, ini, lens, lrucache , mtl, text, unordered-containers, wreq @@ -39825,18 +39969,15 @@ self: { "buildbox" = callPackage ({ mkDerivation, base, bytestring, containers, directory - , exceptions, mtl, old-locale, pretty, process, stm, temporary - , text, time + , exceptions, mtl, old-locale, process, stm, temporary, text, time }: mkDerivation { pname = "buildbox"; - version = "2.1.9.3"; - sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5"; - revision = "1"; - editedCabalFile = "0nqhdmkmgnqgfw8vkjnwbrzrj7lvrhc0gw23p8smxkppvh6y5zv3"; + version = "2.2.1.1"; + sha256 = "19kyi8w3z3k3ydbzw5y57j6m4ffg6y9pachwzsfzjpkfczi7ds7z"; libraryHaskellDepends = [ base bytestring containers directory exceptions mtl old-locale - pretty process stm temporary text time + process stm temporary text time ]; homepage = "http://code.ouroborus.net/buildbox"; description = "Rehackable components for writing buildbots and test harnesses"; @@ -40092,6 +40233,8 @@ self: { pname = "butcher"; version = "1.3.0.0"; sha256 = "0v85ganhfljxyqy9sfmhbqnfdazikmy8a3mpg1w1y827l4a3nkng"; + revision = "1"; + editedCabalFile = "1zw355fg08p90xv3f1qcray0vz68h4sab0q2zfb3hk3j8mpplgvp"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -40101,6 +40244,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "butcher_1_3_1_1" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , hspec, microlens, microlens-th, mtl, multistate, pretty + , transformers, unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.3.1.1"; + sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z"; + libraryHaskellDepends = [ + base bifunctors containers deque extra free microlens microlens-th + mtl multistate pretty transformers unsafe void + ]; + testHaskellDepends = [ + base containers deque extra free hspec microlens microlens-th mtl + multistate pretty transformers unsafe + ]; + homepage = "https://github.com/lspitzner/butcher/"; + description = "Chops a command or program invocation into digestable pieces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "butterflies" = callPackage ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw , OpenGLRaw21, repa, repa-devil @@ -40161,15 +40327,15 @@ self: { }) {}; "bv-sized" = callPackage - ({ mkDerivation, base, containers, lens, parameterized-utils + ({ mkDerivation, base, containers, lens, mtl, parameterized-utils , prettyclass, QuickCheck, random }: mkDerivation { pname = "bv-sized"; - version = "0.3.0"; - sha256 = "04y99mgcgaqpzryc921nqlggfamk0jnrqv482r0hpcdf9in533bc"; + version = "0.4.0"; + sha256 = "18z4k076q0bk23di1i1hh8k0h319psh5hrh6jdv6446c7sg7v1c8"; libraryHaskellDepends = [ - base containers lens parameterized-utils prettyclass QuickCheck + base containers lens mtl parameterized-utils prettyclass QuickCheck random ]; testHaskellDepends = [ @@ -41555,6 +41721,8 @@ self: { pname = "cabal-plan"; version = "0.3.0.0"; sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls"; + revision = "1"; + editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -41923,8 +42091,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.0.2"; - sha256 = "1nklzsclsyxb9y7xyrvhricmkyjhwrs7g853vlf21vbrdcnf7mfs"; + version = "2.1"; + sha256 = "0zh3xypxn78z7p7mg46ykxnmj2fv92maqx8wmclj1hqngp8ifnp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -43713,13 +43881,13 @@ self: { }) {}; "catamorphism" = callPackage - ({ mkDerivation, base, hspec, template-haskell }: + ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.6.1.1"; - sha256 = "1bpmi4k7dfwjkg9qr70gj4y6z87jaa0q11v91wgffdmw84r341vp"; + version = "0.7.0.0"; + sha256 = "0a01nr2lk80pfv9dr4sxyixwhfpprrvbgh44901as4jnb3gcbk33"; libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/frerich/catamorphism"; description = "Exposes a Template Haskell function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; @@ -43846,6 +44014,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cautious" = callPackage + ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec + , genvalidity-hspec-aeson, hspec, hspec-discover, QuickCheck + , transformers, validity + }: + mkDerivation { + pname = "cautious"; + version = "0.0.0.0"; + sha256 = "0kr9aipbi95hz97lbidifsfm51rsjlpjgkbvnyiwrh1cckh6q0zw"; + libraryHaskellDepends = [ + aeson base genvalidity-hspec-aeson hspec hspec-discover QuickCheck + transformers validity + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson + hspec hspec-discover QuickCheck transformers validity + ]; + homepage = "https://github.com/Nickske666/cautious#readme"; + description = "Keep track of warnings and errors during calculations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cautious-file" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, unix }: mkDerivation { @@ -44961,6 +45151,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "chatwork_0_1_3_2" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection + , data-default-class, hspec, http-api-data, http-client + , http-client-tls, http-types, req, servant-server, text, warp + }: + mkDerivation { + pname = "chatwork"; + version = "0.1.3.2"; + sha256 = "17wvmn2immigdbc5kbckwbl8hsali8w0mdii9mib9lfxykawyh54"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text + ]; + executableHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text + ]; + testHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + hspec http-api-data http-client http-client-tls http-types req + servant-server text warp + ]; + homepage = "https://github.com/matsubara0507/chatwork#readme"; + description = "The ChatWork API in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cheapskate" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize @@ -45104,6 +45324,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_4_10" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.4.10"; + sha256 = "07ki0qrw9rdjp3y2188wnbzx4g287qdsn9dwhg69i2ajdw83kxw9"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + homepage = "https://github.com/conal/checkers"; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -45136,6 +45371,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "checksum" = callPackage + ({ mkDerivation, base, explicit-exception, utility-ht }: + mkDerivation { + pname = "checksum"; + version = "0.0"; + sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik"; + libraryHaskellDepends = [ base explicit-exception utility-ht ]; + homepage = "http://hub.darcs.net/thielema/checksum"; + description = "Compute and verify checksums of ISBN, IBAN, etc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chell" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, options, patience , random, template-haskell, text, transformers @@ -47013,8 +47260,8 @@ self: { }: mkDerivation { pname = "cli-setup"; - version = "0.2.0.3"; - sha256 = "1macadfh1dqd6n2cc5rlyn74fz450livy1bg0qns3kcijqilk0p4"; + version = "0.2.0.4"; + sha256 = "0mkxm1kpbfsiv3khp8d96j9bcq7j4zbidd5ks89r69bxsmrp1z7i"; libraryHaskellDepends = [ base bytestring directory file-embed process ]; @@ -47120,6 +47367,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clifm" = callPackage + ({ mkDerivation, base, brick, byteunits, directory, filepath + , optparse-applicative, pointedlist, process, time, vector, vty + }: + mkDerivation { + pname = "clifm"; + version = "0.3.1.0"; + sha256 = "17kd2cfxc9dswlqv141f2anc0g19xhj9w5mk3xicx7vyr6j43y0y"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick byteunits directory filepath optparse-applicative + pointedlist process time vector vty + ]; + homepage = "https://github.com/pasqu4le/clifm"; + description = "Command Line Interface File Manager"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clingo" = callPackage ({ mkDerivation, base, bifunctors, clingo, deepseq, exceptions , hashable, mtl, StateVar, text, transformers, wl-pprint-text @@ -47390,25 +47656,27 @@ self: { "cloud-seeder" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-cloudformation - , amazonka-core, base, bytestring, containers, deepseq, exceptions - , fast-logger, hspec, lens, monad-control, monad-logger, monad-mock - , mtl, optparse-applicative, text, transformers, transformers-base - , unordered-containers, uuid, yaml + , amazonka-core, amazonka-kms, amazonka-s3, base, bytestring + , containers, crypto-api, deepseq, exceptions, fast-logger, hspec + , lens, monad-control, monad-logger, monad-mock, mtl + , optparse-applicative, text, text-conversions, these, transformers + , transformers-base, unordered-containers, uuid, yaml }: mkDerivation { pname = "cloud-seeder"; - version = "0.1.0.0"; - sha256 = "1jyxbk37xzx7dgxkgrmpn7nv7v494l26f4c5r1j665cd1d8x0m4f"; + version = "0.2.0.0"; + sha256 = "0886c6lfqcvwbq3cdxpq2rg25a0p9msjxqv3ncsw02rdcww0dsqc"; libraryHaskellDepends = [ - aeson amazonka amazonka-cloudformation amazonka-core base - containers deepseq exceptions lens monad-control monad-logger mtl - optparse-applicative text transformers transformers-base + aeson amazonka amazonka-cloudformation amazonka-core amazonka-kms + amazonka-s3 base bytestring containers crypto-api deepseq + exceptions lens monad-control monad-logger mtl optparse-applicative + text text-conversions transformers transformers-base unordered-containers uuid yaml ]; testHaskellDepends = [ amazonka-cloudformation base bytestring containers deepseq fast-logger hspec lens monad-logger monad-mock mtl - optparse-applicative text transformers yaml + optparse-applicative text these transformers yaml ]; homepage = "https://github.com/cjdev/cloud-seeder#readme"; description = "A tool for interacting with AWS CloudFormation"; @@ -49019,6 +49287,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinat-diagrams" = callPackage @@ -51815,12 +52084,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constraints-emerge" = callPackage + ({ mkDerivation, base, constraints, containers, ghc, hashable + , hspec, transformers + }: + mkDerivation { + pname = "constraints-emerge"; + version = "0.1.2"; + sha256 = "1l3n5k8q2jfhsiqbzzbpy798zvcv2dvwsvd165c38b2yvxn6zird"; + libraryHaskellDepends = [ + base constraints containers ghc hashable + ]; + testHaskellDepends = [ base constraints hspec transformers ]; + homepage = "https://github.com/isovector/constraints-emerge"; + description = "Defer instance lookups until runtime"; + license = stdenv.lib.licenses.mit; + }) {}; + "constrictor" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "constrictor"; - version = "0.1.0.2"; - sha256 = "13g8cks2bzwb0ndbak91b5k1n22i0hgza4l8i52fqhzs4addaxs3"; + version = "0.1.1.0"; + sha256 = "0vid1m5lsmpdx9bpc78ad3nk720z62chd0j9rx03laiz2fjzx2bh"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/chessai/constrictor.git"; description = "strict versions of many things in base"; @@ -52684,6 +52970,7 @@ self: { homepage = "https://github.com/qfpl/coordinate"; description = "A representation of latitude and longitude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot" = callPackage @@ -53465,6 +53752,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-python/"; description = "Bindings for libpython"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) python34;}; "cql" = callPackage @@ -55269,8 +55557,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.2.2"; - sha256 = "05vlyd3b2kkpspp6jmxrwhv0474rw6ij6ha7jajrbqyx42a4g8bl"; + version = "5.3.1"; + sha256 = "0fwzsmb9syk144d445cw1d9pjx3vn18pxi161yafv2q7q4m57i3g"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -55304,8 +55592,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.3.2"; - sha256 = "09vyvai2k6id2vsnbxnv809v2bml0v8spsrfcdg2zgnxnjv9s4s4"; + version = "0.0.4.0"; + sha256 = "1rzkv24xppysmx20x453wzxfapkic99c98jqzpf2iyfyny1qya2w"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -55321,8 +55609,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.0.2"; - sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82"; + version = "0.2.1.0"; + sha256 = "0w591ij97i1kkv2z5fix8zlvw9shagxq6lpkic71ldpvv1a4cf8q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -57454,6 +57742,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse_3_0_0_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: + mkDerivation { + pname = "data-diverse"; + version = "3.0.0.0"; + sha256 = "1sxv9pyggdpwba0771vpvrawnycjrnvpayq0fjf7ly57mrdi3zd0"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim tagged + ]; + testHaskellDepends = [ base hspec tagged ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/louispan/data-diverse#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-diverse-lens" = callPackage ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens , profunctors, tagged @@ -57473,6 +57780,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse-lens_3_0_0_2" = callPackage + ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens + , profunctors, tagged + }: + mkDerivation { + pname = "data-diverse-lens"; + version = "3.0.0.2"; + sha256 = "0hahvbyb6yr3bq36dlrvdsgzg3nifckyp10h83d2ryqgla7p7rbp"; + libraryHaskellDepends = [ + base data-diverse generic-lens lens profunctors tagged + ]; + testHaskellDepends = [ + base data-diverse generic-lens hspec lens tagged + ]; + homepage = "https://github.com/louispan/data-diverse-lens#readme"; + description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-dword" = callPackage ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty , tasty-quickcheck, template-haskell @@ -58551,10 +58878,8 @@ self: { ({ mkDerivation, base, pretty, syb }: mkDerivation { pname = "data-tree-print"; - version = "0.1.0.0"; - sha256 = "0dymdf7bv98f0xkdm49yxdn5nlbp7ahrfsadx69wzy8si537fnk5"; - revision = "1"; - editedCabalFile = "0ilk496yh0fdw2qisappr91d1s4xwl6hqaf2bnv3l7ah4qv74436"; + version = "0.1.0.1"; + sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f"; libraryHaskellDepends = [ base pretty syb ]; homepage = "https://github.com/lspitzner/data-tree-print"; description = "Print Data instances as a nested tree"; @@ -59745,6 +60070,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debian-build_0_10_1_1" = callPackage + ({ mkDerivation, base, directory, filepath, process, split + , transformers + }: + mkDerivation { + pname = "debian-build"; + version = "0.10.1.1"; + sha256 = "0dv5fs0kp8qmrldly6cj0fkvab7infplii0ay23p1pbx6qjakrnk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath process split transformers + ]; + executableHaskellDepends = [ base filepath transformers ]; + homepage = "http://twitter.com/khibino/"; + description = "Debian package build sequence tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "debug" = callPackage ({ mkDerivation, aeson, base, bytestring, clock, containers , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed @@ -60564,15 +60909,15 @@ self: { "dependency" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, containers - , criterion, deepseq, hspec, microlens, recursion-schemes, tardis + , criterion, deepseq, hspec, lens, recursion-schemes, tardis , transformers }: mkDerivation { pname = "dependency"; - version = "0.1.0.10"; - sha256 = "1cr1h8c127sgbgjg1qy9c17aj3mfp1bh35ypv00sz19k0d6wvmly"; + version = "0.1.0.11"; + sha256 = "0nazbm1mf3agjkfc1ll0fy4jxdkb65dzx92jz15jp7xp5y10866h"; libraryHaskellDepends = [ - ansi-wl-pprint base binary containers deepseq microlens + ansi-wl-pprint base binary containers deepseq lens recursion-schemes tardis transformers ]; testHaskellDepends = [ base containers hspec ]; @@ -61740,10 +62085,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.2"; - sha256 = "1rdg8b46hc1ybk1y9dw7w725rag58rkr7hs7z3gvk4isxm11gm79"; - revision = "1"; - editedCabalFile = "0vz16br2gn4agi35k92qw84cja2dqj63g7q3ak64jhc8r99bd4a1"; + version = "1.4.2.1"; + sha256 = "17vmjcshq6kdpy4qvwabrd7yp7is7zrs6lf3zn25l2ya8a3m0a17"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -61935,6 +62278,8 @@ self: { pname = "diagrams-solve"; version = "0.1.1"; sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; + revision = "1"; + editedCabalFile = "1aabxq020ycmwynm96dvqh9xbvcsw7s4593kca35i4zl2kzg14bb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -62520,15 +62865,16 @@ self: { "digit" = callPackage ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec - , parsers, pretty, semigroupoids, semigroups, tasty, tasty-hedgehog - , tasty-hspec, tasty-hunit, template-haskell, text + , parsers, pretty, scientific, semigroupoids, semigroups, tasty + , tasty-hedgehog, tasty-hspec, tasty-hunit, template-haskell, text }: mkDerivation { pname = "digit"; - version = "0.5.1"; - sha256 = "141w8x7r4b3pkalqvgc71p9rdqsfg9nmhyijcg7vr5336qv52p2a"; + version = "0.5.2"; + sha256 = "18y3dln42avvzj8cxz7hkg6w106zhf64aywx23crywjhilcl5ha0"; libraryHaskellDepends = [ - base lens papa parsers semigroupoids semigroups template-haskell + base lens papa parsers scientific semigroupoids semigroups + template-haskell ]; testHaskellDepends = [ ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty @@ -66340,17 +66686,16 @@ self: { }) {}; "dynamic-graph" = callPackage - ({ mkDerivation, base, cairo, colour, either, GLFW-b, GLUtil - , OpenGL, pango, pipes, transformers + ({ mkDerivation, base, cairo, colour, GLFW-b, GLUtil, OpenGL, pango + , pipes, transformers }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.11"; - sha256 = "0mgciglcq8cshbcrc0ff858596zlm07z6wcmjpaa3irqbkdn7ma1"; + version = "0.1.0.12"; + sha256 = "1jygkj2jryjxlkyf0104abhkhjmfdvjaaa4zcyz7kgpny342fhiy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo colour either GLFW-b GLUtil OpenGL pango pipes - transformers + base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers ]; homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; @@ -67802,24 +68147,6 @@ self: { }) {}; "ekg-statsd" = callPackage - ({ mkDerivation, base, bytestring, ekg-core, network, text, time - , unordered-containers - }: - mkDerivation { - pname = "ekg-statsd"; - version = "0.2.2.0"; - sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862"; - revision = "1"; - editedCabalFile = "1fnazaqdp0d7w5mfx038yv8isyw00dahis66dkyrigd57vrj3f8f"; - libraryHaskellDepends = [ - base bytestring ekg-core network text time unordered-containers - ]; - homepage = "https://github.com/tibbe/ekg-statsd"; - description = "Push metrics to statsd"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ekg-statsd_0_2_3_0" = callPackage ({ mkDerivation, base, bytestring, ekg-core, network, text, time , unordered-containers }: @@ -67833,29 +68160,9 @@ self: { homepage = "https://github.com/tibbe/ekg-statsd"; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-wai" = callPackage - ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json - , filepath, http-types, network, text, time, transformers - , unordered-containers, wai, wai-app-static, warp - }: - mkDerivation { - pname = "ekg-wai"; - version = "0.1.0.2"; - sha256 = "1ridcn930lf8gjj7lqdbhzzmz0i6r668bhid72anbq3v1h6fnhnw"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring ekg-core ekg-json filepath http-types network - text time transformers unordered-containers wai wai-app-static warp - ]; - homepage = "https://github.com/tvh/ekg-wai"; - description = "Remote monitoring of processes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ekg-wai_0_1_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, http-types, network, text, time, transformers , unordered-containers, wai, wai-app-static, warp @@ -67872,7 +68179,6 @@ self: { homepage = "https://github.com/tvh/ekg-wai"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "electrum-mnemonic" = callPackage @@ -69652,6 +69958,7 @@ self: { homepage = "https://github.com/mtesseract/error-context#readme"; description = "Provides API for enriching errors with contexts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "error-continuations" = callPackage @@ -70115,15 +70422,16 @@ self: { "eternity-timestamped" = callPackage ({ mkDerivation, attoparsec, base, cereal, directory, eternity - , foldl, generic-random, hashable, potoki, QuickCheck, text, time + , generic-random, hashable, potoki, QuickCheck, text, time + , timestamp }: mkDerivation { pname = "eternity-timestamped"; - version = "0.2.5"; - sha256 = "1ndvb2gs8a9720k9wlbz01vm12s0pb4kmrkidc9w6m33985jckfa"; + version = "0.4"; + sha256 = "150xqf7kg4131qxnbjhly4ryy251gni1z6vyqcsy477hig2yv5gr"; libraryHaskellDepends = [ - attoparsec base cereal directory eternity foldl generic-random - hashable potoki QuickCheck text time + attoparsec base cereal directory eternity generic-random hashable + potoki QuickCheck text time timestamp ]; homepage = "https://github.com/metrix-ai/eternity-timestamped"; description = "Automatic timestamping for Eternity"; @@ -70141,6 +70449,8 @@ self: { pname = "ether"; version = "0.5.1.0"; sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n"; + revision = "1"; + editedCabalFile = "01q86w79xswdkq08m375xwfqjgix6bzbc4lpxz4phqvzf38lc8i5"; libraryHaskellDepends = [ base exceptions mmorph monad-control mtl reflection tagged template-haskell transformers transformers-base transformers-lift @@ -71573,6 +71883,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "expiring-containers" = callPackage + ({ mkDerivation, base, containers, hashable, int-multimap, time + , timestamp, unordered-containers + }: + mkDerivation { + pname = "expiring-containers"; + version = "0.1.0.2"; + sha256 = "006n6zwdgrdh0717wd85kwxrbpv3fl5srbc77acglms41pcn72yz"; + libraryHaskellDepends = [ + base containers hashable int-multimap time timestamp + unordered-containers + ]; + homepage = "https://github.com/metrix-ai/expiring-containers"; + description = "Expiring containers"; + license = stdenv.lib.licenses.mit; + }) {}; + "expiring-mvar" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -71912,15 +72239,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_5_2_0" = callPackage + "extensible-effects_2_5_3_0" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, mtl , QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.5.2.0"; - sha256 = "12rj2b1zn3lqk5anv01lf95mmadazripa6731jf3m2m5di00i4sc"; + version = "2.5.3.0"; + sha256 = "0dp6wsrlqivghmhwkj5js807i5m71lp9g3v3v8qb7xd3c08awy86"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control QuickCheck silently test-framework @@ -71989,6 +72316,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_6_6" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.6.6"; + sha256 = "17d0fd2hng1bwgdl8ms7vzjb4zzwk8cljci5wsd5ninxi9m6x6br"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; + homepage = "https://github.com/ndmitchell/extra#readme"; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -72298,8 +72643,8 @@ self: { }: mkDerivation { pname = "fake"; - version = "0.1"; - sha256 = "1q6l1nz4anq3njbs772y0mdyy6qhfza7yicxa6fkjaxzgc2dnf1m"; + version = "0.1.1"; + sha256 = "0xp737s8067bynh03d6zhi8w71pl1q8mrk5si80mykn401dzw7ir"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -72410,17 +72755,14 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat-compat - , composition-prelude, criterion, gmpint, hspec, numbertheory - , QuickCheck + ({ mkDerivation, arithmoi, base, combinat-compat + , composition-prelude, criterion, gmpint, hspec, QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.3.7"; - sha256 = "13kcqs7z5vwafvs5d1h14brry0dmijld0c8vz2wmaqr6ijjx86a6"; - setupHaskellDepends = [ ats-pkg base Cabal ]; + version = "0.5.0.0"; + sha256 = "17jv9ysnd0bvlzc0sircj0mnbxpwzzby98wf6p6hj76m284acdx6"; libraryHaskellDepends = [ base composition-prelude gmpint ]; - librarySystemDepends = [ numbertheory ]; testHaskellDepends = [ arithmoi base combinat-compat hspec QuickCheck ]; @@ -72431,7 +72773,7 @@ self: { description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {numbertheory = null;}; + }) {}; "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion @@ -72452,6 +72794,7 @@ self: { homepage = "http://github.com/takano-akio/fast-builder"; description = "Fast ByteString Builder"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-combinatorics" = callPackage @@ -73319,8 +73662,8 @@ self: { pname = "feed"; version = "1.0.0.0"; sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck"; - revision = "3"; - editedCabalFile = "1v1kx8s1fgw0wkqbpxq9q9ky1akvvpgim2rp1s7w8vmjnxm9lwbx"; + revision = "4"; + editedCabalFile = "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -75204,8 +75547,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; - revision = "2"; - editedCabalFile = "0pn5mw1n152i106x60gz05bnpfhn50ll005v4ihvawq5faq3h44l"; + revision = "3"; + editedCabalFile = "09xml5mv63q0wzw09s0ssjdzgnq041gr6gjhk63dr252rydnn4zh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -75230,6 +75573,8 @@ self: { pname = "flac-picture"; version = "0.1.1"; sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w"; + revision = "1"; + editedCabalFile = "02vdh61nzig0yrv6ja6fjlgfcznj5k4iqh3i5f9g5p078ycqb17w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; testHaskellDepends = [ @@ -76081,6 +76426,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt_0_6" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, call-stack + , containers, criterion, deepseq, doctest, doctest-discover + , formatting, hspec, interpolate, microlens, neat-interpolation + , text, time, time-locale-compat, vector + }: + mkDerivation { + pname = "fmt"; + version = "0.6"; + sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers formatting microlens + text time time-locale-compat + ]; + testHaskellDepends = [ + base bytestring call-stack containers doctest hspec + neat-interpolation text vector + ]; + testToolDepends = [ doctest-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq formatting interpolate + text vector + ]; + homepage = "http://github.com/aelve/fmt"; + description = "A new formatting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, resourcet, text @@ -76193,6 +76567,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foldl_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, hashable, mwc-random, primitive + , profunctors, semigroups, text, transformers, unordered-containers + , vector, vector-builder + }: + mkDerivation { + pname = "foldl"; + version = "1.4.0"; + sha256 = "16vx35yl853g9ql9ncpa6r29bg5cai40s7jnpjj2d06ij9cad955"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors semigroups text transformers + unordered-containers vector vector-builder + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-incremental" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty @@ -76783,6 +77178,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_3_4" = callPackage + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, semigroups, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "6.3.4"; + sha256 = "1rcnnzbn1671lcwllpppgh3yv99k83y2n40r8mgsk08hsk1qs0wx"; + libraryHaskellDepends = [ + array base bytestring clock ghc-prim integer-gmp old-locale + scientific semigroups text time transformers + ]; + testHaskellDepends = [ base hspec semigroups ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -77815,6 +78229,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freq" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "freq"; + version = "0.0.0"; + sha256 = "0vrhdmhahhxp43312864mvq38w8100970n92vjd77fj50cbh0r2i"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fresco-binding" = callPackage ({ mkDerivation, base, binary, binary-serialise-cbor, bytestring , containers, text, unix @@ -80344,8 +80769,8 @@ self: { pname = "generics-sop"; version = "0.3.2.0"; sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; - revision = "1"; - editedCabalFile = "1cijsc0chx04i8v1n8zhlkd00dmrjq2pcpiw0y9126vmnxw5l90l"; + revision = "2"; + editedCabalFile = "0hc00hjgxm7vzq146d9kwapgqnjbhdi0c7icyvrpc2fhc4cnwlwf"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -81024,17 +81449,18 @@ self: { }) {}; "geodetics" = callPackage - ({ mkDerivation, array, base, dimensional, HUnit, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, array, base, checkers, dimensional, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "geodetics"; - version = "0.0.4"; - sha256 = "1zml9hpbj7shzsjv6hsyzv3p9yzm6cbvxp2cd79nd1fcsdss0zi3"; + version = "0.0.5"; + sha256 = "1fpfdn4bhdqjnrhiqd8yg5j4vs3rwlsr6nav3cjrvrhynlmqlcaq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base dimensional ]; testHaskellDepends = [ - array base dimensional HUnit QuickCheck test-framework + array base checkers dimensional HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/PaulJohnson/geodetics"; @@ -81433,6 +81859,7 @@ self: { testHaskellDepends = [ base ghc ghc-paths ]; description = "A small-step semantics for Core"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-datasize" = callPackage @@ -82130,6 +82557,19 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-tcplugins-extra_0_2_5" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.2.5"; + sha256 = "0xkq24dr2div9d9hr4rpz65968syqjignn9xn5q48vmzh1m1xwws"; + libraryHaskellDepends = [ base ghc ]; + homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-time-alloc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, tasty, tasty-hunit, temporary, text, time @@ -82206,6 +82646,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_4_2" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.4.2"; + sha256 = "1h0l5hks2pdaibq4w46b9064idshan615iiyjjbzkc2zg04xsbbr"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + homepage = "http://clash-lang.org/"; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell @@ -82223,6 +82685,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_5_10" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit, template-haskell + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.5.10"; + sha256 = "15xn69jdv77pgyd4mgm35zbrc1h0phyvw733j6s5iy01fhrhrdny"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc , ghc-tcplugins-extra, pretty, reflection @@ -82414,6 +82894,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_7" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.7"; + sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + homepage = "https://github.com/ndmitchell/ghcid#readme"; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -83458,8 +83966,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.15"; - sha256 = "1mwd5jyis7rfqpigyk1yp3rx2hkdb2gwg4m1l41dggdb8svv1jhp"; + version = "4.0.18"; + sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -85728,11 +86236,10 @@ self: { ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.7"; - sha256 = "1p0iqsvx85ycd5xab73k5aaj796kqanbkjfmivslb6i6ibix02v9"; + version = "0.1.0.11"; + sha256 = "00sml2d5jbfc0qy0nvrmk9xv31zk66anzz5r4d7h049asq0zh20n"; libraryHaskellDepends = [ base recursion-schemes ]; librarySystemDepends = [ gmp ]; - homepage = "https://github.com/vmchale/gmpint#readme"; description = "GMP integer conversions"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; @@ -85797,8 +86304,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.31"; - sha256 = "0raqapwms5c160n1nqjvmnzqxhimjd1aa8ji9jgb5iv37gfalv8z"; + version = "0.3.32"; + sha256 = "0b2v7msj54r6dd2w2wd4c8q6wvywnkmyddaa05r990cnbg9l4i9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85848,8 +86355,8 @@ self: { }: mkDerivation { pname = "gnuplot"; - version = "0.5.5.1"; - sha256 = "1i0rlmk6kqv1lj71s1av64qc14qmaaplp6z9mxd9hkwjpwzyqdma"; + version = "0.5.5.2"; + sha256 = "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90019,12 +90526,13 @@ self: { ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: mkDerivation { pname = "gtk-strut"; - version = "0.1.1.0"; - sha256 = "1g88afi75a727s85v37n4mvqr5zp4849s2kc1zdx3pvc9a15i9pd"; + version = "0.1.2.0"; + sha256 = "1v73qca2qdkpvfal2ndmwrxyj1qwgxgmammkbf88azs7wcxcf7y6"; libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; homepage = "https://github.com/IvanMalison/gtk-strut#readme"; description = "Libary for creating strut windows with gi-gtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-toggle-button-list" = callPackage @@ -90837,6 +91345,7 @@ self: { homepage = "https://github.com/BioHaskell/hPDB"; description = "Protein Databank file format library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB-examples" = callPackage @@ -90863,6 +91372,7 @@ self: { homepage = "https://github.com/BioHaskell/hPDB-examples"; description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPushover" = callPackage @@ -93748,8 +94258,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.3"; - sha256 = "04f7fiy4zdsl2pxb6yxq91lqgvyw0qwr9ky5sxsxj4nx40inv4d1"; + version = "0.3.5.4"; + sha256 = "02cc7bgld3cl36wq4n1c0n6gf2kbz0klj6ssfgjmjwvxvl064cg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -96038,6 +96548,35 @@ self: { }) {inherit (pkgs) glib; inherit (pkgs.gnome3) gobjectIntrospection;}; + "haskell-gi_0_21_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.21.1"; + sha256 = "0nhsjw0cv29r6rbajz4lf1ca63lm1m0i57wcs8p6aw10kx246q1n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe text + transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + executableHaskellDepends = [ + base containers directory filepath haskell-gi-base pretty-show text + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; + inherit (pkgs.gnome3) gobjectIntrospection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -100430,10 +100969,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "heap"; - version = "1.0.3"; - sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv"; - revision = "1"; - editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5"; + version = "1.0.4"; + sha256 = "0ahpsfmb76728w71xn4021ad7z752n6aqqgzdpcyis9i22g4ihm4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -104494,6 +105031,7 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -104584,8 +105122,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.9"; - sha256 = "0xgd1akird9hpdrwml4dxc0vx3vzgacr5f6z19zy6q4bvnw1g58n"; + version = "1.9.1"; + sha256 = "0fkanj21ivrf5la7zxij1jws955hc0y98n2lg4qkbyw5fz54i9dj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104718,8 +105256,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.1"; - sha256 = "0mmfavd158l5ig5wb1b1zbhbraj8hhqvbk4mg85n6c8ndpr4grd4"; + version = "2.1.3"; + sha256 = "08i7b894vm0p8ipilvhx0pp04r6zgrf44w0mnlmsydq971y59g3a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106479,8 +107017,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.2"; - sha256 = "009brgwczkszmlk8rq6s5s73rnpi2gw94wr9wwp9rgf3r2cfs1br"; + version = "5.0.17.3"; + sha256 = "174gp41v0krzj37m75pnr3aawyhkbk2wq4q6zk2z3zh0avvvmgk6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -107507,8 +108045,8 @@ self: { }: mkDerivation { pname = "hpath"; - version = "0.9.0"; - sha256 = "1d0f58xvqpr5d9n3n8wpy5x59mfh57al4bvpllfmb6a6dm514k4d"; + version = "0.9.2"; + sha256 = "1b8fni11zk3p3yx6pi9sx6cxq9vm31fqx3gm7y6nz5cykpncsx27"; libraryHaskellDepends = [ base bytestring deepseq exceptions hspec IfElse simple-sendfile unix unix-bytestring utf8-string word8 @@ -108809,17 +109347,17 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude , cpphs, criterion, deepseq, haskell-src-exts, hspec - , hspec-dirstream, language-ats, microlens, system-filepath + , hspec-dirstream, language-ats, lens, system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.3.0.0"; - sha256 = "1s92riisihcqim6hy4sa4z3dhk92dp2iyn32j0jl0qlpzdlbj4cp"; + version = "0.3.0.1"; + sha256 = "1z8afx8bc9igd0iv6anw635zfj6vwqq10kp4j95p3fs58wyjg21v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base casing composition-prelude cpphs deepseq - haskell-src-exts language-ats microlens + haskell-src-exts language-ats lens ]; testHaskellDepends = [ base hspec hspec-dirstream system-filepath @@ -108949,6 +109487,7 @@ self: { ]; description = "OASIS Security Assertion Markup Language (SAML) V2.0"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libxml2;}; "hsass" = callPackage @@ -113030,6 +113569,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_5_12_1" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, deepseq, directory + , exceptions, filepath, ghc-prim, hspec, http-types, memory + , mime-types, monad-control, network, network-uri, random, stm + , streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.5.12.1"; + sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab"; + libraryHaskellDepends = [ + array base blaze-builder bytestring case-insensitive containers + cookie deepseq exceptions filepath ghc-prim http-types memory + mime-types network network-uri random stm streaming-commons text + time transformers + ]; + testHaskellDepends = [ + async base blaze-builder bytestring case-insensitive containers + deepseq directory hspec http-types monad-control network + network-uri streaming-commons text time transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -113256,35 +113824,6 @@ self: { }) {}; "http-conduit" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, hspec, http-client, http-client-tls - , http-types, HUnit, mtl, network, resourcet, streaming-commons - , temporary, text, time, transformers, unliftio, unliftio-core - , utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.3.0"; - sha256 = "0z9158a27g6kg7vbhkiw6icb2wgzb3lhsifgg5yh6wph5cd40fx4"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra http-client - http-client-tls http-types mtl resourcet transformers unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit network resourcet streaming-commons - temporary text time transformers unliftio utf8-string wai - wai-conduit warp warp-tls - ]; - doCheck = false; - homepage = "http://www.yesodweb.com/book/http-conduit"; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_3_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, hspec, http-client, http-client-tls @@ -113311,7 +113850,6 @@ self: { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -113378,6 +113916,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-date_0_0_7" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, doctest + , hspec, old-locale, time + }: + mkDerivation { + pname = "http-date"; + version = "0.0.7"; + sha256 = "1hpzs646qqzp2g2qy7rx1bf3knf1hw38n82vcq6bs4mm1xzdryff"; + libraryHaskellDepends = [ array attoparsec base bytestring time ]; + testHaskellDepends = [ + base bytestring doctest hspec old-locale time + ]; + description = "HTTP Date parser/formatter"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-dispatch" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-client, http-client-tls, http-types @@ -114967,8 +115522,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.4.1"; - sha256 = "0mhi85czipxk0mxrzxchljabhkiq5a6y3xn9k5rivi2dgy28mrrk"; + version = "2.4.3"; + sha256 = "18pyayl0xyb045db5584cfbbvzvmkwm3zkpvks30vrz9sb5jx1qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115091,6 +115646,7 @@ self: { homepage = "https://github.com/githubuser/hw-prim-bits#readme"; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect" = callPackage @@ -115433,6 +115989,7 @@ self: { homepage = "https://github.com/srijs/hwsl2"; description = "Hashing with SL2"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwsl2-bytevector" = callPackage @@ -115445,6 +116002,7 @@ self: { homepage = "https://github.com/srijs/hwsl2-haskell-bytevector"; description = "A hashed byte-vector based on algebraic hashes and finger trees"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwsl2-reducers" = callPackage @@ -115459,6 +116017,7 @@ self: { homepage = "https://github.com/srijs/hwsl2-reducers"; description = "Semigroup and Reducer instances for Data.Hash.SL2"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hx" = callPackage @@ -117947,6 +118506,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "immortal_0_3" = callPackage + ({ mkDerivation, base, stm, tasty, tasty-hunit, transformers + , unliftio-core + }: + mkDerivation { + pname = "immortal"; + version = "0.3"; + sha256 = "120znjn7jrmcnzgka8zbiih4g8imh732iivjdzzbpj1kgywrvj0i"; + libraryHaskellDepends = [ base stm unliftio-core ]; + testHaskellDepends = [ base stm tasty tasty-hunit transformers ]; + homepage = "https://github.com/feuerbach/immortal"; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "imparse" = callPackage ({ mkDerivation, ascetic, base, compilation, containers, directory , indents, MissingH, parsec, richreports, split, staticanalysis @@ -118274,10 +118849,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "inchworm"; - version = "1.0.2.1"; - sha256 = "19fx9nrx1jia4qz3rhjsdmmmas7bn5rl59b2y2lnzyyz6n83sfzc"; - revision = "1"; - editedCabalFile = "0yg8x27fk0kr99ways4h64a5wbxmnh59l8mis9xd0faqx7hadic7"; + version = "1.0.2.2"; + sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/DDCSF/inchworm"; description = "Inchworm Lexer Framework"; @@ -118578,6 +119151,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-list-literals_0_2_0_0" = callPackage + ({ mkDerivation, base, Only }: + mkDerivation { + pname = "indexed-list-literals"; + version = "0.2.0.0"; + sha256 = "0n0j5x4v099000fm2ar0lmn06f21gnq39srmimy9bm3zisx8zmzd"; + libraryHaskellDepends = [ base Only ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/davidm-d/indexed-list-literals"; + description = "Type safe indexed list literals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -118802,23 +119389,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_5_1" = callPackage + "influxdb_1_6_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck - , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th - , template-haskell, text, time, unordered-containers, vector + , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, time, unordered-containers + , vector }: mkDerivation { pname = "influxdb"; - version = "1.5.1"; - sha256 = "1gxhd5ywz27z6jkx9bdmqsjafl2j0wk5vmrclz7l7hwfnn5553c7"; + version = "1.6.0"; + sha256 = "1fmz5n3mp3w1v2axp9g1nw9h5sj6cw3xbs44xczn59sgpmz5hv34"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific text time + http-types lens network optional-args scientific tagged text time unordered-containers vector ]; testHaskellDepends = [ @@ -118863,8 +119451,8 @@ self: { ({ mkDerivation, attoparsec, base, text, unordered-containers }: mkDerivation { pname = "ini"; - version = "0.3.5"; - sha256 = "1iicavbjr4qmlcdxh32cgqxlxd80xvzyxxskrs3hji1qzrnq7lxz"; + version = "0.3.6"; + sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw"; libraryHaskellDepends = [ attoparsec base text unordered-containers ]; @@ -119387,6 +119975,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "int-multimap" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "int-multimap"; + version = "0.1.0.1"; + sha256 = "0xi0n9hhra6pzqnxahf109qgifxnsgvc9v9jl0qmnxzz5yki1pvg"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + homepage = "https://github.com/metrix-ai/int-multimap"; + description = "A data structure that associates each Int key with a set of values"; + license = stdenv.lib.licenses.mit; + }) {}; + "integer-gmp_1_0_1_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { @@ -119974,6 +120577,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "invertible_0_2_0_5" = callPackage + ({ mkDerivation, base, haskell-src-meta, invariant, lens + , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell + , transformers + }: + mkDerivation { + pname = "invertible"; + version = "0.2.0.5"; + sha256 = "1fwdbg0pimi9hfyp20fsvyxpicjd7jxg4vsh5kykkxviyfhxl2ha"; + libraryHaskellDepends = [ + base haskell-src-meta invariant lens partial-isomorphisms + semigroupoids template-haskell transformers + ]; + testHaskellDepends = [ base QuickCheck transformers ]; + description = "bidirectional arrows, bijective functions, and invariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible-hlist" = callPackage ({ mkDerivation, base, HList, invertible }: mkDerivation { @@ -123917,8 +124539,8 @@ self: { }: mkDerivation { pname = "judy"; - version = "0.4.0"; - sha256 = "115991jvp9gg9iy3n8p8y0y39x236v17g5xqchmlfsja1nx9hbzc"; + version = "0.4.1"; + sha256 = "0inm77n75066jcjw820cdpklqjfy76i7by4qz136c83x2x7w6fsm"; libraryHaskellDepends = [ base bytestring ghc-prim ]; librarySystemDepends = [ Judy ]; testHaskellDepends = [ base hspec QuickCheck ]; @@ -124182,6 +124804,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "jwt_0_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , doctest, HsOpenSSL, http-types, HUnit, lens, lens-aeson, memory + , network-uri, QuickCheck, RSA, scientific, semigroups, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "jwt"; + version = "0.8.0"; + sha256 = "0ij921vgm0sqlc2ryymqxz6ipgl2iwm0916ny7g5l47qh2fjhcjg"; + libraryHaskellDepends = [ + aeson base bytestring containers cryptonite HsOpenSSL http-types + memory network-uri RSA scientific semigroups text time + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers cryptonite doctest HsOpenSSL + http-types HUnit lens lens-aeson memory network-uri QuickCheck RSA + scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th + text time unordered-containers vector + ]; + homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; + description = "JSON Web Token (JWT) decoding and encoding"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kademlia" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl, network , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck @@ -125451,8 +126101,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "key-state"; - version = "0.1.0"; - sha256 = "0q5pfayi02xhka2xdn2nwng1cms0lyh6pbysvpxsmbiwzq80p4kp"; + version = "0.2.0"; + sha256 = "1n8bp8g2w16mb7ifafx4ypyx393lra4r2vnnmasxjc22fvyiwvsl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/jxv/key-state#readme"; @@ -127129,8 +127779,8 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; - revision = "3"; - editedCabalFile = "041hv4z4xxqidnlr5jgkwp13vj4lr9dvqlrgavl3dmsd07vfj0bc"; + revision = "4"; + editedCabalFile = "0r364limqm570a8xd82wwpcvmcx2j7nfndg5kad022vz2v5n0smz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath @@ -127195,17 +127845,17 @@ self: { "language-ats" = callPackage ({ mkDerivation, alex, ansi-wl-pprint, array, base , composition-prelude, containers, cpphs, criterion, deepseq, happy - , hspec, hspec-dirstream, microlens, microlens-th - , recursion-schemes, system-filepath, transformers + , hspec, hspec-dirstream, lens, recursion-schemes, system-filepath + , transformers }: mkDerivation { pname = "language-ats"; - version = "1.2.0.6"; - sha256 = "0g1yq11pml5pkpszbzdqkhj172v9zyw8mbf9bl97p883p55p0nxa"; + version = "1.2.0.8"; + sha256 = "0609xpjcq294ypjq4blw1cb3a6jnjzm9gwzr54dnp3afhindbq3m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq - microlens microlens-th recursion-schemes transformers + lens recursion-schemes transformers ]; libraryToolDepends = [ alex cpphs happy ]; testHaskellDepends = [ @@ -127544,6 +128194,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-ecmascript_0_18" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, charset, containers + , data-default-class, Diff, directory, filepath, HUnit, mtl, parsec + , QuickCheck, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, testing-feat + , uniplate + }: + mkDerivation { + pname = "language-ecmascript"; + version = "0.18"; + sha256 = "0gg608hniq1v7f1d56akyk44zyrmd0acr33m53cbdlcq8w1c8h70"; + libraryHaskellDepends = [ + ansi-wl-pprint base charset containers data-default-class Diff mtl + parsec QuickCheck template-haskell testing-feat uniplate + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers data-default-class Diff directory + filepath HUnit mtl parsec QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 uniplate + ]; + homepage = "http://github.com/jswebtools/language-ecmascript"; + description = "JavaScript parser and pretty-printer library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-ecmascript-analysis" = callPackage ({ mkDerivation, base, containers, language-ecmascript, parsec , uniplate @@ -127969,6 +128645,7 @@ self: { homepage = "https://github.com/blamario/language-oberon"; description = "Parser and pretty-printer for the Oberon programming language"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-objc" = callPackage @@ -128686,6 +129363,7 @@ self: { homepage = "https://github.com/luna/layered-state"; description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "layers" = callPackage @@ -128773,6 +129451,7 @@ self: { homepage = "https://github.com/luna/layouting"; description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers."; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lazy-csv" = callPackage @@ -130822,6 +131501,7 @@ self: { homepage = "http://redmine.iportnov.ru/projects/libvirt-hs"; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -133281,20 +133961,18 @@ self: { }) {}; "load-font" = callPackage - ({ mkDerivation, base, c2hs, fltkhs, text }: + ({ mkDerivation, base, c2hs, Cabal }: mkDerivation { pname = "load-font"; - version = "0.1.0.0"; - sha256 = "1xva9cxwscjyqpx5yvbicyizk4y439wdv8gzxir2jwkangpvrby5"; - revision = "2"; - editedCabalFile = "0qmz9kmb1cc3cvidxvspa186nkby4m060f6y9v23s3dqp3wd93mm"; + version = "0.1.0.2"; + sha256 = "06vzgyi8r1fhlc1ykdfynll7y4a0wwvjq9x0xg08csr4ypfgj6m3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base fltkhs text ]; - homepage = "https://github.com/deech/load-font#load-font"; + homepage = "https://github.com/deech/load-font#readme"; description = "A cross platform library for loading bundled fonts into your application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133469,18 +134147,6 @@ self: { }) {}; "loch-th" = callPackage - ({ mkDerivation, base, pretty, template-haskell }: - mkDerivation { - pname = "loch-th"; - version = "0.2.1"; - sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p"; - libraryHaskellDepends = [ base pretty template-haskell ]; - homepage = "https://github.com/liskin/loch-th"; - description = "Support for precise error locations in source files (Template Haskell version)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "loch-th_0_2_2" = callPackage ({ mkDerivation, base, pretty, template-haskell }: mkDerivation { pname = "loch-th"; @@ -133490,30 +134156,25 @@ self: { homepage = "https://github.com/liskin/loch-th"; description = "Support for precise error locations in source files (Template Haskell version)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lock-file" = callPackage ({ mkDerivation, base, data-default-class, directory, exceptions - , filepath, HUnit, tagged-exception-core, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers + , filepath, HUnit, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "lock-file"; - version = "0.5.0.2"; - sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7"; - revision = "4"; - editedCabalFile = "0fs4mrhzj90pnc64nvm6k5v095998rxqcq3875aypkgjn2fwfsrc"; + version = "0.7.0.0"; + sha256 = "1vpaw3hh1as00p9vbj90cyd8nhjimgyp9hn8axgiwc1l47ddp6vc"; libraryHaskellDepends = [ - base data-default-class directory exceptions tagged-exception-core - transformers + base data-default-class directory exceptions ]; testHaskellDepends = [ base data-default-class directory exceptions filepath HUnit - tagged-exception-core test-framework test-framework-hunit - test-framework-quickcheck2 transformers + test-framework test-framework-hunit test-framework-quickcheck2 ]; - homepage = "https://github.com/trskop/lock-file"; + homepage = "https://github.com/trskop/lock-file#readme"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -135604,8 +136265,8 @@ self: { }: mkDerivation { pname = "machinecell"; - version = "4.0.0"; - sha256 = "1wwrgd1ag104kdx97vii3rh9lj9lg1vg04rr98ldi2ikb90jbgwb"; + version = "4.0.1"; + sha256 = "1j2gzs7icvffga3b71dmik5ryb2mivmx5dvzii453nivgcxwyw22"; libraryHaskellDepends = [ base free mtl profunctors semigroups transformers ]; @@ -135846,8 +136507,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.6"; - sha256 = "079100sdqh4g7mlbf7p1j04r7g6c6b3q58nm4qiy8yrdvbzjdrhv"; + version = "4.0.2.7"; + sha256 = "08zi6v7p5wy8764505n7wk69iliab1hy40agz9qvgsq9iqi20h3f"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -136138,6 +136799,7 @@ self: { homepage = "https://gitlab.com/igrep/main-tester#readme"; description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mainland-pretty" = callPackage @@ -137163,6 +137825,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "markup_4_2_0" = callPackage + ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup + , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl + , path, path-extra, resourcet, text, transformers-base, urlpath + }: + mkDerivation { + pname = "markup"; + version = "4.2.0"; + sha256 = "065pq5m12hk9k6c8lzrgr5mzgz2rzpafhlaql6bvv422j3pbkfgs"; + libraryHaskellDepends = [ + attoparsec-uri base blaze-html blaze-markup clay comonad lucid + mmorph monad-control monad-logger mtl path path-extra resourcet + text transformers-base urlpath + ]; + homepage = "https://github.com/athanclark/markup#readme"; + description = "Abstraction for HTML-embedded content"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "markup-preview" = callPackage ({ mkDerivation, base, cmdargs, directory, glib, gtk , gtk2hs-buildtools, MissingH, mtl, pandoc, temporary, text @@ -137371,8 +138053,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.1.4.0"; - sha256 = "0hp0dvc9qr0px3x2w28wvks3918jc5z1ib2c0n2bfz0isi11gs1s"; + version = "0.1.6.1"; + sha256 = "1ifkzalbhp3jv41x9zwsn0ks3ahrab6gs1x57c4y0ww56qf0gv2y"; libraryHaskellDepends = [ base data-default-class deepseq ghc-prim primitive vector ]; @@ -137384,46 +138066,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_1_5_0" = callPackage - ({ mkDerivation, base, data-default, data-default-class, deepseq - , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.1.5.0"; - sha256 = "1azd011abvlkr27rssl6cra8an142z6jrfwj6yaas1favbs6r570"; - libraryHaskellDepends = [ - base data-default-class deepseq ghc-prim primitive vector - ]; - testHaskellDepends = [ - base data-default deepseq hspec QuickCheck safe-exceptions vector - ]; - homepage = "https://github.com/lehins/massiv"; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "massiv-io" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq, directory - , filepath, JuicyPixels, massiv, netpbm, process, vector - }: - mkDerivation { - pname = "massiv-io"; - version = "0.1.1.0"; - sha256 = "05sj1w06crdncibsknyrhbjwaldsixfw6qncld736ryr1sjcqv6j"; - revision = "1"; - editedCabalFile = "1nsi12h9jcmypim3vd9x1a5czx9cqcnpf12lbi7d1ipmnqclrj3r"; - libraryHaskellDepends = [ - base bytestring data-default deepseq directory filepath JuicyPixels - massiv netpbm process vector - ]; - homepage = "https://github.com/lehins/massiv"; - description = "Import/export of Image files into massiv Arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv-io_0_1_2_0" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, directory , filepath, JuicyPixels, massiv, netpbm, process, vector }: @@ -137438,7 +138081,6 @@ self: { homepage = "https://github.com/lehins/massiv"; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "master-plan" = callPackage @@ -139486,6 +140128,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "micro-recursion-schemes" = callPackage + ({ mkDerivation, base, cpphs, HUnit, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "micro-recursion-schemes"; + version = "5.0.2.1"; + sha256 = "1n1sza3a87vh74hx1da4mcfwarbjkz2cfvnkldnqwfnqvngq1gaq"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + libraryToolDepends = [ cpphs ]; + testHaskellDepends = [ base HUnit template-haskell ]; + description = "Simple recursion schemes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "microbench" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -140277,6 +140934,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-mail-ses_0_4_1" = callPackage + ({ mkDerivation, base, base64-bytestring, byteable, bytestring + , conduit, cryptohash, http-client, http-client-tls, http-conduit + , http-types, mime-mail, old-locale, text, time, transformers + , xml-conduit, xml-types + }: + mkDerivation { + pname = "mime-mail-ses"; + version = "0.4.1"; + sha256 = "1w6k4cm5yab9dhg7yn6mp7jzk1zdwpnzc6c1xb3vz3rdwp8jjvx7"; + libraryHaskellDepends = [ + base base64-bytestring byteable bytestring conduit cryptohash + http-client http-client-tls http-conduit http-types mime-mail + old-locale text time transformers xml-conduit xml-types + ]; + homepage = "http://github.com/snoyberg/mime-mail"; + description = "Send mime-mail messages via Amazon SES"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime-string" = callPackage ({ mkDerivation, base, base64-string, bytestring, iconv, mtl , network, old-locale, old-time, random @@ -140615,8 +141293,8 @@ self: { }: mkDerivation { pname = "miniutter"; - version = "0.4.6.0"; - sha256 = "093ahw66byzgc9scvmlihl3sa2zph9mszpf9kdjd9ydi5gv6mrmx"; + version = "0.4.7.0"; + sha256 = "10nwg3vw0p8hb8hgc34xspg4vrwf8xyhi22b9j57ms3045marjdd"; libraryHaskellDepends = [ base binary containers ghc-prim minimorph text ]; @@ -140751,15 +141429,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_18_0_0" = callPackage + "miso_0_19_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.18.0.0"; - sha256 = "17znwg6spm950qnjrw2v72lff5xng4c1rpcq3140qkmcq99v1zvi"; + version = "0.19.0.0"; + sha256 = "0xnnhs36rnbaq8q4s6r2lhm9g4qdvm0qm0pj3hgrkgn22cs2fq21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141280,8 +141958,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "modular-arithmetic"; - version = "1.2.1.2"; - sha256 = "0xm1p63r4a8gdpsrdrsf80bihra11blnik2gwvlpph494pvk27wj"; + version = "1.2.1.3"; + sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/TikhonJelvis/modular-arithmetic"; @@ -141518,6 +142196,7 @@ self: { homepage = "https://github.com/mvv/monad-abort-fd"; description = "A better error monad transformer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-atom" = callPackage @@ -141766,6 +142445,7 @@ self: { homepage = "https://github.com/mvv/monad-finally"; description = "Guard monadic computations with cleanup actions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-fork" = callPackage @@ -141942,19 +142622,42 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.28.3"; - sha256 = "11v5014zqp1sl801wc39yyix8m30vrf3ibas28bcdjyfrbhhvskp"; + version = "0.3.28.4"; + sha256 = "1pqay81lk6divcfslg4dqcpyq2wv7vpdzb73kb2g4203mmpjcpv4"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans template-haskell text transformers transformers-base transformers-compat unliftio-core ]; - homepage = "https://github.com/kazu-yamamoto/logger"; + homepage = "https://github.com/snoyberg/monad-logger#readme"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_28_5" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.28.5"; + sha256 = "1w9700v2vbrydpwr5jjivnkrqcrbl7xbklym0w15qdqd5p6xfpi2"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + homepage = "https://github.com/snoyberg/monad-logger#readme"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -142675,8 +143378,8 @@ self: { }: mkDerivation { pname = "monadcryptorandom"; - version = "0.7.2"; - sha256 = "12inwjh1smgrp62hvrca7608vjaff576503xi7ymbkq9szk8rkj9"; + version = "0.7.2.1"; + sha256 = "03bn19wkshs9bjfl65p8klagydva6c543zasibv3y0w1hrpknib9"; libraryHaskellDepends = [ base bytestring crypto-api exceptions mtl tagged transformers transformers-compat @@ -143155,21 +143858,6 @@ self: { }) {}; "monoid-extras" = callPackage - ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups - }: - mkDerivation { - pname = "monoid-extras"; - version = "0.4.3"; - sha256 = "1c2zdsyq0iyagzp9y64j75nxvpbjr5y3fdg8cd1pkfqgms977qsr"; - revision = "1"; - editedCabalFile = "08961ibwiqks8qw5cwpkzpz3acrlrd48l2sl1qny96gycaslzrps"; - libraryHaskellDepends = [ base groups semigroupoids semigroups ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Various extra monoid-related definitions and utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoid-extras_0_4_4" = callPackage ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups }: mkDerivation { @@ -143180,7 +143868,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-owns" = callPackage @@ -143718,28 +144405,28 @@ self: { }) {}; "mp" = callPackage - ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons - , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl - , network, random, setlocale, text, unix, unordered-containers - , utf8-string, vty, vty-ui + ({ mkDerivation, async, base, binary, ConfigFile, containers + , daemons, directory, exceptions, filepath, gi-glib, gi-gobject + , gi-gst, haskell-gi-base, haskell-gi-overloading, lens, MissingH + , mtl, network, random, resourcet, simple-ui, template-haskell + , text, utf8-string, vty }: mkDerivation { pname = "mp"; - version = "0.2.2"; - sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; - revision = "1"; - editedCabalFile = "1cc85zdja69m16h32ii1jw1qkfz7jq3gp0m0m6pfaj146l8qcmwc"; + version = "1.0.2"; + sha256 = "07npcr1rjypjbxrv3hccqfac3piq00psc7yxgh7iw8pl8izqrwl7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base binary bytestring ConfigFile daemons directory filepath glib - gstreamer hgettext MissingH mtl network random setlocale text unix - unordered-containers utf8-string vty vty-ui + async base binary ConfigFile containers daemons directory + exceptions filepath gi-glib gi-gobject gi-gst haskell-gi-base + haskell-gi-overloading lens MissingH mtl network random resourcet + simple-ui template-haskell text utf8-string vty ]; - homepage = "https://bitbucket.org/borekpiotr/linux-music-player"; + homepage = "http://bitbucket.org/borekpiotr/linux-music-player"; description = "Music player for linux"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -144866,6 +145553,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multistate_0_8_0_0" = callPackage + ({ mkDerivation, base, hspec, monad-control, mtl, tagged + , transformers, transformers-base + }: + mkDerivation { + pname = "multistate"; + version = "0.8.0.0"; + sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1"; + revision = "1"; + editedCabalFile = "1p5xf8i7y56fb4m7is0x1z852cq82sv0342z1h4qz1mi8vpln7zz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base monad-control mtl tagged transformers transformers-base + ]; + testHaskellDepends = [ base hspec transformers ]; + homepage = "https://github.com/lspitzner/multistate"; + description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "multivariant" = callPackage ({ mkDerivation, base, containers, free, HUnit, invertible , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty @@ -147601,23 +148310,6 @@ self: { }) {}; "netwire-input-glfw" = callPackage - ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm - }: - mkDerivation { - pname = "netwire-input-glfw"; - version = "0.0.8"; - sha256 = "1nf0ikx6cfsm9xh4zmz64iwq4w92g0g3zalsk3zzd0a7pq74cdz9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers GLFW-b mtl netwire-input stm - ]; - homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; - description = "GLFW instance of netwire-input"; - license = stdenv.lib.licenses.mit; - }) {}; - - "netwire-input-glfw_0_0_10" = callPackage ({ mkDerivation, base, containers, deepseq, GLFW-b, mtl , netwire-input, stm }: @@ -147633,7 +148325,6 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-javascript" = callPackage @@ -148974,8 +149665,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.4.0"; - sha256 = "16gs4wmv8qd8zlm2clsd2h4gcj8fsad6s926nspnbyznbmsbg6p2"; + version = "1.4.1"; + sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -150334,17 +151025,18 @@ self: { }) {}; "number-length" = callPackage - ({ mkDerivation, base, criterion, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + ({ mkDerivation, base, criterion, HUnit, QuickCheck + , quickcheck-instances, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "number-length"; - version = "0.2.0.0"; - sha256 = "1jrlq7qdi7lcpkqqv9qafcgci2gc8rb3f3lv177s8narfdprx2hz"; + version = "0.2.1.0"; + sha256 = "1cdlwdas09q39jag5jl398wmw7ifbgdpp6p5kh0fi71m1c4f05w9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 + base HUnit QuickCheck quickcheck-instances test-framework + test-framework-hunit test-framework-quickcheck2 ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/trskop/number-length"; @@ -150686,6 +151378,7 @@ self: { homepage = "https://github.com/tonyday567/numhask#readme"; description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-range" = callPackage @@ -154443,8 +155136,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) pam;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {pam = null;}; "panda" = callPackage ({ mkDerivation, base, cgi, containers, data-default, directory @@ -154793,10 +155486,8 @@ self: { ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { pname = "pandoc-lens"; - version = "0.6.2"; - sha256 = "18v22salncjdghpg6gz78mpf9wp5qk622jia77qwlh9di36jdqg5"; - revision = "1"; - editedCabalFile = "1b3qk1afdd9l6i625spm26cgzmmd3bqmyp0lfszjnaf32ac7sldd"; + version = "0.6.3"; + sha256 = "1gv9n753qp8l7fivi96sgb8qsia5bijw2fla21dxyn81qza3fk6v"; libraryHaskellDepends = [ base containers lens pandoc-types ]; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; @@ -156692,15 +157383,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-extra_0_1_1" = callPackage - ({ mkDerivation, base, path }: + "path-extra_0_2_0" = callPackage + ({ mkDerivation, attoparsec, base, path, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text + }: mkDerivation { pname = "path-extra"; - version = "0.1.1"; - sha256 = "0dyhazqz8gz6fk79v76j9kw7bj001njdvc0b3wpl6an3dqw8hy9j"; - libraryHaskellDepends = [ base path ]; + version = "0.2.0"; + sha256 = "0fh4m3vidf75j43rk1n46y3bsn0j4247bz71s35651vi9s8vw27b"; + libraryHaskellDepends = [ attoparsec base path text ]; + testHaskellDepends = [ + attoparsec base path QuickCheck quickcheck-instances tasty + tasty-quickcheck text + ]; homepage = "https://github.com/athanclark/path-extra#readme"; - description = "Some extensions to Chris Done's path library, for use with urlpath and attoparsec-uri"; + description = "URLs without host information"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -156713,8 +157410,8 @@ self: { pname = "path-io"; version = "1.3.3"; sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; - revision = "2"; - editedCabalFile = "1zipck6lhhff9v86s4awgl6z35znjd7wcy1x25xplsdrxpzps3nl"; + revision = "3"; + editedCabalFile = "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -156792,14 +157489,15 @@ self: { "paths" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath - , time + , template-haskell, text, time }: mkDerivation { pname = "paths"; - version = "0.1"; - sha256 = "0cccvc2p04rmhbg61jaa592jd86dp08ipamk3ddvswr5ih3rhdgx"; + version = "0.2.0.0"; + sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v"; libraryHaskellDepends = [ - base bytestring deepseq directory filepath time + base bytestring deepseq directory filepath template-haskell text + time ]; description = "Library for representing and manipulating type-safe file paths"; license = stdenv.lib.licenses.bsd3; @@ -158146,8 +158844,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.8.1"; - sha256 = "1mfk6mxicg12vnvc9049k55dgvcx4ss4z2219qr8wy89m2z72l1k"; + version = "2.8.2"; + sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger haskell-src-meta @@ -159587,6 +160285,7 @@ self: { ]; description = "dice game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "piki" = callPackage @@ -161244,6 +161943,7 @@ self: { homepage = "https://github.com/phlummox/hs-plex#readme"; description = "run a subprocess, combining stdout and stderr"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plist" = callPackage @@ -161618,8 +162318,8 @@ self: { ({ mkDerivation, base, bytestring, containers, hspec }: mkDerivation { pname = "plural"; - version = "0.0.1"; - sha256 = "15hbvr565qvm608241xnx8sicspl2200jqbxd138a14qfi5aplc0"; + version = "0.0.2"; + sha256 = "1f35w7rzwq6f1zzdpglij41ra8pwyzjklv2pbnpmbp9q6rpi836p"; libraryHaskellDepends = [ base bytestring containers ]; testHaskellDepends = [ base hspec ]; description = "Pluralize"; @@ -161847,8 +162547,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.5"; - sha256 = "0wrsk5l83dzq0pv0dy24gil0mipw1yalalivjq92qx0dv68z15ja"; + version = "1.1.1.7"; + sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162306,30 +163006,6 @@ self: { }) {}; "pomaps" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, criterion - , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty - , tasty-hspec, tasty-quickcheck, vector - }: - mkDerivation { - pname = "pomaps"; - version = "0.0.0.3"; - sha256 = "1gxfaqcg6d9wkm67d8rrjvigy9kvvh9403v3jk790x9pfydcjvym"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim lattices - ]; - testHaskellDepends = [ - base ChasingBottoms containers doctest Glob lattices tasty - tasty-hspec tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion deepseq lattices random vector - ]; - homepage = "https://github.com/sgraf812/pomaps#readme"; - description = "Maps and sets of partial orders"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pomaps_0_0_0_4" = callPackage ({ mkDerivation, base, ChasingBottoms, containers, criterion , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty , tasty-hspec, tasty-quickcheck, vector @@ -162351,7 +163027,6 @@ self: { homepage = "https://github.com/sgraf812/pomaps#readme"; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pomodoro" = callPackage @@ -163081,8 +163756,8 @@ self: { }: mkDerivation { pname = "postgresql-connector"; - version = "0.2.4"; - sha256 = "0ly6p75c7vsrwlc7zsb91k19ffz0va6xc38djyc184qlji52hr1w"; + version = "0.2.5"; + sha256 = "0ilw7z16jzlys3pv4bvdd5ajprq4dbzgg3ivwpgzxrpnh2mfjkqq"; libraryHaskellDepends = [ base bytestring exceptions lens mtl postgresql-simple resource-pool resourcet time transformers-base @@ -164043,8 +164718,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.60"; - sha256 = "1ygpyaniv4f9ahmnrpkirhmfry40afqwaici4ksrnr3pz64fsll5"; + version = "0.0.61"; + sha256 = "16zs8mqmbvzi4pmjqmga3d17mjk6kriclv3qg3rxhs3rd2gyipqa"; libraryHaskellDepends = [ aeson base basic-prelude exceptions fast-logger lens lifted-base monad-control monad-logger MonadRandom mtl network resourcet safe @@ -164597,6 +165272,8 @@ self: { pname = "pretty-compact"; version = "3.0"; sha256 = "06m8n5rx1d62hwd017ss8nlxas5ia57lgxddm2hv2046938a5wm8"; + revision = "2"; + editedCabalFile = "04c309cdfrfwh031g8syyrwwn0lxdjj9f7d8szabscm19zwbi399"; libraryHaskellDepends = [ base base-compat containers ]; benchmarkHaskellDepends = [ aeson base base-compat bytestring criterion deepseq pretty text @@ -165037,6 +165714,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive-checked" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "primitive-checked"; + version = "0.6.3.0"; + sha256 = "02097f658qidmcfaisrcl4k3vmipx8w8p6mcbnajc8ndb3m58bbl"; + libraryHaskellDepends = [ base primitive ]; + homepage = "https://github.com/andrewthad/primitive-checked#readme"; + description = "primitive functions with bounds-checking"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primitive-simd" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive , random, vector @@ -165666,9 +166355,10 @@ self: { ({ mkDerivation, base, template-haskell, th-data-compat }: mkDerivation { pname = "product-isomorphic"; - version = "0.0.3.1"; - sha256 = "1vm502d3byxiyd01h3pddar9wvh522awvi3awsb34p8s2w01p70i"; + version = "0.0.3.2"; + sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl"; libraryHaskellDepends = [ base template-haskell th-data-compat ]; + testHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/khibino/haskell-product-isomorphic"; description = "Weaken applicative functor on products"; license = stdenv.lib.licenses.bsd3; @@ -166123,8 +166813,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.1.3"; - sha256 = "1nzm4hgjwpbxmvd1y1x58smxbk5ahfyygi22jwwyzqaknrgs5ara"; + version = "3.1.7"; + sha256 = "024ygn8q24sxdxdr1mip9pcjjmzm254am7fyzbqpmj5cjg1kykq6"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -170078,6 +170768,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rakuten_0_1_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, constraints + , data-default-class, extensible, hspec, http-api-data, http-client + , http-client-tls, http-types, lens, req, servant-server, text + , warp + }: + mkDerivation { + pname = "rakuten"; + version = "0.1.1.1"; + sha256 = "01p6f8vapygcw6viwq7kkg6b5fifqzbkski0763x9by49h5gpbsi"; + libraryHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible http-api-data http-client http-client-tls http-types + lens req text + ]; + testHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible hspec http-api-data http-client http-client-tls + http-types lens req servant-server text warp + ]; + homepage = "https://github.com/matsubara0507/rakuten#readme"; + description = "The Rakuten API in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ralist" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec }: mkDerivation { @@ -171014,8 +171730,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.0.7"; - sha256 = "1ry5z8dc8hqq5sqxjz23mssk4symnl98zrm77hnfsfapx7jg8b8x"; + version = "4.0.8"; + sha256 = "05rad5dckya26mai39623n5bvhvk13yjxikrc6r7yc6nvlkkh8zb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171330,8 +172046,8 @@ self: { }: mkDerivation { pname = "rdf4h"; - version = "3.0.2"; - sha256 = "0a9klg4a6ilgmv1p3aa55p5pdimgs9xays8msy01gz38441nnpd3"; + version = "3.0.3"; + sha256 = "0lidqww0d8ckm4iipjx4gq32jspxidz0g009m5xrf8x6qsl26sx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175085,8 +175801,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "2"; - editedCabalFile = "1cbzvqfs8glr004viya4x3p08x8lmkrgwwxjy78s32xkf8b2xxpr"; + revision = "3"; + editedCabalFile = "1gnaq7ya4grjwadz58r9g10dybgg50ch89bhbnhyicdins2aa9b2"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -175456,23 +176172,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, mtl - , primitive, transformers, unliftio-core - }: - mkDerivation { - pname = "resourcet"; - version = "1.2.0"; - sha256 = "09pscvkfr4cnicipdmx156xbxshg9aqgy0z3h0lcvxbhl5qwjp89"; - libraryHaskellDepends = [ - base containers exceptions mtl primitive transformers unliftio-core - ]; - testHaskellDepends = [ base hspec transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_2_1" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, mtl , primitive, transformers, unliftio-core }: @@ -175487,7 +176186,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -176466,8 +177164,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.0.0"; - sha256 = "0k3r7859in1dyybc7lr3bqh91harf7g5yknwxmmsqnhlffzc6ygr"; + version = "0.1.1.0"; + sha256 = "0mr78bd5xcq4gxc7vhz1k70gxbng2rbpip648fs4k0hb7gf2z0ds"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -177891,8 +178589,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.15"; - sha256 = "0si1cj5py2dwcdxwy2yix9bbfmx7gysbdshy5ql38r963yjdhfxs"; + version = "0.2.16"; + sha256 = "0sfllzq97yl1dn3f9avi538121kn7bj5syc27g7139fqrjhvjy18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178381,6 +179079,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe-coerce" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "safe-coerce"; + version = "0.1.0.0"; + sha256 = "0qv4a6p547cnyvchnjrya8paq39gqpnbska9v5l64lqn3a28yk8p"; + libraryHaskellDepends = [ base ]; + description = "A friendly shorthand for an old friend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-exceptions" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, transformers , void @@ -178504,19 +179213,20 @@ self: { "safe-money" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal , constraints, deepseq, hashable, serialise, store, tasty - , tasty-hunit, tasty-quickcheck, text, xmlbf + , tasty-hunit, tasty-quickcheck, text, vector-space, xmlbf }: mkDerivation { pname = "safe-money"; - version = "0.4.1"; - sha256 = "1ql02j1xb3m35y7axi3hsig894jzwzsm4l28ssms2m70lmbwv0qb"; + version = "0.5"; + sha256 = "09ia4sf98ggl2y8xl0gn1vjapvwbbqq3ibfrci2p2akkyykg2vk8"; libraryHaskellDepends = [ aeson base binary cereal constraints deepseq hashable serialise - store text xmlbf + store text vector-space xmlbf ]; testHaskellDepends = [ aeson base binary bytestring cereal constraints deepseq hashable - serialise store tasty tasty-hunit tasty-quickcheck text xmlbf + serialise store tasty tasty-hunit tasty-quickcheck text + vector-space xmlbf ]; homepage = "https://github.com/k0001/safe-money"; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; @@ -178789,16 +179499,17 @@ self: { "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors - , QuickCheck, test-framework, test-framework-quickcheck2 + , QuickCheck, semigroups, test-framework + , test-framework-quickcheck2 }: mkDerivation { pname = "saltine"; - version = "0.1.0.0"; - sha256 = "1hkdvw4fr2p2wmgq9ghna0kq9x9yv3kc9sm9wh0c71cl7gxk9g52"; + version = "0.1.0.1"; + sha256 = "05m3w0xibnhk3whzp7rzn2y2hv9f2i8pyvjnmzsxwbs8ws30cac5"; libraryHaskellDepends = [ base bytestring profunctors ]; libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ - base bytestring QuickCheck test-framework + base bytestring QuickCheck semigroups test-framework test-framework-quickcheck2 ]; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; @@ -179000,6 +179711,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sampling_0_3_3" = callPackage + ({ mkDerivation, base, containers, criterion, foldl, mwc-random + , primitive, vector + }: + mkDerivation { + pname = "sampling"; + version = "0.3.3"; + sha256 = "038fl0mdim3r25jsj8bgvnmkd7iy00hpwbc0yqwijsqyss9xrgn8"; + libraryHaskellDepends = [ + base containers foldl mwc-random primitive vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/jtobin/sampling"; + description = "Sample values from collections"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "samtools" = callPackage ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }: mkDerivation { @@ -179338,6 +180068,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sax" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hspec, mtl, streaming + , text, xeno + }: + mkDerivation { + pname = "sax"; + version = "0.1.0.0"; + sha256 = "08hw88sccb1jb6iki622a988b8j5panbnjpgqcmsi1yx2c9nyxkj"; + revision = "3"; + editedCabalFile = "1gzalbr1v4x99cgrbs5s81fr2y0lzh0qhhi7r5fbxigc2yk9z0gg"; + libraryHaskellDepends = [ + base bytestring deepseq mtl streaming text xeno + ]; + testHaskellDepends = [ base bytestring hspec ]; + homepage = "https://github.com/dredozubov/sax-parser"; + description = "Monadic streaming XML parser"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "say" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, temporary , text, transformers @@ -179383,6 +180132,34 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_3_16" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.16"; + sha256 = "0m8i5n47bzlifp5pq6hkal7zbjga5j305sfccgjyrbiwpp1sxfg3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "https://github.com/swift-nav/libsbp"; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -180870,22 +181647,22 @@ self: { "sdr" = callPackage ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart , Chart-cairo, colour, containers, criterion, Decimal - , dynamic-graph, either, fftwRaw, GLFW-b, mwc-random, OpenGL + , dynamic-graph, fftwRaw, GLFW-b, mwc-random, OpenGL , optparse-applicative, pango, pipes, pipes-bytestring , pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr , storable-complex, test-framework, test-framework-quickcheck2 - , time, tuple, vector + , time, transformers, tuple, vector }: mkDerivation { pname = "sdr"; - version = "0.1.0.10"; - sha256 = "1cjp05sk558vcwasbi15j6qzpa9icfqcyjsvz3a4b2fb59z6gv6z"; + version = "0.1.0.11"; + sha256 = "0gkf7ql1a40vpb4qaivcyygvlykp4whljmhp2jy37bk56zr45yvv"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour - containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random - OpenGL optparse-applicative pango pipes pipes-bytestring - pipes-concurrency primitive pulse-simple rtlsdr storable-complex - time tuple vector + containers Decimal dynamic-graph fftwRaw GLFW-b mwc-random OpenGL + optparse-applicative pango pipes pipes-bytestring pipes-concurrency + primitive pulse-simple rtlsdr storable-complex time transformers + tuple vector ]; testHaskellDepends = [ base primitive QuickCheck storable-complex test-framework @@ -181639,8 +182416,8 @@ self: { }: mkDerivation { pname = "semver-range"; - version = "0.2.2"; - sha256 = "0rmllgibgyixqq59265qnygxlgp87lp1cfqzlfpzvvwl1kaixds5"; + version = "0.2.7"; + sha256 = "04492jx61yj4vq9bf1jg3xnviy22wb03d1kf358dy7w6xx1zzlfc"; libraryHaskellDepends = [ base classy-prelude parsec text unordered-containers ]; @@ -181753,8 +182530,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.4.0.4"; - sha256 = "1pgzfa6ns67fq5cx7qizwjfb2gw6awx012iwhskx8s4wg9snbq5y"; + version = "0.4.0.5"; + sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181767,21 +182544,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_4_0_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, http-client - , http-types, lens, network, optparse-applicative, process - , temporary, text, time, unix, unix-compat, vector, wreq + "sensu-run_0_5_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, filepath + , http-client, http-client-tls, http-types, lens, network + , optparse-applicative, process, temporary, text, time, unix + , unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.4.0.5"; - sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7"; + version = "0.5.0"; + sha256 = "0826al67dwzdyazqkvrcsbxdv6gg6zk52q32avfz7l8dlpswgr9m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring filepath http-client http-types lens network - optparse-applicative process temporary text time unix unix-compat - vector wreq + aeson async base bytestring filepath http-client http-client-tls + http-types lens network optparse-applicative process temporary text + time unix unix-compat vector wreq ]; homepage = "https://github.com/maoe/sensu-run#readme"; description = "A tool to send command execution results to Sensu"; @@ -182304,10 +183082,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.13"; - sha256 = "0fmwcrkjlq1rnlbzdn918z54pqbwrjpgwy2isxmfykb31m2pn230"; - revision = "1"; - editedCabalFile = "1l1a52xard2ax9avh1ic893gykhlvrvgw0cncjsaqvi9rvkd047y"; + version = "0.13.0.1"; + sha256 = "0vfypxdhz1yqkj6ini41ylas91jklvn05rrnarp4d57rli498jx7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -182713,8 +183489,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "1"; - editedCabalFile = "165q0rvbk09z4k5zwhpx6380gakqbbz2xwvw40ahpjf46p0k9159"; + revision = "2"; + editedCabalFile = "11f5azqs007dfk5zr6sa43cri809k7jlf680gf3d7zcwhlf3xiq4"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -182725,6 +183501,7 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant CSV content-type for cassava"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-checked-exceptions" = callPackage @@ -182764,10 +183541,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.13"; - sha256 = "0bfrc3j2b6mbsvbv66l7mh3klkrrfdjvaq5s834jiivaavc6zf93"; - revision = "1"; - editedCabalFile = "0kdymqs9k90ig840bbj58znmfzlgr81jk7pfj1ygdvikjz1k1lpk"; + version = "0.13.0.1"; + sha256 = "120qs135arlby811p9z6zqjyrhsm517dq1xq41x3s2f167zkd7q8"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl @@ -182794,10 +183569,8 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.13"; - sha256 = "1n7s47cqvahzfyyb4cwnq72a0qyrk8ybx4yj3g4lw9va2zlj78vp"; - revision = "1"; - editedCabalFile = "0zxkc0p436clpmh1y30d3ybqw12q2pk2gzfyjjgh17yvhzxzddnb"; + version = "0.13.0.1"; + sha256 = "0fr5lb5ra0nzjay9rm3xyyc01ijqxwr9wa0yxsjx1vippfnbds70"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions generics-sop http-api-data http-media http-types mtl network-uri @@ -182881,8 +183654,8 @@ self: { pname = "servant-docs"; version = "0.11.2"; sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; - revision = "1"; - editedCabalFile = "0pm5gclgwna9bw3avjfp1pghzbk0a32sbd9v3fh321gmsax1h4zi"; + revision = "2"; + editedCabalFile = "17nv36pm0vv0lgfyk5ay65h7i5bdfq48n0npawcvmqfjsls61xs4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183062,6 +183835,8 @@ self: { pname = "servant-foreign"; version = "0.11.1"; sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; + revision = "1"; + editedCabalFile = "1g9631l7cw0kgnsidi943fnzkvddjnm3vgm11ha5vh10pczvn6rb"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -183332,6 +184107,8 @@ self: { pname = "servant-mock"; version = "0.8.4"; sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr"; + revision = "1"; + editedCabalFile = "0izm1slx384cgfaf16r3w1h6cqpssahphb9b0ccy2m04ysgy7chp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183411,14 +184188,19 @@ self: { }) {}; "servant-pagination" = callPackage - ({ mkDerivation, base, safe, servant, servant-server, text }: + ({ mkDerivation, base, hspec, QuickCheck, safe, servant + , servant-server, text + }: mkDerivation { pname = "servant-pagination"; - version = "2.0.0"; - sha256 = "1z6sr43ir9sl85x65yfj21s77y1fqwzfmrfgjlqdas2zygd3fhh3"; + version = "2.1.0"; + sha256 = "00mbg8sxjwaxa6xjgaahdzjqppc01y6qzph6g5sc40rnp3j8ws2g"; + revision = "1"; + editedCabalFile = "0vb7v8yb1g1aqnnypa2hjsh58q2m9zhgz04dyj1vna1pg4yl3691"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe servant servant-server text ]; + testHaskellDepends = [ base hspec QuickCheck servant-server text ]; homepage = "https://github.com/chordify/haskell-servant-pagination"; description = "Type-safe pagination for Servant APIs"; license = stdenv.lib.licenses.lgpl3; @@ -183706,10 +184488,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.13"; - sha256 = "09hqihij87h031qcr4swsn82fsv8v1qklqc2hl0is8rd8bzi2cjy"; - revision = "1"; - editedCabalFile = "0kf88s2wkijfznp0sk3mrfyhr9rnq3kqpsl26di953ynxgd6z4yd"; + version = "0.13.0.1"; + sha256 = "0fggdqz2d6q96x8vnm64yvarg4fgxqh0jd3vis6yxpybfi174arm"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -183908,6 +184688,77 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_3_0_3_13_2" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.3.0.3.13.2"; + sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-swagger-ui-core" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, http-media + , servant, servant-blaze, servant-server, swagger2, text + , transformers, transformers-compat, wai-app-static + }: + mkDerivation { + pname = "servant-swagger-ui-core"; + version = "0.3"; + sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd"; + libraryHaskellDepends = [ + base blaze-markup bytestring http-media servant servant-blaze + servant-server swagger2 text transformers transformers-compat + wai-app-static + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui core components"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-swagger-ui-jensoleg" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui-jensoleg"; + version = "0.3"; + sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui: Jens-Ole Graulund theme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-swagger-ui-redoc" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui-redoc"; + version = "0.3.0.1.21.2"; + sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + homepage = "https://github.com/phadej/servant-swagger-ui"; + description = "Servant swagger ui: ReDoc theme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-tracing" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing , containers, hashable, http-api-data, http-client, HUnit @@ -183917,8 +184768,8 @@ self: { }: mkDerivation { pname = "servant-tracing"; - version = "0.1.0.0"; - sha256 = "0wpybm1vl1bh3sj3vam8y40a0sjrx2ys761jyqrj2dnqymk8xc10"; + version = "0.1.0.1"; + sha256 = "0dff51fywa1z1png1hhwpn4f8av2jxdsplin8h80aad459czaid2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183935,7 +184786,7 @@ self: { QuickCheck tasty tasty-hunit tasty-quickcheck text time transformers ]; - homepage = "https://github.com/ChrisCoffey/servant-tracing#readme"; + homepage = "https://github.com/ChrisCoffey/haskell-opentracing-light#readme"; license = stdenv.lib.licenses.mit; }) {}; @@ -183968,8 +184819,8 @@ self: { }: mkDerivation { pname = "servant-xml"; - version = "1.0.1.1"; - sha256 = "1j1gbwywbb8n6zplvf1drrlpp2ghh7n2jrzl9x7pjplplr6mfpbh"; + version = "1.0.1.2"; + sha256 = "16zyvxscplgb08jljg7k728lq17b8xmrri6xbq47j74namp2n55z"; libraryHaskellDepends = [ base bytestring http-media servant xmlbf xmlbf-xeno ]; @@ -184112,8 +184963,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.4.2"; - sha256 = "1cdpcin060qz5wicf8jqxayi2vjrhapybg401m3rw914s452safw"; + version = "0.4.3"; + sha256 = "0sdx28v81b6d5iankxbyb6psbrrsz5s2y01q36b7kbmg5sc4jiyy"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive lens text time unix @@ -185020,16 +185871,15 @@ self: { "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hashable - , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext - , text + , hs2ats, language-ats, lens, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.0"; - sha256 = "0p29bwh3jfjhy1x795irkwdq6qbmihh3sxgznfrwfz7pxwfx6nb7"; + version = "1.8.0.1"; + sha256 = "0rl0a2d55r55w705jx4si17n403l06jk3d6mrf3gd2ghn93hb13a"; libraryHaskellDepends = [ - base binary dependency directory hashable hs2ats language-ats - microlens microlens-th shake shake-ext text + base binary dependency directory hashable hs2ats language-ats lens + shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; @@ -185055,22 +185905,23 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, Cabal, composition-prelude, cpphs, directory - , shake, template-haskell + ({ mkDerivation, base, Cabal, cdeps, composition-prelude, cpphs + , directory, shake, template-haskell }: mkDerivation { pname = "shake-ext"; - version = "2.11.0.0"; - sha256 = "1ny8fj8wdshwp5df8skl3lsl5rp30fa8yclhh696pwk433pijc8f"; + version = "2.11.0.1"; + sha256 = "09gg30b8xiq2krz58lkavcgi1gybc5sn6snscdq8nj3qbxcvd0av"; libraryHaskellDepends = [ - base Cabal composition-prelude cpphs directory shake + base Cabal cdeps composition-prelude cpphs directory shake template-haskell ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {cdeps = null;}; "shake-extras" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath @@ -185222,8 +186073,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.45"; - sha256 = "0abzw28861k3larph3i6kaqsx4zcbk25f69y47v4i61riwdxcj0j"; + version = "0.0.48"; + sha256 = "1b2rwa6k4qj94mblfkvdj8asp26lknl6gfb4nfiqvi7m9kq27n45"; libraryHaskellDepends = [ base basic-prelude directory lifted-base shake ]; @@ -185670,6 +186521,19 @@ self: { license = "GPL"; }) {}; + "shellwords" = callPackage + ({ mkDerivation, base, hspec, megaparsec, text }: + mkDerivation { + pname = "shellwords"; + version = "0.1.1.0"; + sha256 = "1k3wmkmxr1rvjjrgg2swz8pl2nwf723q8zwpybadss4kz0f4w314"; + libraryHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/pbrisbin/hs-shellwords#readme"; + description = "Parse strings into words, like a shell would"; + license = stdenv.lib.licenses.mit; + }) {}; + "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib @@ -185784,8 +186648,8 @@ self: { }: mkDerivation { pname = "shimmer"; - version = "0.1.3.1"; - sha256 = "04hj31pw04xzhpicblc7mvqrwbs7gf00hps7bffymk2xx4v6xfl7"; + version = "0.1.3.2"; + sha256 = "1mr8y0f83bs0ay02hm6nj173x6djz7dkfpriymjgicnaicn0mvrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187102,6 +187966,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-ui" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, lens, mtl + , stm, template-haskell, transformers, vector, vty + }: + mkDerivation { + pname = "simple-ui"; + version = "0.1.1"; + sha256 = "1phag0frz7l4xgrgjc72x9iwjl1z1l6mpz7lnifjgn7zp3wdkwzs"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base data-default-class exceptions lens mtl stm template-haskell + transformers vector vty + ]; + description = "UI library for terminal"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "simple-vec3" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-discover , QuickCheck, tasty, tasty-quickcheck, vector @@ -187153,8 +188034,8 @@ self: { ({ mkDerivation, base, containers, generic-deriving, lens, text }: mkDerivation { pname = "simpleconfig"; - version = "0.0.8"; - sha256 = "0xxnirw7px97gssi2i823hsri168jy2rjwkhnkh6c80p997icdjf"; + version = "0.0.9"; + sha256 = "1xk8kxdnw118gzwh3i58iy0bdqi80f8li3bjydaqfn073106nf87"; libraryHaskellDepends = [ base containers lens ]; testHaskellDepends = [ base containers generic-deriving lens text @@ -187687,6 +188568,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sized-grid" = callPackage + ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad + , constraints, distributive, generics-sop, hedgehog, HUnit, lens + , markdown-unlit, mtl, random, tasty, tasty-hedgehog, tasty-hunit + , vector, vector-space + }: + mkDerivation { + pname = "sized-grid"; + version = "0.1.0.0"; + sha256 = "1dj5sgmr8114i5ldpdmybwbwg5gkbm30kbk2196pq65jjcvjinxx"; + libraryHaskellDepends = [ + adjunctions aeson base comonad constraints distributive + generics-sop lens mtl random vector vector-space + ]; + testHaskellDepends = [ + adjunctions aeson ansi-terminal base comonad distributive + generics-sop hedgehog HUnit lens markdown-unlit tasty + tasty-hedgehog tasty-hunit vector-space + ]; + homepage = "https://github.com/edwardwas/sized-grid"; + description = "Multidimensional grids with sized specified at compile time"; + license = stdenv.lib.licenses.mit; + }) {}; + "sized-types" = callPackage ({ mkDerivation, array, base, base-compat, containers, singletons }: @@ -189810,8 +190715,8 @@ self: { }: mkDerivation { pname = "snaplet-persistent"; - version = "0.5.1"; - sha256 = "00p5f1xysv618yd4s9zw66zfjpa1gx7nld5k9ysm8vrd0haa4v5r"; + version = "0.6.0"; + sha256 = "1gvnf4fkylazq8bjb8kcv70vcd2k1r2dw5l53r624d10p23fsa8k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clientsession configurator errors heist lens @@ -191332,8 +192237,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.1.3"; - sha256 = "1n1zwhkvhypjmfmk2lqg1dlpw6x720mxd9giggklywhac1brdnzy"; + version = "0.0.1.4"; + sha256 = "0awj1gbrcdq4xp9dgj7q3jbfivjb4pjhkhd3acfgdqk08142fzj7"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -192442,6 +193347,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_6_0" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.6.0"; + sha256 = "065ymcym5vm5xmprbzgv88wk3b09j44ajvsd59apw6qr32j218rn"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "SQL keywords data constructors into OverloadedString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlcipher" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , hspec, openssl, pretty, temporary, time, utf8-string @@ -194342,6 +195261,7 @@ self: { homepage = "https://github.com/IvanMalison/status-notifier-item#readme"; description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statvfs" = callPackage @@ -195281,15 +196201,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_20_0" = callPackage + "stratosphere_0_21_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.20.0"; - sha256 = "0qkhgm951b377i7ny28faczw2s32rrmfvrh1lcgzfz7gszakb5bw"; + version = "0.21.0"; + sha256 = "14bahvq1yz51dwa6ljyj4l3aw3sv2njin00k01bvbizsqnbl8j8k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195462,6 +196382,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "streamdeck" = callPackage + ({ mkDerivation, base, bytestring, hidapi, mtl }: + mkDerivation { + pname = "streamdeck"; + version = "0.0.1"; + sha256 = "05qdnhhjqjs7cg7yvg9ryzxlw1mw3y5y55z4dy1cf5g98j01s449"; + libraryHaskellDepends = [ base bytestring hidapi mtl ]; + homepage = "https://github.com/wuest/haskell-streamdeck"; + description = "Control library for the Elgato Stream Deck"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streamed" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, containers , data-accessor, data-accessor-transformers, event-list, midi @@ -197983,6 +198915,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_2_2" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, transformers-compat, unordered-containers + , uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.2.2"; + sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base-compat-batteries bytestring containers generics-sop + hashable http-media insert-ordered-containers lens mtl network + scientific template-haskell text time transformers + transformers-compat unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat-batteries bytestring containers + doctest Glob hashable hspec HUnit insert-ordered-containers lens + mtl QuickCheck quickcheck-instances text time unordered-containers + vector + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -200730,8 +201695,8 @@ self: { pname = "tasty-hedgehog"; version = "0.2.0.0"; sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s"; - revision = "2"; - editedCabalFile = "1if3pmvnnfs8zrqbg5awdc9qafqhwrgq4f75bqcqlapljlhp4xx0"; + revision = "3"; + editedCabalFile = "1r1sbcz12j9kmbdfr7mjc6z22c3737jc7mf0kdk1v6a3zr6n1js9"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -201318,19 +202283,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tdigest_0_2" = callPackage + ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest + , deepseq, doctest, reducers, semigroupoids, semigroups, tasty + , tasty-quickcheck, transformers, vector, vector-algorithms + }: + mkDerivation { + pname = "tdigest"; + version = "0.2"; + sha256 = "1wii4rkk1xqqdkwd24g6xb3imrrgr4y2vq0a7kg606g3a5mllsvq"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat binary deepseq reducers semigroupoids transformers + vector vector-algorithms + ]; + testHaskellDepends = [ + base base-compat binary deepseq doctest semigroups tasty + tasty-quickcheck vector vector-algorithms + ]; + homepage = "https://github.com/futurice/haskell-tdigest#readme"; + description = "On-line accumulation of rank-based statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tdigest-Chart" = callPackage ({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour - , lens, mwc-random, semigroupoids, semigroups, statistics, tdigest - , vector + , lens, mwc-random, semigroupoids, statistics, tdigest, vector }: mkDerivation { pname = "tdigest-Chart"; - version = "0"; - sha256 = "19vhyk2wgvxnaad32vj9fm0vw8rl5n1lp540dp4yn9dsbilhda3l"; - revision = "2"; - editedCabalFile = "139qimahwi9q2vm2z6m42ghk59drgii71lrgcj2dbai5x5fnfcgb"; + version = "0.2"; + sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l"; libraryHaskellDepends = [ - base base-compat Chart colour lens semigroupoids semigroups tdigest + base base-compat Chart colour lens semigroupoids tdigest ]; testHaskellDepends = [ base base-compat Chart Chart-diagrams lens mwc-random statistics @@ -202285,6 +203271,7 @@ self: { homepage = "https://github.com/luna/terminal-text"; description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "termination-combinators" = callPackage @@ -202977,8 +203964,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.4.0"; - sha256 = "0i301a78790cqhgb28bhc2qksymbx2jdr31m2x59nsj7hmw268b2"; + version = "0.1.4.1"; + sha256 = "0d8fwnrqlfjcls229iiq6x4v1a4yxm5qfsyymbqf6xwj8mcmqhb6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203369,6 +204356,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-ldap_0_1_1_12" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , memory, QuickCheck, quickcheck-simple, random, transformers + }: + mkDerivation { + pname = "text-ldap"; + version = "0.1.1.12"; + sha256 = "1kfp77nm8mvzi6h44334djr88z2w6syrwrvrqy2jfb65d0p9crbx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers dlist memory transformers + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-simple random + ]; + description = "Parser and Printer for LDAP text data stream"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-lens" = callPackage ({ mkDerivation, base, extra, hspec, lens, text }: mkDerivation { @@ -204225,6 +205234,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-data-compat_0_0_2_6" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.0.2.6"; + sha256 = "1gbqrrpib065yw53063i7ydvm9ghwja30zc6s13mr2pp1l5a4bs2"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -204539,6 +205560,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-compat_0_0_1_4" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-reify-compat"; + version = "0.0.1.4"; + sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/khibino/haskell-th-reify-compat/"; + description = "Compatibility for the result type of TH reify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-many" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns @@ -205446,16 +206480,16 @@ self: { "tidal" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit - , text, time, websockets + , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty + , tasty-hunit, text, time, websockets }: mkDerivation { pname = "tidal"; - version = "0.9.6"; - sha256 = "1bldi0ygfn695x3an3qlsfzrbhmqcyhznkmsm5dsjmmh27zs1sx6"; + version = "0.9.8"; + sha256 = "08a8k4kdq6wmhggf3bm4c5a6xck2waf6n6815csms919rhlbkbpb"; libraryHaskellDepends = [ base colour containers hashable hosc mersenne-random-pure64 mtl - parsec safe text time websockets + parsec safe semigroups text time websockets ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "http://tidalcycles.org/"; @@ -205463,18 +206497,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "tidal_0_9_7" = callPackage + "tidal_0_9_9" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit - , text, time, websockets + , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty + , tasty-hunit, text, time, websockets }: mkDerivation { pname = "tidal"; - version = "0.9.7"; - sha256 = "1b9005f9jf9pbiq5hwvqx4cw9c8hb8ygcpnb7qks4h5q6pf7yw6i"; + version = "0.9.9"; + sha256 = "1zpbnn1kw2ybmlg6g9yj39jhfp6sl12335rxqns0nfi8l2jjgbgr"; libraryHaskellDepends = [ base colour containers hashable hosc mersenne-random-pure64 mtl - parsec safe text time websockets + parsec safe semigroups text time websockets ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "http://tidalcycles.org/"; @@ -205489,8 +206523,8 @@ self: { }: mkDerivation { pname = "tidal-midi"; - version = "0.9.5.2"; - sha256 = "0yjbrsg2lwj6x32ly0j6b4ms6i1s447jk2b7c6qp85pblaanmzqc"; + version = "0.9.10"; + sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -206360,6 +207394,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "timestamp" = callPackage + ({ mkDerivation, base, cereal, foldl, generic-random, hashable + , QuickCheck, time + }: + mkDerivation { + pname = "timestamp"; + version = "0.2"; + sha256 = "1cl57lf53kqmrhplf944zqhp59vjah57yakqd9m2rn0m5n6hz6sg"; + libraryHaskellDepends = [ + base cereal foldl generic-random hashable QuickCheck time + ]; + homepage = "https://github.com/metrix-ai/timestamp"; + description = "Space-efficient Unix timestamp and utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "timestamp-subprocess-lines" = callPackage ({ mkDerivation, base, bytestring, process, split, time , transformers @@ -207224,16 +208274,13 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.19"; - sha256 = "1ql24s1wy4c34rmxh8x8lggnkpx686l8x5zsp3asdsxlx0k8n8zp"; - isLibrary = true; + version = "0.1.0.23"; + sha256 = "0m58rrjrrd2n1w313806s9gyj840nzsm7vwdz40639mr3a6vaifg"; + isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ + executableHaskellDepends = [ base htoml-megaparsec megaparsec optparse-generic text ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/vmchale/tomlcheck#readme"; description = "Command-line tool to check syntax of TOML files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -208179,6 +209226,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_6_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, containers + , directory, mtl, random, stm, time, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.6.0.1"; + sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy"; + libraryHaskellDepends = [ + atomic-primops base bytestring containers directory mtl random stm + time transformers + ]; + testHaskellDepends = [ + atomic-primops base bytestring containers directory mtl random stm + time transformers + ]; + homepage = "https://github.com/transient-haskell/transient"; + description = "composing programs with multithreading, events and distributed computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -208212,18 +209281,51 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient-universe_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, filepath, hashable, HTTP, iproute, mtl, network + , network-info, network-uri, process, random, stm, TCache, text + , time, transformers, transient, vector, websockets + }: + mkDerivation { + pname = "transient-universe"; + version = "0.5.0.0"; + sha256 = "1d3bp4xjpi28ph7fa9wm49ssg53jfvlq77ka0zvrkilw1j6f8v3l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP iproute mtl network network-info network-uri process + random stm TCache text time transformers transient vector + websockets + ]; + executableHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP mtl network network-info network-uri process random + stm TCache text time transformers transient vector websockets + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP mtl network network-info network-uri process random + stm TCache text time transformers transient vector websockets + ]; + homepage = "https://github.com/transient-haskell/transient-universe"; + description = "Remote execution and map-reduce: distributed computing for Transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe-tls" = callPackage - ({ mkDerivation, base, bytestring, certificate, cprng-aes - , data-default, network, tls, transient, transient-universe - , x509-store + ({ mkDerivation, base, bytestring, cprng-aes, data-default, network + , tls, transient, transient-universe, x509-store, x509-system }: mkDerivation { pname = "transient-universe-tls"; - version = "0.1.0.0"; - sha256 = "0rw4plnc98ydb5za85hgdvprfxh1cry7ifyfzm93cyny09b38jwz"; + version = "0.1.1.0"; + sha256 = "0fawvdgm7a1s65jc3d3lfl38pak6xx39ian0cbx5sj3aqa7m99hs"; libraryHaskellDepends = [ - base bytestring certificate cprng-aes data-default network tls - transient transient-universe x509-store + base bytestring cprng-aes data-default network tls transient + transient-universe x509-store x509-system ]; homepage = "http://github.com/transient-haskell/transient-universe-tls"; description = "transient with secure communications"; @@ -208485,8 +209587,8 @@ self: { pname = "tree-diff"; version = "0.0.1"; sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; - revision = "2"; - editedCabalFile = "153gffmgdpk3crw9gg4i5mx4jdwglbbx0xwwhbx088j3alim3yvb"; + revision = "3"; + editedCabalFile = "04ajimrbywfnnnlx9axz3hmbi33c4g62hrmv52plgifjiw6c4y2y"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -208500,6 +209602,7 @@ self: { homepage = "https://github.com/phadej/tree-diff"; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -208536,6 +209639,7 @@ self: { homepage = "https://github.com/rampion/tree-traversals"; description = "Functions and newtype wrappers for traversing Trees"; license = stdenv.lib.licenses.cc0; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-view" = callPackage @@ -209375,6 +210479,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tuple-sop" = callPackage + ({ mkDerivation, base, generics-sop }: + mkDerivation { + pname = "tuple-sop"; + version = "0.1.0.0"; + sha256 = "08g0jzqngw1bkrn212rj6d5h7ppfar7q1p8b79049ivrich6zspj"; + libraryHaskellDepends = [ base generics-sop ]; + testHaskellDepends = [ base generics-sop ]; + homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme"; + description = "functions on n-ary tuples using generics-sop"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tuple-th" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -209618,8 +210735,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.36"; - sha256 = "1gmp1936cmz42vf8m3622pjf6gb9c2pi8z0jfki1di9m1p1lbr53"; + version = "1.0.1.37"; + sha256 = "14csa7p3z4ywxwybs0y4ylymsqg1m8scp5fhcm3mayy9cdz2g49n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210667,8 +211784,8 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.8.0.0"; - sha256 = "0cdym66cvidccimhfpy9i5wa29c1aa6vchnywniyaxlmivqjybj4"; + version = "0.8.0.1"; + sha256 = "0ybcivp219h8xw9k31f5cimlnj63y5s2br3rahxgdacvhdb678zg"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger singletons template-haskell @@ -210867,6 +211984,7 @@ self: { homepage = "https://github.com/pikajude/type-tree"; description = "Tree representations of datatypes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-unary" = callPackage @@ -213018,8 +214136,8 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.1.0.0"; - sha256 = "13l0shpg0hmfp5n4rqfd6vl2x820w3558msy915qacbxfqvjis4x"; + version = "0.1.0.1"; + sha256 = "1z4h20jn3i3582i63vmih2ccr0pljp6whb3h4pbpj36s1q75bmgp"; libraryHaskellDepends = [ base resource-pool time transformers unliftio-core ]; @@ -213817,20 +214935,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "urlpath_8_1_0" = callPackage + "urlpath_9_0_0" = callPackage ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph - , monad-control, monad-control-aligned, monad-logger, mtl + , monad-control, monad-control-aligned, monad-logger, mtl, path , path-extra, resourcet, split, strict, text, transformers , transformers-base, vector }: mkDerivation { pname = "urlpath"; - version = "8.1.0"; - sha256 = "0gv5mjhhmxq5zppda431vddpcl138qglxiyksj588d4zzg3kd8iy"; + version = "9.0.0"; + sha256 = "1ysjhb42sk34j29xy7hgf9b4qp90p6hrkqcmwdalvsasbwk8kgwh"; libraryHaskellDepends = [ attoparsec-uri base exceptions mmorph monad-control - monad-control-aligned monad-logger mtl path-extra resourcet split - strict text transformers transformers-base vector + monad-control-aligned monad-logger mtl path path-extra resourcet + split strict text transformers transformers-base vector ]; homepage = "https://github.com/athanclark/urlpath#readme"; description = "Painfully simple URL deployment"; @@ -215908,14 +217026,15 @@ self: { }: mkDerivation { pname = "vector-text"; - version = "1.1.1"; - sha256 = "0hwis2xqj86j3smk9dnq9rpf8hraxzjczpajbkzma50g2kagj5r8"; + version = "1.1.3"; + sha256 = "00x35fv78vp8rffvd7hsccl8vdxzzdzjrqzwvj0mr6g1wmg3p4i3"; libraryHaskellDepends = [ base binary prologue text vector vector-binary-instances ]; homepage = "https://github.com/luna/vector-text"; description = "Text implementation based on unboxed char vector"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-th-unbox" = callPackage @@ -216970,8 +218089,8 @@ self: { ({ mkDerivation, base, vector-sized, vulkan }: mkDerivation { pname = "vulkan"; - version = "1.7.0.0"; - sha256 = "0rg9hv04j62z0ab2dg23qk09hkx4hnniwjmkqkv83vmdc5q47j0p"; + version = "2.0.0.0"; + sha256 = "1lm92sgv1nbc4h4znyilyp3hqlj5xl6i9zcrax0fxx69a9q2jg2l"; libraryHaskellDepends = [ base vector-sized ]; librarySystemDepends = [ vulkan ]; homepage = "http://github.com/expipiplus1/vulkan#readme"; @@ -216981,18 +218100,17 @@ self: { }) {vulkan = null;}; "vulkan-api" = callPackage - ({ mkDerivation, base, ghc-prim, vulkan }: + ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.0.0"; - sha256 = "038iaiy16cyb0g6xhgax8333lz0y4jfmv4r8dqvvmnnmhiak5j8x"; - libraryHaskellDepends = [ base ghc-prim ]; - librarySystemDepends = [ vulkan ]; + version = "1.1.1.0"; + sha256 = "17209hslyqfx3lyh1a8sii3gn1ygsb5a81nampx1ym6f6gx9g3lh"; + libraryHaskellDepends = [ base ]; homepage = "https://github.com/achirkin/vulkan#readme"; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {vulkan = null;}; + }) {}; "wacom-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory @@ -217916,8 +219034,8 @@ self: { }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.6.1.1"; - sha256 = "08lcbyycgr2mb8i00ncph38r0yixx6nn5yfkvv96700wfn0338q4"; + version = "0.6.1.2"; + sha256 = "057xrb6nik8imxg91chyhakddb0ywm7ccfkwjlyrbwrd5hm84j8r"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions extractable-singleton hashable http-media http-types lucid mmorph @@ -218952,6 +220070,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp-tls_3_2_4_3" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, streaming-commons, tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.2.4.3"; + sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network + streaming-commons tls tls-session-manager wai warp + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "HTTP over TLS support for Warp via the TLS package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, certificate, conduit , crypto-random, network, network-conduit, pem, tls, tls-extra @@ -218979,8 +220115,8 @@ self: { }: mkDerivation { pname = "warped"; - version = "0.0.4"; - sha256 = "0gvsqabl1kh0vkzqiijkndk77jdc6md2c2p1f8bilrliqq2p21gq"; + version = "0.0.5"; + sha256 = "1gk7mfainbw8iyg8vqii39yl7n2dz052p8nrphhjbzphibl349jf"; libraryHaskellDepends = [ aeson base blaze-builder conduit http-types lifted-async monad-control preamble uuid wai wai-conduit wai-cors warp @@ -219070,6 +220206,8 @@ self: { pname = "wave"; version = "0.1.5"; sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5"; + revision = "1"; + editedCabalFile = "1wvgxay0r5rpcc7yxkznxxcp1za0ifxvk87w0xrilxgb35r3izz8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers data-default-class transformers @@ -220550,23 +221688,6 @@ self: { }) {}; "wild-bind" = callPackage - ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , stm, text, transformers - }: - mkDerivation { - pname = "wild-bind"; - version = "0.1.1.1"; - sha256 = "00xs9m87skqnwv6cysy84bfbpnhb4jp46x08gn9f07n5jz113asi"; - libraryHaskellDepends = [ base containers text transformers ]; - testHaskellDepends = [ - base hspec microlens QuickCheck stm transformers - ]; - homepage = "https://github.com/debug-ito/wild-bind"; - description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind_0_1_2_0" = callPackage ({ mkDerivation, base, containers, hspec, microlens, QuickCheck , semigroups, stm, text, transformers }: @@ -220583,7 +221704,6 @@ self: { homepage = "https://github.com/debug-ito/wild-bind"; description = "Dynamic key binding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-indicator" = callPackage @@ -220622,26 +221742,6 @@ self: { }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; - version = "0.2.0.1"; - sha256 = "0g02kv710yr8qzh48dcwzyn1aak9hz3ny2pq7v24g40kc7c6pd4d"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - homepage = "https://github.com/debug-ito/wild-bind"; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_2" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: @@ -220659,18 +221759,15 @@ self: { homepage = "https://github.com/debug-ito/wild-bind"; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage - ({ mkDerivation, aeson, base, bytestring }: + ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { pname = "wilton-ffi"; - version = "0.1.0.0"; - sha256 = "0l7smpizp4r59nfk73vyl1vrpgdnf8cfgny9r981bpn6bnv1iv7f"; - revision = "1"; - editedCabalFile = "0fkfffxfph1nip54j9f5hd05339mmg19hn7jwggsi4qmdpf2jd0y"; - libraryHaskellDepends = [ aeson base bytestring ]; + version = "0.2.0.0"; + sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7"; + libraryHaskellDepends = [ aeson base bytestring utf8-string ]; homepage = "https://github.com/wilton-iot/wilton-ffi#readme"; description = "Haskell modules support for Wilton JavaScript runtime"; license = stdenv.lib.licenses.mit; @@ -220788,8 +221885,8 @@ self: { }: mkDerivation { pname = "wires"; - version = "0.2.0"; - sha256 = "1c4ic3v3rrqanr6n3yhm8vy5i8sn5lwraks09kav60f4cc42s1nx"; + version = "0.2.1"; + sha256 = "0dh0kpmja296miax80y3qqq3s8rmab4d7yqdcxrhmy9gzq350hri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221071,6 +222168,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wl-pprint-text_1_1_1_1" = callPackage + ({ mkDerivation, base, base-compat, text }: + mkDerivation { + pname = "wl-pprint-text"; + version = "1.1.1.1"; + sha256 = "1v227rc24ibb6qxiyhq9v9hv8ilkrm6i1snl5icblm8zgvpymplb"; + libraryHaskellDepends = [ base base-compat text ]; + description = "A Wadler/Leijen Pretty Printer for Text values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wlc-hs" = callPackage ({ mkDerivation, base, c2hs, containers, data-default, lens, pretty , process, transformers, wlc, xkbcommon @@ -221166,8 +222275,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.43"; - sha256 = "1iy9qbpwnnzq8d7fvpl8iqn8bc3iz44rvxi4ijjj5xd4z1w6i5fv"; + version = "0.3.44"; + sha256 = "096j1f0xzjrnk8z7niyx19w05nx5222rgfbhgx8df8jwhfz0ymw7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223471,6 +224580,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-isogen_0_3_0" = callPackage + ({ mkDerivation, base, data-default, deepseq, dom-parser + , generic-arbitrary, hspec, lens, mtl, QuickCheck + , quickcheck-instances, semigroups, template-haskell, text + , xml-conduit, xml-conduit-writer + }: + mkDerivation { + pname = "xml-isogen"; + version = "0.3.0"; + sha256 = "05qa83jzmfqa5yhzgp3n3bxi0dvyy9xdfgq1ymi0wa6xnmxjv0cz"; + libraryHaskellDepends = [ + base deepseq dom-parser lens mtl QuickCheck semigroups + template-haskell text xml-conduit xml-conduit-writer + ]; + testHaskellDepends = [ + base data-default deepseq dom-parser generic-arbitrary hspec + QuickCheck quickcheck-instances semigroups xml-conduit + xml-conduit-writer + ]; + homepage = "https://github.com/typeable/xml-isogen"; + description = "Generate XML-isomorphic types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-lens" = callPackage ({ mkDerivation, base, case-insensitive, containers, lens, text , xml-conduit @@ -223795,8 +224929,8 @@ self: { }: mkDerivation { pname = "xmlbf"; - version = "0.3"; - sha256 = "0zvv7ajwj45wsm751951i37ncn2lh73d8h5vqhladi2g14pi9yjb"; + version = "0.4"; + sha256 = "1f63ibvv7ywly7paam238y4bjhvg7jmn87368dnv5lsz28mq432m"; libraryHaskellDepends = [ base bytestring containers text transformers unordered-containers ]; @@ -225514,36 +226648,6 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptonite, data-default, email-validate, file-embed - , http-client, http-client-tls, http-conduit, http-types, memory - , mime-mail, network-uri, nonce, persistent, persistent-template - , random, resourcet, safe, shakespeare, template-haskell, text - , time, transformers, unliftio, unliftio-core, unordered-containers - , wai, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.6.2"; - sha256 = "191sniq19glv0rdrhzqs2hhsjz9y25sqf15x0wnpmrmfh7jyyv6a"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory mime-mail network-uri nonce persistent persistent-template - random resourcet safe shakespeare template-haskell text time - transformers unliftio unliftio-core unordered-containers wai - yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_3" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -225571,7 +226675,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -226125,46 +227228,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec - , hspec-expectations, http-types, HUnit, monad-logger, mtl, network - , old-locale, parsec, path-pieces, primitive, QuickCheck, random - , resourcet, safe, semigroups, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.2"; - sha256 = "0fcbp47rmljz0jas2gz9j7qswa4dab2fzf9mgs4sbk75s76i01b8"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq deepseq-generics directory fast-logger - http-types monad-logger mtl old-locale parsec path-pieces primitive - random resourcet safe semigroups shakespeare template-haskell text - time transformers unix-compat unliftio unordered-containers vector - wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces QuickCheck random resourcet shakespeare - streaming-commons template-haskell text transformers unliftio wai - wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_3" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -226202,7 +227265,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -228963,8 +230025,8 @@ self: { pname = "zip"; version = "1.0.0"; sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9"; - revision = "2"; - editedCabalFile = "14dcabh3h6b1c8yzjq848i7arprgx7imx2rb9s0y2v0ax6b4dm48"; + revision = "3"; + editedCabalFile = "0af1qpyn6vfzcdyi1md7aq39fznswxijzm0ap7mdwp0g0l7pcdyh"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest directory dlist exceptions filepath @@ -229540,27 +230602,6 @@ self: { }) {}; "ztail" = callPackage - ({ mkDerivation, array, base, bytestring, filepath, hinotify - , process, regex-posix, time, unix, unordered-containers - }: - mkDerivation { - pname = "ztail"; - version = "1.2.0.1"; - sha256 = "1gnxjk48jlz988k9mk5mc9hrfqj9wq4v7fbkk648ifmassxyx6wb"; - revision = "1"; - editedCabalFile = "1hsiq6k5rncq6qa9gax2d45vnb4q737sh8djch6b2bq6wc2vyg2d"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bytestring filepath hinotify process regex-posix time - unix unordered-containers - ]; - description = "Multi-file, colored, filtered log tailer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ztail_1_2_0_2" = callPackage ({ mkDerivation, array, base, bytestring, filepath, hinotify , process, regex-posix, time, unix, unordered-containers }: From cb7b52a1b150314f64d98745aa02b127d0052b06 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 18 Apr 2018 07:50:22 -0400 Subject: [PATCH 431/538] hlint, hoogle: add override for extra package --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a3efc1e373b5..6d8c283f268c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1020,6 +1020,9 @@ self: super: { preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }); + # Both need a more up-to-date version + hlint = super.hlint.override { extra = self.extra_1_6_6; }; + hoogle = super.hoogle.override { extra = self.extra_1_6_6; }; } // From 2c4e291083621e3005a3c1b3a7b1df8e151f78f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Apr 2018 10:11:08 +0200 Subject: [PATCH 432/538] haskell-brick: jailbreak for the benefit of GHC 8.4.2 --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 7538c3697412..f55de74d6ce1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -583,7 +583,7 @@ self: super: { }); # Older versions don't compile. - brick = self.brick_0_36; + brick = doJailbreak super.brick_0_36; # https://github.com/jtdaugherty/brick/issues/171 HaTeX = self.HaTeX_3_19_0_0; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_1_3; From 7c1b8ac85f57afcfeb31f241bf778e1127515b71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Apr 2018 14:24:05 +0200 Subject: [PATCH 433/538] haskell-monad-logger: use latest version to avoid bug in current LTS version --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6d8c283f268c..f0819ad20401 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -866,6 +866,9 @@ self: super: { # https://github.com/fpco/stackage/issues/3126 stack = doJailbreak super.stack; + # https://github.com/snoyberg/monad-logger/issues/1 + monad-logger = self.monad-logger_0_3_28_5; + # These packages depend on each other, forming an infinite loop. scalendar = markBroken (super.scalendar.override { SCalendar = null; }); SCalendar = markBroken (super.SCalendar.override { scalendar = null; }); From 6809540815c7b8742d6318c6d996f2473a65b721 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 06:25:38 -0700 Subject: [PATCH 434/538] focuswriter: 1.6.11 -> 1.6.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.6.12 with grep in /nix/store/5vxpci5k243yxhrks31rfgmdvcmw01cz-focuswriter-1.6.12 - directory tree listing: https://gist.github.com/fe69e568c10ec79e4eaa27180b24e4c0 --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 0e4a6a5bf207..b01532ae2881 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.11"; + version = "1.6.12"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "0izbsm2vx24pnd92gf7ky8x47g324a8d16hy1s8kk3x1inxd80z1"; + sha256 = "0vcr9dhfsdls2x493klv7w5kn08iqqfg2jwjcbz274mcnd07bpqj"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; From 8b13023a0a416fcfb588e69d02b364e350a2ca91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 06:35:21 -0700 Subject: [PATCH 435/538] gdcm: 2.8.5 -> 2.8.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gdcm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcm2vtk -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcm2vtk --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmviewer -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmviewer --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmviewer help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmdump -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmdump --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmraw -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmraw --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmscanner -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmscanner --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmanon -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmanon --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmgendir -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmgendir --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmimg -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmimg --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmconv -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmconv --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmtar -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmtar --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcminfo -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcminfo --help’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmpap3 -h’ got 0 exit code - ran ‘/nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6/bin/gdcmpap3 --help’ got 0 exit code - found 2.8.6 with grep in /nix/store/6926apx6cz7dqak9i3mr8w3ccrvbkfpr-gdcm-2.8.6 - directory tree listing: https://gist.github.com/1accba5fab1e337154f40e3d49e54b54 --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 47f9e9c66760..dcdb6a2297b2 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.5"; + version = "2.8.6"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "0aiwmxwa67zsb2sbadf8r2p9018qhc8gycb04kfrsf7rskz3x2h5"; + sha256 = "07q7w2qvpknvncp3g6m5f6b3m1ld4pzns52bqah8da7pabgwspjy"; }; dontUseCmakeBuildDir = true; From 2d44db519e17e10789c6bbcb65d94791cb7ef126 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Fri, 20 Apr 2018 15:40:28 +0200 Subject: [PATCH 436/538] grepcidr: init at 2.0 (#38685) --- pkgs/applications/search/grepcidr/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/search/grepcidr/default.nix diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix new file mode 100644 index 000000000000..69fc0e76932c --- /dev/null +++ b/pkgs/applications/search/grepcidr/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "grepcidr-${version}"; + version = "2.0"; + + src = fetchurl { + url = "http://www.pc-tools.net/files/unix/${name}.tar.gz"; + sha256 = "1yzpa1nigmmp4hir6377hrkpp0z6jnxgccaw2jbqgydbglvnm231"; + }; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Filter IPv4 and IPv6 addresses matching CIDR patterns"; + homepage = http://www.pc-tools.net/unix/grepcidr/; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.fadenb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b80db9d4d0ca..bdf6ab032315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15692,6 +15692,8 @@ with pkgs; grass = callPackage ../applications/gis/grass { }; + grepcidr = callPackage ../applications/search/grepcidr { }; + grepm = callPackage ../applications/search/grepm { }; grip = callPackage ../applications/misc/grip { From 43c171118230a16fbd16e1ee4a00e7f7603d7207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Apr 2018 15:43:10 +0200 Subject: [PATCH 437/538] python.pkgs.pytest-sugar: mark as broken https://github.com/Frozenball/pytest-sugar/issues/134 --- pkgs/development/python-modules/pytest-sugar/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index a266b4617492..16cd9aa966ad 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -19,5 +19,9 @@ buildPythonPackage rec { description = "A plugin that changes the default look and feel of py.test"; homepage = https://github.com/Frozenball/pytest-sugar; license = licenses.bsd3; + + # incompatible with pytest 3.5 + # https://github.com/Frozenball/pytest-sugar/issues/134 + broken = true; # 2018-04-20 }; } From 34b6eb93d27454ede44a337e6e99972edc3f2480 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 06:46:09 -0700 Subject: [PATCH 438/538] facter: 3.11.0 -> 3.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/facter/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p374zrqr6q2q61jfkfmh1i56wrszhln4-facter-3.11.1/bin/facter -h’ got 0 exit code - ran ‘/nix/store/p374zrqr6q2q61jfkfmh1i56wrszhln4-facter-3.11.1/bin/facter --help’ got 0 exit code - ran ‘/nix/store/p374zrqr6q2q61jfkfmh1i56wrszhln4-facter-3.11.1/bin/facter help’ got 0 exit code - found 3.11.1 with grep in /nix/store/p374zrqr6q2q61jfkfmh1i56wrszhln4-facter-3.11.1 - directory tree listing: https://gist.github.com/10738b9674532db0804dfba417c5d454 --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 42d34c9a8230..22c25bfd567a 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { - sha256 = "15cqn09ng23k6a70xvxbpjjqlxw46838k7qr9216lcvxwl2banih"; + sha256 = "10ai59vyx1ssb3jyfwnmi4y5kchlnbi7vn7wbax36pa90l1j7jqk"; rev = version; repo = "facter"; owner = "puppetlabs"; From 844ba7e34a97fd63194df10e5b10770910bbadc3 Mon Sep 17 00:00:00 2001 From: Pi3r Date: Fri, 20 Apr 2018 15:49:41 +0200 Subject: [PATCH 439/538] Enable language-puppet again The latest version of `language-puppet` now works with the latest `lts-11`: https://www.stackage.org/lts-11.5/package/language-puppet-1.3.17 --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 06b5c7b1a647..3c8b7aaa7ce7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6374,7 +6374,7 @@ dont-distribute-packages: language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-puppet: [ i686-linux ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] From 50512d17688882d1c2d8949f31d0692c534633b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 06:50:14 -0700 Subject: [PATCH 440/538] freeradius: 3.0.16 -> 3.0.17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/freeradius/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radcrypt help’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/smbencrypt -h’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/smbencrypt --help’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/smbencrypt help’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radsniff -h’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radlast -h’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radlast --help’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radzap -h’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radiusd -h’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radmin -h’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/radmin --help’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/rc.radiusd -h’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/rc.radiusd --help’ got 0 exit code - ran ‘/nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17/bin/rc.radiusd help’ got 0 exit code - found 3.0.17 with grep in /nix/store/w85s8cwg1d1kblhqiqi1fqxka1lilfb5-freeradius-3.0.17 - directory tree listing: https://gist.github.com/0674f9c9bf80af589d86399e508dc604 --- pkgs/servers/freeradius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index c6ec3d46dda3..a3e83f4e069e 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -40,11 +40,11 @@ assert withCollectd -> collectd != null; with stdenv.lib; stdenv.mkDerivation rec { name = "freeradius-${version}"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "062dw4ckaa7k2br16l3naz9dr7hvzqhpxdwam3klq1i44v4hvl1b"; + sha256 = "0bc35knv46z729l4h22rirqns5v6jb0fzcffnjayhs8wjysfkfyy"; }; nativeBuildInputs = [ autoreconfHook ]; From 7ff5880dee2a2b06c4ef65d3fc789ba004963b31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 06:52:00 -0700 Subject: [PATCH 441/538] electrum: 3.1.1 -> 3.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/electrum/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lwp0yd15d73bsnq54za1v9df8r8ryl9s-electrum-3.1.3/bin/.electrum-wrapped -h’ got 0 exit code - ran ‘/nix/store/lwp0yd15d73bsnq54za1v9df8r8ryl9s-electrum-3.1.3/bin/.electrum-wrapped --help’ got 0 exit code - ran ‘/nix/store/lwp0yd15d73bsnq54za1v9df8r8ryl9s-electrum-3.1.3/bin/.electrum-wrapped help’ got 0 exit code - ran ‘/nix/store/lwp0yd15d73bsnq54za1v9df8r8ryl9s-electrum-3.1.3/bin/electrum -h’ got 0 exit code - ran ‘/nix/store/lwp0yd15d73bsnq54za1v9df8r8ryl9s-electrum-3.1.3/bin/electrum --help’ got 0 exit code - ran ‘/nix/store/lwp0yd15d73bsnq54za1v9df8r8ryl9s-electrum-3.1.3/bin/electrum help’ got 0 exit code - found 3.1.3 with grep in /nix/store/lwp0yd15d73bsnq54za1v9df8r8ryl9s-electrum-3.1.3 - directory tree listing: https://gist.github.com/db75e500a00674c62bfac3e757b1721c --- pkgs/applications/misc/electrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 425203be01cc..383f73b62994 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0ds3p7cjbavsbizm04rhzl8s59czynynpx1jvg367mwbi6gng59i"; + sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy"; }; propagatedBuildInputs = with python3Packages; [ From 07900ec4aa94e5cc17e6a6edae7b25f9403e8da8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 07:00:24 -0700 Subject: [PATCH 442/538] cups-filters: 1.20.2 -> 1.20.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cups-filters/versions. These checks were done: - built on NixOS - ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip -h’ got 0 exit code - ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip --help’ got 0 exit code - found 1.20.3 with grep in /nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3 - directory tree listing: https://gist.github.com/aa62a318dc23326b357322da3e567915 --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 287451d338da..02a7ce219c4b 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.20.2"; + version = "1.20.3"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1f6dw476m9gc94jy38f79a5aa40mk91yc81cdwrsz42wlz3nbdq2"; + sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From 951d6a9f93f95b500f37d3c2dbb27f8b7dc512c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 07:03:24 -0700 Subject: [PATCH 443/538] inboxer: 1.0.4 -> 1.1.2 (#39233) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/inboxer/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.1.2 with grep in /nix/store/dbk6jvgi9kc56yh5grh1d3yndcwd0965-inboxer-1.1.2 - directory tree listing: https://gist.github.com/fd594eb2f8f8083359d8736e32edee72 --- pkgs/applications/networking/mailreaders/inboxer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index 95bdb6cb5813..c0f015944b0a 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.0.4"; + version = "1.1.2"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "0i6qmrnga80q8s6dabfgh0fcdnc2wpj948za04zi1ajv4fjwjh0n"; + sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm"; }; unpackPhase = '' From 5de1823199213f2629662a6e7d9624617fb3556d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 07:10:42 -0700 Subject: [PATCH 444/538] closurecompiler: 20180319 -> 20180402 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/closure-compiler/versions. These checks were done: - built on NixOS - ran ‘/nix/store/gvch7ph5qinav24mdlb48b3lk833aiaf-closure-compiler-20180402/bin/closure-compiler --help’ got 0 exit code - found 20180402 with grep in /nix/store/gvch7ph5qinav24mdlb48b3lk833aiaf-closure-compiler-20180402 - directory tree listing: https://gist.github.com/2858ac6d2346b885778eb695553956a0 --- pkgs/development/compilers/closure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index de3126371bfa..e73871fcb095 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20180319"; + version = "20180402"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "181cskxamq9vkrmb2c78v6hpknrzzp49vkzp53r9pisf5j0p7220"; + sha256 = "1xbr2wvppzhq189z9m70zqry2a3hh6cdydwbc1jm2z7imsg1i6c1"; }; sourceRoot = "."; From 9d8a8959e5d5dbbf66579b0a748fc0f67c68651f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 07:22:17 -0700 Subject: [PATCH 445/538] cli-visualizer: 1.6 -> 1.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cli-visualizer/versions. These checks were done: - built on NixOS - ran ‘/nix/store/mjifmz701jz9zxicim6wqgjgvjrhm47f-cli-visualizer-1.7/bin/vis -h’ got 0 exit code - ran ‘/nix/store/mjifmz701jz9zxicim6wqgjgvjrhm47f-cli-visualizer-1.7/bin/vis --help’ got 0 exit code - ran ‘/nix/store/mjifmz701jz9zxicim6wqgjgvjrhm47f-cli-visualizer-1.7/bin/.vis-wrapped -h’ got 0 exit code - ran ‘/nix/store/mjifmz701jz9zxicim6wqgjgvjrhm47f-cli-visualizer-1.7/bin/.vis-wrapped --help’ got 0 exit code - found 1.7 with grep in /nix/store/mjifmz701jz9zxicim6wqgjgvjrhm47f-cli-visualizer-1.7 - directory tree listing: https://gist.github.com/544d33e8edd7362d66363d64c8cabf80 --- pkgs/applications/misc/cli-visualizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index fa9d3e2fdf48..7aecc8f823ee 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; rev = version; - sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc"; + sha256 = "06z6vj87xjmacppcxvgm47wby6mv1hnbqav8lpdk9v5s1hmmp1cr"; }; postPatch = '' From cff3153b23f432845a7d9c012d01249647cf0333 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 07:24:11 -0700 Subject: [PATCH 446/538] debootstrap: 1.0.95 -> 1.0.97 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions. These checks were done: - built on NixOS - ran ‘/nix/store/3xn6n1ldz25y4lnsy4p9g6m512f7vx96-debootstrap-1.0.97/bin/debootstrap --help’ got 0 exit code - found 1.0.97 with grep in /nix/store/3xn6n1ldz25y4lnsy4p9g6m512f7vx96-debootstrap-1.0.97 - directory tree listing: https://gist.github.com/be7bb7552141923f8ef6cced5d4c16dc --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 9e3abaaedfca..7b143183bc0c 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.95"; + version = "1.0.97"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1xpd1yblcgwhri64hzgxhalpf5j8gqbmkrsm1fs0pbwiy0wdz0ry"; + sha256 = "1w2wdiazfykjkwainxfk72rccqsh1l1i90h93phsvayv0gsbxrnk"; }; buildInputs = [ dpkg gettext gawk perl ]; From 3afd1e2fd8e11f524090b6110f6e8999763b31a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 07:36:33 -0700 Subject: [PATCH 447/538] easyloggingpp: 9.96.2 -> 9.96.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/easyloggingpp/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 9.96.4 with grep in /nix/store/kfaknn3f1g5k8smzf4zj8glb5rg0s6xq-easyloggingpp-9.96.4 - directory tree listing: https://gist.github.com/2590fabe21a830caf117e041adb89d1b --- pkgs/development/libraries/easyloggingpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 89a34a988906..8c6337cfaf60 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; - version = "9.96.2"; + version = "9.96.4"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0qhf93i2ks9v6rk6n4v3fn7xrkqdwgs6rm6wd0gx9sm2wlq4ancd"; + sha256 = "0l0b8cssxkj0wlfqjj8hfnfvrjcxa81h947d54w86iadrilrsprb"; }; nativeBuildInputs = [cmake]; From 94fd34a31b9228d20c66fbf6815b81354b5091a4 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Fri, 20 Apr 2018 10:39:58 -0400 Subject: [PATCH 448/538] vim: idiomatic nix filetype plugin * Never modify tabstop. This causes incompatibilities with other utilities that expect tabs to always be 8 spaces. * Add standard boilerplate for system-level filetype plugins. --- pkgs/applications/editors/vim/ft-nix-support.patch | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 416ec18cf2ca..25fd4b6ad9fa 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -85,5 +85,12 @@ new file mode 100644 --- /dev/null +++ b/runtime/ftplugin/nix.vim @@ -0,0 +1,2 @@ ++" Only do this when not done yet for this buffer ++if exists("b:did_ftplugin") ++ finish ++endif ++let b:did_ftplugin = 1 ++ +" coding conventions -+setlocal sw=2 ts=2 expandtab ++setlocal shiftwidth=2 expandtab ++let b:undo_ftplugin = "setlocal sw< et<" From 7a04c6fc5894095a535e3311b1c1777e414cd6f0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 20 Apr 2018 17:03:39 +0200 Subject: [PATCH 449/538] aliases: remove broken digit aliases --- pkgs/top-level/aliases.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 24ad2699e56b..9c3108913c69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -24,10 +24,6 @@ in ### Deprecated aliases - for backward compatibility mapAliases (rec { - _2048-in-terminal = "2048-in-terminal"; # added 2017-01-16 - _2bwm = "2bwm"; # added 2017-01-16 - _389-ds-base = "389-ds-base"; # added 2017-01-16 - _90secondportraits = "90secondsportraits"; # added 2017-01-16 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; # added 2013-11-04 aircrackng = aircrack-ng; # added 2016-01-14 From 7808216f7b61496688bde4e97f42eb3b12eeb723 Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Fri, 20 Apr 2018 10:00:56 +0200 Subject: [PATCH 450/538] vulnix: 1.4.0 -> 1.6.1 Update to current vulnix which features greatly improved whitelist handling among others. - Temporarly disable flake8 until #39206 is solved. - Split docs into own output. --- pkgs/tools/security/vulnix/default.nix | 34 ++++++++++++++----- .../security/vulnix/disable-flake8.patch | 23 +++++++++++++ 2 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/security/vulnix/disable-flake8.patch diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index b2cbb005ae7c..b28fa7cfd475 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,16 +1,17 @@ -{ stdenv, pythonPackages, fetchurl, callPackage, nix }: +{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "vulnix"; - version = "1.4.0"; + version = "1.6.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "19kfqxlrigrgwn74x06m70ar2fhyhic5kfmdanjwjcbaxblha3l8"; + sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf"; }; - buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; + buildInputs = + [ ronn ] ++ + (with pythonPackages; [ freezegun pytest pytestcov ]); propagatedBuildInputs = [ nix @@ -20,14 +21,31 @@ pythonPackages.buildPythonApplication rec { lxml pyyaml requests + toml zodb ]); - postPatch = '' - sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py + outputs = [ "out" "doc" ]; + + # pytest-flake8 is currently broken + # re-enable after it has been fixed + # https://github.com/NixOS/nixpkgs/issues/39206 + patches = [ ./disable-flake8.patch ]; + + postBuild = '' + make -C doc ''; - checkPhase = "py.test"; + checkPhase = "py.test src/vulnix"; + + postInstall = '' + install -D -t $out/share/man/man1 doc/vulnix.1 + install -D -t $out/share/man/man5 doc/vulnix-whitelist.5 + install -D -t $doc/share/doc/vulnix README.rst CHANGES.rst + gzip $doc/share/doc/vulnix/*.rst + ''; + + dontStrip = true; meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; diff --git a/pkgs/tools/security/vulnix/disable-flake8.patch b/pkgs/tools/security/vulnix/disable-flake8.patch new file mode 100644 index 000000000000..cd165d05ccc1 --- /dev/null +++ b/pkgs/tools/security/vulnix/disable-flake8.patch @@ -0,0 +1,23 @@ +diff --git a/setup.cfg b/setup.cfg +index a9e37ce..41b9886 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,5 +1,5 @@ + [tool:pytest] +-addopts = --flake8 --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix ++addopts = --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix + markers = slow: This is a non-unit test and thus is not run by default. Use ``-m slow`` to run these, or ``-m 1`` to run all tests. + + [aliases] +diff --git a/setup.py b/setup.py +index a9315e5..d14ad59 100644 +--- a/setup.py ++++ b/setup.py +@@ -35,7 +35,6 @@ setup( + 'freezegun>0.3', + 'pytest>=3.2', + 'pytest-cov>=2.5', +- 'pytest-flake8', + 'pytest-runner>=2.11,<3dev', + 'pytest-timeout>=1.2', + 'setuptools_scm>=1.15', From 16bfd5a2be51c0b42d0cb5691c41dd8f1913e15b Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Fri, 20 Apr 2018 11:46:40 -0400 Subject: [PATCH 451/538] vim: Set softtabstop in nix filetype plugin --- pkgs/applications/editors/vim/ft-nix-support.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 25fd4b6ad9fa..5feb9c879517 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -92,5 +92,5 @@ new file mode 100644 +let b:did_ftplugin = 1 + +" coding conventions -+setlocal shiftwidth=2 expandtab -+let b:undo_ftplugin = "setlocal sw< et<" ++setlocal shiftwidth=2 expandtab softtabstop=2 ++let b:undo_ftplugin = "setlocal sw< et< sts<" From ee3fd4ad53ba1063b6b8178f2753d458ec8c6094 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 20 Apr 2018 13:27:10 +0200 Subject: [PATCH 452/538] nixos/sshd: add options for kexAlgorithms, ciphers and MACs --- .../modules/services/networking/ssh/sshd.nix | 70 ++++++++++++++++--- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index e50c4dbacf36..aab1203086ce 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -213,6 +213,65 @@ in description = "Files from which authorized keys are read."; }; + kexAlgorithms = mkOption { + type = types.listOf types.str; + default = [ + "curve25519-sha256@libssh.org" + "diffie-hellman-group-exchange-sha256" + ]; + description = '' + Allowed key exchange algorithms + + + Defaults to recommended settings from both + + and + + ''; + }; + + ciphers = mkOption { + type = types.listOf types.str; + default = [ + "chacha20-poly1305@openssh.com" + "aes256-gcm@openssh.com" + "aes128-gcm@openssh.com" + "aes256-ctr" + "aes192-ctr" + "aes128-ctr" + ]; + description = '' + Allowed ciphers + + + Defaults to recommended settings from both + + and + + ''; + }; + + macs = mkOption { + type = types.listOf types.str; + default = [ + "hmac-sha2-512-etm@openssh.com" + "hmac-sha2-256-etm@openssh.com" + "umac-128-etm@openssh.com" + "hmac-sha2-512" + "hmac-sha2-256" + "umac-128@openssh.com" + ]; + description = '' + Allowed MACs + + + Defaults to recommended settings from both + + and + + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -363,14 +422,9 @@ in HostKey ${k.path} '')} - ### Recommended settings from both: - # https://stribika.github.io/2015/01/04/secure-secure-shell.html - # and - # https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29 - - KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256 - Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr - MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com + KexAlgorithms ${concatStringsSep "," cfg.kexAlgorithms} + Ciphers ${concatStringsSep "," cfg.ciphers} + MACs ${concatStringsSep "," cfg.macs} # LogLevel VERBOSE logs user's key fingerprint on login. # Needed to have a clear audit track of which key was used to log in. From efffa4e392f24ab5479aaf0d407c62112035e8a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 10:32:54 -0700 Subject: [PATCH 453/538] jpegoptim: 1.4.5 -> 1.4.6 (#39229) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jpegoptim/versions. These checks were done: - built on NixOS - ran ‘/nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6/bin/jpegoptim -h’ got 0 exit code - ran ‘/nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6/bin/jpegoptim --help’ got 0 exit code - ran ‘/nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6/bin/jpegoptim help’ got 0 exit code - found 1.4.6 with grep in /nix/store/c0w9l7rcn6kx098z11nx3x5q53dvcvmd-jpegoptim-1.4.6 - directory tree listing: https://gist.github.com/ccc6411a2aca02d1769831b9c561f6b4 --- pkgs/applications/graphics/jpegoptim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 0cad1e1aabb6..b428be1a1ba3 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.5"; + version = "1.4.6"; name = "jpegoptim-${version}"; src = fetchurl { url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; - sha256 = "1mngi8c4mhzwa7i4wqrqq6i80cqj4adbacblfvk6dy573wywyxmi"; + sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; }; # There are no checks, it seems. From e59eb49a0a491d8e7a24d911d49231e3a6504cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 20 Apr 2018 19:40:38 +0200 Subject: [PATCH 454/538] simp_le: drop upper bound of acme requirement (#39263) --- pkgs/tools/admin/simp_le/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index b618e71568d3..47bf848578d9 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -10,6 +10,8 @@ pythonPackages.buildPythonApplication rec { }; postPatch = '' + # drop upper bound of acme requirement + sed -ri "s/'(acme>=[^,]+),<[^']+'/'\1'/" setup.py substituteInPlace simp_le.py \ --replace "/bin/sh" "${bash}/bin/sh" ''; From 36c592df5a48de9b12ffe0eb692bab96ce3e6739 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 11:05:06 -0700 Subject: [PATCH 455/538] aws-sdk-cpp: 1.4.24 -> 1.4.33 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/aws-sdk-cpp/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.4.33 with grep in /nix/store/plknjymzss3c8bfcjfhjmlkf9icgkz7v-aws-sdk-cpp-1.4.33 - directory tree listing: https://gist.github.com/d510b62973cdf67e2ed76e170a388918 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 11005d6097af..0ab102a5ec43 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.24"; + version = "1.4.33"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1prkivapmzjcsykxj42h0p27kjhc66hir0h2j6rz0yqdfr4pyhgl"; + sha256 = "0fl4m3vsycd35gkrrlqsjlv0myh12bgb0jg3pm548l19qwrc0pm7"; }; # FIXME: might be nice to put different APIs in different outputs From b9e7649d4352c43d43f56387c4fbdedc85d339f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 11:06:43 -0700 Subject: [PATCH 456/538] acpid: 2.0.28 -> 2.0.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acpid/versions. These checks were done: - built on NixOS - ran ‘/nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29/bin/acpi_listen -h’ got 0 exit code - ran ‘/nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29/bin/acpi_listen --help’ got 0 exit code - ran ‘/nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29/bin/acpi_listen -v’ and found version 2.0.29 - ran ‘/nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29/bin/acpi_listen --version’ and found version 2.0.29 - ran ‘/nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29/bin/acpid help’ got 0 exit code - ran ‘/nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29/bin/acpid -v’ and found version 2.0.29 - ran ‘/nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29/bin/acpid --version’ and found version 2.0.29 - found 2.0.29 with grep in /nix/store/vm7myzc830jgh1q5xmjc726xgw8fh933-acpid-2.0.29 - directory tree listing: https://gist.github.com/48210d03059b65f940b06df3ebb636d1 --- pkgs/os-specific/linux/acpid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index c209cf6e3162..7a234b16c913 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "acpid-2.0.28"; + name = "acpid-2.0.29"; src = fetchurl { url = "mirror://sourceforge/acpid2/${name}.tar.xz"; - sha256 = "043igasvp1l6nv5rzh4sksmymay2qn20anl4zm4zvwnkn1a3l34q"; + sha256 = "1zq38al07z92r2md18zivrzgjqnn7m2wahdpgri6wijwjwkknl2q"; }; meta = with stdenv.lib; { From 6c6d3e87499588a5b8a74486a3215e0b50e62ede Mon Sep 17 00:00:00 2001 From: chessai Date: Fri, 20 Apr 2018 14:00:20 -0400 Subject: [PATCH 457/538] haskell.packages.ghc842: removed broken 8.4.x deriving-compat override --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index f55de74d6ce1..43c869feff12 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -47,11 +47,6 @@ self: super: { ## • In the instance declaration for ‘Monoid BV’ bv = super.bv_0_5; - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## template-haskell >=2.5 && <2.13 - deriving-compat = super.deriving-compat_0_4_1; - ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 doctest = overrideCabal super.doctest_0_15_0 (drv: { From a2e9a79c03173665bdf9040d723896addc87f709 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 11:11:11 -0700 Subject: [PATCH 458/538] chirp: 20180325 -> 20180412 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chirp-daily/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 20180412 with grep in /nix/store/abbw3jd7qa65a0r689dnbrcfngk106p6-chirp-daily-20180412 - directory tree listing: https://gist.github.com/7b3f78dd8a3296dca074fbcc1ef9092c --- pkgs/applications/misc/chirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 068d8e794547..22d659dd10e4 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180325"; + version = "20180412"; src = fetchurl { url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0z2m74hhkxvxchxv819wy947v3wl13kxrdq4kjjazzrlyaky921y"; + sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9"; }; nativeBuildInputs = [ makeWrapper ]; From 556e81c9bbe35ba209a2aae45f78db0fc52f95f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 11:18:17 -0700 Subject: [PATCH 459/538] mate.caja: 1.20.1 -> 1.21.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/caja/versions. These checks were done: - built on NixOS - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/caja -h’ got 0 exit code - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/caja --help’ got 0 exit code - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/caja-connect-server -h’ got 0 exit code - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/caja-connect-server --help’ got 0 exit code - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/.caja-wrapped -h’ got 0 exit code - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/.caja-wrapped --help’ got 0 exit code - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/.caja-connect-server-wrapped -h’ got 0 exit code - ran ‘/nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0/bin/.caja-connect-server-wrapped --help’ got 0 exit code - found 1.21.0 with grep in /nix/store/sssawkcdpbaprvkllgc2xyklribdizd2-caja-1.21.0 - directory tree listing: https://gist.github.com/eed0de1f462096e2dbac08cdcb6344bd --- pkgs/desktops/mate/caja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index bf0583189bc0..9643c9a34164 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1qqqq3fi1aqjqg36y3v73z4d0bqkx7d5f79i6h9lxyh3s0876v9c"; + sha256 = "0v8zx5rzqh1zkwizkpdckmwm6004cv9sbjghzgz3049xzcqm371g"; }; nativeBuildInputs = [ From 6b91b0d09f582f308a8ad4de526df494ff363622 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 11:23:49 -0700 Subject: [PATCH 460/538] chromedriver: 2.37 -> 2.38 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chromedriver/versions. These checks were done: - built on NixOS - ran ‘/nix/store/bnjr4qgd68lh8fdz2hxz7qrc1zvvxkni-chromedriver-2.38/bin/chromedriver -h’ got 0 exit code - ran ‘/nix/store/bnjr4qgd68lh8fdz2hxz7qrc1zvvxkni-chromedriver-2.38/bin/chromedriver --help’ got 0 exit code - found 2.38 with grep in /nix/store/bnjr4qgd68lh8fdz2hxz7qrc1zvvxkni-chromedriver-2.38 - directory tree listing: https://gist.github.com/8ba491f60826e1ad2389e69f92fb6116 --- pkgs/development/tools/selenium/chromedriver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index cc56e57794a2..d865a20fbb9f 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "1pryrz4ry0pk6kawvj8sxhpqh6c6npxhm187412y2l598dcf9pwl"; + sha256 = "1h7avlns00hd44ayi53lvdj2l85h9higky0jk7bad07hm39nagks"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; From f373be6ebf86f4951fb1396acb8b5d6ab2ce0483 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 11:28:04 -0700 Subject: [PATCH 461/538] adapta-gtk-theme: 3.93.0.225 -> 3.93.0.258 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/213ec110793554e28f0630639c2d18bc --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index c62250b1124c..c0c67eeb6abe 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.0.225"; + version = "3.93.0.258"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "1mjdvfvx45pdypl34yghgi47bj86rwvryx9mwhwwb09psn9smp49"; + sha256 = "114rryaqr97f7qlwxn3fdspzigxx1jgpsbhypdn265511rsh30hx"; }; preferLocalBuild = true; From fdee4484861f9db0acafab0a1b13f1d81adc8ea7 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 20 Apr 2018 20:31:17 +0200 Subject: [PATCH 462/538] prometheus-postfix-exporter: makeWrapper -> nativeBuildInputs --- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index ccf41f5f4962..3c2f01c0a5ce 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -13,7 +13,8 @@ buildGoPackage rec { sha256 = "1p2j66jzzgyv2w832pw57g02vrac6ldrblqllgwyy0i8krb3ibyz"; }; - buildInputs = [ systemd makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ systemd ]; goDeps = ./postfix-exporter-deps.nix; From 4a78942c7586796f8ca6ebcde360d01452f0b246 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Fri, 20 Apr 2018 20:32:17 +0200 Subject: [PATCH 463/538] gnushogi: init at 1.4.2 --- pkgs/games/gnushogi/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/games/gnushogi/default.nix diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix new file mode 100644 index 000000000000..e85674550308 --- /dev/null +++ b/pkgs/games/gnushogi/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "gnushogi-${version}"; + version = "1.4.2"; + buildInputs = [ zlib ]; + + src = fetchurl { + url = "mirror://gnu/gnushogi/${name}.tar.gz"; + sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"; + }; + + meta = with stdenv.lib; { + description = "GNU implementation of Shogi, also known as Japanese Chess"; + homepage = https://www.gnu.org/software/gnushogi/; + license = licenses.gpl3; + maintainers = [ maintainers.ciil ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdf6ab032315..c520e24be020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19077,6 +19077,8 @@ with pkgs; gnujump = callPackage ../games/gnujump { }; + gnushogi = callPackage ../games/gnushogi { }; + gogui = callPackage ../games/gogui {}; gtetrinet = callPackage ../games/gtetrinet { From fc1ec4a8f63bd3aeaed47663d5c34129e7783acc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 12:34:32 -0700 Subject: [PATCH 464/538] arangodb: 3.3.5 -> 3.3.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/arangodb/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/foxx-manager --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/foxx-manager help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangobench --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangodump --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangoexport --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangoimp --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangorestore --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangosh --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangovpack --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arango-dfdb --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arango-init-database --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arango-secure-installation --help’ got 0 exit code - ran ‘/nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7/bin/arangod --help’ got 0 exit code - found 3.3.7 with grep in /nix/store/lh49lm0kdkijvg9q9kzmacnclh5x2s4m-arangodb-3.3.7 - directory tree listing: https://gist.github.com/3fef3cf0eb3977fe8d69df9bbbedc5a9 --- pkgs/servers/nosql/arangodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 9d1e62136651..d460284ef045 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.5"; + version = "3.3.7"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "1015fi47m0j71l6wmp7n06qk0x2h3337sjqxfyan5dnnb0himzb6"; + sha256 = "1464nl2ampfkcd2kh1hmc18hh8ya73mjmxizm6wgl5yvkh56a82x"; }; buildInputs = [ From dcbfbb40fc1a15fdba62bd59d6d2b36ed12bd75b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 12:38:26 -0700 Subject: [PATCH 465/538] mod_wsgi: 4.6.3 -> 4.6.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mod_wsgi/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 4.6.4 with grep in /nix/store/q2skhgd8vwbrff24z9v979h92dwnza35-mod_wsgi-4.6.4 - directory tree listing: https://gist.github.com/aa4e38d80fddf2c367d88e0578a73fb0 --- pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 0599d3affc89..948ef345e10d 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "4.6.3"; + version = "4.6.4"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "1vi2bf2spak70qqc1c673a7pwmzq01gmli43xwhrwdw7l2ig4wj9"; + sha256 = "1hyaxr9km7cj4k6b0d6xx3bplpa8483fhyk9x802sl22m3f2vc1k"; }; buildInputs = [ apacheHttpd python2 ]; From 19742d0bafbfb56c037e4c1b01cbc3895f7481ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 12:39:31 -0700 Subject: [PATCH 466/538] atom: 1.25.1 -> 1.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/atom/versions. These checks were done: - built on NixOS - ran ‘/nix/store/q560gnycgnl44jmldg5y2a9akg47q8kb-atom-1.26.0/bin/apm -h’ got 0 exit code - ran ‘/nix/store/q560gnycgnl44jmldg5y2a9akg47q8kb-atom-1.26.0/bin/apm --help’ got 0 exit code - ran ‘/nix/store/q560gnycgnl44jmldg5y2a9akg47q8kb-atom-1.26.0/bin/apm help’ got 0 exit code - ran ‘/nix/store/q560gnycgnl44jmldg5y2a9akg47q8kb-atom-1.26.0/bin/atom help’ got 0 exit code - ran ‘/nix/store/q560gnycgnl44jmldg5y2a9akg47q8kb-atom-1.26.0/bin/.atom-wrapped help’ got 0 exit code - found 1.26.0 with grep in /nix/store/q560gnycgnl44jmldg5y2a9akg47q8kb-atom-1.26.0 - directory tree listing: https://gist.github.com/10c433ad7807e5aeaa581f442b89dd6c --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9fbf4431f602..7b989f8df1f9 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.25.1"; + version = "1.26.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0h0kr4w26c6i89rb9y4aw4l8f63al42i2cy3ddk16m1irzij9fk4"; + sha256 = "1gyxys3mwwizc88vlb6j769b6r4ibjnqs6pg5iv336b13f9acyvr"; name = "${name}.deb"; }; From 475e2dd2c413c559c4ee7ee1625fd030967a6ac0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 12:43:47 -0700 Subject: [PATCH 467/538] asymptote: 2.42 -> 2.44 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/asymptote/versions. These checks were done: - built on NixOS - ran ‘/nix/store/cxi50l6jrwac932swm8pfd2zb1pm9g4b-asymptote-2.44/bin/asy -h’ got 0 exit code - ran ‘/nix/store/cxi50l6jrwac932swm8pfd2zb1pm9g4b-asymptote-2.44/bin/asy --help’ got 0 exit code - found 2.44 with grep in /nix/store/cxi50l6jrwac932swm8pfd2zb1pm9g4b-asymptote-2.44 - directory tree listing: https://gist.github.com/f39c5dba52ed8849c1eb79ba04db4f1d --- pkgs/tools/graphics/asymptote/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index ce66402d09fc..7337cd227a2e 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.42"; + version="2.44"; name="${baseName}-${version}"; - hash="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; - url="https://freefr.dl.sourceforge.net/project/asymptote/2.42/asymptote-2.42.src.tgz"; - sha256="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; + hash="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg"; + url="https://freefr.dl.sourceforge.net/project/asymptote/2.44/asymptote-2.44.src.tgz"; + sha256="1rs9v95g19ri6ra2m921jf2yr9avqnzfybrqxilsld98xpqx56vg"; }; buildInputs = [ ghostscriptX imagemagick fftw From 63de21fba184da68c04fc32263f13a1a5dae0bc8 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Fri, 20 Apr 2018 23:33:01 +0300 Subject: [PATCH 468/538] feh: 2.25.1 -> 2.26 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index d7f25fdd4261..475c8de97b91 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.25.1"; + version = "2.26"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "197sm78bm33dvahr5nxqkbmpmdn4b13ahc9mrgn1l7n104bg4phc"; + sha256 = "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi"; }; outputs = [ "out" "man" "doc" ]; From a36538f33c071b0236e68ae99719c025dd4e6ab2 Mon Sep 17 00:00:00 2001 From: Pi3r Date: Fri, 20 Apr 2018 22:41:48 +0200 Subject: [PATCH 469/538] Update configuration-hackage2nix.yaml --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3c8b7aaa7ce7..e15482a6708c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6374,7 +6374,7 @@ dont-distribute-packages: language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux ] + language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] From 30c9c54271c461e6978cbb461301046047385b3c Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 20 Apr 2018 22:15:06 +0100 Subject: [PATCH 470/538] Build libLAS with LASzip support --- pkgs/development/libraries/libLAS/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index aafcf86e4a62..272a9774a7f4 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" + "-DWITH_LASZIP=ON" + "-DLASZIP_INCLUDE_DIR=${LASzip}/include" ]; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' From 03b36522e7c16ddc692bc7bfb61d848fd1e96832 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Apr 2018 23:37:18 +0200 Subject: [PATCH 471/538] nix: 2.0 -> 2.0.1 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++---- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 4774cf39c030..6bb556a0123c 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/6p2gambjac7xdkd2a7w1dsxdk1q5cq4d-nix-2.0"; - i686-linux = "/nix/store/zznnaijjk3nwx0cmpczxsvngmqzhl7r4-nix-2.0"; - aarch64-linux = "/nix/store/ci96w9kxfkmlc7x2vwqiz4da0r6abxnq-nix-2.0"; - x86_64-darwin = "/nix/store/xmi4fylvx4qc79ji9v5q3zfy9vfdy4sv-nix-2.0"; + x86_64-linux = "/nix/store/2gk7rk2sx2dkmsjr59gignrfdmya8f6s-nix-2.0.1"; + i686-linux = "/nix/store/5160glkphiv13qggnivyidg8r0491pbl-nix-2.0.1"; + aarch64-linux = "/nix/store/jk29zz3ns9vdkkclcyzzkpzp8dhv1x3i-nix-2.0.1"; + x86_64-darwin = "/nix/store/4a9czmrpd4hf3r80zcmga2c2lm3hbbvv-nix-2.0.1"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a2c30318072d..aee6678d1167 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -132,10 +132,10 @@ in rec { }) // { perl-bindings = nixStable; }; nixStable = (common rec { - name = "nix-2.0"; + name = "nix-2.0.1"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14"; + sha256 = "689c33b9885b56b7817bf94aad3bc7ccf50710ebb34b01c5a5a2ac4e472750b1"; }; }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; From 9a94dd5e7b4c25dd4a5c41679aef9d4a534ef9d4 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sat, 14 Apr 2018 14:25:45 +1000 Subject: [PATCH 472/538] pure: 0.66 -> 0.68 --- pkgs/development/interpreters/pure/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 133329f4f203..c2b120576ea2 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -3,14 +3,12 @@ stdenv.mkDerivation rec { baseName="pure"; - project="pure-lang"; - version="0.66"; + version="0.68"; name="${baseName}-${version}"; - extension="tar.gz"; src = fetchurl { - url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="42df6832476e8bee3a7ca179671284c1edd7bc82b71062fa0de62fd2117ee676"; + url="https://github.com/agraef/pure-lang/releases/download/${name}/${name}.tar.gz"; + sha256="0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb"; }; buildInputs = [ bison flex makeWrapper ]; From 780558a7ea3b6fc7007a3516a9f9c520402b7535 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 18 Apr 2018 15:22:38 +0000 Subject: [PATCH 473/538] bash-supergenpass: 2012-11-02 -> 2018-04-18 --- pkgs/tools/security/bash-supergenpass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index f85d847f5f95..59be6ed0ec26 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "bash-supergenpass-unstable-${version}"; - version = "2012-11-02"; + version = "2018-04-18"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "lanzz"; repo = "bash-supergenpass"; - rev = "c84eaa22fb59ab6c390e7f2de7984513347e3a9a"; - sha256 = "0d3l55kdrf6arb98vwwz9ww55ing5w323fg7546v56hlq3hs5qc9"; + rev = "ece772b9ec095946ac4ea985cda5561b211e56f0"; + sha256 = "1gkbrycyyl7y3klbfx7xjvvfw5df1h4fj6x1f73gglfy6nk8ffnd"; }; installPhase = '' From 4a1aeb050cc5b39b4c7baf776d6f7abe15d07442 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 20 Apr 2018 18:09:02 -0500 Subject: [PATCH 474/538] doctl: 1.7.2 -> 1.8.0 Signed-off-by: Austin Seipp --- pkgs/development/tools/doctl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 14c5eab8cd68..be852066bfcc 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,8 +4,8 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "7"; - patch = "2"; + minor = "8"; + patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; @@ -19,9 +19,9 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "digitalocean"; - repo = "doctl"; - rev = "v${version}"; - sha256 = "1nkyl5274mbdf4j60f2sj0kvvppcpccf7xws11c9vj9c3zxs7r97"; + repo = "doctl"; + rev = "v${version}"; + sha256 = "1h94qagbni8cvzdparmgx3m9qcnbwbk0kjlvy9jzxfd3vcpbg38j"; }; meta = { From 966defff34d7c0edee2544348e44e6eaba424d35 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 20 Apr 2018 20:34:46 -0400 Subject: [PATCH 475/538] linux: 4.9.94 -> 4.9.95 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 569f472545eb..2f10bcc0ea80 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.94"; + version = "4.9.95"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15rd1rmvwx6wyqp857bdl77ijd233svm5wxyjyj8dy8n36yivk39"; + sha256 = "1x4z66v6zl4q0hzinzb1wvlq9fd3v4sbwj9lay69f3vdq8knsnly"; }; } // (args.argsOverride or {})) From 5778c4150abd0212465420410ecce5f235c78059 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 21 Apr 2018 00:19:19 +0800 Subject: [PATCH 476/538] Haskell Packages: Use correct version of indexed-list-literals for vector-sized-1.0.0.0 --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 21207f40d38e..1e993524b5ce 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1026,10 +1026,13 @@ self: super: { # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; + vector-sized_1_0_0_0 = super.vector-sized_1_0_0_0.override { + indexed-list-literals = self.indexed-list-literals_0_2_0_0; + }; + # Both need a more up-to-date version hlint = super.hlint.override { extra = self.extra_1_6_6; }; hoogle = super.hoogle.override { extra = self.extra_1_6_6; }; - } // From e68f820cc42a07b55ce69dbe28a4f293eb73605c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Apr 2018 09:34:02 +0200 Subject: [PATCH 477/538] dashing: don't use callPackages (note the s) cc @peterhoeg @matthiasbeyer --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a14133dfa6a..c109e32e6e41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5839,7 +5839,7 @@ with pkgs; dash = callPackage ../shells/dash { }; - dashing = callPackages ../tools/misc/dashing { }; + dashing = callPackage ../tools/misc/dashing { }; es = callPackage ../shells/es { }; From ddcdc0f10ad079ce5c5066d31ec35b3da425424b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Apr 2018 09:35:13 +0200 Subject: [PATCH 478/538] asciidoctor: remove mathematical from wrapper, fixes #39098 because it does not exist in the original derivation, breaking installation with `nix-env`. Should asciidoctor-mathematical exist? --- pkgs/tools/typesetting/asciidoctor/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index f8cfe44cbd73..b1fe301775c8 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -15,7 +15,6 @@ bundlerApp { "asciidoctor-latex" "asciidoctor-pdf" "asciidoctor-safe" - "asciidoctor-mathematical" ]; gemConfig = { From 5d3c7ff2e101ec155b025ff4ffe409a16dba9706 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sat, 21 Apr 2018 10:41:53 +0200 Subject: [PATCH 479/538] Fixed repo for ImageMagick 6 (#39276) --- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index be3a369c28b6..4bbc34bb7bb6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ImageMagick"; - repo = "ImageMagick"; + repo = "ImageMagick6"; rev = cfg.version; inherit (cfg) sha256; }; From 4c14202bd1e0384daeb8e241af20414dd8bf12e3 Mon Sep 17 00:00:00 2001 From: xeji Date: Sat, 21 Apr 2018 12:09:30 +0200 Subject: [PATCH 480/538] nixos/tests/gnome3-gdm: fix broken test test always failed due to multiple bugs --- nixos/tests/gnome3-gdm.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 4b459e93e1be..71ae1709d526 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -26,15 +26,22 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' + # wait for gdm to start and bring up X + $machine->waitForUnit("display-manager.service"); $machine->waitForX; - $machine->sleep(15); + + # wait for alice to be logged in + $machine->waitForUnit("default.target","alice"); # Check that logging in has given the user ownership of devices. $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->succeed("xauth merge ~alice/.Xauthority"); + # open a terminal and check it's there + $machine->succeed("su - alice -c 'DISPLAY=:0.0 XAUTHORITY=/run/user/\$UID/gdm/Xauthority gnome-terminal'"); + $machine->succeed("xauth merge /run/user/1000/gdm/Xauthority"); $machine->waitForWindow(qr/Terminal/); + + # wait to get a nice screenshot $machine->sleep(20); $machine->screenshot("screen"); ''; From 6db2057f00c0629dae7677674eeb5faaa53c5ed6 Mon Sep 17 00:00:00 2001 From: Lassulus Date: Sat, 21 Apr 2018 12:12:43 +0200 Subject: [PATCH 481/538] nixos/restic: init (#38948) --- nixos/modules/module-list.nix | 1 + nixos/modules/services/backup/restic.nix | 150 +++++++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 nixos/modules/services/backup/restic.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bc4d4cca7b5b..74c8c7bbc820 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -166,6 +166,7 @@ ./services/backup/crashplan-small-business.nix ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix + ./services/backup/restic.nix ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix new file mode 100644 index 000000000000..21d82469c605 --- /dev/null +++ b/nixos/modules/services/backup/restic.nix @@ -0,0 +1,150 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + options.services.restic.backups = mkOption { + description = '' + Periodic backups to create with Restic. + ''; + type = types.attrsOf (types.submodule ({ name, config, ... }: { + options = { + passwordFile = mkOption { + type = types.str; + description = '' + Read the repository password from a file. + ''; + example = "/etc/nixos/restic-password"; + + }; + + repository = mkOption { + type = types.str; + description = '' + repository to backup to. + ''; + example = "sftp:backup@192.168.1.100:/backups/${name}"; + }; + + paths = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Which paths to backup. + ''; + example = [ + "/var/lib/postgresql" + "/home/user/backup" + ]; + }; + + timerConfig = mkOption { + type = types.attrsOf types.str; + default = { + OnCalendar = "daily"; + }; + description = '' + When to run the backup. See man systemd.timer for details. + ''; + example = { + OnCalendar = "00:05"; + RandomizedDelaySec = "5h"; + }; + }; + + user = mkOption { + type = types.str; + default = "root"; + description = '' + As which user the backup should run. + ''; + example = "postgresql"; + }; + + extraBackupArgs = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra arguments passed to restic backup. + ''; + example = [ + "--exclude-file=/etc/nixos/restic-ignore" + ]; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra extended options to be passed to the restic --option flag. + ''; + example = [ + "sftp.command='ssh backup@192.168.1.100 -i /home/user/.ssh/id_rsa -s sftp'" + ]; + }; + + initialize = mkOption { + type = types.bool; + default = false; + description = '' + Create the repository if it doesn't exist. + ''; + }; + }; + })); + default = {}; + example = { + localbackup = { + paths = [ "/home" ]; + repository = "/mnt/backup-hdd"; + passwordFile = "/etc/nixos/secrets/restic-password"; + initialize = true; + }; + remotebackup = { + paths = [ "/home" ]; + repository = "sftp:backup@host:/backups/home"; + passwordFile = "/etc/nixos/secrets/restic-password"; + extraOptions = [ + "sftp.command='ssh backup@host -i /etc/nixos/secrets/backup-private-key -s sftp'" + ]; + timerConfig = { + OnCalendar = "00:05"; + RandomizedDelaySec = "5h"; + }; + }; + }; + }; + + config = { + systemd.services = + mapAttrs' (name: backup: + let + extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; + connectTo = elemAt (splitString ":" backup.repository) 1; + resticCmd = "${pkgs.restic}/bin/restic${extraOptions}"; + in nameValuePair "restic-backups-${name}" ({ + environment = { + RESTIC_PASSWORD_FILE = backup.passwordFile; + RESTIC_REPOSITORY = backup.repository; + }; + path = with pkgs; [ + openssh + ]; + restartIfChanged = false; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${concatStringsSep " " backup.paths}"; + User = backup.user; + }; + } // optionalAttrs backup.initialize { + preStart = '' + ${resticCmd} snapshots || ${resticCmd} init + ''; + }) + ) config.services.restic.backups; + systemd.timers = + mapAttrs' (name: backup: nameValuePair "restic-backups-${name}" { + wantedBy = [ "timers.target" ]; + timerConfig = backup.timerConfig; + }) config.services.restic.backups; + }; +} From e5e8a85555d07302951daebced443104b1e73adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 11:52:24 +0100 Subject: [PATCH 482/538] xfstests: 2017-07-16 -> 2018-04-11 --- pkgs/tools/misc/xfstests/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 6904f43d8469..e6c67ddb9bb8 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -3,16 +3,20 @@ , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { - name = "xfstests-2017-07-16"; + name = "xfstests-2018-04-11"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "c3893c2dc623a07b1ace8e72ee4beb29f8bfae15"; - sha256 = "1p42dakry4r2366hdgj4i1wcnjs4qk0bfmyr70r1n7s7ykvnvnrl"; + rev = "fdf6d4bc862bb3269c95986fdaf1c59271762ad6"; + sha256 = "16j1kcmj0xq6s2qw4hll5r5cz7q4vbbsy2nh1g5aaq7xsl3h8mhb"; }; - nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = [ acl attr gawk libaio libuuid libxfs openssl perl ]; + nativeBuildInputs = [ + autoconf automake libtool + ]; + buildInputs = [ + acl attr gawk libaio libuuid libxfs openssl perl + ]; hardeningDisable = [ "format" ]; enableParallelBuilding = true; From 848a5aded6e1fd450ea7887f571465036d7969a7 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 21 Sep 2017 00:18:01 +0200 Subject: [PATCH 483/538] gem-config: include do_sqlite3 --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 7a31cf0cbbc8..a447cd1a1032 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -96,6 +96,10 @@ in ''; }; + do_sqlite3 = attrs: { + buildInputs = [ sqlite ]; + }; + eventmachine = attrs: { buildInputs = [ openssl ]; }; From c6ce9c3c26ec122c545c22087010abbb02598cd3 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 21 Apr 2018 13:22:29 +0200 Subject: [PATCH 484/538] mopidy-iris: 3.16.3 -> 3.17.1 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 1c8b0af70e43..f3a9b73aabe5 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.16.3"; + version = "3.17.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zdlvrqlj1hapaxnskrbp9idziy3rcxhpqhw3x4q25cjbl8m0b0d"; + sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq"; }; propagatedBuildInputs = [ From 680b16ee86a82705a4cc53cd243c1cdfdba33050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 13:06:23 +0100 Subject: [PATCH 485/538] peek: add ffmpeg to PATH --- pkgs/applications/video/peek/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 493cc66b8b39..728f6387ffa9 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook -, gsettings-desktop-schemas, gtk3, keybinder3 +, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg }: stdenv.mkDerivation rec { @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb"; }; + preConfigure = '' + gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]}) + ''; + nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; From 683eeab2993223bc6391d826691327c3c29e82c5 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 21 Apr 2018 12:51:20 +0200 Subject: [PATCH 486/538] openvpn: remove redundant timestamps from log output The systemd journal is already logging and showing timestamps --- nixos/modules/services/networking/openvpn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 7a96b673c51e..a418839d22b8 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -65,7 +65,7 @@ let path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; - serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --config ${configFile}"; + serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; serviceConfig.Restart = "always"; serviceConfig.Type = "notify"; }; From 4115237312597b1ae944d24670a028ee6c6ccfef Mon Sep 17 00:00:00 2001 From: John Mercier Date: Thu, 19 Apr 2018 22:15:40 -0400 Subject: [PATCH 487/538] jbake: wrap script Upstream script now uses JAVA_HOME. This change wraps the script so JAVA_HOME is set. --- pkgs/development/tools/jbake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 058ed1c82b96..f4fb1b5a9e9c 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre }: +{ stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { version = "2.6.1"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0zlh2azmv8gj3c4d4ndivar31wd42nmvhxq6xhn09cib9kffxbc7"; }; - buildInputs = [ jre ]; + buildInputs = [ makeWrapper jre ]; installPhase = '' - substituteInPlace bin/jbake --replace "java" "${jre}/bin/java" mkdir -p $out cp -vr * $out + wrapProgram $out/bin/jbake --set JAVA_HOME "${jre}" ''; meta = with stdenv.lib; { From 23aaf1cf97c24b40c859dfec53a4d92a907c182c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 12 Apr 2018 23:36:29 +0200 Subject: [PATCH 488/538] dwarf-fortress: 0.44.05 -> 0.44.09 --- pkgs/games/dwarf-fortress/dfhack/default.nix | 6 +++--- pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 4 ++-- pkgs/games/dwarf-fortress/game.nix | 6 +++--- pkgs/games/dwarf-fortress/soundsense.nix | 2 +- pkgs/games/dwarf-fortress/themes/cla.nix | 2 +- pkgs/games/dwarf-fortress/themes/phoebus.nix | 6 +++--- pkgs/games/dwarf-fortress/unfuck.nix | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index e716bdcbb026..641676489ed9 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -4,13 +4,13 @@ }: let - dfVersion = "0.44.05"; - version = "${dfVersion}-r2"; + dfVersion = "0.44.09"; + version = "${dfVersion}-r1"; rev = "refs/tags/${version}"; sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9"; # revision of library/xml submodule - xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; + xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index aaef90954b12..29cc2dc62857 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "39.2.1"; + version = "39.3.1"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "1dgcn1a4sz649kj94ldqy4ms7zhwpaj3q4r86b0yfh6dda8jzlgp"; + sha256 = "0vb0dg1r833gaa4jzlrxf9acn41az3xjs9alx7r9lkqwvkjyrdy2"; }; outputs = [ "out" "layouts" ]; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 8a85578172a9..79dd46c21919 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -4,7 +4,7 @@ let baseVersion = "44"; - patchVersion = "05"; + patchVersion = "09"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; platform = @@ -12,8 +12,8 @@ let else if stdenv.system == "i686-linux" then "linux32" else throw "Unsupported platform"; sha256 = - if stdenv.system == "x86_64-linux" then "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3" - else if stdenv.system == "i686-linux" then "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr" + if stdenv.system == "x86_64-linux" then "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy" + else if stdenv.system == "i686-linux" then "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8" else throw "Unsupported platform"; in diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index def3a09a4ba6..67c86f7f745c 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.44.05"; + dfVersion = "0.44.09"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 7c3eb0b63e3d..c7d85c48ce8e 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.05"; + passthru.dfVersion = "0.44.09"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index d94902719204..8641e15fa864 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "44.05"; + version = "44.07"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "06mhr6dpbvwp9dxn70kyr6dwyql2k6x5zba2zf6awjah7idys0xr"; + sha256 = "114yc0s7j57i4rq6iq295gggbgzx4qb389xip8lkzfg4dnp6klns"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.05"; + passthru.dfVersion = "0.44.09"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 89e98f4b4518..fc42c05f0701 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,7 +3,7 @@ , ncurses, glib, gtk2, libsndfile, zlib }: -let dfVersion = "0.44.05"; in +let dfVersion = "0.44.09"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; From 996238e532a0df555c8bc75534d3bfe34d996899 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 12 Apr 2018 23:37:30 +0200 Subject: [PATCH 489/538] webkitgtk: 2.20.0 -> 2.20.1 --- pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 27524504872e..3cc26b512c89 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.20.0"; + version = "2.20.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp"; + sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23"; }; patches = optionals stdenv.isDarwin [ From dcf7e63f377f6ba36252e8e6f5754f8d1412f534 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 12 Apr 2018 23:37:52 +0200 Subject: [PATCH 490/538] i2p: 0.9.33 -> 0.9.34 --- pkgs/tools/networking/i2p/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 58533f683e71..e2049967e889 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.33"; + name = "i2p-0.9.34"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1hlildi34p34xgpm0gqh09r2jb6nsa7a52gr074r6203xkl2racw"; + sha256 = "1b3qw096b9i55izvrh2793sbg0ikvihfi6k15sz2pzmjn30hy37l"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; From 2b29e401531306d044f797a5dfaeed86f5394085 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 21 Apr 2018 13:10:41 +0200 Subject: [PATCH 491/538] chromium: 65.0.3325.181 -> 66.0.3359.117 Critical CVE-2018-6085: Use after free in Disk Cache. Reported by Ned Williamson on 2018-03-28 Critical CVE-2018-6086: Use after free in Disk Cache. Reported by Ned Williamson on 2018-03-30 High CVE-2018-6087: Use after free in WebAssembly. Reported by Anonymous on 2018-02-20 High CVE-2018-6088: Use after free in PDFium. Reported by Anonymous on 2018-03-15 High CVE-2018-6089: Same origin policy bypass in Service Worker. Reported by Rob Wu on 2018-02-04 High CVE-2018-6090: Heap buffer overflow in Skia. Reported by ZhanJia Song on 2018-03-12 High CVE-2018-6091: Incorrect handling of plug-ins by Service Worker. Reported by Jun Kokatsu (@shhnjk) on 2017-10-05 High CVE-2018-6092: Integer overflow in WebAssembly. Reported by Natalie Silvanovich of Google Project Zero on 2018-03-08 Medium CVE-2018-6093: Same origin bypass in Service Worker. Reported by Jun Kokatsu (@shhnjk) on 2017-11-01 Medium CVE-2018-6094: Exploit hardening regression in Oilpan. Reported by Chris Rohlf on 2016-08-01 Medium CVE-2018-6095: Lack of meaningful user interaction requirement before file upload. Reported by Abdulrahman Alqabandi (@qab) on 2016-08-11 Medium CVE-2018-6096: Fullscreen UI spoof. Reported by WenXu Wu of Tencent's Xuanwu Lab on 2017-10-19 Medium CVE-2018-6097: Fullscreen UI spoof. Reported by xisigr of Tencent's Xuanwu Lab on 2018-01-26 Medium CVE-2018-6098: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-01-03 Medium CVE-2018-6099: CORS bypass in ServiceWorker. Reported by Jun Kokatsu (@shhnjk) on 2018-02-03 Medium CVE-2018-6100: URL spoof in Omnibox. Reported by Lnyas Zhang on 2018-02-11 Medium CVE-2018-6101: Insufficient protection of remote debugging prototol in DevTools . Reported by Rob Wu on 2018-02-19 Medium CVE-2018-6102: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-02-20 Medium CVE-2018-6103: UI spoof in Permissions. Reported by Khalil Zhani on 2018-02-24 Medium CVE-2018-6104: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-03-08 Medium CVE-2018-6105: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-01-18 Medium CVE-2018-6106: Incorrect handling of promises in V8. Reported by lokihardt of Google Project Zero on 2018-01-25 Medium CVE-2018-6107: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-02-02 Medium CVE-2018-6108: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-02-27 Low CVE-2018-6109: Incorrect handling of files by FileAPI. Reported by Dominik Weber (@DoWeb_) on 2017-04-10 Low CVE-2018-6110: Incorrect handling of plaintext files via file:// . Reported by Wenxiang Qian (aka blastxiang) on 2017-10-24 Low CVE-2018-6111: Heap-use-after-free in DevTools. Reported by Khalil Zhani on 2017-11-02 Low CVE-2018-6112: Incorrect URL handling in DevTools. Reported by Rob Wu on 2017-12-29 Low CVE-2018-6113: URL spoof in Navigation. Reported by Khalil Zhani on 2018-01-25 Low CVE-2018-6114: CSP bypass. Reported by Lnyas Zhang on 2018-02-13 Low CVE-2018-6115: SmartScreen bypass in downloads. Reported by James Feher on 2018-03-07 Low CVE-2018-6116: Incorrect low memory handling in WebAssembly. Reported by Jin from Chengdu Security Response Center of Qihoo 360 Technology Co. Ltd. on 2018-03-15 Low CVE-2018-6117: Confusing autofill settings. Reported by Spencer Dailey on 2018-03-15 Low CVE-2018-6084: Incorrect use of Distributed Objects in Google Software Updater on MacOS. Reported by Ian Beer of Google Project Zero on 2018-03-15 --- .../networking/browsers/chromium/common.nix | 29 ++---- ...aybackImageProvider-copy-constructor.patch | 89 ------------------- .../browsers/chromium/upstream-info.nix | 18 ++-- 3 files changed, 15 insertions(+), 121 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 44310b054628..b591d5d7ba0c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -144,29 +144,7 @@ let # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optionals (versionRange "65" "66") [ - (gentooPatch "chromium-stdint.patch" "037gjnc8h087g6dpxz53nqvzbpa9mq0z47h25vix9p62s9nhz2a8") - (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") - (gentooPatch "chromium-math.h-r0.patch" "0dlzbdj0lvp9qklgifsvgbn6p1ppxbl3hkwqqqfsw1d9jka9wy8x") - # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled - # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 - (githubPatch "1517db71cccaec48a05cdf30208e0cba7ab9b9a8" "08ac502cwwb05ml3w4wzn66i5c2d1h22xs5rzszwlnhxckxfc0fk") - # GCC 7 fixes - (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv") - (githubPatch "4d8468a07f374c11425494271256151fb6fe0c34" "0kqqq8kj0zv5bi1n9mm0vnn8wsgi98mjmj7snpav21fh3pgiqjrm") - (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj") - (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj") - # Following commit doesn't apply cleanly to stable branch, replace with handcrafted one - #(githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") - ./patches/PlaybackImageProvider-copy-constructor.patch - # * base/optional.h - (githubPatch "f1c8789c71dbdaeeef98ecd52c9715495824e6b0" "0w3d82s10cl10r6zq9vpsscmdhbdkcy0vbdiqy5pvbr031nfxw5w") - (githubPatch "5cae9645215d02cb1f986a181a208f8a4817fc86" "052y0f9nwq6y6jh2gvr1pm8qdcqghyi3jj5svvrp5aqirlkwb7ri") - # * ConfigurationPolicyProviders - (githubPatch "1ee888aed9f9a6291570ce360bcdd2d06bcc68cb" "1bm34p3bsny44sk60j842ghhhx8qaibwpqnfnyndfj96f7nb2az0") - (githubPatch "76da73abaeede740fc97479c09c92a52972bc477" "03rkf514ddj9d32d3zfcnf96kzzdk6cwxvrqj8acyv93vp1hvckr") - #(gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optionals (versionRange "66" "67") [ + ] ++ optionals (versionRange "66" "67") [ (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4") # GCC 7 fixes @@ -176,6 +154,11 @@ let (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") + (fetchpatch { + ## see https://groups.google.com/a/chromium.org/forum/#!msg/chromium-packagers/So-ojMYOQdI/K66hndtdCAAJ + url = "https://bazaar.launchpad.net/~chromium-team/chromium-browser/bionic-stable/download/head:/addmissingblinktools-20180416203514-02f50sz15c2mn6ei-1/add-missing-blink-tools.patch"; + sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; + }) ] ++ optional enableWideVine ./patches/widevine.patch ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [ ./patches/skia_buildfix.patch diff --git a/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch b/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch deleted file mode 100644 index a9b70ac50863..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/PlaybackImageProvider-copy-constructor.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/cc/raster/playback_image_provider.cc -+++ b/cc/raster/playback_image_provider.cc -@@ -20,7 +20,7 @@ - PlaybackImageProvider::PlaybackImageProvider( - ImageDecodeCache* cache, - const gfx::ColorSpace& target_color_space, -- base::Optional settings) -+ base::Optional&& settings) - : cache_(cache), - target_color_space_(target_color_space), - settings_(std::move(settings)) { -@@ -70,7 +70,10 @@ - } - - PlaybackImageProvider::Settings::Settings() = default; --PlaybackImageProvider::Settings::Settings(const Settings& other) = default; -+PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) = -+ default; - PlaybackImageProvider::Settings::~Settings() = default; -+PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=( -+ PlaybackImageProvider::Settings&&) = default; - - } // namespace cc ---- a/cc/raster/playback_image_provider.h -+++ b/cc/raster/playback_image_provider.h -@@ -20,8 +20,10 @@ - public: - struct CC_EXPORT Settings { - Settings(); -- Settings(const Settings& other); -+ Settings(const Settings&) = delete; -+ Settings(Settings&&); - ~Settings(); -+ Settings& operator=(Settings&&); - - // The set of image ids to skip during raster. - PaintImageIdFlatSet images_to_skip; -@@ -34,7 +36,7 @@ - // If no settings are provided, all images are skipped during rasterization. - PlaybackImageProvider(ImageDecodeCache* cache, - const gfx::ColorSpace& target_color_space, -- base::Optional settings); -+ base::Optional&& settings); - ~PlaybackImageProvider() override; - - PlaybackImageProvider(PlaybackImageProvider&& other); ---- a/cc/raster/playback_image_provider_unittest.cc -+++ b/cc/raster/playback_image_provider_unittest.cc -@@ -84,7 +84,8 @@ TEST(PlaybackImageProviderTest, SkipsSomeImages) { - settings.emplace(); - settings->images_to_skip = {skip_image.stable_id()}; - -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - provider.BeginRaster(); - - SkIRect rect = SkIRect::MakeWH(10, 10); -@@ -100,7 +101,8 @@ TEST(PlaybackImageProviderTest, RefAndUnrefDecode) { - - base::Optional settings; - settings.emplace(); -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - provider.BeginRaster(); - - { -@@ -133,7 +135,8 @@ TEST(PlaybackImageProviderTest, AtRasterImages) { - settings.emplace(); - settings->at_raster_images = {draw_image1, draw_image2}; - -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - - EXPECT_EQ(cache.refed_image_count(), 0); - provider.BeginRaster(); -@@ -158,7 +161,8 @@ TEST(PlaybackImageProviderTest, SwapsGivenFrames) { - settings.emplace(); - settings->image_to_current_frame_index = image_to_frame; - -- PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings); -+ PlaybackImageProvider provider(&cache, gfx::ColorSpace(), -+ std::move(settings)); - provider.BeginRaster(); - - SkIRect rect = SkIRect::MakeWH(10, 10); - diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e30ec4228c8a..d55cc12c165a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "18dampi62wwvscywvdz8lil0zhxdr4p6bhr4yv08arz029w356lc"; - sha256bin64 = "129jq8ynj4y81rhzxyyfcfpllq3a6ddhiy766zw28s7d43q4zca2"; - version = "66.0.3359.45"; + sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; + sha256bin64 = "067gpmiwnpdaqarkz740plg0ixpp7642xf4qqkq32w9v8flx3y57"; + version = "66.0.3359.117"; }; dev = { - sha256 = "09x7p83p188ms0awxj3kl9kdx796ns6m42smqd3jccnljx54jls2"; - sha256bin64 = "1aa24gvbf9awm59n05jkb4wy6ssr7fns4rl1hd2c66cq2d4mx3d8"; - version = "67.0.3377.1"; + sha256 = "0058g5dm5nfm7wdpd9y4fn0dmi8bq013l0ky5fsn4j7msm55rrg5"; + sha256bin64 = "1ag8kg3jjv6jsxdjq33h4ksqhhhfaz5aqw9jaaqhfma908c5mc9y"; + version = "67.0.3396.10"; }; stable = { - sha256 = "11w6wg862ixbgm7dpqag2lmbjknv83zlr9imd8zchvmrqr468rlk"; - sha256bin64 = "0r14w94aa7zg2i3zjpwvb7d6fg9yg0xkki7jzcpjmzwygy78fs16"; - version = "65.0.3325.181"; + sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; + sha256bin64 = "1ycfq6pqk7a9kyqf2112agcxav360rxbqqdc1yil0qkmz51i9zdg"; + version = "66.0.3359.117"; }; } From 1ca71377f3442ac9e24ad1716fcb85f29b3c8e74 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 21 Apr 2018 15:31:16 +0200 Subject: [PATCH 492/538] jasper: include cve name in patch for auto-detection in vulnix --- pkgs/development/libraries/jasper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 6c9ea32d518a..d374c935a2a4 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; patches = [ - # Fixes CVE-2018-9055 (fetchpatch { + name = "CVE-2018-9055.patch"; url = "http://paste.opensuse.org/view/raw/330751ce"; sha256 = "0m798m6c4v9yyhql7x684j5kppcm6884n1rrb9ljz8p9aqq2jqnm"; }) From 931b8aded1fc7354df5f1e21249a25dec6b3d913 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 21 Apr 2018 15:32:15 +0200 Subject: [PATCH 493/538] calibre: 3.21.0 -> 3.22.1 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 50395c9c1d00..479aa26a19ea 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.21.0"; + version = "3.22.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0nd9lv7armmkjwxjhs5mhsksvig5n435kww1dy9fq5hxg7nkq5ip"; + sha256 = "1nd8pbcfpfw9b26511mhvsvjyfmgnfpdmzwhi7wpkx36wpa4sask"; }; patches = [ From 6ccc17f26bdb1b9943830301140c9ff9fa2eb5d9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 21 Apr 2018 15:42:44 +0200 Subject: [PATCH 494/538] cyrus-sasl: use cve tag in patchname for vulnix auto-detection --- pkgs/development/libraries/cyrus-sasl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 68398e93764c..7a9e3991aadb 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 - (fetchpatch { # CVE-2013-4122 + (fetchpatch { + name = "CVE-2013-4122.patch"; url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff"; sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2"; }) From 3d1976b083354c4bf0bce1243d73c607784b807a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 21 Apr 2018 15:48:27 +0200 Subject: [PATCH 495/538] pdf2djvu: 0.9.8 -> 0.9.9 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 9a7dac0a0ca1..23ec4521729b 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.9.8"; + version = "0.9.9"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; - sha256 = "0kc3n4lm9dd13w66ng7l637ha241q89xrv9da0wzsdg6v0gp6ifg"; + sha256 = "0v1his9ph04dllzyxkirc8kd23l41qc41bwg9bfsbzkri16b7xik"; }; nativeBuildInputs = [ pkgconfig ]; From 82f70b63c0c878669091103585598331dcbc6a81 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 21 Apr 2018 11:25:22 -0400 Subject: [PATCH 496/538] gradle: 4.6 -> 4.7 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 5e8f14c5f843..fbbddbd0fcbc 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.6"; + name = "gradle-4.7"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "05drn7a9d2blbmd3l0443bpf5qzf5frwnl9ww0bha1qfng95zgcq"; + sha256 = "016vvjvk3gfasv3h6dxxp48kp9v4ariqj280bijn835mr1yhi9gw"; }; }; From ba8ef6184c8af4ae19cfbbbac27e725cb8c6cd20 Mon Sep 17 00:00:00 2001 From: bfortz Date: Sat, 21 Apr 2018 19:33:13 +0200 Subject: [PATCH 497/538] minergate: init at 8.1 (#39302) --- maintainers/maintainer-list.nix | 5 +++ pkgs/applications/misc/minergate/default.nix | 39 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/misc/minergate/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fbeed6cdcd25..e6a89f93acc5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -587,6 +587,11 @@ github = "bergey"; name = "Daniel Bergey"; }; + bfortz = { + email = "bernard.fortz@gmail.com"; + github = "bfortz"; + name = "Bernard Fortz"; + }; bgamari = { email = "ben@smart-cactus.org"; github = "bgamari"; diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix new file mode 100644 index 000000000000..acf0731f0aeb --- /dev/null +++ b/pkgs/applications/misc/minergate/default.nix @@ -0,0 +1,39 @@ +{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + version = "8.1"; + name = "minergate-${version}"; + src = fetchurl { + url = "https://minergate.com/download/ubuntu"; + sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + pgm=$out/opt/minergate/minergate + + interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + patchelf --set-interpreter "$interpreter" $pgm + + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" + + rm $out/usr/bin/minergate + mkdir -p $out/bin + ln -s $out/opt/minergate/minergate $out/bin + ''; + + meta = with stdenv.lib; { + description = "Minergate CPU/GPU mining software"; + homepage = https://www.minergate.com/; + license = licenses.unfree; + maintainers = with maintainers; [ bfortz ]; + platforms = [ "x86_64-linux" ]; +}; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f7f33a6804d..b575c9c4a974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3285,6 +3285,8 @@ with pkgs; memtester = callPackage ../tools/system/memtester { }; + minergate = callPackage ../applications/misc/minergate { }; + minidlna = callPackage ../tools/networking/minidlna { }; minisign = callPackage ../tools/security/minisign { }; From 14a119e1986cb6d60aef754561f9bbb36729fa43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 18:50:58 +0100 Subject: [PATCH 498/538] rustc: disable test on i686 They run out of memory and lead to failing tests. fixes #39110 --- pkgs/development/compilers/rust/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index f47c1f753ee1..f191515b745c 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -20,10 +20,11 @@ in rec { configureFlags = [ "--release-channel=stable" ]; - # Upstream is not running tests on aarch64: + # 1. Upstream is not running tests on aarch64: # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 # So we do the same. - doCheck = !stdenv.isAarch64; + # 2. Tests run out of memory for i686 + doCheck = !stdenv.isAarch64 && !stdenv.isi686; patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch From 0964410b2893a505c88bc867b1b76e046165890c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 20:13:13 +0100 Subject: [PATCH 499/538] altcoins.memorycoind: restrict to linux x86_64 --- pkgs/applications/altcoins/memorycoin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index b9335dbabe52..944c82250d47 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ AndersonTorres ]; license = licenses.mit; - platforms = subtractLists [ "aarch64-linux" ] platforms.unix; + platforms = [ "x86_64-linux" ]; }; } From b1d4962d67ec7db912f6647764097e637a9dddee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 20:23:15 +0100 Subject: [PATCH 500/538] perlPackages.MNI-Perllib: use callPackage instead of import --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e60a4b847584..e9d6cd97bc8c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9634,9 +9634,7 @@ let self = _self // overrides; _self = with self; { }; }; - MNI-Perllib = import ../development/perl-modules/MNI { - inherit buildPerlPackage fetchFromGitHub stdenv perl; - }; + MNI-Perllib = pkgs.callPackage ../development/perl-modules/MNI {}; Mo = buildPerlPackage rec { name = "Mo-0.40"; @@ -16254,7 +16252,8 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ bcdarwin ]; }; - + }; + TextGerman = buildPerlPackage rec { name = "Text-German-0.06"; src = fetchurl { From f5b3f9962e7c9e1f2413bc591231f004d2481941 Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Sun, 22 Apr 2018 03:37:56 +0800 Subject: [PATCH 501/538] cocoapods: init at 1.3.1 (#32583) * cocoapods: init at 1.3.1 * requires xcode --- pkgs/development/mobile/cocoapods/Gemfile | 2 + .../development/mobile/cocoapods/Gemfile.lock | 74 ++++++ pkgs/development/mobile/cocoapods/default.nix | 17 ++ pkgs/development/mobile/cocoapods/gemset.nix | 234 ++++++++++++++++++ pkgs/development/mobile/cocoapods/update | 10 + pkgs/top-level/all-packages.nix | 2 + 6 files changed, 339 insertions(+) create mode 100644 pkgs/development/mobile/cocoapods/Gemfile create mode 100644 pkgs/development/mobile/cocoapods/Gemfile.lock create mode 100644 pkgs/development/mobile/cocoapods/default.nix create mode 100644 pkgs/development/mobile/cocoapods/gemset.nix create mode 100755 pkgs/development/mobile/cocoapods/update diff --git a/pkgs/development/mobile/cocoapods/Gemfile b/pkgs/development/mobile/cocoapods/Gemfile new file mode 100644 index 000000000000..8308684860e6 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cocoapods' diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock new file mode 100644 index 000000000000..0ab15f1efd2f --- /dev/null +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -0,0 +1,74 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.6) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + claide (1.0.2) + cocoapods (1.3.1) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.3.1) + cocoapods-deintegrate (>= 1.0.1, < 2.0) + cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.2.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.5.7) + nap (~> 1.0) + ruby-macho (~> 1.1) + xcodeproj (>= 1.5.1, < 2.0) + cocoapods-core (1.3.1) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.1) + cocoapods-downloader (1.1.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.3.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.0.5) + escape (0.0.4) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.0.3) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + minitest (5.10.3) + molinillo (0.5.7) + nanaimo (0.2.3) + nap (1.1.0) + netrc (0.11.0) + ruby-macho (1.1.0) + thread_safe (0.3.6) + tzinfo (1.2.4) + thread_safe (~> 0.1) + xcodeproj (1.5.3) + CFPropertyList (~> 2.3.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.3) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix new file mode 100644 index 000000000000..56624370b14a --- /dev/null +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "cocoapods"; + gemdir = ./.; + + meta = with lib; { + description = "CocoaPods manages dependencies for your Xcode projects."; + homepage = https://github.com/CocoaPods/CocoaPods; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ + peterromfeldhk + ]; + }; +} diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix new file mode 100644 index 000000000000..ff7b14e6dd8a --- /dev/null +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -0,0 +1,234 @@ +{ + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + type = "gem"; + }; + version = "4.2.10"; + }; + CFPropertyList = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; + type = "gem"; + }; + version = "2.3.6"; + }; + claide = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + type = "gem"; + }; + version = "1.0.2"; + }; + cocoapods = { + dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050b7795jc6802wcpcgi702qkgy8vjidgq6c6mbx2alrq7l0n8q7"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-core = { + dependencies = ["activesupport" "fuzzy_match" "nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pr42lpqs6q51gnnfxmgmbx7sw0dwyawylssj588izj8av18rhpy"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-deintegrate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x4hxlip6zkrs1vcmw7sh45ayn5pxvsg782iifnmgjwn2pyskj7l"; + type = "gem"; + }; + version = "1.0.1"; + }; + cocoapods-downloader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1664qg1wml70slcfklpnyq5ixp145f6iyn3c6pcqkqc64i1bsg87"; + type = "gem"; + }; + version = "1.1.3"; + }; + cocoapods-plugins = { + dependencies = ["nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16na82sfyc8801qs1n22nwq486s4j7yj6rj7fcp8cbxmj371fpbj"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-search = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-stats = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-trunk = { + dependencies = ["nap" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0shxr64j7f50yglp5l90vr1ba5p9pkk0a3b8apkbci2lmq5kq60b"; + type = "gem"; + }; + version = "1.3.0"; + }; + cocoapods-try = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + type = "gem"; + }; + version = "1.1.0"; + }; + colored2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + escape = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4"; + type = "gem"; + }; + version = "0.0.4"; + }; + fourflusher = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + type = "gem"; + }; + version = "2.0.1"; + }; + fuzzy_match = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm"; + type = "gem"; + }; + version = "2.0.4"; + }; + gh_inspector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + type = "gem"; + }; + version = "1.0.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s"; + type = "gem"; + }; + version = "0.9.1"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2"; + type = "gem"; + }; + version = "5.10.3"; + }; + molinillo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758"; + type = "gem"; + }; + version = "0.5.7"; + }; + nanaimo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + type = "gem"; + }; + version = "0.2.3"; + }; + nap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; + type = "gem"; + }; + version = "1.1.0"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + ruby-macho = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9vkz3ki3yvps4z1hca2q2axniq95x4yypnc22p9pcfjdfrbrq6"; + type = "gem"; + }; + version = "1.1.0"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; + type = "gem"; + }; + version = "1.2.4"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; + type = "gem"; + }; + version = "1.5.3"; + }; +} \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update new file mode 100755 index 000000000000..58a7bd4a4539 --- /dev/null +++ b/pkgs/development/mobile/cocoapods/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -rf ~/.gem +fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95d83af3aaf5..ab3a0fb9637f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1779,6 +1779,8 @@ with pkgs; cloud-utils = callPackage ../tools/misc/cloud-utils { }; + cocoapods = callPackage ../development/mobile/cocoapods { }; + compass = callPackage ../development/tools/compass { }; conda = callPackage ../tools/package-management/conda { }; From d79df63ea2acd5b1a6f895d134c036305d852bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 20:57:22 +0100 Subject: [PATCH 502/538] cloudfoundry-cli: 6.32.0 -> 6.36.1 --- pkgs/development/tools/cloudfoundry-cli/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index fc085b3e5ea5..22c2f0774182 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -2,17 +2,17 @@ buildGoPackage rec { name = "cloudfoundry-cli-${version}"; - version = "6.32.0"; + version = "6.36.1"; goPackagePath = "code.cloudfoundry.org/cli"; subPackages = [ "." ]; src = fetchFromGitHub { + owner = "cloudfoundry"; + repo = "cli"; rev = "v${version}"; - owner = "cloudfoundry-attic"; - repo = "cli-with-i18n"; - sha256 = "16r8zvahn4b98krmyb8zq9370i6572dhz88bfxb3fnddcv6zy1ng"; + sha256 = "19inl7qs2acs59p3gnl5zdsxym0wp2rn05q0zfg7rwf5sjh68amp"; }; outputs = [ "out" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b56c0de69397..3b1d9e0b340a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7644,9 +7644,7 @@ with pkgs; cl-launch = callPackage ../development/tools/misc/cl-launch {}; - cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { - go = go_1_9; - }; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; coan = callPackage ../development/tools/analysis/coan { }; From 0a92fb93155f0b9fa5e95157dc0b8e96a0c4d118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 21:05:00 +0100 Subject: [PATCH 503/538] Revert "libupnp: 1.6.21 -> 1.8.3" This reverts commit ee45689f1430c564acda19efa5d2b12dd267cafb. 1.8.x branch break compatibility. This should become a new package instead. --- pkgs/development/libraries/pupnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 018a57ad0571..fd738faf5074 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libupnp-${version}"; - version = "1.8.3"; + version = "1.6.21"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; + sha256 = "07ksfhadinaa20542gblrxi9pqz0v6y70a836hp3qr4037id4nm9"; }; nativeBuildInputs = [ autoreconfHook ]; From 35eccff44e949e20da6ce5a0bb2c61189c52e5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 21:17:31 +0100 Subject: [PATCH 504/538] rdf4store: mark as broken --- pkgs/servers/http/4store/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix index 186b0790e4a1..664953ca34dc 100644 --- a/pkgs/servers/http/4store/default.nix +++ b/pkgs/servers/http/4store/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sed -e 's@#! */bin/bash@#! ${stdenv.shell}@' -i configure find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';' - rm src/utilities/4s-backend + rm src/utilities/4s-backend sed -e 's@/var/lib/4store@${db_dir}@g' -i configure.ac src/utilities/* sed -e '/FS_STORE_ROOT/d' -i src/utilities/Makefile* ''; @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = https://4store.danielknoell.de/; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + broken = true; # since 2018-04-11 }; } From 595efb966d38eb9480cf332adc0ffcb92855e685 Mon Sep 17 00:00:00 2001 From: berdario Date: Sat, 21 Apr 2018 21:30:24 +0100 Subject: [PATCH 505/538] hydra-eval-faliures: Print Dependency failures as well as direct failures and update to Python3 (#29760) * Print Dependency failures as well as direct failures and update to Python3 some package fail due to non-exposed dependencies and would thus not appear in the list, for example gcj * hydra-eval-failures: simpler hashbang --- maintainers/scripts/hydra-eval-failures.py | 33 +++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index d0bd1913ba8a..23669502e46d 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python -p pythonFull pythonPackages.requests pythonPackages.pyquery pythonPackages.click +#!nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests pyquery click ])' # To use, just execute this script with --help to display help. @@ -16,7 +16,7 @@ maintainers_json = subprocess.check_output([ 'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json' ]) maintainers = json.loads(maintainers_json) -MAINTAINERS = {v: k for k, v in maintainers.iteritems()} +MAINTAINERS = {v: k for k, v in maintainers.items()} def get_response_text(url): @@ -45,6 +45,17 @@ def get_maintainers(attr_name): except: return [] +def print_build(table_row): + a = pq(table_row)('a')[1] + print("- [ ] [{}]({})".format(a.text, a.get('href')), flush=True) + + maintainers = get_maintainers(a.text) + if maintainers: + print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))) + # TODO: print last three persons that touched this file + # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? + + sys.stdout.flush() @click.command() @click.option( @@ -73,23 +84,17 @@ def cli(jobset): # TODO: aborted evaluations # TODO: dependency failed without propagated builds + print('\nFailures:') for tr in d('img[alt="Failed"]').parents('tr'): - a = pq(tr)('a')[1] - print("- [ ] [{}]({})".format(a.text, a.get('href'))) + print_build(tr) - sys.stdout.flush() - - maintainers = get_maintainers(a.text) - if maintainers: - print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))) - # TODO: print last three persons that touched this file - # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? - - sys.stdout.flush() + print('\nDependency failures:') + for tr in d('img[alt="Dependency failed"]').parents('tr'): + print_build(tr) if __name__ == "__main__": try: cli() - except: + except Exception as e: import pdb;pdb.post_mortem() From 58253e37e9311b3eceefc4f2d82c32e92a1264a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 21:43:18 +0100 Subject: [PATCH 506/538] asc: fix build --- pkgs/games/asc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index e532fb75e0b9..6b7ead6d2030 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs -, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2, -libpng, libtiff, fluidsynth, libmikmod }: +, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2 +, libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: stdenv.mkDerivation rec { name = "asc-2.6.0.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng - libtiff fluidsynth libmikmod + libtiff fluidsynth libmikmod flac libvorbis libogg ]; meta = with stdenv.lib; { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { longDescription = '' Advanced Strategic Command is a free, turn based strategy game. It is designed in the tradition of the Battle Isle series from Bluebyte and is - currently available for Windows and Linux. + currently available for Windows and Linux. ''; homepage = http://www.asc-hq.org/; From f76c8427063db7e4d67c95eb8b03cf71949e4fd6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 20 Apr 2018 15:44:01 +0200 Subject: [PATCH 507/538] gpgme: 1.10.0 -> 1.11.1 I've rebuild all packages that depend on gpgme and everything seems fine so far (there are a few failures but the ones I've checked are unrelated to gpgme). Upstream release notes (Noteworthy changes in version 1.11.1): * Fixed build problems in the 1.11.0 release. * Added C++ interfaces which were planned for 1.11.0. The 1.11.0 release came with these changes: * New encryption API to support direct key specification including hidden recipients option and taking keys from a file. This also allows to enforce the use of a subkey. * New encryption flag for the new API to enforce the use of plain mail addresses (addr-spec). * The import API can now tell whether v3 keys are skipped. These old and basically broken keys are not anymore supported by GnuPG 2.1. * The decrypt and verify API will now return the MIME flag as specified by RFC-4880bis. * The offline mode now has an effect on gpg by disabling all network access. [#3831] * A failed OpenPGP verification how returns the fingerprint of the intended key if a recent gpg version was used for signature creation. * New tool gpgme-json as native messaging server for web browsers. As of now public key encryption and decryption is supported. Requires Libgpg-error 1.29. * New context flag "request-origin" which has an effect when used with GnuPG 2.2.6 or later. * New context flag "no-symkey-cache" which has an effect when used with GnuPG 2.2.7 or later. * New convenience constant GPGME_KEYLIST_MODE_LOCATE. * Improved the Python documentation. * Fixed a potential regression with GnuPG 2.2.6 or later. * Fixed a crash in the Python bindings on 32 bit platforms. [#3892] * Various minor fixes. --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 68762e344bdb..94c09b716832 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let inherit (stdenv) lib system; in stdenv.mkDerivation rec { name = "gpgme-${version}"; - version = "1.10.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "14q619lxbk64vz7lih5gjb928qm28jrnn1h3yhsrrff3jw8yv3qs"; + sha256 = "0vxx5xaag3rhp4g2arp5qm77gvz4kj0m3hnpvhkdvqyjfhbi26rd"; }; outputs = [ "out" "dev" "info" ]; From 355d39c02c532128a3db7c126d807080b74a0322 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 21 Apr 2018 23:58:03 +0200 Subject: [PATCH 508/538] lf: 2 -> 3 --- pkgs/tools/misc/lf/default.nix | 4 ++-- pkgs/tools/misc/lf/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 8ef5bd1c07cf..b78bb977dbcb 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "2"; + version = "3"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0g9fy6x3wc5hda886ci79wj7rnjwvaidbwhsrckqgiqymbzvrdb8"; + sha256 = "1w4nly8g1p28ixq1vjg7qv07mb1vryys7cf6b7jdb523swra6a97"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index ec9dc30e0cd6..35becb002636 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "e2050e41c8847748ec5288741c0b19a8cb26d084"; # master - sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s"; + rev = "7cbfaac9e282b3ea0cefeddc67b2c3ed3aaf97bc"; # master + sha256 = "0pb5p8q2x31aqs307lla75mm1a01mr2qyqxsfqix1pgwg16xbad8"; }; } { From c6e575cd5b3d63ef6aeebd24fee691af7e1c54ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Apr 2018 15:15:12 -0700 Subject: [PATCH 509/538] gegl_0_3: 0.3.30 -> 0.3.34 (#39241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gegl/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2w7m19f387zkwhxbv6k2p8nrrlwqimpn-gegl-0.3.34/bin/gegl -h’ got 0 exit code - ran ‘/nix/store/2w7m19f387zkwhxbv6k2p8nrrlwqimpn-gegl-0.3.34/bin/gegl --help’ got 0 exit code - found 0.3.34 with grep in /nix/store/2w7m19f387zkwhxbv6k2p8nrrlwqimpn-gegl-0.3.34 - directory tree listing: https://gist.github.com/96c792a5cd60943effce7884fc50cc3a --- pkgs/development/libraries/gegl/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index fee630c32a81..161153b7e3dc 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -3,11 +3,11 @@ , libwebp, gnome3, libintl }: stdenv.mkDerivation rec { - name = "gegl-0.3.30"; + name = "gegl-0.3.34"; src = fetchurl { url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "0lg5j5kn24qvyb6fn7khxf3jadkacbpnb9nrqzy7w665s8xakd7q"; + sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw"; }; hardeningDisable = [ "format" ]; From 10124a474314afdfb0c9405e2f01198a869d1a23 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 22 Apr 2018 03:38:40 +0200 Subject: [PATCH 510/538] lcalc: init at 1.23 (#38796) --- .../libraries/science/math/lcalc/default.nix | 78 ++++++++++++ .../science/math/lcalc/makefile.patch | 113 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 193 insertions(+) create mode 100644 pkgs/development/libraries/science/math/lcalc/default.nix create mode 100644 pkgs/development/libraries/science/math/lcalc/makefile.patch diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix new file mode 100644 index 000000000000..90393cff001c --- /dev/null +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, fetchurl +, fetchpatch +, pari +}: + +stdenv.mkDerivation rec { + version = "1.23"; + pname = "lcalc"; + name = "${pname}-${version}"; + + src = fetchurl { + # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available + # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source + url = "http://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2"; + sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43"; + }; + + preConfigure = "cd src"; + + buildInputs = [ + pari + ]; + + patches = [ + # Port to newer pari + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/pari-2.7.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1x3aslldm8njjm7p9g9s9w2c91kphnci2vpkxkrcxfihw3ayss6c"; + }) + + # Uncomment the definition of lcalc_to_double(const long double& x). + # (Necessary for GCC >= 4.6.0, cf. https://trac.sagemath.org/ticket/10892) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/Lcommon.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0g4ybvsrcv48rmlh1xjnkms19jp25k58azv6ds1f2cm34hxs8fdx"; + }) + + # Include also in Lcommandline_numbertheory.h (at least required + # on Cygwin, cf. https://trac.sagemath.org/ticket/9845) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/time.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1brf04n11kkc43ylagf8dm32j5r2g9zv51dp5wag1mpm4p04l7cl"; + }) + + # Fix for gcc >4.6 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_1.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0i2yvxm5fx4z0v6m4srgh8rj98kijmlvyirlxf1ky0bp2si6bpka"; + }) + + # gcc 5.1 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_2.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vlh"; + }) + + # based on gentoos makefile patch -- fix paths, adhere to flags + ./makefile.patch + ]; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + makeFlags = [ + "PARI_DEFINE=-DINCLUDE_PARI" + "PARI_PREFIX=${pari}" + ]; + + meta = with stdenv.lib; { + homepage = http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html; + description = "A program for calculating with L-functions"; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch new file mode 100644 index 000000000000..f55bbe3f24fa --- /dev/null +++ b/pkgs/development/libraries/science/math/lcalc/makefile.patch @@ -0,0 +1,113 @@ +diff --git a/src/Makefile b/src/Makefile +index 84e4e88..56ca676 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -58,7 +58,7 @@ ifeq ($(G5),TRUE) + #MACHINE_SPECIFIC_FLAGS = -mpowerpc -mpowerpc64 -m64 + endif + +-CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) ++CCFLAGS = $(CXXFLAGS) $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) + #CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) + #CCFLAGS = -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) + +@@ -68,12 +68,12 @@ CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MA + + ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) + #location of pari.h. +- LOCATION_PARI_H = /usr/local/include/pari #usual location ++ LOCATION_PARI_H = $(PARI_PREFIX)/include/pari #usual location + + #location of libpari.a or of libpari.so + #depending on whether static or dynamic libraries are being used. + #On mac os x it's the former, on linux I think usually the latter. +- LOCATION_PARI_LIBRARY = /usr/local/lib #usual location ++ LOCATION_PARI_LIBRARY = $(PARI_PREFIX)/lib #usual location + else + #supplied as a dummy so as to avoid more ifeq's below + LOCATION_PARI_H = . +@@ -89,24 +89,24 @@ INCLUDEFILES= -I../include + + ifeq ($(OS_NAME),Darwin) + LDFLAGS2 = +- DYN_OPTION=dynamiclib ++ DYN_OPTION=-dynamiclib + else +- LDFLAGS1 = -Xlinker -export-dynamic #not sure why pari calls these when linking but on the web I found ++ LDFLAGS1 = #not sure why pari calls these when linking but on the web I found + #'Libtool provides the `-export-dynamic' link flag (see section Link mode), which does this declaration. + #You need to use this flag if you are linking a shared library that will be dlopened' + #see notes below + #ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) +- LDFLAGS2 = $(LDFLAGS1) -Xlinker -rpath -Xlinker $(LOCATION_PARI_LIBRARY) ++ LDFLAGS2 = $(LDFLAGS) + #else + # LDFLAGS2 = $(LDFLAGS1) + #endif +- DYN_OPTION=shared ++ DYN_OPTION=$(LDFLAGS) -shared -Wl,-soname,libLfunction.so + endif + + ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) +- LDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari ++ MYLDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari + else +- LDFLAGS = $(LDFLAGS2) ++ MYLDFLAGS = $(LDFLAGS2) + endif + + +@@ -129,7 +129,8 @@ endif + #become clear which libraries the computer can find. + + +-INSTALL_DIR= /usr/local ++INSTALL_DIR= $(DESTDIR) ++LIB_DIR ?=lib + + #object files for the libLfunction library + OBJ_L = Lglobals.o Lgamma.o Lriemannsiegel.o Lriemannsiegel_blfi.o Ldokchitser.o +@@ -141,9 +142,8 @@ OBJECTS = $(OBJ3) + + all: + # make print_vars +- make libLfunction.so +- make lcalc +- make examples ++ ${MAKE} libLfunction.so ++ ${MAKE} lcalc + # make find_L + # make test + +@@ -151,7 +151,7 @@ print_vars: + @echo OS_NAME = $(OS_NAME) + + lcalc: $(OBJECTS) +- $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(LDFLAGS) -o lcalc $(GMP_FLAGS) ++ $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(MYLDFLAGS) -o lcalc $(GMP_FLAGS) + + examples: + $(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so -o example_programs/example $(GMP_FLAGS) +@@ -262,15 +262,18 @@ Lcommandline.o: ../include/Lcommandline_values_zeros.h + + + libLfunction.so: $(OBJ_L) +- g++ -$(DYN_OPTION) -o libLfunction.so $(OBJ_L) ++ g++ $(DYN_OPTION) -o libLfunction.so $(OBJ_L) + + clean: + rm -f *.o lcalc libLfunction.so example_programs/example + + install: +- cp -f lcalc $(INSTALL_DIR)/bin/. +- cp -f libLfunction.so $(INSTALL_DIR)/lib/. +- cp -rf ../include $(INSTALL_DIR)/include/Lfunction ++ install -d $(INSTALL_DIR)/bin ++ install -d $(INSTALL_DIR)/$(LIB_DIR) ++ install -d $(INSTALL_DIR)/include/libLfunction ++ install lcalc $(INSTALL_DIR)/bin ++ install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR) ++ install -m 644 -t $(INSTALL_DIR)/include/libLfunction ../include/*.h + + + SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a844693fe3b..6566cf40e9ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19903,6 +19903,8 @@ with pkgs; docs = true; }; + lcalc = callPackage ../development/libraries/science/math/lcalc { }; + lrcalc = callPackage ../applications/science/math/lrcalc { }; lie = callPackage ../applications/science/math/LiE { }; From 1cf1b1e0f4250312a628f3899c699454b5dc9f1b Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 18:56:28 +0200 Subject: [PATCH 511/538] pythonPackages.flask-babel: init at 0.11.2 --- .../python-modules/flask-babel/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/flask-babel/default.nix diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix new file mode 100644 index 000000000000..1f4f914968f6 --- /dev/null +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, buildPythonPackage +, python +, fetchPypi +, flask +, Babel +, jinja2 +, pytz +, speaklater +}: + +buildPythonPackage rec { + pname = "Flask-Babel"; + version = "0.11.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0"; + }; + + propagatedBuildInputs = [ + flask + Babel + jinja2 + pytz + speaklater + ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with stdenv.lib; { + description = "Adds i18n/l10n support to Flask applications"; + longDescription = '' + Implements i18n and l10n support for Flask. + This is based on the Python babel module as well as pytz both of which are + installed automatically for you if you install this library. + ''; + license = licenses.bsd2; + maintainers = with maintainers; [ timokau ]; + homepage = https://github.com/python-babel/flask-babel; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93e821fb719d..200abae44c75 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5531,6 +5531,8 @@ in { flask_assets = callPackage ../development/python-modules/flask-assets { }; + flask-babel = callPackage ../development/python-modules/flask-babel { }; + flask_cache = buildPythonPackage rec { name = "Flask-Cache-0.13.1"; From 9897e959f372445e11a8d683e5de74d0be0f10d4 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 18:50:35 +0200 Subject: [PATCH 512/538] pythonPackages.flask-silk: init at 0.2 --- .../python-modules/flask-silk/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/flask-silk/default.nix diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix new file mode 100644 index 000000000000..e494f22a4762 --- /dev/null +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, flask +}: + +buildPythonPackage rec { + pname = "Flask-Silk"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gjzighx4f0w39sq9xvzr1kwb4y7yv9qrgzvli1p89gy16piz8l0"; + }; + + propagatedBuildInputs = [ + flask + ]; + + meta = with stdenv.lib; { + description = "Adds silk icons to your Flask application or module, or extension"; + license = licenses.bsd3; + maintainers = with maintainers; [ timokau ]; + homepage = https://github.com/sublee/flask-silk; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 200abae44c75..f0ffadc82d1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5582,6 +5582,8 @@ in { flask_script = callPackage ../development/python-modules/flask-script { }; + flask-silk = callPackage ../development/python-modules/flask-silk { }; + flask_sqlalchemy = buildPythonPackage rec { name = "Flask-SQLAlchemy-${version}"; version = "2.1"; From a037da9afe741c5197e1992f38d29d6bf4ee1e00 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 18:25:50 +0200 Subject: [PATCH 513/538] cypari2: init at 1.1.4 --- .../python-modules/cypari2/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/cypari2/default.nix diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix new file mode 100644 index 000000000000..fc3c311a5061 --- /dev/null +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, bootstrapped-pip +, buildPythonPackage +, python +, fetchPypi +, pari +, gmp +, cython +, cysignals +, six +}: + +buildPythonPackage rec { + pname = "cypari2"; + version = "1.1.4"; # remove six dependency on upgrade to >1.1.4 + + src = fetchPypi { + inherit pname version; + sha256 = "0n0mp8qmvvzmfaawg39d3mkyzf65q2zkz7bnqyk4sfjbz4xwc6mb"; + }; + + # This differs slightly from the default python installPhase in that it pip-installs + # "." instead of "*.whl". + # That is because while the default install phase succeeds to build the package, + # it fails to generate the file "auto_paridecl.pxd". + installPhase = '' + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + # install "." instead of "*.whl" + ${bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir . + ''; + + buildInputs = [ + pari + gmp + ]; + + propagatedBuildInputs = [ + cysignals + cython + six # after 1.1.4: will not be needed + ]; + + checkPhase = '' + make check + ''; + + meta = with stdenv.lib; { + description = "Cython bindings for PARI"; + license = licenses.gpl2; + maintainers = with maintainers; [ timokau ]; + homepage = https://github.com/defeo/cypari2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0ffadc82d1b..5b1877875344 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1190,6 +1190,8 @@ in { cysignals = callPackage ../development/python-modules/cysignals { }; + cypari2 = callPackage ../development/python-modules/cypari2 { }; + dlib = buildPythonPackage rec { inherit (pkgs.dlib) name src nativeBuildInputs meta; From 7dc6b2e3c35f916d431ba5c10e8f71e044de7f49 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 13:01:17 +0200 Subject: [PATCH 514/538] pynac: init at 0.7.19 --- .../science/math/pynac/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/science/math/pynac/default.nix diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix new file mode 100644 index 000000000000..fd566abd9a9a --- /dev/null +++ b/pkgs/applications/science/math/pynac/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, flint +, gmp +, python2 +, singular +}: + +stdenv.mkDerivation rec { + version = "0.7.19"; + name = "pynac-${version}"; + + src = fetchFromGitHub { + owner = "pynac"; + repo = "pynac"; + rev = "pynac-${version}"; + sha256 = "132bibvapm245c5xy29j3xmjs0pawvw7lv05374m8vv1m39127d3"; + }; + + buildInputs = [ + flint + gmp + singular + singular + python2 + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + meta = with stdenv.lib; { + description = "Python is Not a CAS -- modified version of Ginac"; + longDescription = '' + Pynac -- "Python is Not a CAS" is a modified version of Ginac that + replaces the depency of GiNaC on CLN by a dependency instead of Python. + It is a lite version of GiNaC as well, not implementing all the features + of the full GiNaC, and it is *only* meant to be used as a Python library. + ''; + homepage = http://pynac.org; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6566cf40e9ea..a3a0f572fd74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20280,6 +20280,8 @@ with pkgs; inherit (gnome3) gtksourceview; }; + pynac = callPackage ../applications/science/math/pynac { }; + singular = callPackage ../applications/science/math/singular { }; scilab = callPackage ../applications/science/math/scilab { From be0b8f2cf697dec85e0e849aadca9e8d1bcab68d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 12:26:50 +0200 Subject: [PATCH 515/538] palp: init at 2.1 --- .../science/math/palp/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/applications/science/math/palp/default.nix diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix new file mode 100644 index 000000000000..3484c369db3b --- /dev/null +++ b/pkgs/applications/science/math/palp/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, fetchurl +, dimensions ? 6 # works for <= dimensions dimensions, but is only optimized for that exact value +, doSymlink ? true # symlink the executables to the default location (without dimension postfix) +}: + +stdenv.mkDerivation rec { + version = "2.1"; + dim = toString dimensions; + name = "palp-${dim}d-${version}"; + + src = fetchurl { + url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; + sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs"; + }; + + hardeningDisable = [ "format" ]; + + preBuild = '' + echo Building PALP optimized for ${dim} dimensions + sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h + ''; + + installPhase = '' + mkdir -p "$out/bin" + for file in poly class cws nef mori; do + cp -p $file.x "$out/bin/$file-${dim}d.x" + done + '' + stdenv.lib.optionalString doSymlink '' + cd "$out/bin" + for file in poly class cws nef mori; do + ln -sf $file-6d.x $file.x + done + ''; + + meta = with stdenv.lib; { + description = "A Package for Analyzing Lattice Polytopes"; + longDescription = '' + A Package for Analyzing Lattice Polytopes (PALP) is a set of C + programs for calculations with lattice polytopes and applications to + toric geometry. + + It contains routines for vertex and facet enumeration, computation of + incidences and symmetries, as well as completion of the set of lattice + points in the convex hull of a given set of points. In addition, there + are procedures specialised to reflexive polytopes such as the + enumeration of reflexive subpolytopes, and applications to toric + geometry and string theory, like the computation of Hodge data and + fibration structures for toric Calabi-Yau varieties. The package is + well tested and optimised in speed as it was used for time consuming + tasks such as the classification of reflexive polyhedra in 4 + dimensions and the creation and manipulation of very large lists of + 5-dimensional polyhedra. + + While originally intended for low-dimensional applications, the + algorithms work in any dimension and our key routine for vertex and + facet enumeration compares well with existing packages. + ''; + homepage = http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html; + # Just a link on the website pointing to gpl -- now gplv3. When the last + # version was released that pointed to gplv2 however, so thats probably + # the right license. + license = licenses.gpl2; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3a0f572fd74..bda907901025 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20268,6 +20268,8 @@ with pkgs; gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {}; + palp = callPackage ../applications/science/math/palp { }; + ratpoints = callPackage ../applications/science/math/ratpoints {}; calc = callPackage ../applications/science/math/calc { }; From b93e1fbbfbb5d97fa90b269f9e77370e5766a314 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 11:33:26 +0200 Subject: [PATCH 516/538] jmol: init at 14.29.12 --- .../science/chemistry/jmol/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/science/chemistry/jmol/default.nix diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix new file mode 100644 index 000000000000..c85e1143d103 --- /dev/null +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchurl +, unzip +, jre +}: + +stdenv.mkDerivation rec { + version = "${baseVersion}.${patchVersion}"; + baseVersion = "14.29"; + patchVersion = "12"; + pname = "jmol"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; + sha256 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv"; + }; + + buildInputs = [ + jre + ]; + + installPhase = '' + mkdir -p "$out/share/jmol" + mkdir -p "$out/bin" + + ${unzip}/bin/unzip jsmol.zip -d "$out/share/" + + sed -i -e 's|command=java|command=${jre}/bin/java|' jmol.sh + cp *.jar jmol.sh "$out/share/jmol" + ln -s $out/share/jmol/jmol.sh "$out/bin/jmol" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A Java 3D viewer for chemical structures"; + homepage = https://sourceforge.net/projects/jmol; + license = licenses.lgpl2; + platforms = platforms.all; + maintainers = with maintainers; [ timokau ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bda907901025..124fa0a86167 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3110,6 +3110,8 @@ with pkgs; jmespath = callPackage ../development/tools/jmespath { }; + jmol = callPackage ../applications/science/chemistry/jmol { }; + jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; jnettop = callPackage ../tools/networking/jnettop { }; From d0d7894f75d3c6b1807a1dbf02fd740c0935e12c Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 20:53:13 +0200 Subject: [PATCH 517/538] rubiks: init at 20070917 --- .../libraries/science/math/rubiks/default.nix | 82 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/development/libraries/science/math/rubiks/default.nix diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix new file mode 100644 index 000000000000..5b20948686b4 --- /dev/null +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -0,0 +1,82 @@ +{ stdenv +, fetchurl +, fetchpatch +, coreutils +}: + +stdenv.mkDerivation rec { + pname = "rubiks"; + version = "20070912"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mirrors.mit.edu/sage/spkg/upstream/rubiks/rubiks-${version}.tar.bz2"; + sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq"; + }; + + preConfigure = '' + export INSTALL="${coreutils}/bin/install" + ''; + + # everything is done in `make install` + buildPhase = "true"; + + installFlags = [ + "PREFIX=$out" + ]; + + patches = [ + # Fix makefiles which use all the variables in all the wrong ways and + # hardcode values for some variables. + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1ry3w1mk9q4jqd91zlaa1bdiiplld4hpfjaldbhlmzlgrrc99qmq"; + }) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0zsbh6k3kqdg82fv0kzghr1x7pafisv943gmssqscp107bhg77bz"; + }) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0vhw70ylnmydgjhwx8jjlb2slccj4pfqn6vzirkyz1wp8apsmfhp"; + }) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/reid-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1r311sn012xs135s0d21qwsig2kld7rdcq19nm0zbnklviid57df"; + }) + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.sagemath.org/spkg/rubiks; + description = "Several programs for working with Rubik's cubes"; + # The individual websites are no longer available + longDescription = '' + There are several programs for working with Rubik's cubes, by three + different people. Look inside the directories under /src to see + specific info and licensing. In summary the three contributers are: + + + Michael Reid (GPL) http://www.math.ucf.edu/~reid/Rubik/optimal_solver.html + optimal - uses many pre-computed tables to find an optimal + solution to the 3x3x3 Rubik's cube + + + Dik T. Winter (MIT License) + cube - uses Kociemba's algorithm to iteratively find a short + solution to the 3x3x3 Rubik's cube + size222 - solves a 2x2x2 Rubik's cube + + + Eric Dietz (GPL) http://www.wrongway.org/?rubiksource + cu2 - A fast, non-optimal 2x2x2 solver + cubex - A fast, non-optimal 3x3x3 solver + mcube - A fast, non-optimal 4x4x4 solver + ''; + license = with licenses; [ + gpl2 # Michael Reid's and Eric Dietz software + mit # Dik T. Winter's software + ]; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 124fa0a86167..c1745bf94d1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19921,6 +19921,8 @@ with pkgs; nauty = callPackage ../applications/science/math/nauty {}; + rubiks = callPackage ../development/libraries/science/math/rubiks { }; + petsc = callPackage ../development/libraries/science/math/petsc { }; sage = callPackage ../applications/science/math/sage { }; From b74e884aab0a0cf7e069ab96ecfdf80dbaceef79 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 20:43:58 +0200 Subject: [PATCH 518/538] flintqs: init at 1.0 --- .../science/math/flintqs/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/science/math/flintqs/default.nix diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix new file mode 100644 index 000000000000..2891429c8578 --- /dev/null +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, gmp +}: + +stdenv.mkDerivation rec { + version = "1.0"; + pname = "flintqs"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "sagemath"; + repo = "FlintQS"; + rev = "v${version}"; + sha256 = "1f0lnayz6j6qgasx8pbq61d2fqam0wwhsmh6h15l4vq58l1vvbwj"; + }; + + preAutoreconf = '' + touch ChangeLog + ''; + + buildInputs = [ + gmp + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/sagemath/FlintQS; + description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1745bf94d1f..143db03a2702 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19864,6 +19864,8 @@ with pkgs; cliquer = callPackage ../development/libraries/science/math/cliquer { }; + flintqs = callPackage ../development/libraries/science/math/flintqs { }; + jags = callPackage ../applications/science/math/jags { }; From 92f083af238f844a0267531cc25275f80e97622e Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 10:28:11 +1000 Subject: [PATCH 519/538] nix-pin: 0.1.2 -> 0.2.2 --- .../package-management/nix-pin/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index c12b82a61e17..e2c18f33d61d 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,12 +1,12 @@ { pkgs, stdenv, fetchFromGitHub, mypy, python3 }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.1.2"; + version = "0.2.2"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.1.2"; - sha256 = "1zwfb5198qzbjwivgiaxbwva9frgrrqaj92nw8vz95yi08pijssh"; + rev = "version-0.2.2"; + sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz"; }; buildInputs = [ python3 mypy ]; buildPhase = '' @@ -16,12 +16,11 @@ let self = stdenv.mkDerivation rec { mkdir "$out" cp -r bin share "$out" ''; - passthru = { - callWithPins = path: args: - import "${self}/share/nix/call.nix" { - inherit pkgs path args; - }; - }; + passthru = + let api = import "${self}/share/nix/api.nix" { inherit pkgs; }; in + { + inherit (api) augmentedPkgs pins callPackage; + }; meta = with stdenv.lib; { homepage = "https://github.com/timbertson/nix-pin"; description = "nixpkgs development utility"; From 0eab0596d063534eeb25525f994a451aa126470b Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 11:32:11 +1000 Subject: [PATCH 520/538] nix-update-source: 0.4.0 -> 0.5.0 --- .../package-management/nix-update-source/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index a156c4f8a722..fe3cf33b46c8 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,12 +1,12 @@ { lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: python3Packages.buildPythonApplication rec { - version = "0.4.0"; + version = "0.5.0"; name = "nix-update-source-${version}"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-update-source"; - rev = "version-0.4.0"; - sha256 = "0gz0f7nx1q697s16ya7q84q1cj020n547k2ffb99ds2r40nckr2g"; + rev = "version-0.5.0"; + sha256 = "13icwk249frddsmn9albasikwp8asmgvp3jf9xj9adzh63wzh1i7"; }; propagatedBuildInputs = [ nix-prefetch-scripts ]; passthru = { @@ -23,7 +23,10 @@ python3Packages.buildPythonApplication rec { fetchFn = builtins.getAttr json.fetch.fn fetchers; src = fetchFn json.fetch.args; in - json // json.fetch // { inherit src; }; + json // json.fetch // { + inherit src; + overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); + }; updateScript = '' set -e echo From b52f5dba48d39a67112f95a15dd0a786959f0e52 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 11:17:59 +1000 Subject: [PATCH 521/538] gup: simplify build expression --- .../tools/build-managers/gup/build.nix | 16 ---------- .../tools/build-managers/gup/default.nix | 32 +++++++++++-------- 2 files changed, 18 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/gup/build.nix diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix deleted file mode 100644 index a9af037bb81e..000000000000 --- a/pkgs/development/tools/build-managers/gup/build.nix +++ /dev/null @@ -1,16 +0,0 @@ -# NOTE: this file is copied from the upstream repository for this package. -# Please submit any changes you make here to https://github.com/timbertson/gup/ - -{ stdenv, lib, python, which, pychecker ? null }: -{ src, version, meta ? {} }: -stdenv.mkDerivation { - inherit src meta; - name = "gup-${version}"; - buildInputs = lib.remove null [ python which pychecker ]; - SKIP_PYCHECKER = pychecker == null; - buildPhase = "make python"; - installPhase = '' - mkdir $out - cp -r python/bin $out/bin - ''; -} diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 8d1ad4490e98..748a59bda2f3 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, lib, python, which }: -let +{ stdenv, fetchFromGitHub, lib, python, which, pychecker ? null }: +stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; @@ -7,15 +7,19 @@ let repo = "gup"; owner = "timbertson"; }; -in -import ./build.nix - { inherit stdenv lib python which; } - { inherit src version; - meta = { - inherit (src.meta) homepage; - description = "A better make, inspired by djb's redo"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.timbertson ]; - platforms = stdenv.lib.platforms.all; - }; - } + name = "gup-${version}"; + buildInputs = lib.remove null [ python which pychecker ]; + SKIP_PYCHECKER = pychecker == null; + buildPhase = "make python"; + installPhase = '' + mkdir $out + cp -r python/bin $out/bin + ''; + meta = { + inherit (src.meta) homepage; + description = "A better make, inspired by djb's redo"; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.timbertson ]; + platforms = stdenv.lib.platforms.all; + }; +} From ad5b090853d381efcc0e2e7f87eaf364aa4abac6 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 11:31:41 +1000 Subject: [PATCH 522/538] gup: add `passthru.updateScript` --- .../tools/build-managers/gup/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 748a59bda2f3..f6d5b7b9b59c 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, lib, python, which, pychecker ? null }: +{ stdenv, fetchFromGitHub, nix-update-source, lib, python, which, pychecker ? null }: stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { - sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; - rev = "version-${version}"; - repo = "gup"; owner = "timbertson"; + repo = "gup"; + rev = "version-0.7.0"; + sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; }; name = "gup-${version}"; buildInputs = lib.remove null [ python which pychecker ]; @@ -15,6 +15,19 @@ stdenv.mkDerivation rec { mkdir $out cp -r python/bin $out/bin ''; + passthru.updateScript = '' + set -e + echo + cd ${toString ./.} + ${nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo gup \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --modify-nix default.nix + ''; meta = { inherit (src.meta) homepage; description = "A better make, inspired by djb's redo"; From 146dabd4aca9794f685528d2b247cb72f2fc54bd Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 11:31:41 +1000 Subject: [PATCH 523/538] nix-pin: add `passthru.updateScript` --- pkgs/tools/package-management/nix-pin/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index e2c18f33d61d..72cea4de5021 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -20,6 +20,19 @@ let self = stdenv.mkDerivation rec { let api = import "${self}/share/nix/api.nix" { inherit pkgs; }; in { inherit (api) augmentedPkgs pins callPackage; + updateScript = '' + set -e + echo + cd ${toString ./.} + ${pkgs.nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo nix-pin \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --modify-nix default.nix + ''; }; meta = with stdenv.lib; { homepage = "https://github.com/timbertson/nix-pin"; From 9cbf81e11b12e3799fe35b039d93caead6083ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 25 Nov 2017 23:03:36 +0100 Subject: [PATCH 524/538] initial kernel modules for TBS devices --- pkgs/os-specific/linux/tbs/default.nix | 50 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/os-specific/linux/tbs/default.nix diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix new file mode 100644 index 000000000000..e4b954d4dbf5 --- /dev/null +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }: +let + media = fetchFromGitHub { + owner = "tbsdtv"; + repo = "linux_media"; + rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4"; + sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h"; + }; + build = fetchFromGitHub { + owner = "tbsdtv"; + repo = "media_build"; + rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05"; + sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl"; + }; +in stdenv.mkDerivation { + name = "tbs-2017-11-05-${kernel.version}"; + + srcs = [ media build ]; + sourceRoot = "${build.name}"; + + preConfigure = '' + make dir DIR=../${media.name} + ''; + + postPatch = '' + patchShebangs . + + sed -i v4l/Makefile \ + -i v4l/scripts/make_makefile.pl \ + -e 's,/sbin/depmod,${kmod}/bin/depmod,g' \ + -e 's,/sbin/lsmod,${kmod}/bin/lsmod,g' + + sed -i v4l/Makefile \ + -e 's,^OUTDIR ?= /lib/modules,OUTDIR ?= ${kernel.dev}/lib/modules,' \ + -e 's,^SRCDIR ?= /lib/modules,SRCDIR ?= ${kernel.dev}/lib/modules,' + ''; + + buildFlags = [ "VER=${kernel.modDirVersion}" ]; + installFlags = [ "DESTDIR=$(out)" ]; + + hardeningDisable = [ "pic" "format" ]; + nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]; + + meta = with stdenv.lib; { + homepage = https://www.tbsdtv.com/; + license = licenses.gpl2; + maintainers = with maintainers; [ ck3d ]; + priority = 20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..5da5087c46bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13522,6 +13522,8 @@ with pkgs; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + tbs = callPackage ../os-specific/linux/tbs { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; From 701f22275c5c54a9cd0db980accb88012578f703 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 22 Apr 2018 08:55:10 +0100 Subject: [PATCH 525/538] xdot: disable for python 2.x It just fails at runtime otherwise. --- pkgs/development/python-modules/xdot/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 526376a41632..f9a735c97ab3 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy3k , wrapGAppsHook, gobjectIntrospection, pygobject3, graphviz, gnome3 }: buildPythonPackage rec { @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3"; }; + disabled = !isPy3k; + nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 graphviz gnome3.gtk ]; From 81a255dc93a6844070b71f45e8d7141b0e9232dd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Apr 2018 11:36:25 +0200 Subject: [PATCH 526/538] libimobiledevice: use cve tag in patchname for vulnix auto-detection --- pkgs/development/libraries/libimobiledevice/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index cef9cc0af6b2..d1b779627c69 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./disable_sslv3.patch - (fetchpatch { # CVE-2016-5104 + (fetchpatch { + name = "CVE-2016-5104.patch"; url = "https://github.com/libimobiledevice/libimobiledevice/commit/df1f5c4d70d0c19ad40072f5246ca457e7f9849e.patch"; sha256 = "06ygb9aqcvm4v08wrldsddjgyqv5bkpq6lxzq2a1nwqp9mq4a4k1"; }) From a1703436af652c435559278043bd5c220e7d756b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Apr 2018 11:42:49 +0200 Subject: [PATCH 527/538] libusbmuxd: use cve tag in patchname for vulnix auto-detection --- pkgs/development/libraries/libusbmuxd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 3e8beef3c9d0..3d15b698b481 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { # CVE-2016-5104 + (fetchpatch { + name = "CVE-2016-5104.patch"; url = "https://github.com/libimobiledevice/libusbmuxd/commit/4397b3376dc4e4cb1c991d0aed61ce6482614196.patch"; sha256 = "0cl3vys7bkwbdzf64d0rz3zlqpfc30w4l7j49ljv01agh42ywhgk"; }) From caa45305fe230421e6f06819ffe157bad0524c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Apr 2018 12:49:17 +0100 Subject: [PATCH 528/538] nix-review: 0.1.2 -> 0.2.0 --- pkgs/tools/package-management/nix-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 2b813638a11a..14b234c4dd5a 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "06lj3q6405fw18fq1xg0bm52cwlwx94lx5hn4zpz3rxl5g49wiyz"; + sha256 = "138f9m2c8fwpvn3kv5q7845ffi1pjbqxcs44aych4832i0pn6jaf"; }; buildInputs = [ makeWrapper ]; From 8bc970bbc7c4ee9423844fbe7a6561ed90d414db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 2 Apr 2018 00:28:50 +0200 Subject: [PATCH 529/538] raspberrypi-bootloader: Adds support for using uboot Uboot is copied into `/boot` in the installation process. The boot entries are created by calling the `generic-extlinux-compatible` builder. --- .../system/boot/loader/raspberrypi/builder.sh | 4 + .../boot/loader/raspberrypi/builder_uboot.nix | 34 +++++++ .../boot/loader/raspberrypi/builder_uboot.sh | 29 ++++++ .../boot/loader/raspberrypi/raspberrypi.nix | 91 +++++++++++++++---- 4 files changed, 141 insertions(+), 17 deletions(-) create mode 100644 nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix create mode 100644 nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh index f627d093eafb..8adc8a6a7e11 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh @@ -109,11 +109,15 @@ copyForced $fwdir/bootcode.bin /boot/bootcode.bin copyForced $fwdir/fixup.dat /boot/fixup.dat copyForced $fwdir/fixup_cd.dat /boot/fixup_cd.dat copyForced $fwdir/fixup_db.dat /boot/fixup_db.dat +copyForced $fwdir/fixup_x.dat /boot/fixup_x.dat copyForced $fwdir/start.elf /boot/start.elf copyForced $fwdir/start_cd.elf /boot/start_cd.elf copyForced $fwdir/start_db.elf /boot/start_db.elf copyForced $fwdir/start_x.elf /boot/start_x.elf +# Add the config.txt +copyForced @configTxt@ /boot/config.txt + # Remove obsolete files from /boot and /boot/old. for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do if ! test "${filesCopied[$fn]}" = 1; then diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix new file mode 100644 index 000000000000..47f25a9c2b1b --- /dev/null +++ b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix @@ -0,0 +1,34 @@ +{ config, pkgs, configTxt }: + +let + cfg = config.boot.loader.raspberryPi; + isAarch64 = pkgs.stdenv.isAarch64; + + uboot = + if cfg.version == 1 then + pkgs.ubootRaspberryPi + else if cfg.version == 2 then + pkgs.ubootRaspberryPi2 + else + if isAarch64 then + pkgs.ubootRaspberryPi3_64bit + else + pkgs.ubootRaspberryPi3_32bit; + + extlinuxConfBuilder = + import ../generic-extlinux-compatible/extlinux-conf-builder.nix { + inherit pkgs; + }; +in +pkgs.substituteAll { + src = ./builder_uboot.sh; + isExecutable = true; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + firmware = pkgs.raspberrypifw; + inherit uboot; + inherit configTxt; + inherit extlinuxConfBuilder; + version = cfg.version; +} + diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh new file mode 100644 index 000000000000..36bf15066274 --- /dev/null +++ b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh @@ -0,0 +1,29 @@ +#! @bash@/bin/sh -e + +copyForced() { + local src="$1" + local dst="$2" + cp $src $dst.tmp + mv $dst.tmp $dst +} + +# Call the extlinux builder +"@extlinuxConfBuilder@" "$@" + +# Add the firmware files +fwdir=@firmware@/share/raspberrypi/boot/ +copyForced $fwdir/bootcode.bin /boot/bootcode.bin +copyForced $fwdir/fixup.dat /boot/fixup.dat +copyForced $fwdir/fixup_cd.dat /boot/fixup_cd.dat +copyForced $fwdir/fixup_db.dat /boot/fixup_db.dat +copyForced $fwdir/fixup_x.dat /boot/fixup_x.dat +copyForced $fwdir/start.elf /boot/start.elf +copyForced $fwdir/start_cd.elf /boot/start_cd.elf +copyForced $fwdir/start_db.elf /boot/start_db.elf +copyForced $fwdir/start_x.elf /boot/start_x.elf + +# Add the uboot file +copyForced @uboot@/u-boot.bin /boot/u-boot-rpi.bin + +# Add the config.txt +copyForced @configTxt@ /boot/config.txt diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index f246d04284ca..adf13ce6098c 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -5,42 +5,99 @@ with lib; let cfg = config.boot.loader.raspberryPi; - builder = pkgs.substituteAll { + builderGeneric = pkgs.substituteAll { src = ./builder.sh; isExecutable = true; inherit (pkgs) bash; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; firmware = pkgs.raspberrypifw; version = cfg.version; + inherit configTxt; }; platform = pkgs.stdenv.platform; + builderUboot = import ./builder_uboot.nix { inherit config; inherit pkgs; inherit configTxt; }; + + builder = + if cfg.uboot.enable then + "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c" + else + builderGeneric; + + blCfg = config.boot.loader; + timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; + + isAarch64 = pkgs.stdenv.isAarch64; + optional = pkgs.stdenv.lib.optionalString; + + configTxt = + pkgs.writeText "config.txt" ('' + # U-Boot used to need this to work, regardless of whether UART is actually used or not. + # TODO: check when/if this can be removed. + enable_uart=1 + + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + '' + optional isAarch64 '' + # Boot in 64-bit mode. + arm_control=0x200 + '' + optional cfg.uboot.enable '' + kernel=u-boot-rpi.bin + ''); + in { options = { - boot.loader.raspberryPi.enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to create files with the system generations in - /boot. - /boot/old will hold files from old generations. - ''; - }; + boot.loader.raspberryPi = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to create files with the system generations in + /boot. + /boot/old will hold files from old generations. + ''; + }; - boot.loader.raspberryPi.version = mkOption { - default = 2; - type = types.enum [ 1 2 3 ]; - description = '' - ''; - }; + version = mkOption { + default = 2; + type = types.enum [ 1 2 3 ]; + description = '' + ''; + }; + uboot = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable using uboot as bootmanager for the raspberry pi. + ''; + }; + + configurationLimit = mkOption { + default = 20; + example = 10; + type = types.int; + description = '' + Maximum number of configurations in the boot menu. + ''; + }; + + }; + }; }; - config = mkIf config.boot.loader.raspberryPi.enable { + config = mkIf cfg.enable { + assertions = singleton { + assertion = !pkgs.stdenv.isAarch64 || cfg.version == 3; + message = "Only Raspberry Pi 3 supports aarch64."; + }; + system.build.installBootLoader = builder; system.boot.loader.id = "raspberrypi"; system.boot.loader.kernelFile = platform.kernelTarget; From 6ed495cf13e55f1884204668b92facce5ee6896f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sun, 8 Apr 2018 23:42:36 +0200 Subject: [PATCH 530/538] raspberrypi-bootloader: Adds `firmwareConfig` config option The `firmwareConfig` option will be appended to `/boot/config.txt`. --- .../system/boot/loader/raspberrypi/raspberrypi.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index adf13ce6098c..f974d07da9e5 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -45,7 +45,7 @@ let arm_control=0x200 '' + optional cfg.uboot.enable '' kernel=u-boot-rpi.bin - ''); + '' + optional (cfg.firmwareConfig != null) cfg.firmwareConfig); in @@ -89,6 +89,15 @@ in }; }; + + firmwareConfig = mkOption { + default = null; + type = types.nullOr types.string; + description = '' + Extra options that will be appended to /boot/config.txt file. + For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/ + ''; + }; }; }; From b96cc8fb8646923e1f9616f64495d58120f409f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Apr 2018 16:43:18 +0100 Subject: [PATCH 531/538] Revert "nix-pin: add `passthru.updateScript`" This reverts commit 146dabd4aca9794f685528d2b247cb72f2fc54bd. breaks evaluation --- pkgs/tools/package-management/nix-pin/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 72cea4de5021..e2c18f33d61d 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -20,19 +20,6 @@ let self = stdenv.mkDerivation rec { let api = import "${self}/share/nix/api.nix" { inherit pkgs; }; in { inherit (api) augmentedPkgs pins callPackage; - updateScript = '' - set -e - echo - cd ${toString ./.} - ${pkgs.nix-update-source}/bin/nix-update-source \ - --prompt version \ - --replace-attr version \ - --set owner timbertson \ - --set repo nix-pin \ - --set type fetchFromGitHub \ - --set rev 'version-{version}' \ - --modify-nix default.nix - ''; }; meta = with stdenv.lib; { homepage = "https://github.com/timbertson/nix-pin"; From 1d0267b2e75c2b74951199f9fe84b113d4358498 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 22 Apr 2018 08:43:19 -0700 Subject: [PATCH 532/538] octopus: 7.2 -> 7.3 --- pkgs/applications/science/chemistry/octopus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 2ff20fef40e8..bf8ccee4a635 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -3,7 +3,7 @@ }: let - version = "7.2"; + version = "7.3"; fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; - sha256 = "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m"; + sha256 = "0hnpqjjxdxh2ggf6ckrsy4hs9iglnazscb4siczddvmysi4kv15d"; }; nativeBuildInputs = [ perl procps fftw.dev ]; From 94d92fd046feeb8d56c8ad88b2916005ef6305ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Apr 2018 16:43:27 +0100 Subject: [PATCH 533/538] Revert "nix-pin: 0.1.2 -> 0.2.2" This reverts commit 92f083af238f844a0267531cc25275f80e97622e. breaks evaluation --- .../package-management/nix-pin/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index e2c18f33d61d..c12b82a61e17 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,12 +1,12 @@ { pkgs, stdenv, fetchFromGitHub, mypy, python3 }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.2.2"; + version = "0.1.2"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.2.2"; - sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz"; + rev = "version-0.1.2"; + sha256 = "1zwfb5198qzbjwivgiaxbwva9frgrrqaj92nw8vz95yi08pijssh"; }; buildInputs = [ python3 mypy ]; buildPhase = '' @@ -16,11 +16,12 @@ let self = stdenv.mkDerivation rec { mkdir "$out" cp -r bin share "$out" ''; - passthru = - let api = import "${self}/share/nix/api.nix" { inherit pkgs; }; in - { - inherit (api) augmentedPkgs pins callPackage; - }; + passthru = { + callWithPins = path: args: + import "${self}/share/nix/call.nix" { + inherit pkgs path args; + }; + }; meta = with stdenv.lib; { homepage = "https://github.com/timbertson/nix-pin"; description = "nixpkgs development utility"; From 17d17ce472c45d792ef5ebff3c92abfc5008a1e4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Apr 2018 17:44:09 +0200 Subject: [PATCH 534/538] as31: use cve tag in patchname for vulnix auto-detection --- pkgs/development/compilers/as31/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix index 93b251707e80..519992fd8c26 100644 --- a/pkgs/development/compilers/as31/default.nix +++ b/pkgs/development/compilers/as31/default.nix @@ -15,9 +15,8 @@ in stdenv.mkDerivation { buildInputs = [ yacc ]; patches = [ - # CVE-2012-0808 (fetchpatch { - name = "as31-mkstemps.patch"; + name = "CVE-2012-0808.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=655496;filename=as31-mkstemps.patch;msg=5"; sha256 = "0iia4wa8m141bwz4588yxb1dp2qwhapcii382sncm6jvwyngwh21"; }) From 7c90a8677090bb144cc8db17aaf485def8d54a91 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 1 Apr 2018 18:22:14 +0300 Subject: [PATCH 535/538] wireguard service: use scripts instead of ExecStarts/Stops This is more in line with what other services do; also looks cleaner. It changes configuration entries for pre-and post-hooks type to lines from lists of strings which are more logical for them; coersion is provided for backwards compatibility. Finally, add several steps to improve robustness: 1. Load kernel module on start if not loaded; 2. Don't remove wireguard interface on start; it is removed on service stop. If it's not something is wrong. --- .../modules/services/networking/wireguard.nix | 95 ++++++++++--------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 24accd41511c..0591917c7423 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -53,30 +53,30 @@ let }; preSetup = mkOption { - example = literalExample ['' + example = literalExample '' ${pkgs.iproute}/bin/ip netns add foo - '']; - default = []; - type = with types; listOf str; + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; description = '' - A list of commands called at the start of the interface setup. + Commands called at the start of the interface setup. ''; }; postSetup = mkOption { - example = literalExample ['' - ${pkgs.bash} -c 'printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0' - '']; - default = []; - type = with types; listOf str; - description = "A list of commands called at the end of the interface setup."; + example = literalExample '' + printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0 + ''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = "Commands called at the end of the interface setup."; }; postShutdown = mkOption { - example = literalExample ["${pkgs.openresolv}/bin/resolvconf -d wg0"]; - default = []; - type = with types; listOf str; - description = "A list of commands called after shutting down the interface."; + example = literalExample "${pkgs.openresolv}/bin/resolvconf -d wg0"; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = "Commands called after shutting down the interface."; }; table = mkOption { @@ -182,9 +182,6 @@ let }; - ipCommand = "${pkgs.iproute}/bin/ip"; - wgCommand = "${pkgs.wireguard}/bin/wg"; - generateUnit = name: values: # exactly one way to specify the private key must be set assert (values.privateKey != null) != (values.privateKeyFile != null); @@ -196,49 +193,53 @@ let after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; + path = with pkgs; [ kmod iproute wireguard ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = flatten([ - values.preSetup + }; - "-${ipCommand} link del dev ${name}" - "${ipCommand} link add dev ${name} type wireguard" + script = '' + modprobe wireguard - (map (ip: - "${ipCommand} address add ${ip} dev ${name}" - ) values.ips) + ${values.preSetup} - ("${wgCommand} set ${name} private-key ${privKey}" + - optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}") + ip link add dev ${name} type wireguard - (map (peer: + ${concatMapStringsSep "\n" (ip: + "ip address add ${ip} dev ${name}" + ) values.ips} + + wg set ${name} private-key ${privKey} ${ + optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"} + + ${concatMapStringsSep "\n" (peer: assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile; in - "${wgCommand} set ${name} peer ${peer.publicKey}" + - optionalString (psk != null) " preshared-key ${psk}" + - optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + - optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + - optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}" - ) values.peers) + "wg set ${name} peer ${peer.publicKey}" + + optionalString (psk != null) " preshared-key ${psk}" + + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}" + ) values.peers} - "${ipCommand} link set up dev ${name}" + ip link set up dev ${name} - (optionals (values.allowedIPsAsRoutes != false) (map (peer: - (map (allowedIP: - "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}" - ) peer.allowedIPs) - ) values.peers)) + ${optionalString (values.allowedIPsAsRoutes != false) (concatStringsSep "\n" (concatMap (peer: + (map (allowedIP: + "ip route replace ${allowedIP} dev ${name} table ${values.table}" + ) peer.allowedIPs) + ) values.peers))} - values.postSetup - ]); - ExecStop = flatten([ - "${ipCommand} link del dev ${name}" - values.postShutdown - ]); - }; + ${values.postSetup} + ''; + + preStop = '' + ip link del dev ${name} + ${values.postShutdown} + ''; }; in From 7de43f38e07d29a5b0c3c91f96724c330929029a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 22 Apr 2018 16:38:27 +0000 Subject: [PATCH 536/538] memtest86plus: disable all hardening With hardening enabled it reports errors on known-good memory modules on my Thinkpad X230 (Ivy Bridge). It's the same bug as reported in https://bugs.launchpad.net/ubuntu/+source/memtest86+/+bug/1071209 but memtest86+ fails on test #9 instead of test #7 (because #7 in 4.20 became #9 in 5.01) and with all the addresses multiplied by 2 (I guess the bug was reported for i686, and I test on x86_64, it was 2012 after all). --- pkgs/tools/misc/memtest86+/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index d949108524f6..8ee4d6eeb9ef 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I. -std=gnu90"; - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; + hardeningDisable = [ "all" ]; buildFlags = "memtest.bin"; From c3148948ff0c5cdbf75b8e2c894f15850e8aff3d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 22 Apr 2018 17:04:51 +0000 Subject: [PATCH 537/538] memtest86plus: 5.01 -> 5.01+coreboot-20180113 aka 5.01+coreboot-001+ The version maintained by coreboot project is superior to Debian, it integrates all the Debian patches and fixes a bunch more bugs. In particular, it fixes SMP freezes and apparent memory errors when running under coreboot ROM. --- pkgs/tools/misc/memtest86+/default.nix | 34 +++++--------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 8ee4d6eeb9ef..6103ba021260 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,36 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "memtest86+-5.01"; + name = "memtest86+-5.01+coreboot-20180113"; - src = fetchurl { - url = "http://www.memtest.org/download/5.01/${name}.tar.gz"; - sha256 = "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l"; + src = fetchgit { + url = "https://review.coreboot.org/memtest86plus"; + rev = "5ca4eb9544e51254254d09ae6e70f93403469ec3"; + sha256 = "08m4rjr0chhhb1whgggknz926zv9hm8bisnxqp8lffqiwhb55rgk"; }; - patches = [ - (fetchurl { - url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/doc-serialconsole"; - sha256 = "1qh2byj9bmpchym8iq20n4hqmy10nrl6bi0d9pgdqikkmw9m38jq"; - }) - (fetchurl { - url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/multiboot"; - sha256 = "0nq61307ah5b41ff5nqs99wjzjzlajvfv6k9c9d0gqvhx8r4dvmy"; - }) - (fetchurl { - url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-O0.patch"; - sha256 = "1xmj3anq1fr0cxwv8lqfp5cr5f58v7glwc6z0v8hx8aib8yj1wl2"; - }) - (fetchurl { - url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-array-size.patch"; - sha256 = "0yxlzpfs6313s91y984p7rlf5rgybcjhg7i9zqy4wqhm3j90f1kb"; - }) - (fetchurl { - url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/gcc-5"; - sha256 = "13xfy6sn8qbj1hx4vms2cz24dsa3bl8n2iblz185hkn11y7141sc"; - }) - ]; - preBuild = '' # Really dirty hack to get Memtest to build without needing a Glibc # with 32-bit libraries and headers. From 6a819c8f8c9100eb1a79515f10ad2d0d49b42ed5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 22 Apr 2018 22:12:17 +0300 Subject: [PATCH 538/538] nixos/iso-image.nix: Fix typo --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index e7cbf415a223..83f8a2586bd3 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -59,7 +59,7 @@ let INITRD /boot/${config.system.boot.loader.initrdFile} # A variant to boot with verbose logging to the console - LABEL boot-nomodeset + LABEL boot-debug MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug) LINUX /boot/${config.system.boot.loader.kernelFile} APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7