From 6c3068ad448363194319f56d2e07a92a0aad46d0 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sat, 17 Jun 2017 11:41:43 +0200 Subject: [PATCH 0001/2743] remove expression for bluez5_28, as it is no longer needed --- pkgs/os-specific/linux/bluez/bluez5_28.nix | 82 ---------------------- pkgs/top-level/all-packages.nix | 3 - 2 files changed, 85 deletions(-) delete mode 100644 pkgs/os-specific/linux/bluez/bluez5_28.nix diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix deleted file mode 100644 index 11aee0d88f2c..000000000000 --- a/pkgs/os-specific/linux/bluez/bluez5_28.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - pythonPackages, readline, libsndfile, udev, libical, - systemd, enableWiimote ? false }: - -assert stdenv.isLinux; - -let - inherit (pythonPackages) python; -in stdenv.mkDerivation rec { - name = "bluez-5.28"; - - src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1a8qzh38wpq5c0rydpx9isf0jc6g14g2qs18j1rmi8a79f7v9fl5"; - }; - - pythonPath = with pythonPackages; - [ dbus pygobject2 pygobject3 recursivePthLoader ]; - - buildInputs = - [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython - readline libsndfile udev libical - # Disables GStreamer; not clear what it gains us other than a - # zillion extra dependencies. - # gstreamer gst-plugins-base - ]; - - preConfigure = '' - substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm - substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " - ''; - - configureFlags = [ - "--localstatedir=/var" - "--enable-library" - "--enable-cups" - "--with-dbusconfdir=$(out)/etc" - "--with-dbussystembusdir=$(out)/share/dbus-1/system-services" - "--with-dbussessionbusdir=$(out)/share/dbus-1/services" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-udevdir=$(out)/lib/udev" - ] ++ - stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; - - # Work around `make install' trying to create /var/lib/bluetooth. - installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; - - makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; - - # FIXME: Move these into a separate package to prevent Bluez from - # depending on Python etc. - postInstall = '' - mkdir $out/test - cp -a test $out - pushd $out/test - for a in \ - simple-agent \ - test-adapter \ - test-device \ - test-thermometer \ - list-devices \ - monitor-bluetooth \ - ; do - ln -s ../test/$a $out/bin/bluez-$a - done - popd - wrapPythonProgramsIn $out/test "$out/test $pythonPath" - - # for bluez4 compatibility for NixOS - mkdir $out/sbin - ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd - ln -s ../libexec/bluetooth/obexd $out/sbin/obexd - ''; - - meta = with stdenv.lib; { - homepage = http://www.bluez.org/; - repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; - description = "Bluetooth support for Linux"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c87ab0a1c4ea..e5b83a3af727 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11526,9 +11526,6 @@ with pkgs; bluez4 = callPackage ../os-specific/linux/bluez { }; - # Needed for LibreOffice - bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); - bluez = bluez5; inherit (python3Packages) bedup; 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 0002/2743] 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 0003/2743] 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 0004/2743] 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 0005/2743] 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 0006/2743] 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 0007/2743] 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 0008/2743] 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 0009/2743] 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 e70d293b6b5f236d69d559ccccdafba19c6d29c3 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 19 Nov 2017 16:41:28 +0100 Subject: [PATCH 0010/2743] nixos/acme: Allow for time window between cert issue and activation --- nixos/modules/security/acme.nix | 65 +++++++++++++++++++++++++++------ 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index fb011019f7f5..df0b4986eb82 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -57,9 +57,11 @@ let default = ""; example = "systemctl reload nginx.service"; description = '' - Commands to run after certificates are re-issued. Typically + Commands to run after new certificates go live. Typically the web server and other servers using certificates need to be reloaded. + + Executed in the same directory with the new certificate. ''; }; @@ -77,6 +79,27 @@ let ''; }; + activationDelay = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Systemd time span expression to delay copying new certificates to main + state directory. See systemd.time + 7. + ''; + }; + + preDelay = mkOption { + type = types.lines; + default = ""; + description = '' + Commands to run after certificates are re-issued but before they are + activated. Typically the new certificate is published to DNS. + + Executed in the same directory with the new certificate. + ''; + }; + extraDomains = mkOption { type = types.attrsOf (types.nullOr types.str); default = {}; @@ -186,14 +209,14 @@ in certToServices = cert: data: let domain = if data.domain != null then data.domain else cert; - cpath = "${cfg.directory}/${cert}"; + cpath = lpath + optionalString (data.activationDelay != null) ".staging"; + lpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) - ++ (if cfg.production then [] - else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]); + ++ optionals (!cfg.production) ["--server" "https://acme-staging.api.letsencrypt.org/directory"]; acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; @@ -206,7 +229,7 @@ in Group = data.group; PrivateTmp = true; }; - path = [ pkgs.simp_le ]; + path = with pkgs; [ simp_le systemd ]; preStart = '' mkdir -p '${cfg.directory}' chown 'root:root' '${cfg.directory}' @@ -229,15 +252,36 @@ in exit "$EXITCODE" ''; postStop = '' + cd '${cpath}' + if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then - echo "Executing postRun hook..." - ${data.postRun} + ${if data.activationDelay != null then '' + + ${data.preDelay} + + if [ -d '${lpath}' ]; then + systemd-run --no-block --on-active='${data.activationDelay}' --unit acme-setlive-${cert}.service + else + systemctl --wait start acme-setlive-${cert}.service + fi + '' else data.postRun} fi ''; before = [ "acme-certificates.target" ]; wantedBy = [ "acme-certificates.target" ]; }; + delayService = { + description = "Set certificate for ${cert} live"; + path = with pkgs; [ rsync ]; + serviceConfig = { + Type = "oneshot"; + }; + script = '' + rsync -a --delete-after '${cpath}/' '${lpath}' + ''; + postStop = data.postRun; + }; selfsignedService = { description = "Create preliminary self-signed certificate for ${cert}"; preStart = '' @@ -297,11 +341,8 @@ in }; in ( [ { name = "acme-${cert}"; value = acmeService; } ] - ++ - (if cfg.preliminarySelfsigned - then [ { name = "acme-selfsigned-${cert}"; value = selfsignedService; } ] - else [] - ) + ++ optional cfg.preliminarySelfsigned { name = "acme-selfsigned-${cert}"; value = selfsignedService; } + ++ optional (data.activationDelay != null) { name = "acme-setlive-${cert}"; value = delayService; } ); servicesAttr = listToAttrs services; injectServiceDep = { From de67f50351b4e35155b40c341452abbd078ede9a Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Wed, 22 Nov 2017 18:07:04 +0100 Subject: [PATCH 0011/2743] 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 0012/2743] 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 0013/2743] 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 0014/2743] 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 0015/2743] 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 1ed47cf21424ff450ed2ce9059b5ce1a2c7e052a Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 18 Jan 2018 01:50:24 +0900 Subject: [PATCH 0016/2743] mathematica: enable installation of localized editions For now English (default) and Japanese editions only. Fill out information in `l10ns.nix` to add the other localized editions. Example usage: `mathematica.override { lang = "ja"; }` derives Japanese edition. --- .../science/math/mathematica/default.nix | 23 +++++-------- .../science/math/mathematica/l10ns.nix | 33 +++++++++++++++++++ 2 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 pkgs/applications/science/math/mathematica/l10ns.nix diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 1c86097f2ee4..9b9d5b250ef6 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -1,7 +1,7 @@ { stdenv , coreutils , patchelf -, requireFile +, callPackage , alsaLib , dbus , fontconfig @@ -18,6 +18,7 @@ , zlib , libxml2 , libuuid +, lang ? "en" }: let @@ -26,21 +27,15 @@ let "Linux" else throw "Mathematica requires i686-linux or x86_64 linux"; + + l10n = + with stdenv.lib; + with callPackage ./l10ns.nix {}; + flip (findFirst (l: l.lang == lang)) l10ns + (throw "Language '${lang}' not supported"); in stdenv.mkDerivation rec { - version = "11.2.0"; - - name = "mathematica-${version}"; - - src = requireFile rec { - name = "Mathematica_${version}_LINUX.sh"; - message = '' - This nix expression requires that ${name} is - already part of the store. Find the file on your Mathematica CD - and add it to the nix store with nix-store --add-fixed sha256 . - ''; - sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9"; - }; + inherit (l10n) version name src; buildInputs = [ coreutils diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix new file mode 100644 index 000000000000..2158021c7548 --- /dev/null +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -0,0 +1,33 @@ +{ lib, requireFile }: + +with lib; +{ + l10ns = flip map + [ + { + version = "11.2.0"; + lang = "en"; + language = "English"; + sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9"; + } + { + version = "11.2.0"; + lang = "ja"; + language = "Japanese"; + sha256 = "916392edd32bed8622238df435dd8e86426bb043038a3336f30df10d819b49b1"; + } + ] + ({ version, lang, language, sha256 }: { + inherit version lang; + name = "mathematica-${version}" + optionalString (lang != "en") "-${lang}"; + src = requireFile rec { + name = "Mathematica_${version}" + optionalString (lang != "en") "_${language}" + "_LINUX.sh"; + message = '' + This nix expression requires that ${name} is + already part of the store. Find the file on your Mathematica CD + and add it to the nix store with nix-store --add-fixed sha256 . + ''; + inherit sha256; + }; + }); +} From 616255adf3128e3883f36a0fca4ae02530a70a14 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 14 Feb 2018 11:33:09 -0800 Subject: [PATCH 0017/2743] pinentry: add option to enable pinentry-emacs --- pkgs/tools/security/pinentry/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index c551a8161aa2..839fb92238fe 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, enableEmacs ? false }: let @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { (mkEnable (libsecret != null) "libsecret") (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") + (mkEnable enableEmacs "pinentry-emacs") (mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (gcr != null) "pinentry-gnome3") (mkEnable (qt != null) "pinentry-qt") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4c48fce84f0..2eeb8961b8ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4145,6 +4145,10 @@ with pkgs; gtk2 = null; }; + pinentry_emacs = pinentry_ncurses.override { + enableEmacs = true; + }; + pinentry_gnome = pinentry_ncurses.override { gcr = gnome3.gcr; }; From 687ecce998439fe7379e731611221e17f8b7b771 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 20 Jan 2018 00:40:23 -0500 Subject: [PATCH 0018/2743] tmon: init --- pkgs/os-specific/linux/tmon/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/tmon/default.nix diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix new file mode 100644 index 000000000000..01c84a1d1faa --- /dev/null +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, kernel, ncurses }: + +stdenv.mkDerivation { + name = "tmon-${kernel.version}"; + + inherit (kernel) src; + + buildInputs = [ ncurses ]; + + configurePhase = '' + cd tools/thermal/tmon + ''; + + makeFlags = kernel.makeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Monitoring and Testing Tool for Linux kernel thermal subsystem"; + homepage = https://www.kernel.org/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b4fbf8c1e6f..14a95836ebe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13202,6 +13202,8 @@ with pkgs; systemtap = callPackage ../development/tools/profiling/systemtap { }; + tmon = callPackage ../os-specific/linux/tmon { }; + tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; usbip = callPackage ../os-specific/linux/usbip { }; From 1cc97befd5550732fd155d04cdd9eca3f5024dbc Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 8 Nov 2017 21:55:40 -0800 Subject: [PATCH 0019/2743] lib/eval-config: document NIXOS_EXTRA_MODULE_PATH This adds some documentation about importing modules external to Nixpkgs, which provides context for documenting NIXOS_EXTRA_MODULE_PATH. Closes #30376 --- .../manual/development/importing-modules.xml | 59 +++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + 2 files changed, 60 insertions(+) create mode 100644 nixos/doc/manual/development/importing-modules.xml diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml new file mode 100644 index 000000000000..ec1da09b9507 --- /dev/null +++ b/nixos/doc/manual/development/importing-modules.xml @@ -0,0 +1,59 @@ +
+ +Importing Modules + + + Sometimes NixOS modules need to be used in configuration but exist + outside of Nixpkgs. These modules can be imported: + + + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} + + + + The environment variable NIXOS_EXTRA_MODULE_PATH is + an absolute path to a NixOS module that is included alongside the + Nixpkgs NixOS modules. Like any NixOS module, this module can import + additional modules: + + + +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] + + + +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } + + + +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} + + +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index cb363b45675b..a49f99cb2669 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -180,6 +180,7 @@ in { + From 7654f8fa3a144847be04c071354eb8ba10d2612f Mon Sep 17 00:00:00 2001 From: Olivier Bourdoux Date: Mon, 19 Feb 2018 16:50:54 +0100 Subject: [PATCH 0020/2743] yarssr: init at git-2017-12-01 --- pkgs/applications/misc/yarssr/default.nix | 68 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/misc/yarssr/default.nix diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix new file mode 100644 index 000000000000..cadf5ccb6a48 --- /dev/null +++ b/pkgs/applications/misc/yarssr/default.nix @@ -0,0 +1,68 @@ +{ +fetchFromGitHub, stdenv, lib, +autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs, +perl, perlPackages, +gnome2 }: + +let + perlDeps = with perlPackages; [ + Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon + XMLLibXML XMLSAXBase XMLParser XMLRSS + HTMLParser + DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone + ParamsValidate + ModuleImplementation ModuleRuntime + TryTiny + ClassSingleton + URI + AnyEvent AnyEventHTTP + CommonSense + FileSlurp + JSON + Guard + LocaleGettext + ]; + libs = [ + stdenv.cc.cc.lib + pkgs.gtk2 + ]; +in +stdenv.mkDerivation rec { + version = "git-2017-12-01"; + name = "yarssr-${version}"; + + src = fetchFromGitHub { + owner = "JGRennison"; + repo = "yarssr"; + rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d"; + sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; + }; + + nativeBuildInputs = [ perl pkgs.gettext makeWrapper ]; + buildInputs = perlDeps ++ [gnome2.libglade]; + propagatedBuildInputs = libs ++ perlDeps; + + installPhase = '' + DESTDIR=$out make install + mv $out/usr/* $out/ + rm -R $out/usr + sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr + sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr + sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm + chmod a+x $out/bin/yarssr + ''; + + postFixup = '' + wrapProgram $out/bin/yarssr \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ + --set PERL5LIB "${lib.makePerlPath perlDeps}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tsyrogit/zxcvbn-c; + description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; + license = licenses.gpl1; + platforms = platforms.linux; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffc8abcdf236..b10c0e790f1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18310,6 +18310,8 @@ with pkgs; yarp = callPackage ../applications/science/robotics/yarp {}; + yarssr = callPackage ../applications/misc/yarssr { }; + yate = callPackage ../applications/misc/yate { }; yed = callPackage ../applications/graphics/yed {}; From 844c468b8f53e8bb84c75bb944ee9b4ad6b025ce Mon Sep 17 00:00:00 2001 From: Olivier Bourdoux Date: Mon, 19 Feb 2018 21:47:36 +0100 Subject: [PATCH 0021/2743] postman : 5.5.2 -> 5.5.3 --- pkgs/development/web/postman/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 605e5de03119..eb5287a3ece9 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "postman-${version}"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha1 = "68886197A8375E860AB880547838FEFC9E12FC64"; + sha1 = "BC0C6117BEC6D1638FD18A0E2A580617669A9297"; name = "${name}.tar.gz"; }; @@ -16,10 +16,15 @@ stdenv.mkDerivation rec { buildPhase = ":"; # nothing to build + icon = fetchurl { + url = "https://www.getpostman.com/img-rebrand/logo.png"; + sha256 = "0jdhl9c07b1723j2f172z3s5p5lh8sqa1rcvdzz3h6z5zwn21g7v"; + }; + desktopItem = makeDesktopItem { name = "postman"; exec = "postman"; - icon = "$out/share/postman/resources/app/assets/icon.png"; + icon = "${icon}"; comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; @@ -28,10 +33,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/postman - mkdir -p $out/share/applications cp -R * $out/share/postman + mkdir -p $out/bin ln -s $out/share/postman/Postman $out/bin/postman + + mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; From 9cdb7fe72285db3369039017c5aa935cccba305d Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 20 Feb 2018 16:40:39 +0000 Subject: [PATCH 0022/2743] 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 0023/2743] 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 c26bf1cb6004e2f4d3535c8def72bf9963fea071 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 21 Feb 2018 08:11:16 +0100 Subject: [PATCH 0024/2743] logkeys: 2017-10-10 -> 2018-01-22 --- pkgs/tools/security/logkeys/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index e30ad30a4dc1..8a73d056b1ed 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, autoconf, automake, which, procps, kbd }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }: stdenv.mkDerivation rec { name = "logkeys-${version}"; - version = "2017-10-10"; + version = "2018-01-22"; - src = fetchgit { - url = https://github.com/kernc/logkeys; - rev = "5c368327a2cd818efaed4794633c260b90b87abf"; - sha256 = "0akj7j775y9c0p53zq5v12jk3fy030fpdvn5m1x9w4rdj47vxdpg"; + src = fetchFromGitHub { + owner = "kernc"; + repo = "logkeys"; + rev = "7a9f19fb6b152d9f00a0b3fe29ab266ff1f88129"; + sha256 = "1k6kj0913imwh53lh6hrhqmrpygqg2h462raafjsn7gbd3vkgx8n"; }; buildInputs = [ autoconf automake which procps kbd ]; From 1c3c80360b914ff8eacdabeb6d05565721121b1e Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 21 Feb 2018 08:11:33 +0100 Subject: [PATCH 0025/2743] logkeys.service: Add 'device' option --- nixos/modules/services/misc/logkeys.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix index df0b3ae24c90..ad13d9eaa674 100644 --- a/nixos/modules/services/misc/logkeys.nix +++ b/nixos/modules/services/misc/logkeys.nix @@ -7,6 +7,13 @@ let in { options.services.logkeys = { enable = mkEnableOption "logkeys service"; + + device = mkOption { + description = "Use the given device as keyboard input event device instead of /dev/input/eventX default."; + default = null; + type = types.nullOr types.string; + example = "/dev/input/event15"; + }; }; config = mkIf cfg.enable { @@ -14,7 +21,7 @@ in { description = "LogKeys Keylogger Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.logkeys}/bin/logkeys -s"; + ExecStart = "${pkgs.logkeys}/bin/logkeys -s${lib.optionalString (cfg.device != null) " -d ${cfg.device}"}"; ExecStop = "${pkgs.logkeys}/bin/logkeys -k"; Type = "forking"; }; From 73b135e6b831166dffdefd5bed299c54883b552a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 26 Feb 2018 12:49:36 +0100 Subject: [PATCH 0026/2743] poppler: fix build on Darwin --- pkgs/development/libraries/poppler/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9a3d24fc0b28..c7e1e024700e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -41,6 +41,9 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; + # Not sure when and how to pass it. It seems an upstream bug anyway. + CXXFLAGS = if stdenv.cc.isClang then [ "-std=c++11" ] else null; + meta = with lib; { homepage = https://poppler.freedesktop.org/; description = "A PDF rendering library"; From 4d7bea7e5efa873b5469af996a0d99ca529ba50f Mon Sep 17 00:00:00 2001 From: edef Date: Mon, 26 Feb 2018 17:50:56 -0500 Subject: [PATCH 0027/2743] ipxe: fix ISO build Without this change, it doesn't seem to properly generate ISOs with embedded scripts. --- pkgs/tools/misc/ipxe/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 786b3992a5cc..1cce03fe74e0 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" + "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; @@ -34,6 +35,7 @@ stdenv.mkDerivation { configurePhase = '' runHook preConfigure for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done + sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso runHook postConfigure ''; From ee8495c4c24381c0fadc88355fe58dbdc98c1af8 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sat, 24 Feb 2018 23:31:46 -0800 Subject: [PATCH 0028/2743] salt: fix msgpack dependency --- pkgs/tools/admin/salt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index b50564602256..799beee52049 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec { futures jinja2 markupsafe - msgpack + msgpack-python pycrypto pyyaml pyzmq From 8ae0c8a64f2f2e36b5815f8686e49a4c9315c09d Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 27 Feb 2018 15:25:13 -0500 Subject: [PATCH 0029/2743] ipxe: 20170922 -> 20180220 --- pkgs/tools/misc/ipxe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 1cce03fe74e0..d34ccaa4b9e9 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -3,8 +3,8 @@ }: let - date = "20170922"; - rev = "74d90b33f8490adcee2026ece18d8411d93b6a39"; + date = "20180220"; + rev = "47849be3a900c546cf92066849be0806f4e611d9"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchgit { url = git://git.ipxe.org/ipxe.git; - sha256 = "12ijrq451fj2x3i7c7xjlxig5mwbhmgzqjvmfl2sza953vfbk4vw"; + sha256 = "1f4pi1dp2zqnrbfnggnzycfvrxv0bqgw73dxbyy3hfy4mhdj6z45"; inherit rev; }; From 76a1e39e1213f6d0ce262226445c18747cc64294 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 17:29:26 -0800 Subject: [PATCH 0030/2743] thin-provisioning-tools: 0.6.3 -> 0.7.5 Semi-automatic update. These checks were performed: - built on NixOS - found 0.7.5 with grep in /nix/store/7y3a77lh1w5ghqlmy5l00bsx90dpwyy4-thin-provisioning-tools-0.7.5 - found 0.7.5 in filename of file in /nix/store/7y3a77lh1w5ghqlmy5l00bsx90dpwyy4-thin-provisioning-tools-0.7.5 cc "@globin" --- pkgs/tools/misc/thin-provisioning-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 5d43679b6fe6..8b9fa4f2f3fc 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "thin-provisioning-tools-${version}"; - version = "0.6.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "jthornber"; repo = "thin-provisioning-tools"; rev = "v${version}"; - sha256 = "0glwhfzwj9afbqdv59ppgfqy7rik8m0vcap7279fpnvwpr1c2p5n"; + sha256 = "1ibg5wxrbqg4pr3f6aacqm42fxpwn5q00j8ldy9mw4an3ck41cwa"; }; nativeBuildInputs = [ autoreconfHook ]; From bd24b3addd46ff660d8ad6cc32a58aecd4715374 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 5 Aug 2017 14:01:52 +0200 Subject: [PATCH 0031/2743] 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 0032/2743] 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 0033/2743] 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 0034/2743] 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 0035/2743] 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 0036/2743] 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 0037/2743] 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 9580f22115dc602ad66b318755937c5444f37d3f Mon Sep 17 00:00:00 2001 From: wucke13 Date: Tue, 27 Feb 2018 20:18:25 +0100 Subject: [PATCH 0038/2743] Solving #30396 --- nixos/modules/services/editors/emacs.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 2c5a0c4849ef..d61e7e7233eb 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -15,6 +15,25 @@ let fi ''; +desktopApplicationFile = pkgs.writeTextFile { + name = "emacsclient.desktop"; + destination = "/share/applications/emacsclient.desktop"; + text = '' +[Desktop Entry] +Name=Emacsclient +GenericName=Text Editor +Comment=Edit text +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=emacseditor %F +Icon=emacs +Type=Application +Terminal=false +Categories=Development;TextEditor; +StartupWMClass=Emacs +Keywords=Text;Editor; +''; +}; + in { options.services.emacs = { @@ -74,7 +93,7 @@ in { }; } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; }; - environment.systemPackages = [ cfg.package editorScript ]; + environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; environment.variables = { # This is required so that GTK applications launched from Emacs From e797e0091356c25282fba4d19690666d4b6f6d0b Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 27 Feb 2018 10:13:05 -0800 Subject: [PATCH 0039/2743] salt: 2017.7.2 -> 2017.7.4 Release notes: https://docs.saltstack.com/en/2017.7/topics/releases/2017.7.4.html --- pkgs/tools/admin/salt/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 799beee52049..4077c4fb9ecb 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,12 +8,11 @@ python2Packages.buildPythonApplication rec { pname = "salt"; - version = "2017.7.2"; - name = "${pname}-${version}"; + version = "2017.7.4"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz"; + sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx"; }; propagatedBuildInputs = with python2Packages; [ 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 0040/2743] 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 a536aee981fb20670b03a55357719dd771e780c2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 6 Mar 2018 13:01:33 +0300 Subject: [PATCH 0041/2743] fontconfig: 2.12.1 -> 2.12.6 --- .../libraries/fontconfig/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 1109582ad64f..29838fe1ffa1 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl, fetchpatch -, pkgconfig, freetype, expat, libxslt, dejavu_fonts +, pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , hostPlatform }: @@ -18,11 +18,12 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-2.12.1"; + name = "fontconfig-${version}"; + version = "2.12.6"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl"; + sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; }; patches = [ @@ -30,23 +31,12 @@ stdenv.mkDerivation rec { src = ./config-compat.patch; inherit configVersion; }) - (fetchpatch { - name = "glibc-2.25.diff"; - url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c"; - sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz"; - }) ]; - # additionally required for the glibc-2.25 patch; avoid requiring gperf - postPatch = '' - sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf} - sleep 2 - touch src/fcobjshash.h - ''; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gperf ]; buildInputs = [ expat ]; configureFlags = [ From 3a28cc1dcd9432c62d46bda6de380b30f6d2e12f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 6 Mar 2018 13:02:13 +0300 Subject: [PATCH 0042/2743] freetype: 2.7.1 -> 2.9 --- .../libraries/freetype/cve-2017-8105.patch | 27 - .../libraries/freetype/cve-2017-8287.patch | 22 - .../libraries/freetype/default.nix | 17 +- .../pcf-config-long-family-names.patch | 553 ------------------ .../freetype/pcf-introduce-driver.patch | 68 --- 5 files changed, 5 insertions(+), 682 deletions(-) delete mode 100644 pkgs/development/libraries/freetype/cve-2017-8105.patch delete mode 100644 pkgs/development/libraries/freetype/cve-2017-8287.patch delete mode 100644 pkgs/development/libraries/freetype/pcf-config-long-family-names.patch delete mode 100644 pkgs/development/libraries/freetype/pcf-introduce-driver.patch diff --git a/pkgs/development/libraries/freetype/cve-2017-8105.patch b/pkgs/development/libraries/freetype/cve-2017-8105.patch deleted file mode 100644 index dc4327a52a88..000000000000 --- a/pkgs/development/libraries/freetype/cve-2017-8105.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=f958c48ee43 - -diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c -index af7b465..7dd4513 100644 ---- a/src/psaux/t1decode.c -+++ b/src/psaux/t1decode.c -@@ -780,10 +780,19 @@ - /* point without adding any point to the outline */ - idx = decoder->num_flex_vectors++; - if ( idx > 0 && idx < 7 ) -+ { -+ /* in malformed fonts it is possible to have other */ -+ /* opcodes in the middle of a flex (which don't */ -+ /* increase `num_flex_vectors'); we thus have to */ -+ /* check whether we can add a point */ -+ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) ) -+ goto Syntax_Error; -+ - t1_builder_add_point( builder, - x, - y, - (FT_Byte)( idx == 3 || idx == 6 ) ); -+ } - } - break; - - diff --git a/pkgs/development/libraries/freetype/cve-2017-8287.patch b/pkgs/development/libraries/freetype/cve-2017-8287.patch deleted file mode 100644 index 7ccf4f3278b7..000000000000 --- a/pkgs/development/libraries/freetype/cve-2017-8287.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3774fc08b - -diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c -index d18e821..0baf836 100644 ---- a/src/psaux/psobjs.c -+++ b/src/psaux/psobjs.c -@@ -1718,6 +1718,14 @@ - first = outline->n_contours <= 1 - ? 0 : outline->contours[outline->n_contours - 2] + 1; - -+ /* in malformed fonts it can happen that a contour was started */ -+ /* but no points were added */ -+ if ( outline->n_contours && first == outline->n_points ) -+ { -+ outline->n_contours--; -+ return; -+ } -+ - /* We must not include the last point in the path if it */ - /* is located on the first point. */ - if ( outline->n_points > 1 ) - diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8f16f85cabf7..cd7ac64da150 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -11,10 +11,10 @@ let inherit (stdenv.lib) optional optionals optionalString; - version = "2.7.1"; name = "freetype-" + version; -in stdenv.mkDerivation { - inherit name; +in stdenv.mkDerivation rec { + name = "freetype-${version}"; + version = "2.9"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs"; + sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype @@ -43,14 +43,7 @@ in stdenv.mkDerivation { ++ optional (!stdenv.isLinux) gnumake; patches = - [ - ./pcf-introduce-driver.patch - ./pcf-config-long-family-names.patch - ./disable-pcf-long-family-names.patch - ./enable-table-validation.patch - # remove the two CVE patches after updating to >= 2.8 - ./cve-2017-8105.patch - ./cve-2017-8287.patch + [ ./enable-table-validation.patch ] ++ optional useEncumberedCode ./enable-subpixel-rendering.patch; diff --git a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch deleted file mode 100644 index 95ed83c60f8f..000000000000 --- a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch +++ /dev/null @@ -1,553 +0,0 @@ -diff --git a/devel/ftoption.h b/devel/ftoption.h -index 3b63931..b8b0a8d 100644 ---- a/devel/ftoption.h -+++ b/devel/ftoption.h -@@ -82,8 +82,8 @@ FT_BEGIN_HEADER - /* to control the various font drivers and modules. The controllable */ - /* properties are listed in the section `Controlling FreeType Modules' */ - /* in the reference's table of contents; currently there are properties */ -- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ -- /* TrueType (file `ftttdrv.h'). */ -+ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ -+ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ - /* */ - /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ - /* multiple lines for better readability). */ -@@ -835,6 +835,33 @@ FT_BEGIN_HEADER - /*************************************************************************/ - /*************************************************************************/ - /**** ****/ -+ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ -+ /**** ****/ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ -+ -+ /*************************************************************************/ -+ /* */ -+ /* There are many PCF fonts just called `Fixed' which look completely */ -+ /* different, and which have nothing to do with each other. When */ -+ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ -+ /* random, the style changes often if one changes the size and one */ -+ /* cannot select some fonts at all. This option makes the PCF module */ -+ /* prepend the foundry name (plus a space) to the family name. */ -+ /* */ -+ /* We also check whether we have `wide' characters; all put together, we */ -+ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ -+ /* */ -+ /* If this option is activated, it can be controlled with the */ -+ /* `no-long-family-names' property of the pcf driver module. */ -+ /* */ -+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ /**** ****/ - /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ - /**** ****/ - /*************************************************************************/ -diff --git a/docs/CHANGES b/docs/CHANGES -index cb3b327..3823395 100644 ---- a/docs/CHANGES -+++ b/docs/CHANGES -@@ -1,4 +1,20 @@ - -+CHANGES BETWEEN 2.7.1 and 2.7.2 -+ -+ I. IMPORTANT CHANGES -+ -+ - The PCF change to show more `colourful' family names (introduced -+ in version 2.7.1) was too radical; it can now be configured with -+ PCF_CONFIG_OPTION_LONG_FAMILY_NAMES at compile time. If -+ activated, it can be switched off at run time with the new pcf -+ property `no-long-family-names'. If the `FREETYPE_PROPERTIES' -+ environment variable is available, you can say -+ -+ FREETYPE_PROPERTIES=pcf:no-long-family-names=1 -+ -+ -+====================================================================== -+ - CHANGES BETWEEN 2.7 and 2.7.1 - - I. IMPORTANT CHANGES -diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h -index 950d36c..d491af5 100644 ---- a/include/freetype/config/ftheader.h -+++ b/include/freetype/config/ftheader.h -@@ -357,6 +357,19 @@ - /************************************************************************* - * - * @macro: -+ * FT_PCF_DRIVER_H -+ * -+ * @description: -+ * A macro used in #include statements to name the file containing -+ * structures and macros related to the PCF driver module. -+ * -+ */ -+#define FT_PCF_DRIVER_H -+ -+ -+ /************************************************************************* -+ * -+ * @macro: - * FT_TYPE1_TABLES_H - * - * @description: -diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index f5bc540..5676074 100644 ---- a/include/freetype/config/ftoption.h -+++ b/include/freetype/config/ftoption.h -@@ -82,8 +82,8 @@ FT_BEGIN_HEADER - /* to control the various font drivers and modules. The controllable */ - /* properties are listed in the section `Controlling FreeType Modules' */ - /* in the reference's table of contents; currently there are properties */ -- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ -- /* TrueType (file `ftttdrv.h'). */ -+ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ -+ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ - /* */ - /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ - /* multiple lines for better readability). */ -@@ -835,6 +835,33 @@ FT_BEGIN_HEADER - /*************************************************************************/ - /*************************************************************************/ - /**** ****/ -+ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ -+ /**** ****/ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ -+ -+ /*************************************************************************/ -+ /* */ -+ /* There are many PCF fonts just called `Fixed' which look completely */ -+ /* different, and which have nothing to do with each other. When */ -+ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ -+ /* random, the style changes often if one changes the size and one */ -+ /* cannot select some fonts at all. This option makes the PCF module */ -+ /* prepend the foundry name (plus a space) to the family name. */ -+ /* */ -+ /* We also check whether we have `wide' characters; all put together, we */ -+ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ -+ /* */ -+ /* If this option is activated, it can be controlled with the */ -+ /* `no-long-family-names' property of the pcf driver module. */ -+ /* */ -+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ -+ /*************************************************************************/ -+ /*************************************************************************/ -+ /**** ****/ - /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ - /**** ****/ - /*************************************************************************/ -diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h -index ab43895..a0a121b 100644 ---- a/include/freetype/ftchapters.h -+++ b/include/freetype/ftchapters.h -@@ -77,6 +77,7 @@ - /* auto_hinter */ - /* cff_driver */ - /* tt_driver */ -+/* pcf_driver */ - /* */ - /***************************************************************************/ - -diff --git a/include/freetype/ftpcfdrv.h b/include/freetype/ftpcfdrv.h -new file mode 100644 -index 0000000..6622c93 ---- /dev/null -+++ b/include/freetype/ftpcfdrv.h -@@ -0,0 +1,105 @@ -+/***************************************************************************/ -+/* */ -+/* ftpcfdrv.h */ -+/* */ -+/* FreeType API for controlling the PCF driver (specification only). */ -+/* */ -+/* Copyright 2017 by */ -+/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -+/* */ -+/* This file is part of the FreeType project, and may only be used, */ -+/* modified, and distributed under the terms of the FreeType project */ -+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -+/* this file you indicate that you have read the license and */ -+/* understand and accept it fully. */ -+/* */ -+/***************************************************************************/ -+ -+ -+#ifndef FTPCFDRV_H_ -+#define FTPCFDRV_H_ -+ -+#include -+#include FT_FREETYPE_H -+ -+#ifdef FREETYPE_H -+#error "freetype.h of FreeType 1 has been loaded!" -+#error "Please fix the directory search order for header files" -+#error "so that freetype.h of FreeType 2 is found first." -+#endif -+ -+ -+FT_BEGIN_HEADER -+ -+ -+ /************************************************************************** -+ * -+ * @section: -+ * pcf_driver -+ * -+ * @title: -+ * The PCF driver -+ * -+ * @abstract: -+ * Controlling the PCF driver module. -+ * -+ * @description: -+ * While FreeType's PCF driver doesn't expose API functions by itself, -+ * it is possible to control its behaviour with @FT_Property_Set and -+ * @FT_Property_Get. Right now, there is a single property -+ * `no-long-family-names' available if FreeType is compiled with -+ * PCF_CONFIG_OPTION_LONG_FAMILY_NAMES. -+ * -+ * The PCF driver's module name is `pcf'. -+ * -+ */ -+ -+ -+ /************************************************************************** -+ * -+ * @property: -+ * no-long-family-names -+ * -+ * @description: -+ * If PCF_CONFIG_OPTION_LONG_FAMILY_NAMES is active while compiling -+ * FreeType, the PCF driver constructs long family names. -+ * -+ * There are many PCF fonts just called `Fixed' which look completely -+ * different, and which have nothing to do with each other. When -+ * selecting `Fixed' in KDE or Gnome one gets results that appear rather -+ * random, the style changes often if one changes the size and one -+ * cannot select some fonts at all. The improve this situation, the PCF -+ * module prepends the foundry name (plus a space) to the family name. -+ * It also checks whether there are `wide' characters; all put together, -+ * family names like `Sony Fixed' or `Misc Fixed Wide' are constructed. -+ * -+ * If `no-long-family-names' is set, this feature gets switched off. -+ * -+ * { -+ * FT_Library library; -+ * FT_Bool no_long_family_names = TRUE; -+ * -+ * -+ * FT_Init_FreeType( &library ); -+ * -+ * FT_Property_Set( library, "pcf", -+ * "no-long-family-names", -+ * &no_long_family_names ); -+ * } -+ * -+ * @note: -+ * This property can be used with @FT_Property_Get also. -+ * -+ * This property can be set via the `FREETYPE_PROPERTIES' environment -+ * variable (using values 1 and 0 for `on' and `off', respectively). -+ * -+ */ -+ -+ -+FT_END_HEADER -+ -+ -+#endif /* FTPCFDRV_H_ */ -+ -+ -+/* END */ -diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h -index 830cabe..f0390cb 100644 ---- a/src/pcf/pcf.h -+++ b/src/pcf/pcf.h -@@ -167,6 +167,8 @@ FT_BEGIN_HEADER - { - FT_DriverRec root; - -+ FT_Bool no_long_family_names; -+ - } PCF_DriverRec, *PCF_Driver; - - -diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c -index 8f4a90d..bc65423 100644 ---- a/src/pcf/pcfdrivr.c -+++ b/src/pcf/pcfdrivr.c -@@ -49,6 +49,8 @@ THE SOFTWARE. - - #include FT_SERVICE_BDF_H - #include FT_SERVICE_FONT_FORMAT_H -+#include FT_SERVICE_PROPERTIES_H -+#include FT_PCF_DRIVER_H - - - /*************************************************************************/ -@@ -667,6 +669,110 @@ THE SOFTWARE. - }; - - -+ /* -+ * PROPERTY SERVICE -+ * -+ */ -+ static FT_Error -+ pcf_property_set( FT_Module module, /* PCF_Driver */ -+ const char* property_name, -+ const void* value, -+ FT_Bool value_is_string ) -+ { -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ FT_Error error = FT_Err_Ok; -+ PCF_Driver driver = (PCF_Driver)module; -+ -+#ifndef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES -+ FT_UNUSED( value_is_string ); -+#endif -+ -+ -+ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) -+ { -+#ifdef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES -+ if ( value_is_string ) -+ { -+ const char* s = (const char*)value; -+ long lfn = ft_strtol( s, NULL, 10 ); -+ -+ -+ if ( lfn == 0 ) -+ driver->no_long_family_names = 0; -+ else if ( lfn == 1 ) -+ driver->no_long_family_names = 1; -+ else -+ return FT_THROW( Invalid_Argument ); -+ } -+ else -+#endif -+ { -+ FT_Bool* no_long_family_names = (FT_Bool*)value; -+ -+ -+ driver->no_long_family_names = *no_long_family_names; -+ } -+ -+ return error; -+ } -+ -+#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_UNUSED( module ); -+ FT_UNUSED( value ); -+ FT_UNUSED( value_is_string ); -+ -+#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_TRACE0(( "pcf_property_set: missing property `%s'\n", -+ property_name )); -+ return FT_THROW( Missing_Property ); -+ } -+ -+ -+ static FT_Error -+ pcf_property_get( FT_Module module, /* PCF_Driver */ -+ const char* property_name, -+ const void* value ) -+ { -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ FT_Error error = FT_Err_Ok; -+ PCF_Driver driver = (PCF_Driver)module; -+ -+ -+ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) -+ { -+ FT_Bool no_long_family_names = driver->no_long_family_names; -+ FT_Bool* val = (FT_Bool*)value; -+ -+ -+ *val = no_long_family_names; -+ -+ return error; -+ } -+ -+#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_UNUSED( module ); -+ FT_UNUSED( value ); -+ -+#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ -+ FT_TRACE0(( "pcf_property_get: missing property `%s'\n", -+ property_name )); -+ return FT_THROW( Missing_Property ); -+ } -+ -+ -+ FT_DEFINE_SERVICE_PROPERTIESREC( -+ pcf_service_properties, -+ -+ (FT_Properties_SetFunc)pcf_property_set, /* set_property */ -+ (FT_Properties_GetFunc)pcf_property_get ) /* get_property */ -+ -+ - /* - * - * SERVICE LIST -@@ -677,6 +783,7 @@ THE SOFTWARE. - { - { FT_SERVICE_ID_BDF, &pcf_service_bdf }, - { FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_PCF }, -+ { FT_SERVICE_ID_PROPERTIES, &pcf_service_properties }, - { NULL, NULL } - }; - -@@ -694,7 +801,14 @@ THE SOFTWARE. - FT_CALLBACK_DEF( FT_Error ) - pcf_driver_init( FT_Module module ) /* PCF_Driver */ - { -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ PCF_Driver driver = (PCF_Driver)module; -+ -+ -+ driver->no_long_family_names = 0; -+#else - FT_UNUSED( module ); -+#endif - - return FT_Err_Ok; - } -diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c -index 38ba110..3eacf2b 100644 ---- a/src/pcf/pcfread.c -+++ b/src/pcf/pcfread.c -@@ -1393,57 +1393,75 @@ THE SOFTWARE. - prop = pcf_find_property( face, "FAMILY_NAME" ); - if ( prop && prop->isString ) - { -- /* Prepend the foundry name plus a space to the family name. */ -- /* There are many fonts just called `Fixed' which look completely */ -- /* different, and which have nothing to do with each other. When */ -- /* selecting `Fixed' in KDE or Gnome one gets results that appear */ -- /* rather random, the style changes often if one changes the size */ -- /* and one cannot select some fonts at all. */ -- /* */ -- /* We also check whether we have `wide' characters; all put */ -- /* together, we get family names like `Sony Fixed' or `Misc Fixed */ -- /* Wide'. */ -- PCF_Property foundry_prop, point_size_prop, average_width_prop; -- -- int l = ft_strlen( prop->value.atom ) + 1; -- int wide = 0; -- -- -- foundry_prop = pcf_find_property( face, "FOUNDRY" ); -- point_size_prop = pcf_find_property( face, "POINT_SIZE" ); -- average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); -- -- if ( point_size_prop && average_width_prop ) -+ -+#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES -+ -+ PCF_Driver driver = (PCF_Driver)FT_FACE_DRIVER( face ); -+ -+ -+ if ( !driver->no_long_family_names ) - { -- if ( average_width_prop->value.l >= point_size_prop->value.l ) -+ /* Prepend the foundry name plus a space to the family name. */ -+ /* There are many fonts just called `Fixed' which look */ -+ /* completely different, and which have nothing to do with each */ -+ /* other. When selecting `Fixed' in KDE or Gnome one gets */ -+ /* results that appear rather random, the style changes often if */ -+ /* one changes the size and one cannot select some fonts at all. */ -+ /* */ -+ /* We also check whether we have `wide' characters; all put */ -+ /* together, we get family names like `Sony Fixed' or `Misc */ -+ /* Fixed Wide'. */ -+ -+ PCF_Property foundry_prop, point_size_prop, average_width_prop; -+ -+ int l = ft_strlen( prop->value.atom ) + 1; -+ int wide = 0; -+ -+ -+ foundry_prop = pcf_find_property( face, "FOUNDRY" ); -+ point_size_prop = pcf_find_property( face, "POINT_SIZE" ); -+ average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); -+ -+ if ( point_size_prop && average_width_prop ) - { -- /* This font is at least square shaped or even wider */ -- wide = 1; -- l += ft_strlen( " Wide" ); -+ if ( average_width_prop->value.l >= point_size_prop->value.l ) -+ { -+ /* This font is at least square shaped or even wider */ -+ wide = 1; -+ l += ft_strlen( " Wide" ); -+ } - } -- } - -- if ( foundry_prop && foundry_prop->isString ) -- { -- l += ft_strlen( foundry_prop->value.atom ) + 1; -+ if ( foundry_prop && foundry_prop->isString ) -+ { -+ l += ft_strlen( foundry_prop->value.atom ) + 1; - -- if ( FT_NEW_ARRAY( root->family_name, l ) ) -- goto Exit; -+ if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ goto Exit; -+ -+ ft_strcpy( root->family_name, foundry_prop->value.atom ); -+ ft_strcat( root->family_name, " " ); -+ ft_strcat( root->family_name, prop->value.atom ); -+ } -+ else -+ { -+ if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ goto Exit; - -- ft_strcpy( root->family_name, foundry_prop->value.atom ); -- ft_strcat( root->family_name, " " ); -- ft_strcat( root->family_name, prop->value.atom ); -+ ft_strcpy( root->family_name, prop->value.atom ); -+ } -+ -+ if ( wide ) -+ ft_strcat( root->family_name, " Wide" ); - } - else -+ -+#endif /* PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ -+ - { -- if ( FT_NEW_ARRAY( root->family_name, l ) ) -+ if ( FT_STRDUP( root->family_name, prop->value.atom ) ) - goto Exit; -- -- ft_strcpy( root->family_name, prop->value.atom ); - } -- -- if ( wide ) -- ft_strcat( root->family_name, " Wide" ); - } - else - root->family_name = NULL; --- -cgit v1.0-41-gc330 - diff --git a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch deleted file mode 100644 index c1685c5116cc..000000000000 --- a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h -index c726e5e..830cabe 100644 ---- a/src/pcf/pcf.h -+++ b/src/pcf/pcf.h -@@ -163,6 +163,13 @@ FT_BEGIN_HEADER - } PCF_FaceRec, *PCF_Face; - - -+ typedef struct PCF_DriverRec_ -+ { -+ FT_DriverRec root; -+ -+ } PCF_DriverRec, *PCF_Driver; -+ -+ - /* macros for pcf font format */ - - #define LSBFirst 0 -diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c -index 10d5c20..8f4a90d 100644 ---- a/src/pcf/pcfdrivr.c -+++ b/src/pcf/pcfdrivr.c -@@ -691,22 +691,38 @@ THE SOFTWARE. - } - - -+ FT_CALLBACK_DEF( FT_Error ) -+ pcf_driver_init( FT_Module module ) /* PCF_Driver */ -+ { -+ FT_UNUSED( module ); -+ -+ return FT_Err_Ok; -+ } -+ -+ -+ FT_CALLBACK_DEF( void ) -+ pcf_driver_done( FT_Module module ) /* PCF_Driver */ -+ { -+ FT_UNUSED( module ); -+ } -+ -+ - FT_CALLBACK_TABLE_DEF - const FT_Driver_ClassRec pcf_driver_class = - { - { - FT_MODULE_FONT_DRIVER | - FT_MODULE_DRIVER_NO_OUTLINES, -- sizeof ( FT_DriverRec ), - -+ sizeof ( PCF_DriverRec ), - "pcf", - 0x10000L, - 0x20000L, - -- NULL, /* module-specific interface */ -+ NULL, /* module-specific interface */ - -- NULL, /* FT_Module_Constructor module_init */ -- NULL, /* FT_Module_Destructor module_done */ -+ pcf_driver_init, /* FT_Module_Constructor module_init */ -+ pcf_driver_done, /* FT_Module_Destructor module_done */ - pcf_driver_requester /* FT_Module_Requester get_interface */ - }, - --- -cgit v1.0-41-gc330 - From 7093810b0ca1ac88f9c3f0d0b50d70c0b04d9dac Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Wed, 7 Mar 2018 15:11:33 +1100 Subject: [PATCH 0043/2743] 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 0044/2743] 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 0045/2743] 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 0046/2743] 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 0047/2743] 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 0048/2743] 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 0049/2743] 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 0050/2743] 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 928dbcf01dfe491ae0e9f3ff07ab46095e049c28 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 18:16:34 -0800 Subject: [PATCH 0051/2743] help2man: 1.47.5 -> 1.47.6 Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/3qw4v9wzqzk8kljaln8r0p7s0g8msyj2-help2man-1.47.6/bin/help2man --help` got 0 exit code - ran `/nix/store/3qw4v9wzqzk8kljaln8r0p7s0g8msyj2-help2man-1.47.6/bin/help2man --version` and found version 1.47.6 - found 1.47.6 with grep in /nix/store/3qw4v9wzqzk8kljaln8r0p7s0g8msyj2-help2man-1.47.6 - found 1.47.6 in filename of file in /nix/store/3qw4v9wzqzk8kljaln8r0p7s0g8msyj2-help2man-1.47.6 --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6e341b577cfb..cdbdd8b2cf98 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.5"; + name = "help2man-1.47.6"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"; + sha256 = "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr"; }; nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; From 2c81bc115cde311de88af3164043995d14ceb72b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 9 Mar 2018 08:48:08 -0800 Subject: [PATCH 0052/2743] pigz: 2.3.4 -> 2.4 Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -h` got 0 exit code - ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --help` got 0 exit code - ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -V` and found version 2.4 - ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --version` and found version 2.4 - found 2.4 with grep in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4 - found 2.4 in filename of file in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4 --- pkgs/tools/compression/pigz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 76704c254bdb..3c2f7f81c1c2 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, zlib, utillinux }: let name = "pigz"; - version = "2.3.4"; + version = "2.4"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg"; + sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; }; enableParallelBuilding = true; From 64f1c7ea982f00fa3764a1b50f0722e5e453b2ed Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 9 Mar 2018 11:47:04 -0800 Subject: [PATCH 0053/2743] 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 0054/2743] 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 0055/2743] 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 0056/2743] 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 0057/2743] 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 b9a74cf2fb9792eba605bc0b87e7f089f1ff5177 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 14 Mar 2018 00:28:31 -0700 Subject: [PATCH 0058/2743] buildbot: 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/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/.buildbot-wrapped --help` got 0 exit code - ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/.buildbot-wrapped --version` and found version 1.1.0 - ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/buildbot --help` got 0 exit code - ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/buildbot --version` and found version 1.1.0 - found 1.1.0 with grep in /nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0 --- pkgs/development/tools/build-managers/buildbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 3e994227ef05..98adaf1c1aa1 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "1.0.0"; + version = "1.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0y7gpymxl09gd9dyqj7zqhaihpl9da1v8ppxi4r161ywd8jv9b1g"; + sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc"; }; buildInputs = with pythonPackages; [ From 560891d3a0496e4fa5dcbac757724f60aa36c302 Mon Sep 17 00:00:00 2001 From: Fionn Cleary Date: Tue, 13 Mar 2018 15:07:49 +0100 Subject: [PATCH 0059/2743] cdparanoia: Fix private keyword in header Patch taken from SVN, cdparanoia has not had a release since September 11, 2008. Allows including the header in C++ files. https://trac.xiph.org/changeset/15338/ --- .../applications/audio/cdparanoia/default.nix | 3 +- .../cdparanoia/fix_private_keyword.patch | 468 ++++++++++++++++++ 2 files changed, 470 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/cdparanoia/fix_private_keyword.patch diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index d4d302f07d21..760b04bef005 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch + ++ [./fix_private_keyword.patch]; buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; diff --git a/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch b/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch new file mode 100644 index 000000000000..3e9cbe2bd8c2 --- /dev/null +++ b/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch @@ -0,0 +1,468 @@ +--- cdparanoia-III-10.2/interface/cdda_interface.h (revision 15337) ++++ cdparanoia-III-10.2/interface/cdda_interface.h (revision 15338) +@@ -85,5 +85,5 @@ + int is_mmc; + +- cdda_private_data_t *private; ++ cdda_private_data_t *private_data; + void *reserved; + unsigned char inqbytes[4]; +--- cdparanoia-III-10.2/interface/cooked_interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/cooked_interface.c (revision 15338) +@@ -14,11 +14,11 @@ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; +--- cdparanoia-III-10.2/interface/interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/interface.c (revision 15338) +@@ -40,7 +40,7 @@ + if(d->cdda_fd!=-1)close(d->cdda_fd); + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + +@@ -128,5 +128,5 @@ + } + } +- if(ms)*ms=d->private->last_milliseconds; ++ if(ms)*ms=d->private_data->last_milliseconds; + return(sectors); + } +--- cdparanoia-III-10.2/interface/scan_devices.c (revision 15337) ++++ cdparanoia-III-10.2/interface/scan_devices.c (revision 15338) +@@ -265,9 +265,9 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); +@@ -675,13 +675,13 @@ + d->nsectors=-1; + d->messagedest = messagedest; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + if(use_sgio){ + d->interface=SGIO_SCSI; +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); + g_fd=d->cdda_fd=dup(d->ioctl_fd); + }else{ +@@ -697,6 +697,6 @@ + + /* malloc our big buffer for scsi commands */ +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + } + +@@ -773,7 +773,7 @@ + if(g_fd!=-1)close(g_fd); + if(d){ +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + free(d); +@@ -822,5 +822,5 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + d->drive_model=copystring("File based test interface"); + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); +--- cdparanoia-III-10.2/interface/scsi_interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/scsi_interface.c (revision 15338) +@@ -16,11 +16,11 @@ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; +@@ -97,5 +97,5 @@ + fd_set fdset; + struct timeval tv; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + int flag=0; + +@@ -186,5 +186,5 @@ + int tret1,tret2; + int status = 0; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + long writebytes=SG_OFF+cmd_len+in_size; + +@@ -196,5 +196,5 @@ + memset(sg_hd,0,sizeof(sg_hd)); + memset(sense_buffer,0,SG_MAX_SENSE); +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); ++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); + sg_hd->twelve_byte = cmd_len == 12; + sg_hd->result = 0; +@@ -210,5 +210,5 @@ + + if(bytecheck && out_size>in_size){ +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); + /* the size does not remove cmd_len due to the way the kernel + driver copies buffers */ +@@ -244,5 +244,5 @@ + + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); +- tret1=clock_gettime(d->private->clock,&tv1); ++ tret1=clock_gettime(d->private_data->clock,&tv1); + errno=0; + status = write(d->cdda_fd, sg_hd, writebytes ); +@@ -290,5 +290,5 @@ + } + +- tret2=clock_gettime(d->private->clock,&tv2); ++ tret2=clock_gettime(d->private_data->clock,&tv2); + errno=0; + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); +@@ -314,5 +314,5 @@ + long i,flag=0; + for(i=in_size;iprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; +@@ -327,7 +327,7 @@ + errno=0; + if(tret1<0 || tret2<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; + } + return(0); +@@ -348,5 +348,5 @@ + memset(&hdr,0,sizeof(hdr)); + memset(sense,0,sizeof(sense)); +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); ++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); + + hdr.cmdp = cmd; +@@ -356,5 +356,5 @@ + hdr.timeout = 50000; + hdr.interface_id = 'S'; +- hdr.dxferp = d->private->sg_buffer; ++ hdr.dxferp = d->private_data->sg_buffer; + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ + +@@ -401,5 +401,5 @@ + long i,flag=0; + for(i=in_size;iprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; +@@ -413,5 +413,5 @@ + + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ +- /* d->private->last_milliseconds = hdr.duration; */ ++ /* d->private_data->last_milliseconds = hdr.duration; */ + + errno = 0; +@@ -446,7 +446,7 @@ + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); + +- key = d->private->sg_buffer[2] & 0xf; +- ASC = d->private->sg_buffer[12]; +- ASCQ = d->private->sg_buffer[13]; ++ key = d->private_data->sg_buffer[2] & 0xf; ++ ASC = d->private_data->sg_buffer[12]; ++ ASCQ = d->private_data->sg_buffer[13]; + + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; +@@ -493,5 +493,5 @@ + + { +- unsigned char *b=d->private->sg_buffer; ++ unsigned char *b=d->private_data->sg_buffer; + if(b[0])return(1); /* Handles only up to 256 bytes */ + if(b[6])return(1); /* Handles only up to 256 bytes */ +@@ -605,6 +605,6 @@ + if(mode_sense(d,12,0x01))return(-1); + +- d->orgdens = d->private->sg_buffer[4]; +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); ++ d->orgdens = d->private_data->sg_buffer[4]; ++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); + } + +@@ -665,6 +665,6 @@ + } + +- first=d->private->sg_buffer[2]; +- last=d->private->sg_buffer[3]; ++ first=d->private_data->sg_buffer[2]; ++ last=d->private_data->sg_buffer[3]; + tracks=last-first+1; + +@@ -684,5 +684,5 @@ + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; +@@ -705,5 +705,5 @@ + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; +@@ -739,5 +739,5 @@ + + /* copy to our structure and convert start sector */ +- tracks = d->private->sg_buffer[1]; ++ tracks = d->private_data->sg_buffer[1]; + if (tracks > MAXTRK) { + cderror(d,"003: CDROM reporting illegal number of tracks\n"); +@@ -755,31 +755,31 @@ + } + +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; ++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; + d->disc_toc[i].bTrack = i + 1; + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- (((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5])); ++ (((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5])); + } + + d->disc_toc[i].bFlags = 0; + d->disc_toc[i].bTrack = i + 1; +- memcpy (&foo, d->private->sg_buffer+2, 4); +- memcpy (&bar, d->private->sg_buffer+6, 4); ++ memcpy (&foo, d->private_data->sg_buffer+2, 4); ++ memcpy (&bar, d->private_data->sg_buffer+6, 4); + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + + be32_to_cpu(bar)); + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- ((((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5]))+ ++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5]))+ + +- ((((signed char)(d->private->sg_buffer[6])<<24) | +- (d->private->sg_buffer[7]<<16)| +- (d->private->sg_buffer[8]<<8)| +- (d->private->sg_buffer[9])))); ++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | ++ (d->private_data->sg_buffer[7]<<16)| ++ (d->private_data->sg_buffer[8]<<8)| ++ (d->private_data->sg_buffer[9])))); + + +@@ -818,5 +818,5 @@ + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -837,5 +837,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -855,5 +855,5 @@ + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -873,5 +873,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -891,5 +891,5 @@ + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -909,5 +909,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -923,5 +923,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -937,5 +937,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -951,5 +951,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -965,5 +965,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -979,5 +979,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -993,5 +993,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1027,5 +1027,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1040,5 +1040,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1053,5 +1053,5 @@ + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } +@@ -1276,5 +1276,5 @@ + long i; + for(i=2351;i>=0;i--) +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') ++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') + return(((i+3)>>2)<<2); + +@@ -1285,5 +1285,5 @@ + long i,flag=0; + for(i=0;i<2352;i++) +- if(d->private->sg_buffer[i]!=0){ ++ if(d->private_data->sg_buffer[i]!=0){ + flag=1; + break; +@@ -1622,5 +1622,5 @@ + if(mode_sense(d,22,0x2A)==0){ + +- b=d->private->sg_buffer; ++ b=d->private_data->sg_buffer; + b+=b[3]+4; + +@@ -1670,5 +1670,5 @@ + return(NULL); + } +- return (d->private->sg_buffer); ++ return (d->private_data->sg_buffer); + } + +@@ -1726,6 +1726,6 @@ + + d->error_retry=1; +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + d->report_all=1; + return(0); +--- cdparanoia-III-10.2/interface/test_interface.c (revision 15337) ++++ cdparanoia-III-10.2/interface/test_interface.c (revision 15338) +@@ -67,7 +67,7 @@ + + if(beginprivate->last_milliseconds=20; ++ d->private_data->last_milliseconds=20; + else +- d->private->last_milliseconds=sectors; ++ d->private_data->last_milliseconds=sectors; + + #ifdef CDDA_TEST_UNDERRUN From b99cae3931d23f522c61b37d9d0f737372f5bf0c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:20:07 -0500 Subject: [PATCH 0060/2743] cmake: set CMAKE_FIND_FRAMEWORK=last --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index c796c31cb70a..4607453867f2 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -44,6 +44,10 @@ cmakeConfigurePhase() { cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags" fi + # on macOS we want to prefer Unix-style headers to Frameworks + # because we usually do not package the framework + cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the # basename as the install name, which means that, on Darwin, they From acbf439fef3de30956f78118b69b2804c9d8dcc2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:30:10 -0500 Subject: [PATCH 0061/2743] cmake: disable detecting global macOS sdk --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 4607453867f2..b7a4ab3d6f02 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -48,6 +48,9 @@ cmakeConfigurePhase() { # because we usually do not package the framework cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + # we never want to use the global macOS SDK + cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" + # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the # basename as the install name, which means that, on Darwin, they From 8beb809fd1daca0f4e8b7807a05076ffbcc18c5f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:31:53 -0500 Subject: [PATCH 0062/2743] cmake: don't detect macOS deployment target --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index b7a4ab3d6f02..95822eec5920 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -51,6 +51,10 @@ cmakeConfigurePhase() { # we never want to use the global macOS SDK cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" + # disable OSX deployment target + # we don't want our binaries to have a "minimum" OSX version + cmakeFlags="-DCMAKE_OSX_DEPLOYMENT_TARGET= $cmakeFlags" + # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the # basename as the install name, which means that, on Darwin, they From bd9b17f762e22720612e8650737c3200b0dabb37 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:36:27 -0500 Subject: [PATCH 0063/2743] cmake: correctly detect clang compiler on macOS --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 95822eec5920..5053559bcca3 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -55,6 +55,9 @@ cmakeConfigurePhase() { # we don't want our binaries to have a "minimum" OSX version cmakeFlags="-DCMAKE_OSX_DEPLOYMENT_TARGET= $cmakeFlags" + # correctly detect our clang compiler + cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags" + # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the # basename as the install name, which means that, on Darwin, they From f7c6491613a4f1cc9b50c05720f424bddcdbcb5f Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 15 Mar 2018 04:40:57 -0700 Subject: [PATCH 0064/2743] rocksdb: 5.10.3 -> 5.11.3 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/0z5hqf7lmzgynw5vgliy7848dr7p6fis-rednotebook-2.4/bin/rednotebook -h` got 0 exit code - ran `/nix/store/0z5hqf7lmzgynw5vgliy7848dr7p6fis-rednotebook-2.4/bin/rednotebook --help` got 0 exit code - found 5.11.3 in filename of file in /nix/store/0z5hqf7lmzgynw5vgliy7848dr7p6fis-rednotebook-2.4 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index cd17bb8499d6..c082d06eddd5 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "5.10.3"; + version = "5.11.3"; outputs = [ "dev" "out" "static" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq"; + sha256 = "15x2r7aib1xinwcchl32wghs8g96k4q5xgv6z97mxgp35475x01p"; }; nativeBuildInputs = [ which perl ]; From 5ec1ae9883e4fd2fd47019de9fe80e1283149f0e Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 15 Mar 2018 06:36:47 -0700 Subject: [PATCH 0065/2743] 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 837ecc2f6a1d48c579f6a9cc8d19104d49f429d3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Mar 2018 19:08:12 -0400 Subject: [PATCH 0066/2743] curl: 7.58.0 -> 7.59.0 --- pkgs/tools/networking/curl/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index dbe2a6639352..32a8a7888484 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl +{ stdenv, lib, fetchurl, pkgconfig, perl , http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null @@ -24,11 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.58.0"; + name = "curl-7.59.0"; src = fetchurl { - url = "https://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0cg7klhf1ksnbw5wvwa802qir877zv4y3dj7swz1xh07g3wq3c0w"; + urls = [ + "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" + "https://curl.haxx.se/download/${name}.tar.bz2" + ]; + sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From 837538da4390d1bd5c48f2f4410a0e865205d184 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 14 Mar 2018 19:25:20 -0500 Subject: [PATCH 0067/2743] openblas: don't build w/openmp on musl --- pkgs/development/libraries/science/math/openblas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 07d2a04c5e20..5ac0bcd1d7d7 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -60,7 +60,7 @@ let TARGET = "ATHLON"; DYNAMIC_ARCH = "1"; CC = "gcc"; - USE_OPENMP = "1"; + USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1"; }; }; in From c292469c6f0d9bcc76e55143d6c40eb4a5bf3f9e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 14 Mar 2018 18:30:55 -0500 Subject: [PATCH 0068/2743] numpy: 1.14.1 -> 1.14.2 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 3fce29cd8cda..4d5042e210cb 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.14.1"; + version = "1.14.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fa0944650d5d3fb95869eaacd8eedbd2d83610c85e271bd9d3495ffa9bc4dc9c"; + sha256 = "facc6f925c3099ac01a1f03758100772560a0b020fb9d70f210404be08006bcb"; }; disabled = isPyPy; From d01b1f6b1dbb0cec3f49c6fcbddeb9cf1a0373c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 14 Mar 2018 19:40:45 -0500 Subject: [PATCH 0069/2743] numpy: fix on musl --- pkgs/development/python-modules/numpy/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 4d5042e210cb..b561149b2abd 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: +{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }: buildPythonPackage rec { pname = "numpy"; @@ -20,6 +20,18 @@ buildPythonPackage rec { ./numpy-distutils-C++.patch ]; + postPatch = lib.optionalString hostPlatform.isMusl '' + # Use fenv.h + sed -i \ + numpy/core/src/npymath/ieee754.c.src \ + numpy/core/include/numpy/ufuncobject.h \ + -e 's/__GLIBC__/__linux__/' + # Don't use various complex trig functions + substituteInPlace numpy/core/src/private/npy_config.h \ + --replace '#if defined(__GLIBC__)' "#if 1" \ + --replace '#if !__GLIBC_PREREQ(2, 18)' "#if 1" + ''; + preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES From f07b330effc24307f1e15c0c528df4f6f9ce3006 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 8 Mar 2018 00:14:05 +0100 Subject: [PATCH 0070/2743] linbox: init at 1.5.2 --- pkgs/development/libraries/linbox/default.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/libraries/linbox/default.nix diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix new file mode 100644 index 000000000000..0f5442bd63b6 --- /dev/null +++ b/pkgs/development/libraries/linbox/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, givaro +, pkgconfig +, openblas +, liblapack +, fflas-ffpack +, gmpxx +, optimize ? false # impure +, withSage ? false # sage support +}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "linbox"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "linbox-team"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1wfivlwp30mzdy1697w7rzb8caajim50mc8h27k82yipn2qc5n4i"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + givaro + (liblapack.override {shared = true;}) + openblas + gmpxx + fflas-ffpack + ]; + + configureFlags = [ + "--with-blas-libs=-lopenblas" + "--with-lapack-libs=-llapack" + "--disable-optimization" + ] ++ stdenv.lib.optionals (!optimize) [ + # disable SIMD instructions (which are enabled *when available* by default) + "--disable-sse" + "--disable-sse2" + "--disable-sse3" + "--disable-ssse3" + "--disable-sse41" + "--disable-sse42" + "--disable-avx" + "--disable-avx2" + "--disable-fma" + "--disable-fma4" + ] ++ stdenv.lib.optionals withSage [ + "--enable-sage" + ]; + + patches = stdenv.lib.optionals withSage [ + # https://trac.sagemath.org/ticket/24214#comment:39 + # Will be resolved by + # https://github.com/linbox-team/linbox/issues/69 + (fetchpatch { + url = "https://raw.githubusercontent.com/sagemath/sage/a843f48b7a4267e44895a3dfa892c89c85b85611/build/pkgs/linbox/patches/linbox_charpoly_fullCRA.patch"; + sha256 = "16nxfzfknra3k2yk3xy0k8cq9rmnmsch3dnkb03kx15h0y0jmibk"; + }) + ]; + + doCheck = true; + + meta = { + inherit version; + description = "C++ library for exact, high-performance linear algebra"; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = [stdenv.lib.maintainers.timokau]; + platforms = stdenv.lib.platforms.linux; + homepage = http://linalg.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b83424eabbad..f4a3cac618ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8666,6 +8666,7 @@ with pkgs; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {}; fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {}; + linbox = callPackage ../development/libraries/linbox {}; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; From ae9a49a77dcf64e1cfa508dd3fc7dc9751ca650c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 23 Sep 2017 11:10:36 +0200 Subject: [PATCH 0071/2743] grub2: pkgconfig to fix finding freetype --- pkgs/tools/misc/grub/2.0x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 5b9130bbe0e8..78c9056db7a2 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont +, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig , zfs ? null , efiSupport ? false , zfsSupport ? true @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"; }; - nativeBuildInputs = [ bison flex python ]; + nativeBuildInputs = [ bison flex python pkgconfig ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] ++ optional doCheck qemu ++ optional zfsSupport zfs; From cf77fcadec53eb89cff480fbcb8ed0238ea3b8ac Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 16 Mar 2018 03:15:01 +0200 Subject: [PATCH 0072/2743] audit: 2.8.2 -> 2.8.3 --- pkgs/os-specific/linux/audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 390bab849c28..7e14983a6d2b 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.2"; + name = "audit-2.8.3"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "1fmw8whraz1q3y3z5mgdpgsa3wz6r3zq0kgsgbc9xvmgfwmrpdb7"; + sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl"; }; outputs = [ "bin" "dev" "out" "man" ]; From de529a5d2ce140b3e91461fd77ce8c73580d8fab Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 16 Mar 2018 03:15:14 +0200 Subject: [PATCH 0073/2743] e2fsprogs: 1.43.9 -> 1.44.0 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 62eab06c387c..95a57cefc0ec 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.43.9"; + name = "e2fsprogs-1.44.0"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "15rqvkzylqqckshfy7vmk15k7wds2rh3k1pwrkrs684p3g0gzq2v"; + sha256 = "1l8z17zfzhi00f56xl6c4f2g3fi9m4ixlmwpmaihm9y9qz1giaq4"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; From 3d251d06c2cda8480dda7952d45c9943c11de64c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 16 Mar 2018 03:15:26 +0200 Subject: [PATCH 0074/2743] gnu-efi: 3.0.6 -> 3.0.8 --- pkgs/development/libraries/gnu-efi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index a46abe3b4f7c..940b4e2aee4e 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnu-efi-${version}"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2"; - sha256 = "149cyadpn2jm4zxfn1qmpm520iqssp9p07d650rs5ghgv015jl91"; + sha256 = "08mpw8s79azip9jbzm6msq0999pnkqzd82axydrcyyynm276s03n"; }; buildInputs = [ pciutils ]; From c37e1e2ff9238d80d98dd6633ff233fd0f5db5f3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 8 Mar 2018 15:44:22 +0200 Subject: [PATCH 0075/2743] lsof: 4.89 -> 4.90 - The patch has been applied upstream. - LSOF_INCLUDE was referring to wrong output, this broke the build. - Remove an unneeded legacy sed. - Maintain, while at it. --- pkgs/development/tools/misc/lsof/default.nix | 11 ++++------- pkgs/development/tools/misc/lsof/dfile.patch | 18 ------------------ 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/tools/misc/lsof/dfile.patch diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 224e0aba6ef7..8b89fd80c1a5 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in stdenv.mkDerivation rec { name = "lsof-${version}"; - version = "4.89"; + version = "4.90"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; @@ -23,22 +23,19 @@ stdenv.mkDerivation rec { + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" ) [ false true ] ; - sha256 = "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41"; + sha256 = "1xhn3amvl5mmwji5g90nkw7lfmh2494v18qbv1f729hrg468853g"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - patches = [ ./dfile.patch ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 ''; # Stop build scripts from searching global include paths - LSOF_INCLUDE = "${stdenv.cc.libc}/include"; + LSOF_INCLUDE = "${stdenv.cc.libc.dev}/include"; configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; preBuild = '' - sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' for filepath in $(find dialects/${dialect} -type f); do sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath done @@ -58,7 +55,7 @@ stdenv.mkDerivation rec { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.dezgeg ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/lsof/dfile.patch b/pkgs/development/tools/misc/lsof/dfile.patch deleted file mode 100644 index 47202d5ebeab..000000000000 --- a/pkgs/development/tools/misc/lsof/dfile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lsof_4.89_src/dialects/darwin/libproc/dfile.c 2014-10-30 12:39:46.000000000 +0100 -+++ lsof_4.89_src/dialects/darwin/libproc/dfile_new.c 2016-10-04 13:44:58.000000000 +0200 -@@ -286,13 +286,13 @@ - - #if defined(PROC_FP_GUARDED) - if (extra > 1) -- putchar(`,'); -+ putchar(','); - if (lf->guardflags) { - struct pff_tab *tp; - long gf; - - (void) printf("guard="); -- tp = Pgf_tab; -+ tp = Pff_tab; - gf = lf->guardflags; - while (gf && !FsvFlagX) { - while (tp->nm) { From d32ea36e8caae8701742466b4034471246222226 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 05:25:15 -0700 Subject: [PATCH 0076/2743] 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 519f0b8db2f91e73964375ee81fc411153bf3aa3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2018 14:40:41 -0400 Subject: [PATCH 0077/2743] gnumake: Unconditionally fix build against glibc-2.27 --- .../build-managers/gnumake/4.2/default.nix | 2 + .../gnumake/4.2/glibc-2.27-glob.patch | 32 +++++++++ .../gnumake/4.2/glibc-2.27.patch | 24 ------- .../tools/build-managers/gnumake/4.2/head.nix | 69 ------------------- .../gnumake/4.2/impure-dirs-head.patch | 31 --------- pkgs/top-level/all-packages.nix | 6 +- 6 files changed, 35 insertions(+), 129 deletions(-) create mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27.patch delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/head.nix delete mode 100644 pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index e175205143fc..95466d843d69 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch ./pselect.patch + # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html + ./glibc-2.27-glob.patch ]; nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch new file mode 100644 index 000000000000..186212d0d298 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch @@ -0,0 +1,32 @@ +diff -Naur glob/glob.c glob/glob.c +--- glob/glob.c 2013-10-20 13:14:38.000000000 -0400 ++++ glob/glob.c 2018-03-16 14:32:38.483496170 -0400 +@@ -208,28 +208,9 @@ + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ +- +-# ifdef __GNUC__ +-# undef alloca +-# define alloca(n) __builtin_alloca (n) +-# else /* Not GCC. */ +-# ifdef HAVE_ALLOCA_H + # include +-# else /* Not HAVE_ALLOCA_H. */ +-# ifndef _AIX +-# ifdef WINDOWS32 +-# include +-# else +-extern char *alloca (); +-# endif /* WINDOWS32 */ +-# endif /* Not _AIX. */ +-# endif /* sparc or HAVE_ALLOCA_H. */ +-# endif /* GCC. */ +- + # define __alloca alloca + +-#endif + + #ifndef __GNU_LIBRARY__ + # define __stat stat diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27.patch deleted file mode 100644 index c2639c6cc927..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: * configure.ac: Support GLIBC glob interface version 2 - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff -Naur a/configure b/configure ---- configure 2016-06-10 19:03:21.000000000 -0400 -+++ configure 2018-02-18 04:40:32.971371555 -0500 -@@ -11481,10 +11481,9 @@ - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/head.nix b/pkgs/development/tools/build-managers/gnumake/4.2/head.nix deleted file mode 100644 index 5f3ae10c3e5b..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/head.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, texinfo, guileSupport ? false, pkgconfig , guile ? null, autoreconfHook }: - -assert guileSupport -> ( guile != null ); - -let - version = "4.2.90"; - revision = "48c8a116a914a325a0497721f5d8b58d5bba34d4"; - revCount = "2491"; - shortRev = "48c8a11"; - - baseVersion = "4.2.1"; - baseTarball = fetchurl { - url = "mirror://gnu/make/make-${baseVersion}.tar.bz2"; - sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; - }; -in -stdenv.mkDerivation { - name = "gnumake-${version}pre${revCount}_${shortRev}"; - - src = fetchurl { - url = "http://git.savannah.gnu.org/cgit/make.git/snapshot/make-${revision}.tar.gz"; - sha256 = "0k6yvhr2a5lh1qhflv02dyvq5p20ikgaakm8w6gr4xmkspljwpwx"; - }; - - postUnpack = '' - unpackFile ${baseTarball} - cp make-${baseVersion}/po/*.po $sourceRoot/po - cp make-${baseVersion}/doc/{fdl,make-stds}.texi $sourceRoot/doc - ''; - - patches = [ - # Purity: don't look for library dependencies (of the form `-lfoo') in /lib - # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for - # included Makefiles, don't look in /usr/include and friends. - ./impure-dirs-head.patch - ]; - - postPatch = '' - # These aren't in the 4.2.1 tarball yet. - sed -i -e 's/sr//' -e 's/zh_TW//' po/LINGUAS - ''; - - nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; - buildInputs = stdenv.lib.optional guileSupport guile; - - configureFlags = stdenv.lib.optional guileSupport "--with-guile"; - - outputs = [ "out" "man" "info" ]; - - meta = with stdenv.lib; { - homepage = http://www.gnu.org/software/make/; - description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - - longDescription = '' - Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. - ''; - - platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; - }; -} diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch b/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch deleted file mode 100644 index 06d39e13ce39..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur a/src/read.c b/src/read.c ---- a/src/read.c 2017-11-19 15:17:47.000000000 -0500 -+++ b/src/read.c 2018-02-19 08:53:51.548755213 -0500 -@@ -109,10 +109,12 @@ - #endif - INCLUDEDIR, - #ifndef _AMIGA -+#if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", - #endif -+#endif - 0 - }; - -diff -Naur a/src/remake.c b/src/remake.c ---- a/src/remake.c 2017-11-19 15:17:47.000000000 -0500 -+++ b/src/remake.c 2018-02-19 08:54:08.304101943 -0500 -@@ -1601,9 +1601,11 @@ - static const char *dirs[] = - { - #ifndef _AMIGA -+#if 0 - "/lib", - "/usr/lib", - #endif -+#endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* - * This is completely up to the user at product install time. Just define diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816f0a2b597b..ed16ed95b942 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7758,11 +7758,7 @@ with pkgs; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; - gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = if hostPlatform.isRiscV # Technically this check should be for glibc version. - then gnumake42HEAD - else gnumake42; - gnumake42HEAD = callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { }; + gnumake = callPackage ../development/tools/build-managers/gnumake/4.2 { }; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); From 633acbf5c042326c7fb44413aaca772dd74c2817 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 12:33:58 -0700 Subject: [PATCH 0078/2743] gnustep-make: 2.6.8 -> 2.7.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests -h` got 0 exit code - ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests --help` got 0 exit code - ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests -h` and found version 2.7.0 - ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-tests --help` and found version 2.7.0 - ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/openapp --help` got 0 exit code - ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/opentool --help` got 0 exit code - ran `/nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0/bin/gnustep-config --help` got 0 exit code - found 2.7.0 with grep in /nix/store/9bilynlmzsc8z4wv6qjpgz983r434yad-gnustep-make-2.7.0 - directory tree listing: https://gist.github.com/30c82119c95760404469e4a1fcfa0d8d --- pkgs/desktops/gnustep/make/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 622505864971..6ef87cece4e4 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, clang, which, libobjc }: let - version = "2.6.8"; + version = "2.7.0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "0r00439f7vrggdwv60n8p626gnyymhq968i5x9ad2i4v6g8x4gk0"; + sha256 = "1khiygfkz0zhh9b5nybn40g0xnnjxchk24n49hff1bwanszir84h"; }; configureFlags = [ From a1ede569efc8f2dfc22c06f0e40fa218b9732536 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2018 16:38:32 -0400 Subject: [PATCH 0079/2743] gcc: Unconditionally add some upstream RISC-V patches. --- pkgs/development/compilers/gcc/7/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 8e7cd3d3fab8..0462231b064e 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -57,16 +57,18 @@ let version = "7.3.0"; enableParallelBuilding = true; patches = - [ ] + [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html + ./riscv-pthread-reentrant.patch + # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html + ./riscv-no-relax.patch + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs"; }) - ++ optional langFortran ../gfortran-driving.patch - # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html - ++ optional targetPlatform.isRiscV ./riscv-pthread-reentrant.patch; + ++ optional langFortran ../gfortran-driving.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at From 017d678a00e28020bdb4fb036f29a14d773c29ca Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2018 16:39:55 -0400 Subject: [PATCH 0080/2743] gcc: Add uncommitted patch. --- .../compilers/gcc/7/riscv-no-relax.patch | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 pkgs/development/compilers/gcc/7/riscv-no-relax.patch diff --git a/pkgs/development/compilers/gcc/7/riscv-no-relax.patch b/pkgs/development/compilers/gcc/7/riscv-no-relax.patch new file mode 100644 index 000000000000..93d9cd1d60f5 --- /dev/null +++ b/pkgs/development/compilers/gcc/7/riscv-no-relax.patch @@ -0,0 +1,109 @@ +commit e7c570f37384d824cb9725f237920e9691e57269 +gpg: Signature made Tue 06 Mar 2018 04:52:46 PM PST +gpg: using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41 +gpg: issuer "palmer@dabbelt.com" +gpg: Good signature from "Palmer Dabbelt " [ultimate] +gpg: aka "Palmer Dabbelt " [ultimate] +Author: Palmer Dabbelt +Date: Thu Mar 1 12:01:06 2018 -0800 + + RISC-V: Add and document the "-mno-relax" option + + RISC-V relies on aggressive linker relaxation to get good code size. As + a result no text symbol addresses can be known until link time, which + means that alignment must be handled during the link. This alignment + pass is essentially just another linker relaxation, so this has the + unfortunate side effect that linker relaxation is required for + correctness on many RISC-V targets. + + The RISC-V assembler has supported an ".option norelax" for a long time + because there are situations in which linker relaxation is a bad idea -- + the canonical example is when trying to materialize the initial value of + the global pointer into a register, which would otherwise be relaxed to + a NOP. We've been relying on users who want to disable relaxation for + an entire link to pass "-Wl,--no-relax", but that still relies on the + linker relaxing R_RISCV_ALIGN to handle alignment despite it not being + strictly necessary. + + This patch adds a GCC option, "-mno-relax", that disable linker + relaxation by adding ".option norelax" to the top of every generated + assembly file. The assembler is smart enough to handle alignment at + assemble time for files that have never emitted a relaxable relocation, + so this is sufficient to really disable all relaxations in the linker, + which results in significantly faster link times for large objects. + + This also has the side effect of allowing toolchains that don't support + linker relaxation (LLVM and the Linux module loader) to function + correctly. Toolchains that don't support linker relaxation should + default to "-mno-relax" and error when presented with any R_RISCV_ALIGN + relocation as those need to be handled for correctness. + + gcc/ChangeLog + + 2018-03-01 Palmer Dabbelt + + * config/riscv/riscv.opt (mrelax): New option. + * config/riscv/riscv.c (riscv_file_start): Emit ".option + "norelax" when riscv_mrelax is disabled. + * doc/invoke.texi (RISC-V): Document "-mrelax" and "-mno-relax". + +diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c +index c38f6c394d54..3e81874de232 100644 +--- a/gcc/config/riscv/riscv.c ++++ b/gcc/config/riscv/riscv.c +@@ -3979,6 +3979,11 @@ riscv_file_start (void) + + /* Instruct GAS to generate position-[in]dependent code. */ + fprintf (asm_out_file, "\t.option %spic\n", (flag_pic ? "" : "no")); ++ ++ /* If the user specifies "-mno-relax" on the command line then disable linker ++ relaxation in the assembler. */ ++ if (! riscv_mrelax) ++ fprintf (asm_out_file, "\t.option norelax\n"); + } + + /* Implement TARGET_ASM_OUTPUT_MI_THUNK. Generate rtl rather than asm text +diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt +index 581a26bb5c1e..b37ac75d9bb4 100644 +--- a/gcc/config/riscv/riscv.opt ++++ b/gcc/config/riscv/riscv.opt +@@ -106,6 +106,11 @@ mexplicit-relocs + Target Report Mask(EXPLICIT_RELOCS) + Use %reloc() operators, rather than assembly macros, to load addresses. + ++mrelax ++Target Bool Var(riscv_mrelax) Init(1) ++Take advantage of linker relaxations to reduce the number of instructions ++required to materialize symbol addresses. ++ + Mask(64BIT) + + Mask(MUL) +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 8d366c626bae..deb48af2ecad 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1042,7 +1042,8 @@ See RS/6000 and PowerPC Options. + -msave-restore -mno-save-restore @gol + -mstrict-align -mno-strict-align @gol + -mcmodel=medlow -mcmodel=medany @gol +--mexplicit-relocs -mno-explicit-relocs @gol} ++-mexplicit-relocs -mno-explicit-relocs @gol ++-mrelax -mno-relax @gol} + + @emph{RL78 Options} + @gccoptlist{-msim -mmul=none -mmul=g13 -mmul=g14 -mallregs @gol +@@ -23102,6 +23103,12 @@ Use or do not use assembler relocation operators when dealing with symbolic + addresses. The alternative is to use assembler macros instead, which may + limit optimization. + ++@item -mrelax ++@itemx -mno-relax ++Take advantage of linker relaxations to reduce the number of instructions ++required to materialize symbol addresses. The default is to take advantage of ++linker relaxations. ++ + @end table + + @node RL78 Options + From ad7bd4c7a3b692dfeae9dee0e3863dc43c493504 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 18:07:08 -0700 Subject: [PATCH 0081/2743] 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 0082/2743] 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 c1c0094f7ffe2be233c9785fba1a0901419e026e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 17 Mar 2018 02:38:43 -0500 Subject: [PATCH 0083/2743] SDL_gfx: 2.0.25 -> 2.0.26 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.0.26 with grep in /nix/store/cbvm4r21kf3acf43hff5sf6r1vbd6lpg-SDL_gfx-2.0.26 --- pkgs/development/libraries/SDL_gfx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 1d7d96f7536d..83a2ffc077c3 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL_gfx-${version}"; - version = "2.0.25"; + version = "2.0.26"; src = fetchurl { url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; - sha256 = "1h2rj34dxi5xlwpvm293v2d91gsirhnpzlmnjns9xwkcdg0fsvjm"; + sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; buildInputs = [ SDL ] ; From adf11dcc01ed413a03597d119bae414de70b9e55 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 13:58:41 +0100 Subject: [PATCH 0084/2743] darwin-frameworks: add hook for private frameworks to CoreMIDI Some parts of CoreMIDI depend on private frameworks, this enables eg. adding -framework MultitouchSupport to a build. --- pkgs/os-specific/darwin/apple-sdk/default.nix | 7 +++++++ .../darwin/apple-sdk/private-frameworks-setup-hook.sh | 8 ++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 5a58410ae926..7f6f0cdd0c48 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -210,6 +210,13 @@ in rec { ]; }); + CoreMIDI = stdenv.lib.overrideDerivation super.CoreMIDI (drv: { + __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ + "/System/Library/PrivateFrameworks/" + ]; + setupHook = ./private-frameworks-setup-hook.sh; + }); + Security = stdenv.lib.overrideDerivation super.Security (drv: { setupHook = ./security-setup-hook.sh; }); diff --git a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh new file mode 100644 index 000000000000..fbd977f8552d --- /dev/null +++ b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh @@ -0,0 +1,8 @@ +addPrivateFrameworks() { + flag="-F/System/Library/PrivateFrameworks" + if [[ "$NIX_CFLAGS_COMPILE" != *$flag* ]]; then + NIX_CFLAGS_COMPILE+=" $flag" + fi +} + +addEnvHooks "$hostOffset" addPrivateFrameworks From 33aa3f3488ecd127c0564d2788cd941be23b0954 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 8 Mar 2018 23:33:35 +0100 Subject: [PATCH 0085/2743] chuck: fix darwin build --- pkgs/applications/audio/chuck/clang.patch | 58 +++++++++++++++++++++++ pkgs/applications/audio/chuck/default.nix | 19 +++++--- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/audio/chuck/clang.patch diff --git a/pkgs/applications/audio/chuck/clang.patch b/pkgs/applications/audio/chuck/clang.patch new file mode 100644 index 000000000000..77227ef0fd44 --- /dev/null +++ b/pkgs/applications/audio/chuck/clang.patch @@ -0,0 +1,58 @@ +diff --git a/src/ugen_osc.cpp b/src/ugen_osc.cpp +index 6b93c6b..dbefe4f 100644 +--- a/src/ugen_osc.cpp ++++ b/src/ugen_osc.cpp +@@ -1232,7 +1232,7 @@ CK_DLL_CTRL( gen5_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1287,7 +1287,7 @@ CK_DLL_CTRL( gen7_coeffs ) + Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(in_args<0) return; ++ if(in_args!=0) return; + size = in_args->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1340,7 +1340,7 @@ CK_DLL_CTRL( gen9_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1390,7 +1390,7 @@ CK_DLL_CTRL( gen10_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen10coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1441,7 +1441,7 @@ CK_DLL_CTRL( gen17_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) return; ++ if(weights!=0) return; + size = weights->size(); + if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; + +@@ -1502,7 +1502,7 @@ CK_DLL_CTRL( curve_coeffs ) + Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); + + // fprintf(stdout, "calling gen17coeffs, %d\n", weights); +- if(weights<0) goto done; ++ if(weights!=0) goto done; + + nargs = weights->size(); + if (nargs < 5 || (nargs % 3) != 2) { // check number of args diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index fd7f0c2b07c2..e94172b0f879 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }: +{ stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which +, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel +}: stdenv.mkDerivation rec { version = "1.3.5.2"; @@ -10,19 +12,24 @@ stdenv.mkDerivation rec { }; buildInputs = [ bison flex libsndfile which ] - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib + ++ stdenv.lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; - patches = [ ./darwin-limits.patch ]; + patches = [ ./clang.patch ./darwin-limits.patch ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" substituteInPlace src/makefile.osx --replace "xcodebuild" "/usr/bin/xcodebuild" substituteInPlace src/makefile.osx --replace "weak_framework" "framework" + substituteInPlace src/makefile.osx --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" ''; - buildPhase = - stdenv.lib.optionals stdenv.isLinux ["make -C src linux-alsa"] ++ - stdenv.lib.optionals stdenv.isDarwin ["make -C src osx"]; + buildPhase = '' + make -C src ${if stdenv.isDarwin then "osx" else "linux-alsa"} + ''; installPhase = '' install -Dm755 ./src/chuck $out/bin/chuck diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e6b9008295..3fc37f091f16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14868,7 +14868,9 @@ with pkgs; chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chuck = callPackage ../applications/audio/chuck { }; + chuck = callPackage ../applications/audio/chuck { + inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel; + }; cinelerra = callPackage ../applications/video/cinelerra { }; From cdfd7ccdc1daaf33528c66ca0e691cfb8e43b007 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sat, 17 Mar 2018 11:50:46 -0700 Subject: [PATCH 0086/2743] 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 0d0672e95c6d6836d1202ad007a3025e317881ea Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 17 Mar 2018 21:39:16 -0400 Subject: [PATCH 0087/2743] lsof: Add (temporary?) tarball URL and fix eval on darwin. --- pkgs/development/tools/misc/lsof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 8b89fd80c1a5..53b960a7c031 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; src = fetchurl { - urls = + urls = ["https://fossies.org/linux/misc/lsof_4.90.tar.bz2"] ++ # Mirrors seem to be down... ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] ++ map ( # the tarball is moved after new version is released @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; # Stop build scripts from searching global include paths - LSOF_INCLUDE = "${stdenv.cc.libc.dev}/include"; + LSOF_INCLUDE = "${stdenv.lib.getDev stdenv.cc.libc}/include"; configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; preBuild = '' for filepath in $(find dialects/${dialect} -type f); do From 273e58ebd9f8ef04948a89d496c7cb23dab8cbe8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 18 Feb 2018 16:52:44 -0500 Subject: [PATCH 0088/2743] glibc: Make 2.27 the default. --- pkgs/development/libraries/glibc/2.27.nix | 101 -------- .../libraries/glibc/common-2.27.nix | 216 ------------------ pkgs/development/libraries/glibc/common.nix | 41 +--- .../dont-use-system-ld-so-cache-2.27.patch | 46 ---- .../glibc/dont-use-system-ld-so-cache.patch | 38 +-- .../glibc/nix-locale-archive-2.27.patch | 118 ---------- .../libraries/glibc/nix-locale-archive.patch | 128 ++++++----- pkgs/top-level/all-packages.nix | 12 +- 8 files changed, 98 insertions(+), 602 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.27.nix delete mode 100644 pkgs/development/libraries/glibc/common-2.27.nix delete mode 100644 pkgs/development/libraries/glibc/dont-use-system-ld-so-cache-2.27.patch delete mode 100644 pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch diff --git a/pkgs/development/libraries/glibc/2.27.nix b/pkgs/development/libraries/glibc/2.27.nix deleted file mode 100644 index bb057ae899e7..000000000000 --- a/pkgs/development/libraries/glibc/2.27.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv, callPackage -, withLinuxHeaders ? true -, installLocales ? true -, profilingLibraries ? false -, withGd ? false -}: - -assert stdenv.cc.isGNU; - -callPackage ./common-2.27.nix { inherit stdenv; } { - name = "glibc" + stdenv.lib.optionalString withGd "-gd"; - - inherit withLinuxHeaders profilingLibraries installLocales withGd; - - NIX_NO_SELF_RPATH = true; - - postConfigure = '' - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS - - # Apparently --bindir is not respected. - makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") - ''; - - # The stackprotector and fortify hardening flags are autodetected by glibc - # and enabled by default if supported. Setting it for every gcc invocation - # does not work. - hardeningDisable = [ "stackprotector" "fortify" ]; - - # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for - # any program we run, because the gcc will have been placed at a new - # store path than that determined when built (as a source for the - # bootstrap-tools tarball) - # Building from a proper gcc staying in the path where it was installed, - # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without - # any special hack. - preInstall = '' - if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then - mkdir -p $out/lib - cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 - # the .so It used to be a symlink, but now it is a script - cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so - fi - ''; - - postInstall = '' - if test -n "$installLocales"; then - make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - fi - - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - - if test -n "$linuxHeaders"; then - # Include the Linux kernel headers in Glibc, except the `scsi' - # subdirectory, which Glibc provides itself. - (cd $dev/include && \ - ln -sv $(ls -d $linuxHeaders/include/* | grep -v scsi\$) .) - fi - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi - - # Get rid of more unnecessary stuff. - rm -rf $out/var $bin/bin/sln - - # For some reason these aren't stripped otherwise and retain reference - # to bootstrap-tools; on cross-arm this stripping would break objects. - if [ -z "$crossConfig" ]; then - for i in "$out"/lib/*.a; do - [ "$i" = "$out/lib/libm.a" ] || strip -S "$i" - done - fi - - # Put libraries for static linking in a separate output. Note - # that libc_nonshared.a and libpthread_nonshared.a are required - # for dynamically-linked applications. - mkdir -p $static/lib - mv $out/lib/*.a $static/lib - mv $static/lib/lib*_nonshared.a $out/lib - # Some of *.a files are linker scripts where moving broke the paths. - sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ - -i "$static"/lib/*.a - - # Work around a Nix bug: hard links across outputs cause a build failure. - cp $bin/bin/getconf $bin/bin/getconf_ - mv $bin/bin/getconf_ $bin/bin/getconf - ''; - - separateDebugInfo = true; - - meta.description = "The GNU C Library"; - } diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix deleted file mode 100644 index 4a5b31245c1c..000000000000 --- a/pkgs/development/libraries/glibc/common-2.27.nix +++ /dev/null @@ -1,216 +0,0 @@ -/* Build configuration used to build glibc, Info files, and locale - information. */ - -{ stdenv, lib -, buildPlatform, hostPlatform -, buildPackages -, fetchurl, fetchpatch ? null -, linuxHeaders ? null -, gd ? null, libpng ? null -, bison -}: - -{ name -, withLinuxHeaders ? false -, profilingLibraries ? false -, installLocales ? false -, withGd ? false -, meta -, ... -} @ args: - -let - version = "2.27"; - patchSuffix = ""; - sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji"; - cross = if buildPlatform != hostPlatform then hostPlatform else null; -in - -assert withLinuxHeaders -> linuxHeaders != null; -assert withGd -> gd != null && libpng != null; - -stdenv.mkDerivation ({ - inherit installLocales; - linuxHeaders = if withLinuxHeaders then linuxHeaders else null; - - # The host/target system. - crossConfig = if cross != null then cross.config else null; - - inherit (stdenv) is64bit; - - enableParallelBuilding = true; - - patches = - [ - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - - /* Allow NixOS and Nix to handle the locale-archive. */ - ./nix-locale-archive-2.27.patch - - /* Don't use /etc/ld.so.cache, for non-NixOS systems. */ - ./dont-use-system-ld-so-cache-2.27.patch - - /* Don't use /etc/ld.so.preload, but /etc/ld-nix.so.preload. */ - ./dont-use-system-ld-so-preload.patch - - /* The command "getconf CS_PATH" returns the default search path - "/bin:/usr/bin", which is inappropriate on NixOS machines. This - patch extends the search path by "/run/current-system/sw/bin". */ - ./fix_path_attribute_in_getconf.patch - - /* Allow running with RHEL 6 -like kernels. The patch adds an exception - for glibc to accept 2.6.32 and to tag the ELFs as 2.6.32-compatible - (otherwise the loader would refuse libc). - Note that glibc will fully work only on their heavily patched kernels - and we lose early mismatch detection on 2.6.32. - - On major glibc updates we should check that the patched kernel supports - all the required features. ATM it's verified up to glibc-2.26-131. - # HOWTO: check glibc sources for changes in kernel requirements - git log -p glibc-2.25.. sysdeps/unix/sysv/linux/x86_64/kernel-features.h sysdeps/unix/sysv/linux/kernel-features.h - # get kernel sources (update the URL) - mkdir tmp && cd tmp - curl http://vault.centos.org/6.9/os/Source/SPackages/kernel-2.6.32-696.el6.src.rpm | rpm2cpio - | cpio -idmv - tar xf linux-*.bz2 - # check syscall presence, for example - less linux-*?/arch/x86/kernel/syscall_table_32.S - */ - ./allow-kernel-2.6.32.patch - ] - ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch - ++ lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - name = "fix-with-musl.patch"; - url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw"; - sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2"; - }); - - postPatch = - '' - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 - sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - ''; - - configureFlags = - [ "-C" - "--enable-add-ons" - "--enable-obsolete-nsl" - "--enable-obsolete-rpc" - "--sysconfdir=/etc" - "--enable-stackguard-randomization" - (if withLinuxHeaders - then "--with-headers=${linuxHeaders}/include" - else "--without-headers") - (if profilingLibraries - then "--enable-profile" - else "--disable-profile") - ] ++ lib.optionals withLinuxHeaders [ - "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 - ] ++ lib.optionals (cross != null) [ - (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") - ] ++ lib.optionals (cross != null) [ - "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - - # To avoid linking with -lgcc_s (dynamic link) - # so the glibc does not depend on its compiler store path - "libc_cv_as_needed=no" - ] ++ lib.optional withGd "--with-gd"; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - outputs = [ "out" "bin" "dev" "static" ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; - buildInputs = lib.optionals withGd [ gd libpng ]; - - # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to - # prevent a retained dependency on the bootstrap tools in the stdenv-linux - # bootstrap. - BASH_SHELL = "/bin/sh"; -} - -// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // - -{ - name = name + "-${version}${patchSuffix}"; - - src = fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; - inherit sha256; - }; - - # Remove absolute paths from `configure' & co.; build out-of-tree. - preConfigure = '' - export PWD_P=$(type -tP pwd) - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - mkdir ../build - cd ../build - - configureScript="`pwd`/../$sourceRoot/configure" - - ${lib.optionalString (stdenv.cc.libc != null) - ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"'' - } - - - '' + lib.optionalString (cross != null) '' - sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" - - cat > config.cache << "EOF" - libc_cv_forced_unwind=yes - libc_cv_c_cleanup=yes - libc_cv_gnu89_inline=yes - EOF - ''; - - preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... - - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; - - license = lib.licenses.lgpl2Plus; - - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - } // meta; - - passthru = { inherit version; }; -} - -// lib.optionalAttrs (cross != null) { - preInstall = null; # clobber the native hook - - dontStrip = true; - - separateDebugInfo = false; # this is currently broken for crossDrv - - # To avoid a dependency on the build system 'bash'. - preFixup = '' - rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace} - ''; -}) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index c8e5b4562856..517c98e9f644 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -7,6 +7,7 @@ , fetchurl, fetchpatch ? null , linuxHeaders ? null , gd ? null, libpng ? null +, bison }: { name @@ -19,9 +20,9 @@ } @ args: let - version = "2.26"; - patchSuffix = "-131"; - sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5"; + version = "2.27"; + patchSuffix = ""; + sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -29,7 +30,7 @@ assert withLinuxHeaders -> linuxHeaders != null; assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ - inherit installLocales; + inherit version installLocales; linuxHeaders = if withLinuxHeaders then linuxHeaders else null; # The host/target system. @@ -41,17 +42,6 @@ stdenv.mkDerivation ({ patches = [ - /* No tarballs for stable upstream branch, only https://sourceware.org/git/?p=glibc.git - $ git co release/2.25/master; git describe - glibc-2.25-49-gbc5ace67fe - $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz - */ - ./2.26-75.patch.gz - ./2.26-75to115.diff.gz - # contains fix for CVE-2018-1000001 as the last commit: - # https://sourceware.org/git/?p=glibc.git;a=commit;h=fabef2edbc - ./2.26-115to131.diff.gz - /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch @@ -97,24 +87,14 @@ stdenv.mkDerivation ({ }); postPatch = - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 '' + # Needed for glibc to build with the gnumake 3.82 + # http://comments.gmane.org/gmane.linux.lfs.support/31227 sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - '' - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - + '' + + # nscd needs libgcc, and we don't want it dynamically linked + # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - '' - # Replace the date and time in nscd by a prefix of $out. - # It is used as a protocol compatibility check. - # Note: the size of the struct changes, but using only a part - # would break hash-rewriting. When receiving stats it does check - # that the struct sizes match and can't cause overflow or something. - + '' - cat ${./glibc-remove-datetime-from-nscd.patch} \ - | sed "s,@out@,$out," | patch -p1 ''; configureFlags = @@ -150,6 +130,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison ]; buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache-2.27.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache-2.27.patch deleted file mode 100644 index f84b1049adf8..000000000000 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache-2.27.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c ---- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500 -@@ -51,7 +51,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ -diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile ---- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500 -@@ -559,13 +559,13 @@ - - $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) - --SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c += $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ -+PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c += $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' - libof-ldconfig = ldconfig --CFLAGS-dl-cache.c += $(SYSCONF-FLAGS) --CFLAGS-cache.c += $(SYSCONF-FLAGS) --CFLAGS-rtld.c += $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c += $(PREFIX-FLAGS) -+CFLAGS-cache.c += $(PREFIX-FLAGS) -+CFLAGS-rtld.c += $(PREFIX-FLAGS) - - cpp-srcs-left := $(all-rtld-routines:=.os) - lib := rtld -diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h ---- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500 -@@ -28,7 +28,7 @@ - #endif - - #ifndef LD_SO_CACHE --# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" -+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" - #endif - - #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch index fc14553c3ee0..f84b1049adf8 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch @@ -1,7 +1,7 @@ -diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c ---- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400 -@@ -50,7 +50,7 @@ +diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c +--- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500 +@@ -51,7 +51,7 @@ #endif #ifndef LD_SO_CONF @@ -10,31 +10,31 @@ diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c #endif /* Get libc version number. */ -diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile ---- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 -@@ -415,12 +415,12 @@ +diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile +--- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500 +@@ -559,13 +559,13 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) -SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +-CFLAGS-ldconfig.c += $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ ++CFLAGS-ldconfig.c += $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ -D'SLIBDIR="$(slibdir)"' libof-ldconfig = ldconfig --CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) --CFLAGS-cache.c = $(SYSCONF-FLAGS) --CFLAGS-rtld.c = $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c = $(PREFIX-FLAGS) -+CFLAGS-cache.c = $(PREFIX-FLAGS) -+CFLAGS-rtld.c = $(PREFIX-FLAGS) +-CFLAGS-dl-cache.c += $(SYSCONF-FLAGS) +-CFLAGS-cache.c += $(SYSCONF-FLAGS) +-CFLAGS-rtld.c += $(SYSCONF-FLAGS) ++CFLAGS-dl-cache.c += $(PREFIX-FLAGS) ++CFLAGS-cache.c += $(PREFIX-FLAGS) ++CFLAGS-rtld.c += $(PREFIX-FLAGS) cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld -diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h ---- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 +diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h +--- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500 @@ -28,7 +28,7 @@ #endif diff --git a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch deleted file mode 100644 index 39312951fcf9..000000000000 --- a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c ---- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 -@@ -123,6 +123,23 @@ - return MAX (namehash_end, MAX (string_end, locrectab_end)); - } - -+static int -+open_locale_archive (void) -+{ -+ int fd = -1; -+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (versioned_path) -+ fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (path && fd < 0) -+ fd = __open_nocancel (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (fd < 0) -+ fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (fd < 0) -+ fd = __open_nocancel ("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ return fd; -+} -+ - - /* Find the locale *NAMEP in the locale archive, and return the - internalized data structure for its CATEGORY data. If this locale has -@@ -202,7 +219,7 @@ - archmapped = &headmap; - - /* The archive has never been opened. */ -- fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; -@@ -397,8 +414,7 @@ - if (fd == -1) - { - struct stat64 st; -- fd = __open_nocancel (archfname, -- O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; -diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c ---- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 -@@ -633,6 +633,24 @@ - - - static int -+open_locale_archive (void) -+{ -+ int fd = -1; -+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (versioned_path) -+ fd = open64 (versioned_path, O_RDONLY); -+ if (path && fd < 0) -+ fd = open64 (path, O_RDONLY); -+ if (fd < 0) -+ fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ if (fd < 0) -+ fd = open64 ("/usr/lib/locale/locale-archive", O_RDONLY); -+ return fd; -+} -+ -+ -+static int - write_archive_locales (void **all_datap, char *linebuf) - { - struct stat64 st; -@@ -644,7 +662,7 @@ - int fd, ret = 0; - uint32_t cnt; - -- fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_locale_archive (); - if (fd < 0) - return 0; - -diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c ---- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 -@@ -117,6 +117,22 @@ - } - - -+static int -+open_locale_archive (const char * archivefname, int flags) -+{ -+ int fd = -1; -+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (versioned_path) -+ fd = open64 (versioned_path, flags); -+ if (path && fd < 0) -+ fd = open64 (path, flags); -+ if (fd < 0) -+ fd = open64 (archivefname, flags); -+ return fd; -+} -+ -+ - static void - create_archive (const char *archivefname, struct locarhandle *ah) - { -@@ -578,7 +594,7 @@ - while (1) - { - /* Open the archive. We must have exclusive write access. */ -- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); - if (fd == -1) - { - /* Maybe the file does not yet exist? If we are opening diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch index eeaf21901a39..39312951fcf9 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -1,114 +1,118 @@ -diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.c ---- glibc-2.16.0-orig/locale/loadarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/loadarchive.c 2012-09-18 11:57:57.277515212 -0400 -@@ -123,6 +123,25 @@ +diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c +--- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 +@@ -123,6 +123,23 @@ + return MAX (namehash_end, MAX (string_end, locrectab_end)); } - +static int +open_locale_archive (void) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ const char *usualpath = "/usr/lib/locale/locale-archive"; -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (path2 && fd < 0) -+ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (path && fd < 0) ++ fd = __open_nocancel (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + if (fd < 0) -+ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = __open_nocancel ("/usr/lib/locale/locale-archive", O_RDONLY|O_LARGEFILE|O_CLOEXEC); + return fd; +} + -+ + /* Find the locale *NAMEP in the locale archive, and return the internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -@@ -202,7 +221,7 @@ +@@ -202,7 +219,7 @@ archmapped = &headmap; /* The archive has never been opened. */ -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); +- fd = __open_nocancel (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = open_locale_archive (); if (fd < 0) /* Cannot open the archive, for whatever reason. */ return NULL; -@@ -393,8 +412,7 @@ +@@ -397,8 +414,7 @@ if (fd == -1) { struct stat64 st; -- fd = open_not_cancel_2 (archfname, -- O_RDONLY|O_LARGEFILE|O_CLOEXEC); +- fd = __open_nocancel (archfname, +- O_RDONLY|O_LARGEFILE|O_CLOEXEC); + fd = open_locale_archive (); if (fd == -1) /* Cannot open the archive, for whatever reason. */ return NULL; -diff -ru glibc-2.16.0-orig/locale/programs/locale.c glibc-2.16.0/locale/programs/locale.c ---- glibc-2.16.0-orig/locale/programs/locale.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locale.c 2012-09-18 11:53:03.719920947 -0400 -@@ -628,6 +628,20 @@ - ((const struct nameent *) b)->name); - } +diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c +--- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 +@@ -633,6 +633,24 @@ -+static int -+open_nix_locale_archive (const char * fname, int access) -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); -+ if (fd < 0) -+ fd = open64 (fname, access); -+ return fd; -+} static int ++open_locale_archive (void) ++{ ++ int fd = -1; ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = open64 (versioned_path, O_RDONLY); ++ if (path && fd < 0) ++ fd = open64 (path, O_RDONLY); ++ if (fd < 0) ++ fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ if (fd < 0) ++ fd = open64 ("/usr/lib/locale/locale-archive", O_RDONLY); ++ return fd; ++} ++ ++ ++static int write_archive_locales (void **all_datap, char *linebuf) -@@ -641,7 +655,7 @@ + { + struct stat64 st; +@@ -644,7 +662,7 @@ int fd, ret = 0; uint32_t cnt; - fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); ++ fd = open_locale_archive (); if (fd < 0) return 0; -diff -ru glibc-2.16.0-orig/locale/programs/locarchive.c glibc-2.16.0/locale/programs/locarchive.c ---- glibc-2.16.0-orig/locale/programs/locarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locarchive.c 2012-09-18 11:53:03.720920942 -0400 -@@ -509,6 +509,20 @@ - *ah = new_ah; +diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c +--- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 +@@ -117,6 +117,22 @@ } + +static int -+open_nix_locale_archive (const char * fname, int access) ++open_locale_archive (const char * archivefname, int flags) +{ + int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); ++ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27"); ++ char *path = getenv ("LOCALE_ARCHIVE"); ++ if (versioned_path) ++ fd = open64 (versioned_path, flags); ++ if (path && fd < 0) ++ fd = open64 (path, flags); + if (fd < 0) -+ fd = open64 (fname, access); ++ fd = open64 (archivefname, flags); + return fd; +} - - void - open_archive (struct locarhandle *ah, bool readonly) -@@ -528,7 +542,7 @@ ++ ++ + static void + create_archive (const char *archivefname, struct locarhandle *ah) + { +@@ -578,7 +594,7 @@ while (1) { /* Open the archive. We must have exclusive write access. */ - fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); ++ fd = open_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); if (fd == -1) { - /* Maybe the file does not yet exist. */ + /* Maybe the file does not yet exist? If we are opening diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35fc1e7c019f..31800d78bb09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8883,13 +8883,9 @@ with pkgs; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc_2_26 = callPackage ../development/libraries/glibc { + glibc = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; }; - glibc_2_27 = callPackage ../development/libraries/glibc/2.27.nix { - installLocales = config.glibc.locales or false; - }; - glibc = if hostPlatform.isRiscV then glibc_2_27 else glibc_2_26; glibc_memusage = callPackage ../development/libraries/glibc { installLocales = false; @@ -8897,11 +8893,7 @@ with pkgs; }; # Being redundant to avoid cycles on boot. TODO: find a better way - glibcCross = let - expr = if hostPlatform.isRiscV - then ../development/libraries/glibc/2.27.nix - else ../development/libraries/glibc; - in callPackage expr { + glibcCross = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; stdenv = crossLibcStdenv; }; From 2929a2c1faee6736bf13025e085d6b17328724be Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Feb 2018 09:44:47 -0500 Subject: [PATCH 0089/2743] help2man: Make safe to use in bootstrap stdenv. --- .../tools/misc/help2man/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6e341b577cfb..9ee8d2279b39 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: +{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext }: stdenv.mkDerivation rec { name = "help2man-1.47.5"; @@ -8,19 +8,27 @@ stdenv.mkDerivation rec { sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"; }; - nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; + nativeBuildInputs = [ gettext LocaleGettext ]; buildInputs = [ perl LocaleGettext ]; doCheck = false; # target `check' is missing patches = if hostPlatform.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; - postInstall = - '' wrapProgram "$out/bin/help2man" \ - --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)" \ - ${stdenv.lib.optionalString hostPlatform.isCygwin "--prefix PATH : ${gettext}/bin"} - ''; - + # We don't use makeWrapper here because it uses substitutions our + # bootstrap shell can't handle. + postInstall = '' + gettext_perl="$(echo ${LocaleGettext}/lib/perl*/site_perl)" + mv $out/bin/help2man $out/bin/.help2man-wrapped + cat > $out/bin/help2man < Date: Mon, 26 Feb 2018 07:40:51 -0500 Subject: [PATCH 0090/2743] xfsprogs: Fix build on glibc-2.27 --- pkgs/tools/filesystems/xfsprogs/default.nix | 1 + .../filesystems/xfsprogs/glibc-2.27.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 5321fd8a830f..cc2bbad1680a 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { (gentooPatch "xfsprogs-4.12.0-sharedlibs.patch" "1i081749x91jvlrw84l4a3r081vqcvn6myqhnqbnfcfhd64h12bq") (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s") (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7") + ./glibc-2.27.patch ]; preConfigure = '' diff --git a/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch b/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch new file mode 100644 index 000000000000..757ea81c9279 --- /dev/null +++ b/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch @@ -0,0 +1,37 @@ +diff -Naur a/io/copy_file_range.c b/io/copy_file_range.c +--- a/io/copy_file_range.c 1969-12-31 19:00:01.000000000 -0500 ++++ b/io/copy_file_range.c 2018-02-26 07:39:21.533535821 -0500 +@@ -42,24 +42,6 @@ + ")); + } + +-static loff_t +-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len) +-{ +- loff_t ret; +- +- do { +- ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0); +- if (ret == -1) { +- perror("copy_range"); +- return errno; +- } else if (ret == 0) +- break; +- len -= ret; +- } while (len > 0); +- +- return 0; +-} +- + static off64_t + copy_src_filesize(int fd) + { +@@ -130,7 +112,7 @@ + copy_dst_truncate(); + } + +- ret = copy_file_range(fd, &src, &dst, len); ++ ret = copy_file_range(fd, &src, file->fd, &dst, len, 0); + close(fd); + return ret; + } From fa3c86e196f8c82f20f4146dae41523dc322527a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 1 Mar 2018 06:40:59 -0500 Subject: [PATCH 0091/2743] acl: patchShebangs before build to avoid /bin/sh dependency. install.sh depends on bashisms. https://nix-cache.s3.amazonaws.com/log/zczav3lw4pdzjy3ilqz9mng539xca5bi-acl-2.2.52.drv. --- pkgs/development/libraries/acl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 3c6f42e5cbf8..f9bb982a7842 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { patchPhase = '' echo "Removing C++-style comments from include/acl.h" sed -e '/^\/\//d' -i include/acl.h + + patchShebangs . ''; configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ZIP=gzip" "ECHO=echo" "SED=sed" "AWK=gawk" ]; From 0f172e971c0919f831f665e40dfbe503bffb618e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Mar 2018 05:50:35 -0500 Subject: [PATCH 0092/2743] libxshmfence: Bump to 1.3. Needed with glibc-2.27. --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 18189ba2e68d..02e5a29a8f63 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -271,6 +271,11 @@ in }; libxshmfence = attrs: attrs // { + name = "libxshmfence-1.3"; + src = args.fetchurl { + url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; + }; outputs = [ "out" "dev" ]; # mainly to avoid propagation }; From 88d10c7f1d2c3406739e9abaef710ca91af31a63 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Mar 2018 07:30:01 -0500 Subject: [PATCH 0093/2743] libpulseaudio: Add upstream glibc 2.27-compat patch --- pkgs/servers/pulseaudio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 6a65e8d03201..ed4a8889c67d 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -43,7 +43,11 @@ stdenv.mkDerivation rec { sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; }; - patches = [ ./caps-fix.patch ] + patches = [ ./caps-fix.patch (fetchpatch { + name = "glibc-2.27.patch"; + url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb"; + sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv"; + }) ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "padsp-fix.patch"; url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244"; From 34898469f7b027bd1011869ccf42d045d7bd491d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Mar 2018 10:42:10 -0500 Subject: [PATCH 0094/2743] qemu: Add upstream glibc 2.27-compat patch --- pkgs/applications/virtualization/qemu/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 00303be12da2..252ed555534b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -61,7 +61,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ./statfs-flags.patch ] + 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"; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch; From 3a143dcad2e43128af574a8d4873e68eeb67cfa7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Mar 2018 20:52:09 -0500 Subject: [PATCH 0095/2743] rustc: 1.24.0 -> 1.24.1 and glibc-2.27 patch. --- pkgs/development/compilers/rust/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index dd15580c11b8..fd19a38ead22 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, fetchpatch , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -6,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.24.0"; + version = "1.24.1"; cargoVersion = "0.24.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "17v3jpyky8vkkgai5yd2zr8zl87qpgj6dx99gx27x1sf0kv7d0mv"; + sha256 = "1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y"; }; in rec { rustc = callPackage ./rustc.nix { @@ -22,6 +23,11 @@ in rec { patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch + # Adapted from https://github.com/rust-lang/rust/pull/47912 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/rust/raw/1bb4d24c060915c304c9a9f86a438388e599f9c6/f/0002-Use-a-range-to-identify-SIGSEGV-in-stack-guards.patch"; + sha256 = "16hc170qzzcb9lcabk0ln005zji2h1gq0knbr9avbbzlbg9jha2q"; + }) ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch # https://github.com/rust-lang/rust/issues/45410 ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; From 86972b23218d92cac5d539aa3b27bd550910f3d3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2018 16:16:25 -0400 Subject: [PATCH 0096/2743] xz: Fix dependency on /bin/sh --- pkgs/tools/compression/xz/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 8d02e926e57f..da3a537da283 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = '' + # Tests have a /bin/sh dependency... + patchShebangs tests + ''; + # In stdenv-linux, prevent a dependency on bootstrap-tools. preConfigure = "CONFIG_SHELL=/bin/sh"; From a5d064826b4c1fae4beda19beadc953aaed8a246 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2018 16:47:24 -0400 Subject: [PATCH 0097/2743] gcc: Try to fix /bin/sh dependency --- pkgs/development/compilers/gcc/7/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 0462231b064e..0b19aa95effe 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -214,7 +214,12 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" ''; - postPatch = + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( if (hostPlatform.isHurd || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig @@ -273,7 +278,7 @@ stdenv.mkDerivation ({ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) - else null; + else ""); # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; From 8ee6a03a3e75c6aaf4d7cf53bd6ffc6892d89950 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 18 Mar 2018 09:33:24 -0700 Subject: [PATCH 0098/2743] 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 0099/2743] 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 955898a05f168512f863ea8f967cd04c4c5fa3a1 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 18 Mar 2018 12:24:54 -0700 Subject: [PATCH 0100/2743] unbound: 1.6.8 -> 1.7.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/p36fksfjzi9715cgx8s3kmngy51qfjki-unbound-1.7.0/bin/unbound-host help` got 0 exit code - found 1.7.0 with grep in /nix/store/p36fksfjzi9715cgx8s3kmngy51qfjki-unbound-1.7.0 - directory tree listing: https://gist.github.com/bb22fcb9572c54b0464c82405bf26b56 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index cc2f994d0d54..ed5c30aa42b5 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.8"; + version = "1.7.0"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "0jfxhh4gc5amhndikskz1s7da27ycn442j3l20bm992n7zijid73"; + sha256 = "18i6p6zqmbs9gj57mz3iwz828csaab26gb534b8wrn0kzdqr1pcl"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB From ab42a7595a4ef3dcce99e79bef40cf0b8e335ac0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 20 Mar 2018 08:43:21 -0400 Subject: [PATCH 0101/2743] buildPerlPackage: "properly" quote FULLPERL --- pkgs/development/perl-modules/generic/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 937dad971b87..b833ceb3cab0 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -22,7 +22,7 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=$perl/bin/perl + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$perl/bin/perl\" } From 375ba615d400750f41429c4409a6600ff45372ee Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 20 Mar 2018 07:53:15 -0700 Subject: [PATCH 0102/2743] 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 0103/2743] 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 dc3b791854589d7c1c6d210f070a1e82315798f6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 18 Mar 2018 20:13:46 -0400 Subject: [PATCH 0104/2743] zig: 0.1.1 -> 0.2.0 --- pkgs/development/compilers/zig/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index cffc683f9e7b..44d1f7bfe4a2 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: stdenv.mkDerivation rec { - version = "0.1.1"; + version = "0.2.0"; name = "zig-${version}"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig"; rev = "${version}"; - sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; }; - buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; cmakeFlags = [ "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; - homepage = http://ziglang.org/; + homepage = https://ziglang.org/; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35fc1e7c019f..9dbd7b849466 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11851,7 +11851,9 @@ with pkgs; czmq = czmq3; }; - zig = callPackage ../development/compilers/zig {}; + zig = callPackage ../development/compilers/zig { + llvmPackages = llvmPackages_6; + }; zimlib = callPackage ../development/libraries/zimlib { }; 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 0105/2743] 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 c6b71f55fd1813659c7c274a3d44adf79f0fe09a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Mar 2018 22:22:56 -0400 Subject: [PATCH 0106/2743] attr: Remove /bin/sh dependency. --- pkgs/development/libraries/attr/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 0bfeaf81a81d..96fe5b89a18c 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; + postPatch = '' + for script in install-sh include/install-sh; do + patchShebangs $script + done + ''; + meta = with stdenv.lib; { homepage = "http://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; From 5ce31aa6b78f132c198007e62adae451c800acff Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 20 Mar 2018 16:57:56 -0400 Subject: [PATCH 0107/2743] Revert "atlas: 3.10.2 -> 3.10.3" 3.10.3 segfaults with glibc 2.27, and since it was fairly recently added via autoupdate hopefully it's not too strongly needed yet. This reverts commit 4c28d80be2232304cf185e21f80777bb501600e7. --- pkgs/development/libraries/science/math/atlas/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index d971f1a2e0b2..8cca5565bf6f 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -45,7 +45,9 @@ let inherit (stdenv.lib) optional optionalString; - version = "3.10.3"; + # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44 + # is resolved. + version = "3.10.2"; in stdenv.mkDerivation { @@ -53,7 +55,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; - sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216"; + sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"; }; buildInputs = [ gfortran ]; From 3027bca02aa2ab50393cb9a8924ad73284d2700b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 20 Feb 2018 11:15:57 -0500 Subject: [PATCH 0108/2743] binutils: Bump default to 2.30 --- pkgs/development/tools/misc/binutils/2.30.nix | 131 ------------------ .../tools/misc/binutils/default.nix | 7 +- pkgs/top-level/all-packages.nix | 11 -- 3 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/2.30.nix diff --git a/pkgs/development/tools/misc/binutils/2.30.nix b/pkgs/development/tools/misc/binutils/2.30.nix deleted file mode 100644 index 830c07330524..000000000000 --- a/pkgs/development/tools/misc/binutils/2.30.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ stdenv, buildPackages -, fetchurl, zlib -, buildPlatform, hostPlatform, targetPlatform -, noSysDirs, gold ? true, bison ? null -}: - -let - version = "2.30"; - basename = "binutils-${version}"; - inherit (stdenv.lib) optional optionals optionalString; - # The targetPrefix prepended to binary names to allow multiple binuntils on the - # PATH to both be usable. - targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; -in - -stdenv.mkDerivation rec { - name = targetPrefix + basename; - - src = fetchurl { - url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; - }; - - patches = [ - # Turn on --enable-new-dtags by default to make the linker set - # RUNPATH instead of RPATH on binaries. This is important because - # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime. - ./new-dtags.patch - - # Since binutils 2.22, DT_NEEDED flags aren't copied for dynamic outputs. - # That requires upstream changes for things to work. So we can patch it to - # get the old behaviour by now. - ./dtneeded.patch - - # Make binutils output deterministic by default. - ./deterministic.patch - - # Always add PaX flags section to ELF files. - # This is needed, for instance, so that running "ldd" on a binary that is - # PaX-marked to disable mprotect doesn't fail with permission denied. - ./pt-pax-flags.patch - - # Bfd looks in BINDIR/../lib for some plugins that don't - # exist. This is pointless (since users can't install plugins - # there) and causes a cycle between the lib and bin outputs, so - # get rid of it. - ./no-plugins.patch - - # Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and - # elf32-littlearm-vxworks in favor of the first. - # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 - ./disambiguate-arm-targets.patch - - # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's - # not clear why this behavior was decided upon but it has the unfortunate - # consequence that the linker will fail to find transitive dependencies of - # shared objects when cross-compiling. Consequently, we are forced to - # override this behavior, forcing ld to search DT_RPATH even when - # cross-compiling. - ./always-search-rpath.patch - ]; - - outputs = [ "out" "info" "man" ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; - buildInputs = [ zlib ]; - - inherit noSysDirs; - - preConfigure = '' - # Clear the default library search path. - if test "$noSysDirs" = "1"; then - echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt - fi - - # Use symlinks instead of hard links to save space ("strip" in the - # fixup phase strips each hard link separately). - for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do - sed -i "$i" -e 's|ln |ln -s |' - done - ''; - - # As binutils takes part in the stdenv building, we don't want references - # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = if hostPlatform.isDarwin - then "-Wno-string-plus-int -Wno-deprecated-declarations" - else "-static-libgcc"; - - # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - - configureFlags = [ - "--enable-targets=all" "--enable-64-bit-bfd" - "--disable-install-libbfd" - "--disable-shared" "--enable-static" - "--with-system-zlib" - - "--enable-deterministic-archives" - "--disable-werror" - "--enable-fix-loongson2f-nop" - ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ]; - - enableParallelBuilding = true; - - passthru = { - inherit targetPrefix version; - }; - - meta = with stdenv.lib; { - description = "Tools for manipulating binaries (linker, assembler, etc.)"; - longDescription = '' - The GNU Binutils are a collection of binary tools. The main - ones are `ld' (the GNU linker) and `as' (the GNU assembler). - They also include the BFD (Binary File Descriptor) library, - `gprof', `nm', `strip', etc. - ''; - homepage = http://www.gnu.org/software/binutils/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ericson2314 ]; - platforms = platforms.unix; - - /* Give binutils a lower priority than gcc-wrapper to prevent a - collision due to the ld/as wrappers/symlinks in the latter. */ - priority = 10; - }; -} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 05d0d21a179b..830c07330524 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -5,10 +5,7 @@ }: let - # Note to whoever is upgrading this: 2.29 is broken. - # ('nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test' segfaults on aarch64) - # Also glibc might need patching, see commit 733e20fee4a6700510f71fbe1a58ac23ea202f6a. - version = "2.28.1"; + version = "2.30"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; # The targetPrefix prepended to binary names to allow multiple binuntils on the @@ -21,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31800d78bb09..f97d6051a3f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7422,8 +7422,6 @@ with pkgs; binutils = if targetPlatform.isDarwin then darwin.binutils - else if targetPlatform.isRiscV - then binutils_2_30 else binutils-raw; binutils-unwrapped = callPackage ../development/tools/misc/binutils { @@ -7434,15 +7432,6 @@ with pkgs; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; bintools = binutils-unwrapped; }; - binutils-unwrapped_2_30 = callPackage ../development/tools/misc/binutils/2.30.nix { - # FHS sys dirs presumably only have stuff for the build platform - noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; - }; - binutils-raw_2_30 = wrapBintoolsWith { - libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; - bintools = binutils-unwrapped_2_30; - }; - binutils_2_30 = binutils-raw_2_30; binutils_nogold = lowPrio (binutils-raw.override { bintools = binutils-raw.bintools.override { From 1fa4b7149c0d05da44faa7b72014e4817246915f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Mar 2018 11:00:41 -0400 Subject: [PATCH 0109/2743] binutils: Revert apparently-broken multiple-definition support in gold. Fixes llvm at least. --- .../tools/misc/binutils/default.nix | 3 + .../binutils/gold-symbol-visibility.patch | 79 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 830c07330524..ec0a5b4e9eb1 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation rec { # override this behavior, forcing ld to search DT_RPATH even when # cross-compiling. ./always-search-rpath.patch + + # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 + ./gold-symbol-visibility.patch ]; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch new file mode 100644 index 000000000000..0fb05a482d1c --- /dev/null +++ b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch @@ -0,0 +1,79 @@ +commit 8564af037f5c4c6d2744a89497691359205b2bbc +Author: Shea Levy +Date: Mon Mar 19 10:52:40 2018 -0400 + + Revert "Allow multiply-defined absolute symbols when they have the same value." + + This reverts commit 5dc824ed42cd173c1525f5abc76f4091f11a4dbc. + +diff --git a/gold/ChangeLog-2017 b/gold/ChangeLog-2017 +index b2a47710b5..d7ca1b48c0 100644 +--- a/gold/ChangeLog-2017 ++++ b/gold/ChangeLog-2017 +@@ -114,11 +114,6 @@ + (localedir): Define as @localedir@. + (gnulocaledir, gettextsrcdir): Use @datarootdir@. + +-2017-11-28 Cary Coutant +- +- * resolve.cc (Symbol_table::resolve): Allow multiply-defined absolute +- symbols when they have the same value. +- + 2017-11-28 Cary Coutant + + * object.h (class Sized_relobj_file): Remove discarded_eh_frame_shndx_. +diff --git a/gold/resolve.cc b/gold/resolve.cc +index 4a5784cf8b..803576bfed 100644 +--- a/gold/resolve.cc ++++ b/gold/resolve.cc +@@ -247,28 +247,18 @@ Symbol_table::resolve(Sized_symbol* to, + Object* object, const char* version, + bool is_default_version) + { +- bool to_is_ordinary; +- const unsigned int to_shndx = to->shndx(&to_is_ordinary); +- + // It's possible for a symbol to be defined in an object file + // using .symver to give it a version, and for there to also be + // a linker script giving that symbol the same version. We + // don't want to give a multiple-definition error for this + // harmless redefinition. ++ bool to_is_ordinary; + if (to->source() == Symbol::FROM_OBJECT + && to->object() == object +- && to->is_defined() + && is_ordinary ++ && to->is_defined() ++ && to->shndx(&to_is_ordinary) == st_shndx + && to_is_ordinary +- && to_shndx == st_shndx +- && to->value() == sym.get_st_value()) +- return; +- +- // Likewise for an absolute symbol defined twice with the same value. +- if (!is_ordinary +- && st_shndx == elfcpp::SHN_ABS +- && !to_is_ordinary +- && to_shndx == elfcpp::SHN_ABS + && to->value() == sym.get_st_value()) + return; + +@@ -360,8 +350,8 @@ Symbol_table::resolve(Sized_symbol* to, + && (sym.get_st_bind() == elfcpp::STB_WEAK + || to->binding() == elfcpp::STB_WEAK) + && orig_st_shndx != elfcpp::SHN_UNDEF ++ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF + && to_is_ordinary +- && to_shndx != elfcpp::SHN_UNDEF + && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. + && to->symsize() != 0 + && (sym.get_st_type() != to->type() +@@ -372,7 +362,7 @@ Symbol_table::resolve(Sized_symbol* to, + { + Symbol_location fromloc + = { object, orig_st_shndx, static_cast(sym.get_st_value()) }; +- Symbol_location toloc = { to->object(), to_shndx, ++ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), + static_cast(to->value()) }; + this->candidate_odr_violations_[to->name()].insert(fromloc); + this->candidate_odr_violations_[to->name()].insert(toloc); From 31119d3ef68c515e857cf192e2c87e1b77d63a78 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 20 Mar 2018 17:26:21 -0400 Subject: [PATCH 0110/2743] pcre: Fix /bin/sh dependency --- pkgs/development/libraries/pcre/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 2ea5e923bad0..973798b849bc 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -35,6 +35,10 @@ in stdenv.mkDerivation rec { # https://bugs.exim.org/show_bug.cgi?id=2173 patches = [ ./stacksize-detection.patch ]; + preCheck = '' + patchShebangs RunGrepTest + ''; + doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra From 006332d8acf011bb119448f3b58db24e00366f63 Mon Sep 17 00:00:00 2001 From: Thomas Karolski Date: Wed, 21 Mar 2018 01:57:58 +0100 Subject: [PATCH 0111/2743] 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 0112/2743] 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 49182bcd34a73d33fccb9a0e709bd9cc45bfa26f Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:04:18 +0000 Subject: [PATCH 0113/2743] Fix grass build on darwin --- pkgs/applications/gis/grass/default.nix | 6 ++- .../gis/grass/no_symbolic_links.patch | 37 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/gis/grass/no_symbolic_links.patch diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 987b544c5565..5b36c24ab10e 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, lib }: stdenv.mkDerivation { @@ -15,6 +15,10 @@ stdenv.mkDerivation { readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + # On Darwin the installer tries to symlink the help files into a system + # directory + patches = [] ++ lib.optional stdenv.isDarwin [ ./no_symbolic_links.patch ]; + configureFlags = [ "--with-proj-share=${proj}/share/proj" "--without-opengl" diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/applications/gis/grass/no_symbolic_links.patch new file mode 100644 index 000000000000..ef09b97b7037 --- /dev/null +++ b/pkgs/applications/gis/grass/no_symbolic_links.patch @@ -0,0 +1,37 @@ +diff --git a/include/Make/Install.make b/include/Make/Install.make +index 0aba138..8ba74bc 100644 +--- a/include/Make/Install.make ++++ b/include/Make/Install.make +@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) + -$(INSTALL) config.status $(INST_DIR)/config.status + -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null + +-ifneq ($(findstring darwin,$(ARCH)),) +- @# enable OSX Help Viewer +- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) +-endif +- + $(INST_DIR) $(UNIX_BIN): + $(MAKE_DIR_CMD) $@ + +diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh +index 04e63eb..c9d9c2c 100755 +--- a/macosx/app/build_html_user_index.sh ++++ b/macosx/app/build_html_user_index.sh +@@ -140,7 +140,6 @@ else + # echo "$BASENAME $SHORTDESC" >> $FULLINDEX + # make them local to user to simplify page links + echo "$BASENAME $SHORTDESC" >> $FULLINDEX +- ln -sf "$HTMLDIRG/$i" global_$i + done + done + fi +@@ -183,8 +182,3 @@ echo " + " > $i.html + done + +-# add Help Viewer links in user docs folder +- +-mkdir -p $HOME/Library/Documentation/Help/ +-ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon +-ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER From f0a8f1f313c2197d5c441191752e2e79c8638e94 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:43:47 +0000 Subject: [PATCH 0114/2743] Refine libspatialindex platforms attribute --- pkgs/development/libraries/libspatialindex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index fe0acbfc538d..aa3aaa1c59bc 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From de6360b63e322ad5b301f732f225626bc5807e5c Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:44:31 +0000 Subject: [PATCH 0115/2743] Build qca2 on darwin --- pkgs/development/libraries/qca2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 4976399a66a6..dd2e772450a4 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = "LGPL"; homepage = http://delta.affinix.com/qca; maintainers = [ maintainers.sander ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 3391006fd584fadb89fac191407c08a87d307f11 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:47:08 +0000 Subject: [PATCH 0116/2743] Fix qscintilla qt5 darwin build --- pkgs/development/libraries/qscintilla/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index d6bd90fa47d8..f442e1bf908e 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -3,6 +3,11 @@ , withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null }: +# Fix Xcode 8 compilation problem +let xcodePatch = + fetchurl { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch"; + sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; }; +in stdenv.mkDerivation rec { pname = "qscintilla"; version = "2.9.4"; @@ -19,6 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); + + patches = [] ++ lib.optional withQt5 [ xcodePatch ]; + enableParallelBuilding = true; preConfigure = '' From ef4bce8bf11d2f7e7ec53c48d90cc38800161252 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:48:17 +0000 Subject: [PATCH 0117/2743] Build qwt6 on darwin --- pkgs/development/libraries/qwt/6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 314ab0f9e611..6e0fa53aa828 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; branch = "6"; }; From 2c6cd5b69cb4ed8d8da790ca1cad1fe11a98a4ed Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 20 Mar 2018 18:41:37 +0000 Subject: [PATCH 0118/2743] Build qscintilla on darwin --- 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 5c49b6bc0c8d..64c92056c5f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14189,7 +14189,7 @@ in { description = "A Python binding to QScintilla, Qt based text editing control"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ danbst ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }); From 4a4478bbc097269f30566cb52b5cde6fde3b8032 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:58:29 +0000 Subject: [PATCH 0119/2743] Add additional darwin dependency for qca2 --- pkgs/development/libraries/qca2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index dd2e772450a4..568e7ce07b3b 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt }: +{ stdenv, fetchurl, cmake, pkgconfig, qt, darwin }: stdenv.mkDerivation rec { name = "qca-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt ]; + buildInputs = [ (stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security) qt ]; enableParallelBuilding = true; From 92f76df8254c633b78f744df155efa52599eb130 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:59:02 +0000 Subject: [PATCH 0120/2743] Add darwin to qwt platforms attribute --- pkgs/development/libraries/qwt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index da5769e92cd1..f900de5e578b 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://qwt.sourceforge.net/; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } From 7842e5dda5986d1f1da33e75bdc5c8135925174d Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 13 Mar 2018 09:57:12 +0000 Subject: [PATCH 0121/2743] Package QGIS 2.18 for darwin There are still some problems with the withGrass option but the package is mostly functional. --- pkgs/applications/gis/qgis/default.nix | 55 ++++++++++++++++++++------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index c2a09a507cc5..043da8c8031e 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,23 +1,31 @@ { stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags, openssl -, withGrass ? false, grass +, qjson, qca2, txt2tags, openssl, darwin, pkgconfig +, withGrass ? false, grass, IOKit, ApplicationServices }: stdenv.mkDerivation rec { name = "qgis-2.18.16"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla - fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ + fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] + ++ + (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]) + ++ (stdenv.lib.optional withGrass grass) ++ + (stdenv.lib.optional (stdenv.isDarwin && withGrass) darwin.apple_sdk.libs.utmp) ++ (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory enableParallelBuilding = false; + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libspatialindex)" + ''; + # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' @@ -29,19 +37,44 @@ stdenv.mkDerivation rec { sha256 = "0d880m013kzi4qiyr27yjx6hzpb652slp66gyqgw9ziw03wy12c9"; }; - cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system + # installed frameworks + # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the + # installation which causes havoc + # Building RelWithDebInfo allows QGIS_DEBUG to print debugging information + cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}" + ++ stdenv.lib.optional stdenv.isDarwin + (["-DCMAKE_FIND_FRAMEWORK=never"] + ++ ["-DQGIS_MACAPP_BUNDLE=0"]); +# ++ ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"]; - postInstall = '' - wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} - ''; + + + postInstall = + (stdenv.lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/qgis \ + --set PYTHONPATH $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} + '') + + (stdenv.lib.optionalString stdenv.isDarwin '' + # Necessary for QGIS to find the correct default GRASS path + ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} + for file in $(find $out -type f -name "QGIS"); do + wrapProgram "$file" \ + --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ + --prefix DYLD_LIBRARY_PATH : "${qscintilla}/lib" \ + ${stdenv.lib.optionalString withGrass "--prefix PATH : ${grass}/bin"} \ + --set PYTHONPATH $PYTHONPATH + done + mkdir -p $out/bin + ln -s $out/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis + ''); meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71a868536517..63a74435a774 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17225,7 +17225,9 @@ with pkgs; qemu-riscv = callPackage ../applications/virtualization/qemu/riscv.nix {}; - qgis = callPackage ../applications/gis/qgis {}; + qgis = callPackage ../applications/gis/qgis { + inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; + }; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; From 9031300f5e05520f4eb0cabdab457427e32a854d Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 20 Mar 2018 22:34:17 +0000 Subject: [PATCH 0122/2743] Remove darwin specific patch --- pkgs/applications/gis/grass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5b36c24ab10e..8353bce1b847 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, lib +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages }: stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { # On Darwin the installer tries to symlink the help files into a system # directory - patches = [] ++ lib.optional stdenv.isDarwin [ ./no_symbolic_links.patch ]; + patches = [ ./no_symbolic_links.patch ]; configureFlags = [ "--with-proj-share=${proj}/share/proj" From ebe7b86bac6dc548d81486d090435e417ac6c5fc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 21 Mar 2018 16:05:39 -0500 Subject: [PATCH 0123/2743] lua-{5.2,5.3}: cross fixups, drop crossAttrs mostly just forward environment variables to make arguments, this partially reverts 5d1e51a199917fa945cb59567597e354c6e4f56d which removed them because they're already set in env-- but that's not enough to override make vars. Also, readline is buildInput not nativeBuildInput (we need headers and to link against it) --- pkgs/development/interpreters/lua-5/5.2.nix | 31 ++------------------- pkgs/development/interpreters/lua-5/5.3.nix | 31 ++------------------- 2 files changed, 6 insertions(+), 56 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 0cdc4770a983..acddbcfd303c 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; }; - nativeBuildInputs = [ readline ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ]; configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) ''; @@ -56,31 +56,6 @@ stdenv.mkDerivation rec { EOF ''; - crossAttrs = let - inherit (hostPlatform) isDarwin isMinGW; - in { - configurePhase = '' - makeFlagsArray=( - INSTALL_TOP=$out - INSTALL_MAN=$out/share/man/man1 - V=${luaversion} - R=${version} - ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' - ''} - ) - '' + stdenv.lib.optionalString isMinGW '' - installFlagsArray=( - TO_BIN="lua.exe luac.exe" - TO_LIB="liblua.a lua52.dll" - INSTALL_DATA="cp -d" - ) - ''; - } // stdenv.lib.optionalAttrs isDarwin { - postPatch = '' - sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile - ''; - }; - meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index ad1dfa8823cb..7f0703c62884 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; }; - nativeBuildInputs = [ readline ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else []; configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version}) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' ) cat ${./lua-5.3-dso.make} >> src/Makefile sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile @@ -55,31 +55,6 @@ stdenv.mkDerivation rec { EOF ''; - crossAttrs = let - inherit (hostPlatform) isDarwin isMinGW; - in { - configurePhase = '' - makeFlagsArray=( - INSTALL_TOP=$out - INSTALL_MAN=$out/share/man/man1 - V=${luaversion} - R=${version} - ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' - ''} - ) - '' + stdenv.lib.optionalString isMinGW '' - installFlagsArray=( - TO_BIN="lua.exe luac.exe" - TO_LIB="liblua.a lua52.dll" - INSTALL_DATA="cp -d" - ) - ''; - } // stdenv.lib.optionalAttrs isDarwin { - postPatch = '' - sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile - ''; - }; - meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; From 13ab409b1e6f388c0412fc03aa8f2c7cc37dc7b2 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 18 Mar 2018 12:41:47 -0700 Subject: [PATCH 0124/2743] xorg.utilmacros: 1.19.1 -> 1.19.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 1.19.2 with grep in /nix/store/0dsmsg3p8dzp24h3ldc8xl0kzjwxpg6b-util-macros-1.19.2 - directory tree listing: https://gist.github.com/c2988d9a6c1d7cd8bfd5b9513e60d79c --- pkgs/servers/x11/xorg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d22565ae8db9..286662ca0483 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1364,11 +1364,11 @@ let }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; utilmacros = (mkDerivation "utilmacros" { - name = "util-macros-1.19.1"; + name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2; - sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q"; + url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2; + sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; From 0e443ceb9e815fda4a580a484ea0b2627ee78509 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 20 Mar 2018 12:53:45 -0700 Subject: [PATCH 0125/2743] xorg.libXfixes: 5.0.2 -> 5.0.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 5.0.3 with grep in /nix/store/g5hcg35wmg25sgfjp7mvi4cx3shldbxd-libXfixes-5.0.3 - directory tree listing: https://gist.github.com/7398ada0908969ebbd1e7e629a1e0ef7 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 286662ca0483..8a9cd1c6dd47 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -848,11 +848,11 @@ let }) // {inherit libX11 xextproto xproto ;}; libXfixes = (mkDerivation "libXfixes" { - name = "libXfixes-5.0.2"; + name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2; - sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv"; + url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2; + sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 xextproto xproto ]; From 05818138bad01a935b89c44614c3b2fa3462ce9b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 21 Mar 2018 06:39:45 -0700 Subject: [PATCH 0126/2743] xf86_input_wacom: 0.35.0 -> 0.36.0 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/xsetwacom -h` got 0 exit code - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/xsetwacom --help` got 0 exit code - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/xsetwacom -V` and found version 0.36.0 - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/xsetwacom --version` and found version 0.36.0 - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-debugger -h` got 0 exit code - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-debugger --help` got 0 exit code - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-debugger -V` and found version 0.36.0 - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-debugger --version` and found version 0.36.0 - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-inputattach -h` got 0 exit code - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-inputattach --help` got 0 exit code - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-inputattach -V` and found version 0.36.0 - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-inputattach -v` and found version 0.36.0 - ran `/nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0/bin/isdv4-serial-inputattach --version` and found version 0.36.0 - found 0.36.0 with grep in /nix/store/ipx3qfwcd0g7wnmnqxq008fws2n8ldg4-xf86-input-wacom-0.36.0 - directory tree listing: https://gist.github.com/ceac89f2f9f39c6b3da0882790d97699 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 2ebb2b1890d5..b5937dff3752 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.35.0"; + name = "xf86-input-wacom-0.36.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm"; + sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender From 601e1d80c3d31ce7eff4158a08e9a0745efafefa Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 20 Mar 2018 12:27:50 -0700 Subject: [PATCH 0127/2743] srtp: 1.5.4 -> 2.1.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 2.1.0 with grep in /nix/store/rgqp3xyxn4m88whigf4msz3kj07hhgkf-libsrtp-2.1.0 - directory tree listing: https://gist.github.com/d1a145c8a1c6845fe2715b901b9f99b2 --- pkgs/development/libraries/srtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index d4ea531f886e..29ad55eb9d92 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libsrtp-${version}"; - version = "1.5.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "0s029m4iw0nsvnsm2hlz8yajrasdvf315iv2dw8mfm7nhbshwsqa"; + sha256 = "1q2rf1d2bsypdnw9k8ag6hrh9vbinfa504d1f42fdgdqw31d6lib"; }; nativeBuildInputs = [ pkgconfig ]; From 2af1357bbbf1ce698973ce69acd431c7f4a0b852 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 19 Mar 2018 21:21:38 -0700 Subject: [PATCH 0128/2743] apacheHttpd: 2.4.29 -> 2.4.32 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/jqy7a2lm1zlq16al63hl6v66hvlgvw6i-apache-httpd-2.4.32/bin/httpd -V` and found version 2.4.32 - ran `/nix/store/jqy7a2lm1zlq16al63hl6v66hvlgvw6i-apache-httpd-2.4.32/bin/httpd -v` and found version 2.4.32 - ran `/nix/store/jqy7a2lm1zlq16al63hl6v66hvlgvw6i-apache-httpd-2.4.32/bin/apachectl -V` and found version 2.4.32 - ran `/nix/store/jqy7a2lm1zlq16al63hl6v66hvlgvw6i-apache-httpd-2.4.32/bin/apachectl -v` and found version 2.4.32 - found 2.4.32 with grep in /nix/store/jqy7a2lm1zlq16al63hl6v66hvlgvw6i-apache-httpd-2.4.32 - directory tree listing: https://gist.github.com/70eb713ae0f87b3472cac40abc006a26 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 41e65b588e16..5c396a4a5036 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.29"; + version = "2.4.32"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00"; + sha256 = "0adrca77awvf6vbq8943b1z25abqz6g8rk6zc8wm7y6w2mfd2lv3"; }; # FIXME: -dev depends on -doc From cd1cb1051538b1bd47f4700d4ea54ab002e23701 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 22 Mar 2018 09:48:05 +0200 Subject: [PATCH 0129/2743] automake: 1.16 -> 1.16.1 --- pkgs/development/tools/misc/automake/automake-1.16.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 43efcf462800..affc400a9ed0 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.16"; + name = "automake-1.16.1"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr"; + sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; }; nativeBuildInputs = [ autoconf perl ]; From c9d3fc7cad4d243025f9a0e1b3eec9305863c06d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 22 Mar 2018 09:48:13 +0200 Subject: [PATCH 0130/2743] help2man: 1.47.5 -> 1.47.6 --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6e341b577cfb..cdbdd8b2cf98 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.5"; + name = "help2man-1.47.6"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"; + sha256 = "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr"; }; nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; From 380171c9f6247480a31d87f04a20e96b0a1154c9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 22 Mar 2018 09:28:58 -0400 Subject: [PATCH 0131/2743] libgpg-error: 1.27 -> 1.28 --- .../libraries/libgpg-error/default.nix | 6 +-- .../libraries/libgpg-error/riscv.patch | 54 ------------------- 2 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 pkgs/development/libraries/libgpg-error/riscv.patch diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 5c5824a9930c..c138364ff289 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,15 +17,13 @@ }; in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; - version = "1.27"; + version = "1.28"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; + sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"; }; - patches = if hostPlatform.isRiscV then ./riscv.patch else null; - postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/libgpg-error/riscv.patch b/pkgs/development/libraries/libgpg-error/riscv.patch deleted file mode 100644 index afc3b9993a43..000000000000 --- a/pkgs/development/libraries/libgpg-error/riscv.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit b3e9ec5626d474c58e683a41d09576297d4acd3d -Author: Shea Levy -Date: Sat Feb 24 21:12:44 2018 -0500 - - syscfg: Add lock-obj-pub file for riscv64-unknown-linux-gnu. - - * src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: new. - * src/Makefile.am (lock_obj_pub): Add it. - - Signed-off-by: Shea Levy - -diff --git a/src/Makefile.am b/src/Makefile.am -index 4446612..5a8cc43 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -65,6 +65,7 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ -+ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ - syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ -diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -new file mode 100644 -index 0000000..8aab9d6 ---- /dev/null -+++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -@@ -0,0 +1,25 @@ -+## lock-obj-pub.riscv64-unknown-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[40]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## From 72984210ab06dc3a56a1c2b666f3528ec5dcaadf Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 21 Mar 2018 14:20:04 -0400 Subject: [PATCH 0132/2743] guile: Fix and clean up `libtool` propagation fixes Fixes #37548 --- pkgs/development/interpreters/guile/2.0.nix | 16 ++++++++++------ pkgs/development/interpreters/guile/default.nix | 16 ++++++++++------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index afd90397e232..2c9aec5b6952 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -27,12 +27,15 @@ nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; - propagatedBuildInputs = [ gmp boehmgc ] - # XXX: These ones aren't normally needed here, but since - # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add + propagatedBuildInputs = [ + gmp boehmgc + + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. Adding them here will add # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, # see below. - ++ [ libtool libunistring ]; + libtool libunistring + ]; enableParallelBuilding = true; @@ -70,11 +73,12 @@ postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" - + '' # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. - sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + + '' + sed -i "$out/lib/pkgconfig/guile"-*.pc \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index dc6e18ae1afd..3d5c51dc420b 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -28,12 +28,15 @@ nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; - propagatedBuildInputs = [ gmp boehmgc ] - # XXX: These ones aren't normally needed here, but since - # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add + propagatedBuildInputs = [ + gmp boehmgc + + # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l' + # flags for them without corresponding '-L' flags. Adding them here will add # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, # see below. - ++ [ libtool libunistring ]; + libtool libunistring + ]; enableParallelBuilding = true; @@ -66,11 +69,12 @@ postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" - + '' # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. - sed -i "$out/lib/pkgconfig/guile-2.2.pc" \ + + '' + sed -i "$out/lib/pkgconfig/guile"-*.pc \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; From e31c3f8b9f6e4d550b39744be7d26ec532be7169 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 22 Mar 2018 22:15:35 +0300 Subject: [PATCH 0133/2743] kernel: enable CGROUP_NET_PRIO It's required by systemd 238 because of a bug, otherwise systemd aborts. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5fbd9955c2a3..4eaa7bcf666e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -135,6 +135,7 @@ with stdenv.lib; NETFILTER y NETFILTER_ADVANCED y CGROUP_BPF? y # Required by systemd per-cgroup firewalling + CGROUP_NET_PRIO y # Required by systemd IP_ROUTE_VERBOSE y IP_MROUTE_MULTIPLE_TABLES y IP_VS_PROTO_TCP y From 26256ead321df1efde762bbd47f37f1b1074d5b0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 22 Mar 2018 22:16:19 +0300 Subject: [PATCH 0134/2743] btrfs-progs: fix build with new e2fsprogs --- pkgs/tools/filesystems/btrfs-progs/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 09f004f28440..c49b0269cb0f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd }: -let version = "4.15.1"; in - stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; + version = "4.15.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"; }; + patches = [ + # Fix build with e2fsprogs 1.44.0 + (fetchpatch { + url = "https://patchwork.kernel.org/patch/10281327/raw/"; + sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf"; + }) + ]; + nativeBuildInputs = [ pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; @@ -20,7 +27,7 @@ stdenv.mkDerivation rec { # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally - patchPhase = "sed -i s/-O1/-O2/ configure"; + postPatch = "sed -i s/-O1/-O2/ configure"; postInstall = '' install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs From 0ccab4946d5d0405ebced50a7b7f847730d502a9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 22 Mar 2018 22:16:30 +0300 Subject: [PATCH 0135/2743] systemd: 237 -> 238 --- nixos/modules/system/boot/systemd.nix | 4 ++-- pkgs/os-specific/linux/systemd/default.nix | 13 +++---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 92c9ee0c4691..2391e85f9f74 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -137,7 +137,6 @@ let # Slices / containers. "slices.target" - "system.slice" "user.slice" "machine.slice" "machines.target" @@ -821,7 +820,8 @@ in system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" - "SYSFS" "PROC_FS" "FHANDLE" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" + "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC" + "CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" "TMPFS_XATTR" "SECCOMP" ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a792283e70e1..5fea5241d133 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,14 +18,14 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "237"; + version = "238"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "98067cc806ae0d2759cdd2334f230cd8548e5317"; - sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q"; + rev = "243d65d38f2df82d4a39f6a9970337803dff65a1"; + sha256 = "098hxlkh6q17rxa178adylksxnnd4x9rxb8amjnlbiydcc6kaa5n"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -177,13 +177,6 @@ in stdenv.mkDerivation rec { rm -rf $out/etc/systemd/system - # Install SysV compatibility commands. - mkdir -p $out/sbin - ln -s $out/lib/systemd/systemd $out/sbin/telinit - for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i - done - # Fix reference to /bin/false in the D-Bus services. for i in $out/share/dbus-1/system-services/*.service; do substituteInPlace $i --replace /bin/false ${coreutils}/bin/false From 223a77c311610b92f25dccd5d621498ed4a39213 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:13:42 -0500 Subject: [PATCH 0136/2743] libiconvOrNull: deprecate --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa20bbaf47de..e3ad45d15f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9990,7 +9990,10 @@ with pkgs; }; # On non-GNU systems we need GNU Gettext for libintl. - libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; + libintl = if hostPlatform.libc != "glibc" then gettext else null; + + # deprecated: provided for compatability + libintlOrEmpty = [ libintl ]; libid3tag = callPackage ../development/libraries/libid3tag { gperf = gperf_3_0; From 90c132c7f1052703e236b6a6c46602e207f09e47 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:14:21 -0500 Subject: [PATCH 0137/2743] gettext: add -lintl to setup-hook --- pkgs/development/libraries/gettext/gettext-setup-hook.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 5932ef6a44f9..bdd34f453942 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -5,3 +5,11 @@ gettextDataDirsHook() { } addEnvHooks "$hostOffset" gettextDataDirsHook + +# libintl must be listed in load flags on non-Glibc +# it doesn't hurt to have it in Glibc either though +gettextLdflags() { + export NIX_LDFLAGS="$NIX_LDFLAGS -lintl" +} + +addEnvHooks "$hostOffset" gettextLdflags From 9e75fb5eb4f26de4e551137c3caaa78b9bf8b050 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:14:46 -0500 Subject: [PATCH 0138/2743] libiconv: add setup-hook --- pkgs/development/libraries/libiconv/default.nix | 2 ++ pkgs/development/libraries/libiconv/setup-hook.sh | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/development/libraries/libiconv/setup-hook.sh diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b55fc18cb69b..a4e6fed88e1c 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"; }; + setupHook = ./setup-hook.sh; + postPatch = lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh new file mode 100644 index 000000000000..d8e1b4597a06 --- /dev/null +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -0,0 +1,7 @@ +# libintl must be listed in load flags on non-Glibc +# it doesn't hurt to have it in Glibc either though +iconvLdflags() { + export NIX_LDFLAGS="$NIX_LDFLAGS -iconv" +} + +addEnvHooks "$hostOffset" iconvLdflags From ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:15:06 -0500 Subject: [PATCH 0139/2743] treewide: remove libintl hacks --- pkgs/applications/audio/ncmpc/default.nix | 2 -- pkgs/applications/editors/geany/default.nix | 6 ++---- pkgs/applications/graphics/gimp/2.8.nix | 3 +-- pkgs/applications/misc/djvulibre/default.nix | 6 ++---- pkgs/applications/misc/girara/default.nix | 7 ++----- pkgs/applications/misc/sdcv/default.nix | 3 +-- pkgs/applications/misc/zathura/core/default.nix | 7 +++---- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 6 +++--- pkgs/desktops/gnome-2/platform/libglade/default.nix | 2 -- pkgs/development/compilers/vala/default.nix | 4 ++-- pkgs/development/libraries/at-spi2-core/default.nix | 3 --- pkgs/development/libraries/atk/default.nix | 4 +--- pkgs/development/libraries/cairo/default.nix | 5 +++-- pkgs/development/libraries/cogl/default.nix | 7 ++----- pkgs/development/libraries/cracklib/default.nix | 4 ++-- pkgs/development/libraries/gdk-pixbuf/default.nix | 5 ++--- pkgs/development/libraries/gegl/3.0.nix | 6 ++---- pkgs/development/libraries/gegl/default.nix | 8 +++----- pkgs/development/libraries/geoclue/2.0.nix | 7 ++----- pkgs/development/libraries/glib-networking/default.nix | 1 - pkgs/development/libraries/glib/default.nix | 10 ++++------ .../libraries/gobject-introspection/default.nix | 5 ++--- pkgs/development/libraries/gstreamer/bad/default.nix | 6 ++---- pkgs/development/libraries/gstreamer/base/default.nix | 7 ++----- pkgs/development/libraries/gstreamer/good/default.nix | 7 ++----- .../gstreamer/legacy/gst-plugins-base/default.nix | 7 ++----- .../gstreamer/legacy/gst-plugins-good/default.nix | 7 ++----- .../gstreamer/legacy/gst-plugins-ugly/default.nix | 6 ++---- .../libraries/gstreamer/legacy/gstreamer/default.nix | 6 +++--- pkgs/development/libraries/gstreamer/ugly/default.nix | 7 +++---- pkgs/development/libraries/gtk+/2.x.nix | 5 +---- pkgs/development/libraries/gtk+/3.x.nix | 2 -- pkgs/development/libraries/harfbuzz/default.nix | 7 +++---- pkgs/development/libraries/json-glib/default.nix | 7 ++----- pkgs/development/libraries/libgsf/default.nix | 9 +++------ pkgs/development/libraries/libgtop/default.nix | 5 +---- pkgs/development/libraries/libinfinity/default.nix | 8 +++----- pkgs/development/libraries/libmicrohttpd/default.nix | 6 ++---- pkgs/development/libraries/librsvg/default.nix | 6 ++---- pkgs/development/libraries/libsecret/default.nix | 4 +--- pkgs/development/libraries/libsoup/default.nix | 6 ++---- pkgs/development/libraries/libui/default.nix | 4 +++- pkgs/development/libraries/pango/default.nix | 4 ++-- pkgs/development/libraries/poppler/default.nix | 4 ++-- pkgs/development/libraries/webkitgtk/2.20.nix | 8 +++----- pkgs/games/lbreakout2/default.nix | 6 ++---- pkgs/servers/dns/knot-dns/default.nix | 6 ++---- pkgs/tools/graphics/exif/default.nix | 4 ++-- pkgs/tools/misc/desktop-file-utils/default.nix | 6 ++---- pkgs/tools/misc/fwup/default.nix | 3 --- pkgs/tools/networking/wget/default.nix | 8 +++----- pkgs/tools/package-management/disnix/default.nix | 8 ++++---- pkgs/tools/security/gnupg/22.nix | 2 -- pkgs/tools/text/recode/default.nix | 9 +++------ pkgs/top-level/perl-packages.nix | 1 - 56 files changed, 107 insertions(+), 199 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 93e909fc604b..1b865642178f 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 23478758efe5..bedc299ee673 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl }: with stdenv.lib; @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool libintl ]; buildInputs = [ gtk2 which file ]; doCheck = true; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index a2cbffd5d217..3802fff2ad21 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -46,8 +46,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"; meta = { description = "The GNU Image Manipulation Program"; diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 6e158f5696c1..0b685e04a6fc 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }: +{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libiconv }: stdenv.mkDerivation rec { name = "djvulibre-3.5.27"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; - buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + buildInputs = [ libjpeg libtiff librsvg libiconv ]; meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 7fd3db860dfb..184ab818b1c3 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintl , withBuildColors ? true }: @@ -19,10 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk gettext libintlOrEmpty ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + buildInputs = [ gtk gettext libintl libiconv ]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 0a8d20a3958d..cc8c30043b29 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { mkdir locale ''; - NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__" - + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with stdenv.lib; { homepage = https://dushistov.github.io/sdcv/; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index afb38ace1d93..78d4d69e1263 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , gtk, girara, ncurses, gettext, docutils -, file, sqlite, glib, texlive, libintlOrEmpty +, file, sqlite, glib, texlive, libintl , gtk-mac-integration, synctexSupport ? true }: @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { icon = ./icon.xpm; nativeBuildInputs = [ - pkgconfig - ] ++ optional stdenv.isDarwin [ libintlOrEmpty ]; + pkgconfig libintl + ]; buildInputs = [ file gtk girara @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ] ++ optional synctexSupport texlive.bin.core ++ optional stdenv.isDarwin [ gtk-mac-integration ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; makeFlags = [ diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 97838312fd0b..b03673a00b66 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses glib openssl perl libintlOrEmpty ]; + buildInputs = [ ncurses glib openssl perl libintl ]; configureFlags = [ "--with-proxy" diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index b8a41a529b05..ef18f0783ce3 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintl }: stdenv.mkDerivation rec { name = "ORBit2-${minVer}.19"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 5003215529e4..956fec1ddf15 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -14,6 +14,4 @@ stdenv.mkDerivation { buildInputs = [ gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 6a020e11a4be..f36bea42e2a8 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz -, glib, libiconv, libintlOrEmpty, libtool, expat +, glib, libiconv, libintl, libtool, expat }: let @@ -16,7 +16,7 @@ let nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; - buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; + buildInputs = [ glib libiconv libintl ] ++ extraBuildInputs; meta = with stdenv.lib; { description = "Compiler for GObject type system"; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index b717101b3e13..6715a59579b5 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,10 +23,7 @@ stdenv.mkDerivation rec { # ToDo: on non-NixOS we create a symlink from there? configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; - NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; - meta = with stdenv.lib; { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 6f10c9c2f5a2..b3ead726cba1 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, libintlOrEmpty, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, gobjectIntrospection, gnome3 }: let pname = "atk"; @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = libintlOrEmpty; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6aa184e4204e..6a7beb1cc1a8 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv -, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg +, libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv - ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libintl + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText ApplicationServices diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 48b38c22af59..0209799f5fcd 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 , gstreamerSupport ? true, gst_all_1 }: @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ "--enable-introspection" @@ -27,7 +27,6 @@ in stdenv.mkDerivation rec { glib gdk_pixbuf gobjectIntrospection wayland libGL libXrandr libXfixes libXcomposite libXdamage ] - ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; @@ -37,8 +36,6 @@ in stdenv.mkDerivation rec { = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - #doCheck = true; # all tests fail (no idea why) passthru = { diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index d316b5bf2d1e..aa8b4231a869 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libintlOrEmpty, zlib, gettext }: +{ stdenv, fetchurl, zlib, gettext }: stdenv.mkDerivation rec { name = "cracklib-2.9.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp"; }; - buildInputs = [ libintlOrEmpty zlib gettext ]; + buildInputs = [ zlib gettext ]; meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index ace1d687a91b..08e94648e7d7 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, shared-mime-info, libintlOrEmpty, gobjectIntrospection, doCheck ? false, makeWrapper }: +, jasper, shared-mime-info, libintl, gobjectIntrospection, doCheck ? false, makeWrapper }: let pname = "gdk-pixbuf"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info ++ libintlOrEmpty; + buildInputs = [ libX11 libintl ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info; nativeBuildInputs = [ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 @@ -78,4 +78,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 03f6054791e4..bc708cf03d2a 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3 }: +, libwebp, gnome3, libintl }: stdenv.mkDerivation rec { name = "gegl-0.3.28"; @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - hardeningDisable = [ "format" ]; # needs fonts otherwise don't know how to pass them @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc - nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; + nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; meta = with stdenv.lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 304d8110ad46..8c93428a0780 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk2, bzip2, intltool +, librsvg, pango, gtk2, bzip2, intltool, libintl , OpenGL ? null }: stdenv.mkDerivation rec { @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool ] + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index b70163789dec..495a113391e3 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip +{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip , dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection }: @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { pkgconfig intltool wrapGAppsHook gobjectIntrospection ]; - buildInputs = libintlOrEmpty ++ - [ glib json-glib libsoup geoip + buildInputs = [ glib json-glib libsoup geoip dbus dbus-glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; @@ -37,8 +36,6 @@ stdenv.mkDerivation rec { "--disable-modem-gps-source" "--disable-nmea-source" ]; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - postInstall = '' sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" ''; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 2e0e8cbb910e..ec3e9077e934 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -47,4 +47,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2c070ff3fa8c..f5963b756cab 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python -, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf, gnome3 +, libiconv, libintl, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null @@ -66,10 +66,9 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; - nativeBuildInputs = [ pkgconfig gettext perl python ]; + nativeBuildInputs = [ pkgconfig gettext perl python libintl libiconv ]; - propagatedBuildInputs = [ zlib libffi libiconv ] - ++ libintlOrEmpty; + propagatedBuildInputs = [ zlib libffi ]; # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] @@ -84,8 +83,7 @@ stdenv.mkDerivation rec { # GElf only supports elf64 hosts ++ optional (!stdenv.hostPlatform.is64bit) "--disable-libelf"; - NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl" - ++ optional stdenv.isSunOS "-DBSD_COMP"; + NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP"; preConfigure = optionalString stdenv.isSunOS '' sed -i -e 's|inotify.h|foobar-inotify.h|g' configure diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 3c884bb1224a..f79511897fbe 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python -, libintlOrEmpty, cctools, cairo, gnome3 +, libintl, cctools, cairo, gnome3 , substituteAll, nixStoreDir ? builtins.storeDir , x11Support ? true }: @@ -24,9 +24,8 @@ stdenv.mkDerivation rec { outputBin = "dev"; outputMan = "dev"; # tiny pages - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; buildInputs = [ flex bison python setupHook/*move .gir*/ ] - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin cctools; propagatedBuildInputs = [ libffi glib ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d4cc2f43aaa6..72fead258f5d 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -6,7 +6,7 @@ , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools -, libGLU_combined, libintlOrEmpty, libgme +, libGLU_combined, libintl, libgme , openssl, x265, libxml2 }: @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { fluidsynth libvdpau libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 + libintl ] - ++ libintlOrEmpty ++ optional faacSupport faac # for gtksink ++ optional gtkSupport gtk3 @@ -75,7 +75,5 @@ stdenv.mkDerivation rec { # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin ++ optional (!stdenv.isDarwin) mjpegtools; - LDFLAGS = optionalString stdenv.isDarwin "-lintl"; - enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 2cd0c14c1f34..c0c03dc15661 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection , orc, alsaLib, libXv, pango, libtheora -, cdparanoia, libvisual, libintlOrEmpty +, cdparanoia, libvisual, libintl }: stdenv.mkDerivation rec { @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - orc libXv pango libtheora cdparanoia + orc libXv pango libtheora cdparanoia libintl ] - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isLinux alsaLib ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual; @@ -40,7 +39,5 @@ stdenv.mkDerivation rec { "--disable-cdparanoia" ] else null; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index e4e4f3b394db..daca02c408ba 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -3,7 +3,7 @@ , libv4l, libdv, libavc1394, libiec61883 , libvpx, speex, flac, taglib, libshout , cairo, gdk_pixbuf, aalib, libcaca -, libsoup, libpulseaudio, libintlOrEmpty +, libsoup, libpulseaudio, libintl , darwin }: @@ -38,9 +38,8 @@ stdenv.mkDerivation rec { gst-plugins-base orc bzip2 libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca - libsoup libshout + libsoup libshout libintl ] - ++ libintlOrEmpty ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; @@ -48,6 +47,4 @@ stdenv.mkDerivation rec { mkdir -p "$dev/lib/gstreamer-1.0" mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0" ''; - - LDFLAGS = optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 2c2e1b0da122..8371b2780409 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc -, libintlOrEmpty +, libintl , ApplicationServices , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # TODO : v4l, libvisual buildInputs = - [ pkgconfig glib cairo orc ] + [ pkgconfig glib cairo orc libintl ] # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) @@ -37,11 +37,8 @@ stdenv.mkDerivation rec { liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia - ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - propagatedBuildInputs = [ gstreamer ]; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index d533f798d999..75583624f545 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc -, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty +, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl , # Whether to build no plugins that have external dependencies # (except the PulseAudio plugin). minimalDeps ? false @@ -23,15 +23,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-experimental" "--disable-oss" ]; buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base ] + [ pkgconfig glib gstreamer gst-plugins-base libintl ] ++ lib.optional stdenv.isLinux libpulseaudio - ++ libintlOrEmpty ++ lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ]; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - enableParallelBuilding = true; postInstall = lib.optionalString (!minimalDeps) '' diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 5c289fb39114..ac680f8432ab 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base -, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }: +, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-0.10.19"; @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index 55d34a3fada3..e46ecfb76127 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty }: +{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintl }: stdenv.mkDerivation rec { name = "gstreamer-0.10.36"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libintl ]; buildInputs = [ perl bison flex ]; - propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; + propagatedBuildInputs = [ glib libxml2 ]; patchPhase = '' sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index cdaa88ce350f..a4083b3e84b2 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python , gst-plugins-base, orc , a52dec, libcdio, libdvdread -, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 +, lame, libmad, libmpeg2, x264, libintl, mpg123 }: stdenv.mkDerivation rec { @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { gst-plugins-base orc a52dec libcdio libdvdread lame libmad libmpeg2 x264 mpg123 - ] ++ libintlOrEmpty; - - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + libintl + ]; } diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 8a3ce884dfd7..d35e47f312f9 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg -, gdk_pixbuf, libintlOrEmpty, xlibsWrapper, gobjectIntrospection +, gdk_pixbuf, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null , gdktarget ? "x11" @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = optionalString (libintlOrEmpty != []) "-lintl"; - setupHook = ./setup-hook.sh; nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; @@ -38,7 +36,6 @@ stdenv.mkDerivation rec { libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] - ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ] ++ optionals stdenv.isDarwin [ AppKit Cocoa ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index c96139ddb576..ca659525272e 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { ++ optional cupsSupport cups; #TODO: colord? - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; - # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index bb68ae94a7f0..9b2e2e27f42e 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it @@ -25,9 +25,8 @@ stdenv.mkDerivation { ( "--with-icu=" + (if withIcu then "yes" else "no") ) ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + buildInputs = [ glib freetype cairo ]; # recommended by upstream propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ] diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index bf32f4f8e8bc..21bddf8f6bb5 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext -, gobjectIntrospection, dbus, libintlOrEmpty +, gobjectIntrospection, dbus , fixDarwinDylibNames }: @@ -14,10 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - buildInputs = libintlOrEmpty - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; patches = [ # https://gitlab.gnome.org/GNOME/json-glib/issues/27 diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 54a17d94a598..b0013d0f9491 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: +, python, perl, gdk_pixbuf, libiconv, libintl }: let inherit (stdenv.lib) optionals; in @@ -11,21 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool libintl ]; buildInputs = [ gettext bzip2 zlib python ] ++ stdenv.lib.optional doCheck perl; - propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] - ++ libintlOrEmpty; + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]; outputs = [ "out" "dev" ]; doCheck = true; preCheck = "patchShebangs ./tests/"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "GNOME's Structured File Library"; homepage = https://www.gnome.org/projects/libgsf; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 0a44eee90aa0..656395b8867d 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintlOrEmpty, gnome3 }: +{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, gnome3 }: let pname = "libgtop"; version = "2.38.0"; @@ -12,11 +12,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - buildInputs = libintlOrEmpty; nativeBuildInputs = [ pkgconfig perl gettext gobjectIntrospection ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 9bbb8f0e129d..944cf7a6f5e2 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -4,7 +4,7 @@ , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl , gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss -, libintlOrEmpty }: +, libintl }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -19,14 +19,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintlOrEmpty ] + buildInputs = [ glib libxml2 gsasl libidn gss libintl ] ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; propagatedBuildInputs = [ gnutls ]; - + configureFlags = '' ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} ${edf gtkWidgets "inftextgtk"} @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { ${edf avahiSupport "avahi"} ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 2e7c913e6a8d..041e0d98d654 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }: +{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: stdenv.mkDerivation rec { name = "libmicrohttpd-${version}"; @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" "info" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgcrypt curl gnutls ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ]; + buildInputs = [ libgcrypt curl gnutls libiconv libintl ]; preCheck = '' # Since `localhost' can't be resolved in a chroot, work around it. @@ -38,4 +37,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4bb4db104382..c2e1739117b5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3 +, bzip2, libcroco, libintl, darwin, rust, gnome3 , withGTK ? false, gtk3 ? null , vala, gobjectIntrospection }: @@ -15,11 +15,9 @@ stdenv.mkDerivation rec { sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - outputs = [ "out" "dev" ]; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ]; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 4ff00d777691..4c8af65b90d7 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -14,10 +14,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; + nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl libintl ]; buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; # optional: build docs with gtk-doc? (probably needs a flag as well) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index dad245d0791e..92e9c3662c9f 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3 , gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection , valaSupport ? true, vala_0_40 -, libintlOrEmpty , intltool, python3 }: + let pname = "libsoup"; version = "2.62.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = libintlOrEmpty ++ [ python3 sqlite ]; + buildInputs = [ python3 sqlite ]; nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ] ++ stdenv.lib.optionals valaSupport [ vala_0_40 ]; propagatedBuildInputs = [ glib libxml2 ]; @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { "--with-gnome=${if gnomeSupport then "yes" else "no"}" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 2f8963db0cd8..2bee04600d00 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -15,7 +15,9 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ] ++ - (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]); + (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa] + else if backend == "unix" then [gtk3]) + else null; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 3806926fa244..d880d41c7084 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz -, libintlOrEmpty, gobjectIntrospection, darwin +, libintl, gobjectIntrospection, darwin }: with stdenv.lib; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo harfbuzz libXft ] ++ libintlOrEmpty; + propagatedBuildInputs = [ cairo harfbuzz libXft libintl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index c7e1e024700e..5bcfbd52182e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; + buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 8b44f11ee930..65a1af769cfa 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -2,7 +2,7 @@ , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt , gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit -, libidn, libedit, readline, libGLU_combined, libintlOrEmpty +, libidn, libedit, readline, libGLU_combined, libintl , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null , gst-plugins-base, gst-plugins-bad, woff2 @@ -60,15 +60,13 @@ stdenv.mkDerivation rec { "-DENABLE_GTKDOC=OFF" ]; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - nativeBuildInputs = [ cmake ninja perl python2 ruby bison gperf pkgconfig gettext gobjectIntrospection ]; - buildInputs = libintlOrEmpty ++ [ - libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 + buildInputs = [ + libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index eb9bed9e1d95..5ab9954739b2 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintlOrEmpty }: +{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintl }: stdenv.mkDerivation rec { name = "lbreakout2-${version}"; version = "2.6.5"; - buildInputs = [ SDL SDL_mixer zlib libpng ] ++ libintlOrEmpty; + buildInputs = [ SDL SDL_mixer zlib libpng libintl ]; src = fetchurl { url = "mirror://sourceforge/lgames/${name}.tar.gz"; sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = with stdenv.lib; { description = "Breakout clone from the LGames series"; homepage = http://lgames.sourceforge.net/LBreakout2/; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index a47d3106443f..0af077c455c9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn -, systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty +, systemd, nettle, libedit, zlib, libiconv, libintl }: let inherit (stdenv.lib) optional optionals; in @@ -20,11 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls liburcu libidn nettle libedit - libiconv lmdb + libiconv lmdb libintl # without sphinx &al. for developer documentation ] ++ optionals stdenv.isLinux [ libcap_ng systemd ] - ++ libintlOrEmpty ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; @@ -43,4 +42,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } - diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 537d1a8c7db9..d6ec68ba3cc5 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libexif, popt, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, libexif, popt, libintl }: stdenv.mkDerivation rec { name = "exif-0.6.21"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libexif popt ] ++ libintlOrEmpty; + buildInputs = [ libexif popt libintl ]; meta = { homepage = http://libexif.sourceforge.net/; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 6e2f6548722e..e89222af74b4 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, libintl }: with stdenv.lib; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libintlOrEmpty ]; - - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl"; + buildInputs = [ glib libintl ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index e7e40bc851e2..e334a2a8813e 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ]; - # segfaults on darwin without - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-F/System/Library/Frameworks"; - meta = with stdenv.lib; { description = "Configurable embedded Linux firmware update creator and runner"; homepage = https://github.com/fhunleth/fwup; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b31ae93066ef..e2d4712d5bc3 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, pkgconfig, perl -, libidn2, zlib, pcre, libuuid, libiconv +, libidn2, zlib, pcre, libuuid, libiconv, libintl , IOSocketSSL, LWP, python3, lzip , libpsl ? null , openssl ? null }: @@ -25,12 +25,10 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's/localhost/127.0.0.1/g' done - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export LIBS="-liconv -lintl" ''; - nativeBuildInputs = [ gettext pkgconfig perl lzip ]; - buildInputs = [ libidn2 libiconv zlib pcre libuuid ] + nativeBuildInputs = [ gettext pkgconfig perl lzip libiconv libintl ]; + buildInputs = [ libidn2 zlib pcre libuuid ] ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (openssl != null) openssl ++ stdenv.lib.optional (libpsl != null) libpsl diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 03831f9b8b87..a55fd33f8991 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: +{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }: stdenv.mkDerivation { name = "disnix-0.8"; - + src = fetchurl { url = https://github.com/svanderburg/disnix/files/1756701/disnix-0.8.tar.gz; sha256 = "02cmj1jqk5i90szjsn5csr7qb7n42v04rvl9syx0zi9sx9ldnb0w"; }; - + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; + buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index c47780588cd7..860c90eb4c9d 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 sqlite ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - patches = [ ./fix-libusb-include-path.patch ]; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index acf657d2292c..9cc09a702102 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook, -texinfo, libiconv }: +{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook +, texinfo, libiconv, libintl }: stdenv.mkDerivation rec { name = "recode-3.7-2fd838565"; @@ -11,16 +11,13 @@ stdenv.mkDerivation rec { sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; }; - nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ]; + nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv libintl ]; preAutoreconf = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" "" sed -i '/^AM_C_PROTOTYPES/d' configure.ac substituteInPlace src/Makefile.am --replace "ansi2knr" "" - '' - + stdenv.lib.optionalString stdenv.isDarwin '' - export LDFLAGS=-lintl ''; #doCheck = true; # doesn't work yet diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13554ff6ee68..e4e53b90a655 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8072,7 +8072,6 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext; - NIX_CFLAGS_LINK = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) "-lintl"; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; From 929f469ede271ada14b47cb62fe086710f952771 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:17:05 -0500 Subject: [PATCH 0140/2743] treewide: remove libiconv hacks --- pkgs/development/libraries/libnatspec/default.nix | 1 - pkgs/development/libraries/stfl/default.nix | 3 --- pkgs/tools/misc/aescrypt/default.nix | 2 -- pkgs/tools/networking/whois/default.nix | 2 -- pkgs/tools/text/odt2txt/default.nix | 2 -- pkgs/tools/text/unrtf/default.nix | 3 +-- 6 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fe38755f10c5..9b692e9e3b2e 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation (rec { maintainers = [ ]; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { - NIX_LDFLAGS = "-liconv"; propagatedBuildInputs = [ libiconv ]; }) diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index fd9ab5a2036d..89261b665f50 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildPhase = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc != "glibc") '' - sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile '' + ( stdenv.lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile '' ) + '' @@ -36,4 +34,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; }; } - diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index d11392599220..d1125d572ee9 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = https://www.aescrypt.com/; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 48a3d1591fc9..4a40c3200407 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done - '' + stdenv.lib.optionalString (stdenv.isDarwin || stdenv.hostPlatform.isMusl) '' - echo "whois_LDADD += -liconv" >> Makefile ''; makeFlags = [ "HAVE_ICONV=1" ]; diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 187a6526dc3c..3feecdf4f53c 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - meta = { description = "Simple .odt to .txt converter"; homepage = http://stosberg.net/odt2txt; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index c1b4aa1cf2c6..361b6782526b 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + buildInputs = [ libiconv ]; preConfigure = "./bootstrap"; From a59003d58fba77b77946db7b70d44f8e69b9ddeb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 15:29:44 -0500 Subject: [PATCH 0141/2743] treewide: fix eval --- pkgs/development/libraries/libsecret/default.nix | 2 +- pkgs/development/libraries/libui/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 4c8af65b90d7..b77ba49822fd 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc -, libgcrypt, gobjectIntrospection, vala_0_38, gnome3 }: +, libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: let pname = "libsecret"; version = "0.18.5"; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 2bee04600d00..b1e6938a1494 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -16,8 +16,8 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ] ++ (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa] - else if backend == "unix" then [gtk3]) - else null; + else if backend == "unix" then [gtk3] + else null); preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt From 9c6b76f6af9fb0bf1106f821f6302e90d534f89f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 16:55:27 -0500 Subject: [PATCH 0142/2743] darwin.libiconv: add setup hook --- .../darwin/apple-source-releases/libiconv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 13b6156492bb..d9b3dfb74049 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -14,6 +14,8 @@ appleDerivation { -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib ''; + setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh; + meta = { platforms = stdenv.lib.platforms.darwin; }; From 63b41e2be7c50605ba055143b5991436af31b764 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 16:55:49 -0500 Subject: [PATCH 0143/2743] all-packages: remove legacy darwin.libiconv override --- pkgs/top-level/all-packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3ad45d15f80..4c59ab88c618 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8898,12 +8898,10 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security; }; libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9908,9 +9906,6 @@ with pkgs; }; libnatspec = callPackage ../development/libraries/libnatspec ( - stdenv.lib.optionalAttrs stdenv.isDarwin { - inherit (darwin) libiconv; - } ); libndp = callPackage ../development/libraries/libndp { }; @@ -11702,9 +11697,7 @@ with pkgs; stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7 }; - wavpack = callPackage ../development/libraries/wavpack { - inherit (darwin) libiconv; - }; + wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { graphviz = graphviz-nox; From c295e7a7f53e336c3654618b836404ba2bfb733b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 16:58:57 -0500 Subject: [PATCH 0144/2743] libiconv: fix bad setup-hook --- pkgs/development/libraries/libiconv/setup-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh index d8e1b4597a06..80843e19809b 100644 --- a/pkgs/development/libraries/libiconv/setup-hook.sh +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -1,7 +1,7 @@ -# libintl must be listed in load flags on non-Glibc +# libiconv must be listed in load flags on non-Glibc # it doesn't hurt to have it in Glibc either though iconvLdflags() { - export NIX_LDFLAGS="$NIX_LDFLAGS -iconv" + export NIX_LDFLAGS="$NIX_LDFLAGS -liconv" } addEnvHooks "$hostOffset" iconvLdflags From 9109a904794ab2be09d10727f45cf9f043a6cf00 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 17:58:20 -0500 Subject: [PATCH 0145/2743] treewide: remove some more gettext references --- pkgs/development/libraries/gnutls/generic.nix | 4 +--- pkgs/development/libraries/gts/default.nix | 2 +- pkgs/development/libraries/libassuan/default.nix | 3 +-- pkgs/development/libraries/libksba/default.nix | 2 +- pkgs/development/r-modules/generic-builder.nix | 4 ++-- pkgs/os-specific/linux/policycoreutils/default.nix | 1 - pkgs/tools/filesystems/e2fsprogs/default.nix | 2 +- pkgs/tools/graphics/graphviz/base.nix | 3 ++- pkgs/tools/networking/lftp/default.nix | 3 +-- pkgs/top-level/perl-packages.nix | 4 ++-- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 8769584a9f21..984603827c8d 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] - ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv - ++ lib.optional stdenv.isDarwin gettext + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile ++ buildInputs; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 59b3a34f7bdd..770f743fd260 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + buildInputs = [ glib gettext ]; meta = { homepage = http://gts.sourceforge.net/; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 827d3de79ea8..91ceb959779e 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ libgpgerror pth gettext]; doCheck = true; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 3f7a4bed9cc9..0611e0e57e7b 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ gettext ]; propagatedBuildInputs = [ libgpgerror ]; postInstall = '' diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index ff6c3ad1b903..0d731de33f84 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -3,9 +3,9 @@ { name, buildInputs ? [], ... } @ attrs: stdenv.mkDerivation ({ - buildInputs = buildInputs ++ [R] ++ + buildInputs = buildInputs ++ [R gettext] ++ stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gettext gfortran]; + stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 536c69ff5573..980b77f8df24 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -65,4 +65,3 @@ stdenv.mkDerivation rec { inherit (libsepol.meta) homepage platforms maintainers; }; } - diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 95a57cefc0ec..a97e024c0aa9 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig texinfo ]; - buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + buildInputs = [ libuuid gettext ]; configureFlags = if stdenv.isLinux then [ diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index f61c7923d794..b360f9a34503 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + gettext ] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) - ++ optionals (stdenv.isDarwin) [ ApplicationServices gettext ]; + ++ optionals (stdenv.isDarwin) [ ApplicationServices ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 3e4f1eaeeefe..36eced808569 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring ] - ++ stdenv.lib.optional stdenv.isDarwin gettext; + buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ]; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4e53b90a655..50f0d0a57cce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3877,7 +3877,7 @@ let self = _self // overrides; _self = with self; { \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h - \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi + \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsif # --- '; @@ -8071,7 +8071,7 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; - buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext; + buildInputs = [ pkgs.gettext ]; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; From 7ab562c7d2402812c094065f02dd231ffdd02986 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 18:33:25 -0500 Subject: [PATCH 0146/2743] all-packages: fix eval issue --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c59ab88c618..a21957afd12b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9905,8 +9905,7 @@ with pkgs; mysql = mysql57; }; - libnatspec = callPackage ../development/libraries/libnatspec ( - ); + libnatspec = callPackage ../development/libraries/libnatspec { }; libndp = callPackage ../development/libraries/libndp { }; From facd1707909a7868a67677c794df01266bd22f0e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 18:39:31 -0500 Subject: [PATCH 0147/2743] aliases: properly deprecate libintlOrEmpty --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4e91dee6a405..48bad91d2fe5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -120,6 +120,7 @@ mapAliases (rec { libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 + libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libtidy = html-tidy; # added 2014-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a21957afd12b..a8e4f521772f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9986,9 +9986,6 @@ with pkgs; # On non-GNU systems we need GNU Gettext for libintl. libintl = if hostPlatform.libc != "glibc" then gettext else null; - # deprecated: provided for compatability - libintlOrEmpty = [ libintl ]; - libid3tag = callPackage ../development/libraries/libid3tag { gperf = gperf_3_0; }; From d9aaae55796e3bbbf654eab2c61d41c02dfb6b3f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 19:07:43 -0500 Subject: [PATCH 0148/2743] gettext: disable hook when libc == glibc --- pkgs/development/libraries/gettext/default.nix | 1 + pkgs/development/libraries/gettext/gettext-setup-hook.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 9c3024ce25fb..e5795951bf75 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; setupHook = ./gettext-setup-hook.sh; + gettextNeedsLdflags = !hostPlatform.libc != "glibc"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index bdd34f453942..dabd1e0af936 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -12,4 +12,6 @@ gettextLdflags() { export NIX_LDFLAGS="$NIX_LDFLAGS -lintl" } -addEnvHooks "$hostOffset" gettextLdflags +if [ ! -z "@gettextNeedsLdflags@" ]; then + addEnvHooks "$hostOffset" gettextLdflags +fi From 0a2ef043597359f48b071153aa008336b0fd14de Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 15 Mar 2018 12:47:03 -0500 Subject: [PATCH 0149/2743] gettext: fixup --- pkgs/development/libraries/gettext/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index e5795951bf75..c3a74f73663a 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; setupHook = ./gettext-setup-hook.sh; - gettextNeedsLdflags = !hostPlatform.libc != "glibc"; + gettextNeedsLdflags = hostPlatform.libc != "glibc"; enableParallelBuilding = true; From 4f3c212696d5b54c0df376a3cd2f16e7791aecd8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 22 Mar 2018 16:44:49 -0500 Subject: [PATCH 0150/2743] perl-packages: undo typo --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 50f0d0a57cce..4349b22dea7b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3877,7 +3877,7 @@ let self = _self // overrides; _self = with self; { \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h - \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsif + \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi # --- '; From 077dedbf241a3a644cc3d28ff2f7befdb2b0d200 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 22 Mar 2018 21:36:07 +0000 Subject: [PATCH 0151/2743] freetype: fix freetype-config --- pkgs/development/libraries/freetype/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index cd7ac64da150..3fccce02def4 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, copyPathsToStore , hostPlatform -, pkgconfig, which +, pkgconfig, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which ] + nativeBuildInputs = [ pkgconfig which makeWrapper ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -58,7 +58,10 @@ in stdenv.mkDerivation rec { doCheck = true; - postInstall = glib.flattenInclude; + postInstall = glib.flattenInclude + '' + wrapProgram "$dev/bin/freetype-config" \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" + ''; crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead From dcaea58eb724c03726b0bf8cfd9c1620fb5d2c34 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Mar 2018 18:06:10 -0500 Subject: [PATCH 0152/2743] git: 2.16.2 -> 2.16.3 --- .../version-management/git-and-tools/git/default.nix | 6 ++---- .../git-and-tools/git/git-sh-i18n.patch | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) 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 e545cb33befe..b336f72c7ac1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.2"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; hardeningDisable = [ "format" ]; @@ -58,8 +58,6 @@ stdenv.mkDerivation { + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") - # XXX: USE_PCRE2 might be useful in general, look into it - # XXX other alpine options? + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); # build git-credential-osxkeychain if darwin diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f..216c0e56b44c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh From 7a77439b03ba2b0b1967b9f9b9c556719a9a25f4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 23 Mar 2018 01:18:07 +0300 Subject: [PATCH 0153/2743] libgpg-error: fix on ARM --- .../libraries/libgpg-error/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index c138364ff289..2fcf6701ab8f 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,7 +1,7 @@ -{ stdenv, buildPackages, fetchurl, gettext -, hostPlatform, genPosixLockObjOnly ? false +{ stdenv, lib, fetchpatch, buildPackages, fetchurl, gettext +, genPosixLockObjOnly ? false }: let - genPosixLockObjOnlyAttrs = stdenv.lib.optionalAttrs genPosixLockObjOnly { + genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { buildPhase = '' cd src make gen-posix-lock-obj @@ -24,9 +24,17 @@ in stdenv.mkDerivation (rec { sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"; }; + patches = [ + # Fix builds on ARM, AArch64 + (fetchpatch { + url = "https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623.patch"; + sha256 = "0vqfw0ak1j37wf6sk9y9vmdyk3kxdxkldhs0bv2waa76s11cmdx0"; + }) + ]; + postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h ''; @@ -39,7 +47,7 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ gettext ]; postConfigure = - stdenv.lib.optionalString stdenv.isSunOS + lib.optionalString stdenv.isSunOS # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number From b59fd7021093d73bcc0927f9f0d65f0e5d9c7542 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 23 Mar 2018 03:04:55 -0500 Subject: [PATCH 0154/2743] gettext: don't add -lintl on musl, either gettext won't actually provide libintl unless we go out of our way to tell it to do so [1][2]. We could add those flags on musl (as I initially did in [3]), but then we have two different libintl.h files and generally some confusion about which gettext is being used. Instead of sorting that out, for now let's just continue on without gettext providing libintl-- it's worked well enough so far. Only change that needs to be made, then, is to avoid adding -lintl on musl since there is no libintl. [1] https://github.com/pullmoll/void-packages/commit/c739240fd25e8378fe0467cd51ab483427337410 [2] https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libintl/libintl-0.19.8.1.ebuild?id=332e48712b6521697f992f923c9c985482dd1c36#n41 [3] https://github.com/dtzWill/nixpkgs/commit/729302f29aea8d380196d114e7d2f904add40711 --- pkgs/development/libraries/gettext/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c3a74f73663a..6dec7747c7e8 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; setupHook = ./gettext-setup-hook.sh; - gettextNeedsLdflags = hostPlatform.libc != "glibc"; + gettextNeedsLdflags = hostPlatform.libc != "glibc" && !hostPlatform.isMusl; enableParallelBuilding = true; From 0b7a3308b71d198860104704f3133ac93ce7246e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 23 Mar 2018 10:21:28 +0100 Subject: [PATCH 0155/2743] poppler: 0.62 -> 0.63 (cherry picked from commit 988bcca05cdad2f26282cf037a192a8816ea12c9) --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 5bcfbd52182e..3f95e2187ddf 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.62.0"; + version = "0.63.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1ii9ly1pngyvs0aiq2wxpya08hidpl54y7nsb8b1vxnnskgp76jv"; + sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17"; }; outputs = [ "out" "dev" ]; From 6b9771e4a78808c82cc800e61232ce20d58a1bef Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 23 Mar 2018 12:44:10 +0300 Subject: [PATCH 0156/2743] systemd: use stable tree This fixes a bug with changed qemu network interface names and also generally should be preferred to using a release tag. --- pkgs/os-specific/linux/systemd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5fea5241d133..0bb9f509b38a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -21,11 +21,13 @@ in stdenv.mkDerivation rec { version = "238"; name = "systemd-${version}"; + # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! + # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "243d65d38f2df82d4a39f6a9970337803dff65a1"; - sha256 = "098hxlkh6q17rxa178adylksxnnd4x9rxb8amjnlbiydcc6kaa5n"; + rev = "3a439bcdb5706dbb44215ef4e70f07b09aaac040"; + sha256 = "0qkk5891068pkxmxqvm07bwl597i8lfp89c23yxp11m21cjq0f4b"; }; outputs = [ "out" "lib" "man" "dev" ]; From 1482c3c8d8257d5b33e978c8e1888d69c706130a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 23 Mar 2018 12:07:11 -0400 Subject: [PATCH 0157/2743] gettext: Make setup hook work for cross --- .../libraries/gettext/gettext-setup-hook.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index dabd1e0af936..074d313e48aa 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -9,7 +9,18 @@ addEnvHooks "$hostOffset" gettextDataDirsHook # libintl must be listed in load flags on non-Glibc # it doesn't hurt to have it in Glibc either though gettextLdflags() { - export NIX_LDFLAGS="$NIX_LDFLAGS -lintl" + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -lintl" } if [ ! -z "@gettextNeedsLdflags@" ]; then From 045de0af81f8505e666c501ba29e23f4eed5aa10 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 23 Mar 2018 12:07:11 -0400 Subject: [PATCH 0158/2743] libiconv: Make setup hook work for cross --- pkgs/development/libraries/libiconv/setup-hook.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh index 80843e19809b..78222dddbf1d 100644 --- a/pkgs/development/libraries/libiconv/setup-hook.sh +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -1,7 +1,18 @@ # libiconv must be listed in load flags on non-Glibc # it doesn't hurt to have it in Glibc either though iconvLdflags() { - export NIX_LDFLAGS="$NIX_LDFLAGS -liconv" + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -liconv" } addEnvHooks "$hostOffset" iconvLdflags From 9bfd74deff5eea15a19bb79e4be82fdeb24ecf12 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 24 Mar 2018 07:33:04 -0400 Subject: [PATCH 0159/2743] qemu-riscv: Don't apply already-applied glibc-2.27 patch --- pkgs/applications/virtualization/qemu/riscv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix index 5e234dcb8935..936aadcf9918 100644 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ b/pkgs/applications/virtualization/qemu/riscv.nix @@ -16,7 +16,7 @@ in lib.overrideDerivation qemu (orig: { name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; inherit src; # https://github.com/riscv/riscv-qemu/pull/109 - patches = orig.patches ++ [ ./riscv-initrd.patch ]; + patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ]; configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; postInstall = null; }) From b2a2131ff0f0a7ecd521408841e55ea21dbe3c40 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 24 Mar 2018 07:50:16 -0400 Subject: [PATCH 0160/2743] meson: Patch around overly strict struct size check. Fixes systemd cross-compile. --- .../tools/build-managers/meson/default.nix | 4 ++++ .../meson/overly-strict-size-check.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 47e574236329..aa642ffa727f 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -43,6 +43,10 @@ in python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) + + # No one will ever need more than 128 bytes of data structure + # https://github.com/mesonbuild/meson/issues/3113 + ./overly-strict-size-check.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch new file mode 100644 index 000000000000..ea0e9bcd7eac --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch @@ -0,0 +1,12 @@ +diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py +--- a/mesonbuild/compilers/c.py 2017-12-10 08:37:19.000000000 -0500 ++++ b/mesonbuild/compilers/c.py 2018-03-24 07:46:04.739929307 -0400 +@@ -406,7 +406,7 @@ + }}''' + if not self.compiles(t.format(**fargs), env, extra_args, dependencies): + return -1 +- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) ++ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies) + + def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): + if extra_args is None: From 67b23ee0d97e87aefd7d3d8f951664aa4cf6980c Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 24 Mar 2018 11:50:10 +0100 Subject: [PATCH 0161/2743] procps-ng: updated project location - use the real project location and not some sf.net mirror - the meta attribute shouldn't point users to a website cluttered with ads (sf.net) where they probably just follow the link to the real project location - adapted the build to the new archive --- pkgs/os-specific/linux/procps-ng/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index cc5e3dd5190c..7a200aa6e29c 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; version = "3.3.12"; - src = fetchurl { - url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; - sha256 = "1m57w6jmry84njd5sgk5afycbglql0al80grx027kwqqcfw5mmkf"; + src = fetchFromGitLab { + owner ="procps-ng"; + repo = "procps"; + rev = "v${version}"; + sha256 = "0k5vvvjn954xqnhk97j62ilwmipbi4gqjcznllmk6ilfmszqczzz"; }; buildInputs = [ ncurses ]; + nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ]; + + # autoreconfHook doesn't quite get, what procps-ng buildprocss does + # with po/Makefile.in.in and stuff. + preConfigure = '' + ./autogen.sh + ''; makeFlags = "usrbin_execdir=$(out)/bin"; @@ -22,7 +31,7 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; meta = { - homepage = https://sourceforge.net/projects/procps-ng/; + homepage = https://gitlab.com/procps-ng/procps; description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; From 59a9165b9dffc35e34304f7b9f8a4cc8edd3564d Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 24 Mar 2018 12:03:04 +0100 Subject: [PATCH 0162/2743] procps-ng: took maintainership --- maintainers/maintainer-list.nix | 5 +++++ pkgs/os-specific/linux/procps-ng/default.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0524b26b8315..8af199eab29d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3660,6 +3660,11 @@ github = "twey"; name = "James ‘Twey’ Kay"; }; + typetetris = { + email = "ericwolf42@mail.com"; + github = "typetetris"; + name = "Eric Wolf"; + }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 7a200aa6e29c..dd09a9c52999 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; platforms = lib.platforms.linux ++ lib.platforms.cygwin; + maintainers = [ lib.maintainers.typetetris ]; }; } From 6dbb6a380ba7280acd3c94a0273a92564c15935a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 24 Mar 2018 14:56:15 +0100 Subject: [PATCH 0163/2743] poppler: fix evaluation, probably after merges --- pkgs/development/libraries/poppler/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index faeadeb5b4e5..11dd8ec32910 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; + # Not sure when and how to pass it. It seems an upstream bug anyway. CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; cmakeFlags = [ @@ -43,9 +44,6 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = if stdenv.cc.isClang then [ "-std=c++11" ] else null; - meta = with lib; { homepage = https://poppler.freedesktop.org/; description = "A PDF rendering library"; From d0384cc7b8f2bba52969a9dcbd642d95454705c3 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 25 Mar 2018 01:56:57 -0500 Subject: [PATCH 0164/2743] glib: propagate gettext/iconv --- pkgs/development/libraries/glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f5963b756cab..ce1adb0e20c3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python +{ stdenv, hostPlatform, fetchurl, pkgconfig, perl, python , libiconv, libintl, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null @@ -66,9 +66,9 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; - nativeBuildInputs = [ pkgconfig gettext perl python libintl libiconv ]; + nativeBuildInputs = [ pkgconfig perl python ]; - propagatedBuildInputs = [ zlib libffi ]; + propagatedBuildInputs = [ zlib libffi gettext libiconv ]; # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] From 8349d73c8f57606f95e2b2ffee65e8e9a060ea45 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 25 Mar 2018 02:00:32 -0500 Subject: [PATCH 0165/2743] glib: oops --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ce1adb0e20c3..1f71baaeb5d7 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ -{ stdenv, hostPlatform, fetchurl, pkgconfig, perl, python -, libiconv, libintl, zlib, libffi, pcre, libelf, gnome3 +{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python +, libiconv, zlib, libffi, pcre, libelf, gnome3 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null From 66deb3aa29801db9c42ef70f0f17fd6d8d47f603 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 25 Mar 2018 21:19:21 +0200 Subject: [PATCH 0166/2743] 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 0167/2743] 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 2e29f46cc48054c1806c525159814649ea280bc1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 11:23:29 -0500 Subject: [PATCH 0168/2743] libpipeline: 1.4.1 -> 1.5.0 --- pkgs/development/libraries/libpipeline/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index 4da6a0b3cbc7..e11527ca10c9 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { - name = "libpipeline-1.4.1"; - + name = "libpipeline-1.5.0"; + src = fetchurl { url = "mirror://savannah/libpipeline/${name}.tar.gz"; - sha256 = "1vmrs4nvdsmb550bk10cankrd42ffczlibpsnafxpak306rdfins"; + sha256 = "0avg525wvifcvjrwa6i1r6kvahmsswj0mpxrsxzzdzra9wpf2whd"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; From cb30a1b4253f7f92390baa11bae1e477439da360 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 12:02:24 -0500 Subject: [PATCH 0169/2743] wrapper.c: fixup includes to work w/musl --- nixos/modules/security/wrappers/wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c index 7091e314bb22..494e9e93ac22 100644 --- a/nixos/modules/security/wrappers/wrapper.c +++ b/nixos/modules/security/wrappers/wrapper.c @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include #include // Make sure assertions are not compiled out, we use them to codify From d6ffaac4ace8d9427a9618d2f2d08a14cf3861c6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 13:49:05 -0500 Subject: [PATCH 0170/2743] zfs: libtirpc dep on musl --- pkgs/os-specific/linux/zfs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index aac1576261d4..6088e86218d1 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -4,6 +4,7 @@ # Userspace dependencies , zlib, libuuid, python, attr, openssl +, libtirpc # Kernel dependencies , kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null @@ -49,7 +50,8 @@ let buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] - ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ]; + ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ] + ++ optional stdenv.hostPlatform.isMusl [ libtirpc ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; From 47dc9d7b35e1dfb308ea7285e583cf276bbc0ee1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 14:00:08 -0500 Subject: [PATCH 0171/2743] tirpc: remove upstreamed patch, fix w/musl --- pkgs/development/libraries/ti-rpc/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index aa134d351044..99f0bb65441c 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -8,14 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/2be873301420ec6ca2c70d899b7c49a7e2b0954d/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch"; - sha256 = "1jmbn0j2bnjp0j9z5vzz5xiwyv3kd28w5pixbqsy2lz6q8nii7cf"; - }); - postPatch = '' sed '1i#include ' -i src/xdr_sizeof.c + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace tirpc/rpc/types.h \ + --replace '#if defined __APPLE_CC__ || defined __FreeBSD__' \ + '#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined __GLIBC__' ''; nativeBuildInputs = [ autoreconfHook ]; From bae5ec0faf435143c8cea72924c8c70cf7f70468 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 14:09:00 -0500 Subject: [PATCH 0172/2743] zfs: fix hardcoded include path for libtirpc --- pkgs/os-specific/linux/zfs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6088e86218d1..2535745e3595 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -43,6 +43,9 @@ let postPatch = optionalString buildKernel '' patchShebangs scripts + '' + optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace config/user-libtirpc.m4 \ + --replace /usr/include/tirpc ${libtirpc}/include/tirpc ''; nativeBuildInputs = [ autoreconfHook nukeReferences ] From 9f7d5981b8510eef0d0457783630cecf5b032f8c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 15:07:24 -0500 Subject: [PATCH 0173/2743] udisks2: 2.1.6 -> 2.1.8 --- pkgs/os-specific/linux/udisks/2-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 725b1cd25643..99b91343a482 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "udisks-2.1.6"; + name = "udisks-2.1.8"; src = fetchurl { url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2"; - sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify"; + sha256 = "1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs"; }; outputs = [ "out" "man" "dev" ]; From 990d29282fbc992eb60fdd68262e39deb3085127 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 15:01:04 -0500 Subject: [PATCH 0174/2743] udisks: extend "we know better than compiler" to more platforms (musl) --- pkgs/os-specific/linux/udisks/2-default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 99b91343a482..1c8e429c9455 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { --replace "/bin/sh" "${stdenv.shell}" \ --replace "/sbin/mdadm" "${mdadm}/bin/mdadm" \ --replace " sed " " ${gnused}/bin/sed " - ''; + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace udisks/udisksclient.c \ + --replace 'defined( __GNUC_PREREQ)' 1 \ + --replace '__GNUC_PREREQ(4,6)' 1 + ''; nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; From 55e59e4557a0193b5dd098f41269b169517573a2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 21:15:43 -0500 Subject: [PATCH 0175/2743] qemu: musl patches (cherry picked from commit 1bf8ff49d55fc7dfdd460f3d4f02c148ed2a2b40) --- .../virtualization/qemu/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 252ed555534b..6e4c272db2a7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -67,7 +67,25 @@ stdenv.mkDerivation rec { sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optional pulseSupport ./fix-hda-recording.patch; + ++ optional pulseSupport ./fix-hda-recording.patch + ++ optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch; + sha256 = "1xfdjs1jlvs99hpf670yianb8c3qz2ars8syzyz8f2c2cp5y4bxb"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; + sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch; + sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6"; + }) + (fetchpatch { + url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; + sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; + }) + ]; hardeningDisable = [ "stackprotector" ]; From 5faa470da20de6c860a24baee9152021c0fb2596 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 13:40:25 -0500 Subject: [PATCH 0176/2743] btrfs-progs: disable backtrace, fix build w/musl --- pkgs/tools/filesystems/btrfs-progs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index c49b0269cb0f..e84260052a41 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs ''; + configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; + meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; From 88ea78745a92a23fe0d8f4098ff5f990c6a7fac2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 12:27:17 -0500 Subject: [PATCH 0177/2743] libbsd: apply upstream patch to fix w/musl --- pkgs/development/libraries/libbsd/default.nix | 5 +- .../libraries/libbsd/non-glibc.patch | 74 +++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libbsd/non-glibc.patch diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 0e232a50e943..52d038e3d6b2 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch + # Suitable for all, but limited to musl to avoid rebuilds + # https://cgit.freedesktop.org/libbsd/patch/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./non-glibc.patch; meta = with stdenv.lib; { description = "Common functions found on BSD systems"; diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch new file mode 100644 index 000000000000..f61e0d242943 --- /dev/null +++ b/pkgs/development/libraries/libbsd/non-glibc.patch @@ -0,0 +1,74 @@ +From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:39:45 +0100 +Subject: Fix function declaration protection for glibc already providing them +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On non-glibc based systems we cannot unconditionally use the +__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, +if it is undefined, define it to 0. + +We should also always declare these functions on non-glibc based +systems. And on systems with a new enough glibc, which provides these +functions, we should still provide the declarations if _GNU_SOURCE +is *not* defined. + +Reported-by: Jörg Krause +--- + include/bsd/stdlib.h | 3 ++- + include/bsd/string.h | 3 ++- + include/bsd/sys/cdefs.h | 8 ++++++++ + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index 8d33d1f..a5b063c 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, + const unsigned char *table, unsigned endbyte); + + void *reallocf(void *ptr, size_t size); +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) + void *reallocarray(void *ptr, size_t nmemb, size_t size); + #endif + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 29097f6..f987fee 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); + char *strnstr(const char *str, const char *find, size_t str_len); + void strmode(mode_t mode, char *str); + +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) ++#if !defined(__GLIBC__) || \ ++ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) + void explicit_bzero(void *buf, size_t len); + #endif + __END_DECLS +diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h +index b4c8f30..d1cc419 100644 +--- a/include/bsd/sys/cdefs.h ++++ b/include/bsd/sys/cdefs.h +@@ -59,6 +59,14 @@ + #endif + + /* ++ * On non-glibc based systems, we cannot unconditionally use the ++ * __GLIBC_PREREQ macro as it gets expanded before evaluation. ++ */ ++#ifndef __GLIBC_PREREQ ++#define __GLIBC_PREREQ(maj, min) 0 ++#endif ++ ++/* + * Some kFreeBSD headers expect those macros to be set for sanity checks. + */ + #ifndef _SYS_CDEFS_H_ +-- +cgit v1.1 + From 969499f3e293ed899f5fdaf39b28537aab913460 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 12:34:51 -0500 Subject: [PATCH 0178/2743] libbsd: more upstream patches --- pkgs/development/libraries/libbsd/cdefs.patch | 222 ++++++++++++++++++ pkgs/development/libraries/libbsd/default.nix | 10 +- .../libraries/libbsd/features.patch | 26 ++ 3 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libbsd/cdefs.patch create mode 100644 pkgs/development/libraries/libbsd/features.patch diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch new file mode 100644 index 000000000000..81822654aeb4 --- /dev/null +++ b/pkgs/development/libraries/libbsd/cdefs.patch @@ -0,0 +1,222 @@ +From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:41:35 +0100 +Subject: Handle systems missing + +This is a non-portable header, and we cannot expect it to be provided by +the system libc (e.g. musl). We just need and rely on declaration that +we have defined ourselves in our own . So we switch to +only ever assume that. + +Fixes: https://bugs.freedesktop.org/105281 +--- + include/bsd/libutil.h | 4 ++++ + include/bsd/md5.h | 4 ++++ + include/bsd/nlist.h | 4 ++++ + include/bsd/readpassphrase.h | 4 ++++ + include/bsd/stdlib.h | 4 ++++ + include/bsd/string.h | 4 ++++ + include/bsd/stringlist.h | 5 +++++ + include/bsd/sys/queue.h | 4 ++++ + include/bsd/sys/tree.h | 4 ++++ + include/bsd/timeconv.h | 4 ++++ + include/bsd/vis.h | 4 ++++ + include/bsd/wchar.h | 4 ++++ + 12 files changed, 49 insertions(+) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index 45b3b15..ccca29a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -40,7 +40,11 @@ + #define LIBBSD_LIBUTIL_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + #include +diff --git a/include/bsd/md5.h b/include/bsd/md5.h +index 5f3ae46..bf36a30 100644 +--- a/include/bsd/md5.h ++++ b/include/bsd/md5.h +@@ -27,7 +27,11 @@ typedef struct MD5Context { + uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ + } MD5_CTX; + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h +index cb297e8..8767117 100644 +--- a/include/bsd/nlist.h ++++ b/include/bsd/nlist.h +@@ -27,7 +27,11 @@ + #ifndef LIBBSD_NLIST_H + #define LIBBSD_NLIST_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + struct nlist { + union { +diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h +index 14744b8..5eb8021 100644 +--- a/include/bsd/readpassphrase.h ++++ b/include/bsd/readpassphrase.h +@@ -31,7 +31,11 @@ + #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ + #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h +index ebc9638..8d33d1f 100644 +--- a/include/bsd/stdlib.h ++++ b/include/bsd/stdlib.h +@@ -42,7 +42,11 @@ + #ifndef LIBBSD_STDLIB_H + #define LIBBSD_STDLIB_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/string.h b/include/bsd/string.h +index 6798bf6..29097f6 100644 +--- a/include/bsd/string.h ++++ b/include/bsd/string.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_STRING_H + #define LIBBSD_STRING_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h +index ff30cac..dd71496 100644 +--- a/include/bsd/stringlist.h ++++ b/include/bsd/stringlist.h +@@ -31,7 +31,12 @@ + + #ifndef LIBBSD_STRINGLIST_H + #define LIBBSD_STRINGLIST_H ++ ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + /* +diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h +index 4a94ea7..ac00026 100644 +--- a/include/bsd/sys/queue.h ++++ b/include/bsd/sys/queue.h +@@ -33,7 +33,11 @@ + #ifndef LIBBSD_SYS_QUEUE_H + #define LIBBSD_SYS_QUEUE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines four types of data structures: singly-linked lists, +diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h +index 628bec0..325b382 100644 +--- a/include/bsd/sys/tree.h ++++ b/include/bsd/sys/tree.h +@@ -30,7 +30,11 @@ + #ifndef LIBBSD_SYS_TREE_H + #define LIBBSD_SYS_TREE_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + /* + * This file defines data structures for different types of trees: +diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h +index e2a2c55..a426bd3 100644 +--- a/include/bsd/timeconv.h ++++ b/include/bsd/timeconv.h +@@ -41,7 +41,11 @@ + #ifndef LIBBSD_TIMECONV_H + #define LIBBSD_TIMECONV_H + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + #include + +diff --git a/include/bsd/vis.h b/include/bsd/vis.h +index 970dfdd..ab5430c 100644 +--- a/include/bsd/vis.h ++++ b/include/bsd/vis.h +@@ -72,7 +72,11 @@ + */ + #define UNVIS_END 1 /* no more characters */ + ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + + __BEGIN_DECLS + char *vis(char *, int, int, int); +diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h +index 33a500e..7216503 100644 +--- a/include/bsd/wchar.h ++++ b/include/bsd/wchar.h +@@ -40,7 +40,11 @@ + #define LIBBSD_WCHAR_H + + #include ++#ifdef LIBBSD_OVERLAY + #include ++#else ++#include ++#endif + #include + + __BEGIN_DECLS +-- +cgit v1.1 + diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 52d038e3d6b2..ff9412ceb580 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -15,8 +15,14 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch # Suitable for all, but limited to musl to avoid rebuilds - # https://cgit.freedesktop.org/libbsd/patch/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./non-glibc.patch; + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 + ./non-glibc.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd + ./cdefs.patch + # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404 + ./features.patch + ]; meta = with stdenv.lib; { description = "Common functions found on BSD systems"; diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch new file mode 100644 index 000000000000..66bd1e9232ba --- /dev/null +++ b/pkgs/development/libraries/libbsd/features.patch @@ -0,0 +1,26 @@ +From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 6 Mar 2018 01:42:52 +0100 +Subject: Remove inclusion from + +This is a non-portable header, and we should not assume it is present. +Let the first system header pull it in if needed. +--- + include/bsd/libutil.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h +index ccca29a..e5f148a 100644 +--- a/include/bsd/libutil.h ++++ b/include/bsd/libutil.h +@@ -39,7 +39,6 @@ + #ifndef LIBBSD_LIBUTIL_H + #define LIBBSD_LIBUTIL_H + +-#include + #ifdef LIBBSD_OVERLAY + #include + #else +-- +cgit v1.1 + From 3675d77058416c297785806c10e492b9c90f5dd2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 21:16:02 -0500 Subject: [PATCH 0179/2743] vde2: musl patch --- pkgs/tools/networking/vde2/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index ff54e1ab2d21..39674d22aa1d 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libpcap, python2 }: +{ stdenv, fetchurl, fetchpatch, openssl, libpcap, python2 }: stdenv.mkDerivation rec { name = "vde2-2.3.2"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( + fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; + sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; + } + ); + + buildInputs = [ openssl libpcap python2 ]; hardeningDisable = [ "format" ]; From 7f71182cc1f89340840d5784215e99ccf139d0a8 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 17:31:39 -0700 Subject: [PATCH 0180/2743] libusb1: 1.0.21 -> 1.0.22 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/libusb/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.22 with grep in /nix/store/5wk75f6zd7ha7vhm4y3pd9p1qbc3vmgd-libusb-1.0.22 - directory tree listing: https://gist.github.com/ceccc2a897849afc2956de19e751995f --- pkgs/development/libraries/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 44638b4dfd59..69afd9d4c691 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }: stdenv.mkDerivation rec { - name = "libusb-1.0.21"; + name = "libusb-1.0.22"; src = fetchurl { url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "0jw2n5kdnrqvp7zh792fd6mypzzfap6jp4gfcmq4n6c1kb79rkkx"; + sha256 = "0mw1a5ss4alg37m6bd4k44v35xwrcwp5qm4s686q1nsgkbavkbkm"; }; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure From 3bf20021999d7095fc10073d84d28d9c7b648bf0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 20:49:12 -0500 Subject: [PATCH 0181/2743] celt-0.5.1: disable tests that fail to build due to bad code These were fixed upstream, but patches don't apply to 0.5.1 which we need to use for spice. Instead of maintaining backported patches for very deprecated software, just don't build the tests in the first place. --- pkgs/development/libraries/celt/0.5.1.nix | 7 +++++++ pkgs/development/libraries/celt/generic.nix | 3 +++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 561be1ba2819..e45d74345d44 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -7,4 +7,11 @@ callPackage ./generic.nix (args // rec{ url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz"; sha256 = "0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; }; + + # Don't build tests due to badness with ec_ilog + prePatch = '' + substituteInPlace Makefile.in \ + --replace 'SUBDIRS = libcelt tests' \ + 'SUBDIRS = libcelt' + ''; }) diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 4ab554561f73..9d861f2c4328 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -1,5 +1,6 @@ { stdenv, version, src , liboggSupport ? true, libogg ? null # if disabled only the library will be built +, prePatch ? "" , ... }: @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { inherit src; + inherit prePatch; + buildInputs = [] ++ stdenv.lib.optional liboggSupport libogg; From f623858a82ed237ec79398f9c9db16302954addf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 23 Mar 2018 22:49:02 -0500 Subject: [PATCH 0182/2743] glib: no one wants --witih-libiconv=gnu Previously this was set on FreBSD and SunOS... --- pkgs/development/libraries/glib/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1f71baaeb5d7..d2dc9a8c637b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -73,9 +73,6 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - # glibc inclues GNU libiconv, but Darwin's iconv function is good enonugh. - ++ optional (stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isDarwin) - "--with-libiconv=gnu" ++ optional stdenv.isSunOS "--disable-dtrace" # Can't run this test when cross-compiling ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) From 9204fa2620affbe10e57ffaddbb6d658f211c2cb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 23 Mar 2018 21:57:16 -0500 Subject: [PATCH 0183/2743] propagate libiconv header from musl too --- 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 91e81361f698..b301a8a4ff7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9977,7 +9977,7 @@ with pkgs; # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if hostPlatform.libc == "glibc" + if (hostPlatform.libc == "glibc" || hostPlatform.libc == "musl") then glibcIconv (if hostPlatform != buildPlatform then libcCross else stdenv.cc.libc) From b6b94f0b272da06419d64d5a1a0991bb23e5b17f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 11:54:28 -0500 Subject: [PATCH 0184/2743] man-db: disable tests w/musl as simplest solution --- pkgs/tools/misc/man-db/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index eadb736aeeb2..8d0728b7556e 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.hostPlatform.isMusl; /* iconv binary */ meta = with stdenv.lib; { homepage = http://man-db.nongnu.org; From 1eda88c3bf58f1705faf46e268ac7cc268c18fa3 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 25 Mar 2018 23:36:14 -0500 Subject: [PATCH 0185/2743] recode: fix libintl issue should resolve https://hydra.nixos.org/build/71918435/nixlog/1 --- pkgs/tools/text/recode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 9cc09a702102..9946da614c71 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; }; - nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv libintl ]; + nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ]; + buildInputs = [ libintl ]; preAutoreconf = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 From 4ba85f508f194a6f3374151c370d8bf684ff7afe Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 22:34:47 -0700 Subject: [PATCH 0186/2743] 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 6467c94c8d2d99c13d594037295722c38e916312 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:42:59 +0300 Subject: [PATCH 0187/2743] libglvnd: 2016-12-22 -> 1.0.0 Move driverLink attribute there. --- .../libraries/libglvnd/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 7ea1ecdd0522..3740fd5569ad 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,15 +1,16 @@ -{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGL_driver, libX11, libXext, glproto }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: -# Git version is needed for EGL and GLES handling. - -stdenv.mkDerivation rec { - name = "libglvnd-2016-12-22"; +let + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; +in stdenv.mkDerivation rec { + name = "libglvnd-${version}"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; - rev = "dc16f8c337703ad141f83583a4004fcf42e07766"; - sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f"; + rev = "v${version}"; + sha256 = "1a126lzhd2f04zr3rvdl6814lfl0j077spi5dsf2alghgykn5iif"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; @@ -17,11 +18,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGL_driver.driverLink}/share/glvnd/egl_vendor.d\"" + # FHS paths are added so that non-NixOS applications can find vendor files. + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ]; outputs = [ "out" "dev" ]; + passthru = { inherit driverLink; }; + meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; homepage = https://github.com/NVIDIA/libglvnd; From 03a6766a6d080e064bea374f442a9f36a9a18b31 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:44:40 +0300 Subject: [PATCH 0188/2743] mesa_noglu: build with libglvnd --- pkgs/development/libraries/mesa/default.nix | 38 +++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index fbbfe44e27e8..3207229c1d48 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -3,6 +3,7 @@ , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva , libelf, libvdpau, valgrind-light, python2 +, libglvnd , grsecEnabled ? false , enableRadv ? true # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. @@ -68,7 +69,6 @@ in let version = "17.3.6"; branch = head (splitString "." version); - driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in stdenv.mkDerivation { @@ -98,10 +98,10 @@ stdenv.mkDerivation { # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ - "--sysconfdir=${driverLink}/etc" + "--sysconfdir=${libglvnd.driverLink}/etc" "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" - "--with-dri-searchpath=${driverLink}/lib/dri" + "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri" "--with-platforms=x11,wayland,drm" ] ++ (optional (galliumDrivers != []) @@ -118,6 +118,7 @@ stdenv.mkDerivation { (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine + "--enable-libglvnd" "--enable-dri" "--enable-driglx-direct" "--enable-gles1" @@ -146,7 +147,7 @@ stdenv.mkDerivation { ++ optional stdenv.isLinux libdrm; buildInputs = with xorg; [ - expat llvmPackages.llvm + expat llvmPackages.llvm libglvnd glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC @@ -154,13 +155,13 @@ stdenv.mkDerivation { valgrind-light python2 ]; - enableParallelBuilding = true; doCheck = false; installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" + "vendorjsondir=\${out}/share/glvnd/egl_vendor.d" ]; # TODO: probably not all .la files are completely fixed, but it shouldn't matter; @@ -174,8 +175,10 @@ stdenv.mkDerivation { $out/lib/libxatracker* \ $out/lib/libvulkan_* + # Move other drivers to a separate output mv $out/lib/dri/* $drivers/lib/dri # */ rmdir "$out/lib/dri" + mv $out/lib/lib*_mesa* $drivers/lib # move libOSMesa to $osmesa, as it's relatively big mkdir -p {$osmesa,$drivers}/lib/ @@ -185,10 +188,22 @@ stdenv.mkDerivation { sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la # set the default search path for DRI drivers; used e.g. by X server - substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" - '' + optionalString (vulkanDrivers != []) '' - # move share/vulkan/icd.d/ + substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${libglvnd.driverLink}" + + # remove GLES libraries; they are provided by libglvnd + rm $out/lib/lib{GLESv1_CM,GLESv2}.* + + # remove pkgconfig files for GL/GLES/EGL; they are provided by libGL. + rm $dev/lib/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc + + # move vendor files mv $out/share/ $drivers/ + + # Update search path used by glvnd + for js in $drivers/share/glvnd/egl_vendor.d/*.json; do + substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" + done + '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) for js in $drivers/share/vulkan/icd.d/*.json; do @@ -209,13 +224,16 @@ stdenv.mkDerivation { done ''; - passthru = { inherit libdrm version driverLink; }; + passthru = { + inherit libdrm version; + inherit (libglvnd) driverLink; + }; meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; maintainers = with maintainers; [ eduarrrd vcunat ]; }; } From 803e87aa1e5bd071713276fd13e55854f7e5e385 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:45:44 +0300 Subject: [PATCH 0189/2743] mesa_noglu: build virgl driver It's used for 3D acceleration inside qemu. --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3207229c1d48..7aadc491bf8b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -55,7 +55,7 @@ let (if gallium_ == null then defaultGalliumDrivers else gallium_) - ++ ["swrast"]; + ++ ["swrast" "virgl"]; driDrivers = (if dri_ == null then defaultDriDrivers From 6bf1421f13d667c2997b67728cf777c6a70716a5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:47:55 +0300 Subject: [PATCH 0190/2743] treewide: refactor to use libglvnd * Implement libGL as a symlink package which uses libraries from libglvnd and headers from Mesa (since ones from libglvnd are outdated). * Use libGL_driver.driverLink treewide; add FHS paths where possible. --- pkgs/development/libraries/libva/1.0.0.nix | 7 +-- pkgs/development/libraries/libva/default.nix | 5 +- .../libraries/libvdpau/default.nix | 7 +-- .../libraries/mesa-glu/default.nix | 7 +-- pkgs/development/libraries/mesa/default.nix | 36 ++++++++++++- .../development/libraries/ocl-icd/default.nix | 4 +- .../libraries/qt-4.x/4.8/default.nix | 1 - .../libraries/vulkan-loader/default.nix | 4 +- .../development/mobile/genymotion/default.nix | 4 +- pkgs/misc/emulators/caprice32/default.nix | 2 +- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/os-specific/linux/amdgpu-pro/default.nix | 4 +- pkgs/top-level/all-packages.nix | 53 +++++++------------ 13 files changed, 78 insertions(+), 58 deletions(-) diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 031ac781651c..47464d225e81 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, mesa_noglu +, libGL, libGL_driver , minimal ? true, libva }: @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them configureFlags = - [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++ + # Add FHS paths for non-NixOS applications. + [ "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 6b8c3631fb37..b1108355106f 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 -, libGL +, libGL, libGL_driver , minimal ? true, libva }: @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - "--with-drivers-path=${libGL.driverLink}/lib/dri" + # Add FHS paths for non-NixOS applications. + "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index eebdc2941974..35c339b45d09 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, xorg, libGL }: +{ stdenv, fetchurl, pkgconfig, xorg, libGL_driver }: stdenv.mkDerivation rec { - name = "libvdpau-1.1.1"; + name = "libvdpau-${version}"; + version = "1.1.1"; src = fetchurl { url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${libGL.driverLink}/lib/vdpau"; + "--with-module-dir=${libGL_driver.driverLink}/lib/vdpau"; installFlags = [ "moduledir=$(out)/lib/vdpau" ]; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 9a6441956db3..4e35d6ed24d1 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, libGL }: stdenv.mkDerivation rec { - name = "glu-9.0.0"; + name = "glu-${version}"; + version = "9.0.0"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ mesa_noglu ]; + propagatedBuildInputs = [ libGL ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 7aadc491bf8b..07c966cbbfcd 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -71,7 +71,7 @@ let branch = head (splitString "." version); in -stdenv.mkDerivation { +let self = stdenv.mkDerivation { name = "mesa-noglu-${version}"; src = fetchurl { @@ -227,6 +227,37 @@ stdenv.mkDerivation { passthru = { inherit libdrm version; inherit (libglvnd) driverLink; + + stubs = stdenv.mkDerivation { + name = "libGL-${libglvnd.version}"; + outputs = [ "out" "dev" ]; + + # Use stub libraries from libglvnd and headers from Mesa. + buildCommand = '' + ln -s ${libglvnd.out} $out + mkdir -p $dev/{,lib/pkgconfig,nix-support} + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${self.dev}/include $dev/include + + genPkgConfig() { + local name="$1" + local lib="$2" + + cat <$dev/lib/pkgconfig/$name.pc + Name: $name + Description: $lib library + Version: ${self.version} + Libs: -L${libglvnd.out}/lib -l$lib + Cflags: -I${self.dev}/include + EOF + } + + genPkgConfig gl GL + genPkgConfig egl EGL + genPkgConfig glesv1_cm GLESv1_CM + genPkgConfig glesv2 GLESv2 + ''; + }; }; meta = with stdenv.lib; { @@ -236,4 +267,5 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ eduarrrd vcunat ]; }; -} +}; +in self diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index afd2a7b12dfa..ec6dc5f90528 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, libGL }: +{stdenv, fetchurl, ruby, opencl-headers, libGL_driver }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${libGL.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${libGL_driver.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index bafe36647359..10f892bc4d00 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { icu = icu.out; libXfixes = libXfixes.out; glibc = stdenv.cc.libc.out; - openglDriver = if libGLSupported then libGL.driverLink else "/no-such-path"; }) (fetchpatch { name = "fix-medium-font.patch"; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 4bc642030517..9b73b9e1e416 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, libGL, makeWrapper }: + libXext, wayland, libGL_driver, makeWrapper }: let version = "1.0.61.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_WSI_MIR_SUPPORT=OFF" - "-DFALLBACK_DATA_DIRS=${libGL.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" ]; outputs = [ "out" "dev" "demos" ]; diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index db3cb07765b9..37834eff9473 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -5,9 +5,9 @@ let packages = [ - stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext + stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL ]; - libPath = "${stdenv.lib.makeLibraryPath packages}:${libGL.driverLink}/lib"; + libPath = "${stdenv.lib.makeLibraryPath packages}"; in stdenv.mkDerivation rec { name = "genymotion-${version}"; diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 5928d53d5422..c0c3b40f6b65 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib, mesa }: +{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 9af5c889c42f..b1a0ba5809f9 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.libGL.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index a3c09c3de994..6828fbf6b1c9 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils, libGL +{ stdenv, fetchurl, elfutils , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib , fetchFromGitHub, ncurses @@ -13,8 +13,6 @@ let kernelDir = if libsOnly then null else kernel.dev; - inherit (libGL) driverLink; - bitness = if stdenv.is64bit then "64" else "32"; libArch = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b301a8a4ff7f..9171d03bbbb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10498,60 +10498,47 @@ with pkgs; ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them - # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, - # or other runtime dispatcher - libGL = mesa_noglu; + libGL = libGLDarwinOr mesa_noglu.stubs; # Default libGLU - libGLU = mesa_glu; + libGLU = libGLDarwinOr mesa_glu; # Combined derivation, contains both libGL and libGLU # Please, avoid using this attribute. It was meant as transitional hack # for packages that assume that libGLU and libGL live in the same prefix. # libGLU_combined propagates both libGL and libGLU - libGLU_combined = mesa; + libGLU_combined = libGLDarwinOr (buildEnv { + name = "libGLU-combined"; + paths = [ libGL libGLU ]; + extraOutputsToInstall = [ "dev" ]; + }); # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) - libGL_driver = mesa_drivers; + libGL_driver = libGLDarwinOr mesa_drivers; libGLSupported = lib.elem system lib.platforms.mesaPlatforms; - libGLDarwinOr = alternative: if stdenv.isDarwin - then callPackage ../development/libraries/mesa-darwin { - inherit (darwin.apple_sdk.frameworks) OpenGL; - inherit (darwin.apple_sdk.libs) Xplugin; - inherit (darwin) apple_sdk; - } - else alternative; + libGLDarwin = callPackage ../development/libraries/mesa-darwin { + inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk.libs) Xplugin; + inherit (darwin) apple_sdk; + }; - # FIXME: should be `libGL = libGLDarwinOr mesa_nonglu` but this change cause mass rebuild, - # until all packages will refer to libGL/GLU/GLU combined - mesa_noglu = libGLDarwinOr (callPackage ../development/libraries/mesa { + libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; + + mesa_noglu = callPackage ../development/libraries/mesa { # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM - }); + }; - mesa_glu = libGLDarwinOr (callPackage ../development/libraries/mesa-glu { }); - mesa_drivers = libGLDarwinOr ( + mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa_drivers = let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; enableTextureFloats = true; }; - in mo.drivers - ); - - # Please, avoid using this attribute. It was meant as transitional hack - # for packages that assume that libGLU and libGL live in the same prefix. - # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether - # you need libGLU or not (_glu propagates _noglu). - mesa = libGLDarwinOr (buildEnv { - name = "mesa-${mesa_noglu.version}"; - paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; - meta = { - platforms = lib.platforms.unix; - }; - }); + in mo.drivers; ## End libGL/libGLU/Mesa stuff From f362cf23d791c417e6fb33b69fae039215a88077 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:51:48 +0300 Subject: [PATCH 0191/2743] qt4: remove OpenGL absolute path patch In resulting derivation there's no mention of this path anyway (checked with grep). --- .../qt-4.x/4.8/dlopen-absolute-paths.diff | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff index 0f5cf2b79c96..4c64e9e26e30 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -59,32 +59,6 @@ index 6b42d1e..f88b628 100644 lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) return; -diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp -index 229d6f9..c122bf3 100644 ---- a/src/plugins/platforms/xcb/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/qglxintegration.cpp -@@ -136,7 +136,7 @@ void* QGLXContext::getProcAddress(const QString& procName) - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } -diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp -index 2467247..a2441d4 100644 ---- a/src/plugins/platforms/xlib/qglxintegration.cpp -+++ b/src/plugins/platforms/xlib/qglxintegration.cpp -@@ -137,7 +137,7 @@ void* QGLXContext::getProcAddress(const QString& procName) - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp index f8f3d69..d63c5bc 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.cpp From 0934c8f49ba47aaba691417e5fcc15383c3f9929 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:52:42 +0300 Subject: [PATCH 0192/2743] nvidia service: rely on libglvnd --- nixos/modules/hardware/video/nvidia.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index eafc9869315a..4a7d6da286ba 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -27,13 +27,6 @@ let nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; - nvidiaPackage = nvidia: pkgs: - if !nvidia.useGLVND then nvidia.out - else pkgs.buildEnv { - name = "nvidia-libs"; - paths = [ pkgs.libglvnd nvidia.out ]; - }; - enabled = nvidia_x11 != null; in @@ -59,8 +52,8 @@ in source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; }; - hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs; - hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686; + hardware.opengl.package = nvidia_x11.out; + hardware.opengl.package32 = nvidia_libs32.out; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; From d61e6c5ed7f6e1f8ad18731838192acff1fb14e0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 18:53:06 +0300 Subject: [PATCH 0193/2743] opengl service: move options under common hardware.opengl tree Purely cosmetic. --- nixos/modules/hardware/opengl.nix | 153 +++++++++++++++--------------- 1 file changed, 78 insertions(+), 75 deletions(-) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index d9646704e6f6..95c6eb03b048 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -33,89 +33,92 @@ in { options = { - hardware.opengl.enable = mkOption { - description = '' - Whether to enable OpenGL drivers. This is needed to enable - OpenGL support in X11 systems, as well as for Wayland compositors - like sway, way-cooler and Weston. It is enabled by default - by the corresponding modules, so you do not usually have to - set it yourself, only if there is no module for your wayland - compositor of choice. See services.xserver.enable, - programs.sway.enable, and programs.way-cooler.enable. - ''; - type = types.bool; - default = false; - }; - hardware.opengl.driSupport = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable accelerated OpenGL rendering through the - Direct Rendering Interface (DRI). - ''; - }; + hardware.opengl = { + enable = mkOption { + description = '' + Whether to enable OpenGL drivers. This is needed to enable + OpenGL support in X11 systems, as well as for Wayland compositors + like sway, way-cooler and Weston. It is enabled by default + by the corresponding modules, so you do not usually have to + set it yourself, only if there is no module for your wayland + compositor of choice. See services.xserver.enable, + programs.sway.enable, and programs.way-cooler.enable. + ''; + type = types.bool; + default = false; + }; - hardware.opengl.driSupport32Bit = mkOption { - type = types.bool; - default = false; - description = '' - On 64-bit systems, whether to support Direct Rendering for - 32-bit applications (such as Wine). This is currently only - supported for the nvidia and - ati_unfree drivers, as well as - Mesa. - ''; - }; + driSupport = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable accelerated OpenGL rendering through the + Direct Rendering Interface (DRI). + ''; + }; - hardware.opengl.s3tcSupport = mkOption { - type = types.bool; - default = false; - description = '' - Make S3TC(S3 Texture Compression) via libtxc_dxtn available - to OpenGL drivers instead of the patent-free S2TC replacement. + driSupport32Bit = mkOption { + type = types.bool; + default = false; + description = '' + On 64-bit systems, whether to support Direct Rendering for + 32-bit applications (such as Wine). This is currently only + supported for the nvidia and + ati_unfree drivers, as well as + Mesa. + ''; + }; - Using this library may require a patent license depending on your location. - ''; - }; + s3tcSupport = mkOption { + type = types.bool; + default = false; + description = '' + Make S3TC(S3 Texture Compression) via libtxc_dxtn available + to OpenGL drivers instead of the patent-free S2TC replacement. - hardware.opengl.package = mkOption { - type = types.package; - internal = true; - description = '' - The package that provides the OpenGL implementation. - ''; - }; + Using this library may require a patent license depending on your location. + ''; + }; - hardware.opengl.package32 = mkOption { - type = types.package; - internal = true; - description = '' - The package that provides the 32-bit OpenGL implementation on - 64-bit systems. Used when is - set. - ''; - }; + package = mkOption { + type = types.package; + internal = true; + description = '' + The package that provides the OpenGL implementation. + ''; + }; - hardware.opengl.extraPackages = mkOption { - type = types.listOf types.package; - default = []; - example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; - description = '' - Additional packages to add to OpenGL drivers. This can be used - to add OpenCL drivers, VA-API/VDPAU drivers etc. - ''; - }; + package32 = mkOption { + type = types.package; + internal = true; + description = '' + The package that provides the 32-bit OpenGL implementation on + 64-bit systems. Used when is + set. + ''; + }; - hardware.opengl.extraPackages32 = mkOption { - type = types.listOf types.package; - default = []; - example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; - description = '' - Additional packages to add to 32-bit OpenGL drivers on - 64-bit systems. Used when is - set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. - ''; + extraPackages = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; + description = '' + Additional packages to add to OpenGL drivers. This can be used + to add OpenCL drivers, VA-API/VDPAU drivers etc. + ''; + }; + + extraPackages32 = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; + description = '' + Additional packages to add to 32-bit OpenGL drivers on + 64-bit systems. Used when is + set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. + ''; + }; }; }; From 1e35a9cc06dad1803ce8d583feb2c400f4d274c8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 19:14:44 +0300 Subject: [PATCH 0194/2743] virglrenderer: add libdrm as dependency --- pkgs/development/libraries/virglrenderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 0d9abc0247e2..38b473673a54 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11 }: +{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa_noglu }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a"; }; - buildInputs = [ libGLU epoxy libX11 ]; + buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ]; nativeBuildInputs = [ pkgconfig ]; From 5f44faaca979ccec5e4252ebd5f1d865d69ea06a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Mar 2018 05:26:38 +0300 Subject: [PATCH 0195/2743] qemu: use SDL2 as SDL library This is needed for OpenGL support. --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 6e4c272db2a7..f84016d4a9a6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,7 +7,7 @@ , numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio -, sdlSupport ? !stdenv.isDarwin, SDL +, sdlSupport ? !stdenv.isDarwin, SDL2 , vncSupport ? true, libjpeg, libpng , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ++ optionals seccompSupport [ libseccomp ] ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] - ++ optionals sdlSupport [ SDL ] + ++ optionals sdlSupport [ SDL2 ] ++ optionals vncSupport [ libjpeg libpng ] ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] From 1de04e45cb489a6f69dfa5d0452dc8a87b7b7679 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Mar 2018 05:27:01 +0300 Subject: [PATCH 0196/2743] qemu: add OpenGL support --- pkgs/applications/virtualization/qemu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f84016d4a9a6..833e7c8c789b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -12,6 +12,7 @@ , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen +, openGLSupport ? true, mesa_noglu, epoxy, libdrm , hostCpuOnly ? false , nixosTestRunner ? false }: @@ -57,7 +58,8 @@ stdenv.mkDerivation rec { ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] - ++ optionals xenSupport [ xen ]; + ++ optionals xenSupport [ xen ] + ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]; enableParallelBuilding = true; @@ -106,7 +108,8 @@ stdenv.mkDerivation rec { ++ optional hostCpuOnly "--target-list=${hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio" - ++ optional xenSupport "--enable-xen"; + ++ optional xenSupport "--enable-xen" + ++ optional openGLSupport "--enable-opengl"; postFixup = '' From e2d59e06bff83676a9b10d804a36d94f8245d42d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 19:14:52 +0300 Subject: [PATCH 0197/2743] qemu: add virgl renderer support --- pkgs/applications/virtualization/qemu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 833e7c8c789b..e0762b5ca8b5 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -13,6 +13,7 @@ , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , openGLSupport ? true, mesa_noglu, epoxy, libdrm +, virglSupport ? true, virglrenderer , hostCpuOnly ? false , nixosTestRunner ? false }: @@ -59,7 +60,8 @@ stdenv.mkDerivation rec { ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] - ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]; + ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] + ++ optionals virglSupport [ virglrenderer ]; enableParallelBuilding = true; @@ -109,7 +111,8 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio" ++ optional xenSupport "--enable-xen" - ++ optional openGLSupport "--enable-opengl"; + ++ optional openGLSupport "--enable-opengl" + ++ optional virglSupport "--enable-virglrenderer"; postFixup = '' From 22671aa03177cc6659d001c73be7b79a18f5413d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 19:57:15 +0300 Subject: [PATCH 0198/2743] glxinfo: fix build --- pkgs/tools/graphics/glxinfo/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index b4b881e6c500..a3a9a4d8eda4 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, xlibsWrapper, libGL }: +{ stdenv, fetchurl, libGL, libX11 }: -let version = "8.3.0"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "glxinfo-${version}"; + version = "8.3.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/libGLU_combined/demos/${version}/mesa-demos-${version}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [ xlibsWrapper libGL ]; + buildInputs = [ libX11 libGL ]; configurePhase = "true"; buildPhase = " cd src/xdemos - gcc glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 - gcc glxgears.c -o glxgears -lGL -lX11 + $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 + $CC glxgears.c -o glxgears -lGL -lX11 -lm "; installPhase = " @@ -25,7 +24,11 @@ stdenv.mkDerivation { cp glxinfo glxgears $out/bin/ "; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Test utilities for OpenGL"; + homepage = https://www.mesa3d.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; }; } From a798ec30f9bf2741a914c4757260dd855029f63d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Mar 2018 20:59:46 +0300 Subject: [PATCH 0199/2743] xorg: update autogeneration script * Fix shebang so that it's usable on NixOS; * Enable warnings (they were enabled with Perl flag before); * Switch from mesa to libGL. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 9 +++++---- pkgs/servers/x11/xorg/overrides.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 92afb90c6c5d..f5d7f54eb5ca 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,6 +1,6 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol +, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; @@ -1839,9 +1839,9 @@ let sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoark = (mkDerivation "xf86videoark" { name = "xf86-video-ark-0.7.5"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index acf234a1683e..9f21d3c2024b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#! /usr/bin/env perl # Typical command to generate the list of tarballs: @@ -11,6 +11,7 @@ use strict; +use warnings; my $tmpDir = "/tmp/xorg-unpack"; @@ -25,7 +26,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -33,7 +34,7 @@ $pcMap{"libpng"} = "libpng"; $pcMap{"dbus-1"} = "dbus"; $pcMap{"uuid"} = "libuuid"; $pcMap{"libudev"} = "udev"; -$pcMap{"gl"} = "mesa"; +$pcMap{"gl"} = "libGL"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; $pcMap{"\$DRI3PROTO"} = "dri3proto"; @@ -230,7 +231,7 @@ print OUT ""; print OUT < Date: Sun, 18 Mar 2018 05:28:14 +0300 Subject: [PATCH 0200/2743] xserver service: cleanup LD_LIBRARY_PATH X libraries in LD_LIBRARY_PATH seem to not be needed anymore. I've tracked this addition as far as I could (02cef04c8187f12fd160d5fedf0ec8a928f02639) and they seem to be added for unfree NVIDIA and ATI drivers but at least for NVIDIA they are not needed anymore. We can add them with patchelf instead if it turns out to be the case with ATI. --- nixos/modules/services/x11/xserver.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f96d3c5afbac..a89d446187e0 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -640,9 +640,7 @@ in environment = { - XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. - LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ] + LD_LIBRARY_PATH = concatStringsSep ":" ([ "/run/opengl-driver/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment; From 65da25997dbe383312411a3bc41940e7a18dc254 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Mar 2018 05:28:29 +0300 Subject: [PATCH 0201/2743] xorg.xorgserver: don't use XORG_DRI_DRIVER_PATH Our patch which adds this envvar has been removed. --- pkgs/servers/x11/xorg/overrides.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b0dd33bd25f6..55eb54622d51 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -515,8 +515,6 @@ in ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it - wrapProgram $out/bin/Xvfb \ - --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others cd "$dev" for f in include/xorg/*.h; do From 220d0decafc7dd4d7f010bf9f94d6023971c899c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Mar 2018 05:28:48 +0300 Subject: [PATCH 0202/2743] qemu-vm service: quote arguments in qemu runner --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index ee327ed805b2..45325c6b0d8d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -98,7 +98,7 @@ let ${qemuGraphics} \ ${toString config.virtualisation.qemu.options} \ $QEMU_OPTS \ - $@ + "$@" ''; From db51b836b21eb439435a88e112f6fc2b45dfb095 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Mar 2018 13:29:00 +0300 Subject: [PATCH 0203/2743] gtk3: fix build --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index ca659525272e..dc6a519dfade 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection , xorg, epoxy, json-glib, libxkbcommon, gmp -, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols +, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null , darwin, gnome3 @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] - ++ optionals waylandSupport [ wayland wayland-protocols ] + ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; From a5b2e0277a4c067c08973b466529a06a8701b0c4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Mar 2018 19:28:14 +0300 Subject: [PATCH 0204/2743] qt5.qtwebengine: fix build --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index df9995bc3b9f..4825c1b167cd 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -4,7 +4,7 @@ , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst -, fontconfig, freetype, harfbuzz, icu, dbus +, fontconfig, freetype, harfbuzz, icu, dbus, libdrm , zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus , jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent , alsaLib @@ -104,7 +104,7 @@ qtModule { # X11 libs xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst - xorg.libXcomposite + xorg.libXcomposite xorg.libXdamage libdrm ]; dontUseNinjaBuild = true; From 564f9be78f7b5a807fe30bb3509a539818a64703 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 19 Mar 2018 01:43:44 +0300 Subject: [PATCH 0205/2743] fbida: fix build --- pkgs/applications/graphics/fbida/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 2943b5ef94c0..2e91f7873501 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, lirc }: +, epoxy, poppler, mesa_noglu, lirc }: stdenv.mkDerivation rec { name = "fbida-2.13"; @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff - libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; + buildInputs = [ + libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp + imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc + mesa_noglu + ]; makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ]; From 6493261bf28023549ce7882dc91ea9b3a5f01519 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 19 Mar 2018 01:45:14 +0300 Subject: [PATCH 0206/2743] cogl: fix build --- pkgs/development/libraries/cogl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 0209799f5fcd..e06c71c15db4 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 +, mesa_noglu , gstreamerSupport ? true, gst_all_1 }: let pname = "cogl"; - version = "1.22.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.22.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; @@ -24,7 +25,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection wayland + glib gdk_pixbuf gobjectIntrospection wayland mesa_noglu libGL libXrandr libXfixes libXcomposite libXdamage ] ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer From 4b8e3c66d9f8adf7c3e730f8a781472f43f5abd2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 19 Mar 2018 03:00:34 +0300 Subject: [PATCH 0207/2743] intel-gpu-tools: enable parallel building --- pkgs/development/tools/misc/intel-gpu-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 775a31df2b17..5176be123018 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; description = "Tools for development and testing of the Intel DRM driver"; From cdf107966539e90fc1ebf672e2ff325ec65ec32b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 19 Mar 2018 03:06:07 +0300 Subject: [PATCH 0208/2743] opengl service: don't override mesa non-drivers in runtime --- nixos/modules/hardware/opengl.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 95c6eb03b048..b371af353cf9 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -14,7 +14,6 @@ let name = "mesa-drivers+txc-${p.mesa_drivers.version}"; paths = [ p.mesa_drivers - p.mesa_drivers.out # mainly for libGL (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) ]; }; From 96a76b8b9c3c2e5db4dfe77cc8ffb993cbf65060 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 19 Mar 2018 12:35:58 +0300 Subject: [PATCH 0209/2743] primusLib: fix path to libglapi --- pkgs/tools/X11/primus/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index dcd50ee9158c..5c4c65bc17a2 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, libX11, libGL +, libX11, libGL, mesa_noglu , nvidia_x11 ? null , libglvnd }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation { makeFlags = [ "LIBDIR=$(out)/lib" "PRIMUS_libGLa=${aPackage}/lib/libGL.so" "PRIMUS_libGLd=${libGL}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${libGL}/lib/libglapi.so" + "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" ]; installPhase = '' From 9cdaddf3a001ef7fadfc1a86f094ba45d6ffc7a6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 19 Mar 2018 12:36:10 +0300 Subject: [PATCH 0210/2743] steam: add libGL to the environment Also remove duplicate libGLU. --- pkgs/games/steam/chrootenv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index e896c74ca357..c44a166268cc 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -57,6 +57,7 @@ in buildFHSUserEnv rec { xorg.libXext xorg.libX11 xorg.libXfixes + libGL # Not formally in runtime but needed by some games gst_all_1.gstreamer @@ -144,7 +145,6 @@ in buildFHSUserEnv rec { SDL2_mixer gstreamer gst-plugins-base - libGLU libappindicator-gtk2 libcaca libcanberra From 7fe170baff7090a3f281d7ac724830bbe191959d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 19 Mar 2018 12:43:36 +0300 Subject: [PATCH 0211/2743] bumblebee: remove X libraries from LD_LIBRARY_PATH They seem to no longer be needed. --- pkgs/tools/X11/bumblebee/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 7868c2726ece..8ad1b6f6455e 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -39,7 +39,7 @@ let primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; - primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); + primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686); nvidia_x11s = [ nvidia_x11 ] ++ lib.optional nvidia_x11.useGLVND libglvnd @@ -49,7 +49,6 @@ let nvidiaLibs = lib.makeLibraryPath nvidia_x11s; bbdPath = lib.makeBinPath [ kmod xorgserver ]; - bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); @@ -133,8 +132,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --prefix PATH : "${bbdPath}" \ - --prefix LD_LIBRARY_PATH : "${bbdLibs}" + --prefix PATH : "${bbdPath}" wrapProgram "$out/bin/optirun" \ --prefix PATH : "${virtualgl}/bin" From 228eee6cd47ac7b1cd0f7c39ef577ddd8cfe6343 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 25 Mar 2018 21:33:23 +0000 Subject: [PATCH 0212/2743] qemu: fix options --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e0762b5ca8b5..055273d0dac6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -12,8 +12,8 @@ , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen -, openGLSupport ? true, mesa_noglu, epoxy, libdrm -, virglSupport ? true, virglrenderer +, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm +, virglSupport ? openGLSupport, virglrenderer , hostCpuOnly ? false , nixosTestRunner ? false }: From e822c8528759511a3e6f17edc32bf76fe4ed2dad Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 25 Mar 2018 21:33:23 +0000 Subject: [PATCH 0213/2743] spice-gtk: fix build --- pkgs/development/libraries/spice-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f9b3de36b2c4..8d826f01360f 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -2,7 +2,7 @@ , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , polkit, acl, usbutils, vala -, gtk3, epoxy }: +, gtk3, epoxy, libdrm }: with stdenv.lib; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { buildInputs = [ spice-protocol celt_0_5_1 openssl libpulseaudio pixman - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm polkit acl usbutils ]; From 98a8a9b08a97cc72146ee42a88833c0caced2650 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 25 Mar 2018 21:33:23 +0000 Subject: [PATCH 0214/2743] webkitgtk218x: fix build --- pkgs/development/libraries/webkitgtk/2.20.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 65a1af769cfa..47144bee83ac 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 - ++ (with xorg; [ libXdmcp libXt libXtst ]) + ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] ++ optional stdenv.isLinux wayland; From 53af02b5bb26da4ca68690ec701a499fb431be97 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 25 Mar 2018 21:33:23 +0000 Subject: [PATCH 0215/2743] kodi: fix build --- pkgs/applications/video/kodi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 8a40912a1d68..64119d2dfc55 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -13,7 +13,7 @@ , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva, wayland +, sqlite, mysql, nasm, gnutls, libva, libdrm, wayland , curl, bzip2, zip, unzip, glxinfo, xdpyinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd @@ -121,7 +121,7 @@ in stdenv.mkDerivation rec { gnutls libidn libtasn1 nasm p11-kit libxml2 yasm python2 boost libmicrohttpd - gettext pcre-cpp yajl fribidi libva + gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto libXt libXmu libXext xextproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto From 8f6f69cb0fe8c39b441ddce1c56fad9dba18348b Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 25 Mar 2018 21:33:23 +0000 Subject: [PATCH 0216/2743] nvidia_x11.settings: fix build --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index bbe3af5d0169..92577d03a512 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau, libXext +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus libXv ] + buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; From c7cf808ff856df7be8bb765034fd81f57b852717 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 9 Feb 2018 04:05:38 +0000 Subject: [PATCH 0217/2743] libva: make `libva-full` the default It seems that all uses of `libva` it in nixpkgs except `mesa` and itself actually either will gain from using `libva-full` instead of `libva-minimal` by default or simply won't care. --- .../libraries/gstreamer/default.nix | 3 +- pkgs/development/libraries/libva/default.nix | 6 ++-- pkgs/development/libraries/mesa/default.nix | 4 +-- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/top-level/all-packages.nix | 29 +++++-------------- 5 files changed, 15 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 76cffa89dbc5..97f775e8e584 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ callPackage, libva-full }: +{ callPackage }: rec { gstreamer = callPackage ./core { }; @@ -23,7 +23,6 @@ rec { gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; - libva = libva-full; # looks also for libva-{x11,wayland} }; gst-validate = callPackage ./validate { inherit gst-plugins-base; }; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index b1108355106f..0ba49da06cfe 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 , libGL, libGL_driver -, minimal ? true, libva +, minimal ? false, libva-minimal }: stdenv.mkDerivation rec { - name = "libva-${lib.optionalString (!minimal) "full-"}${version}"; + name = "libva-${lib.optionalString minimal "minimal-"}${version}"; version = "2.1.0"; # update libva-utils and vaapiIntel as well @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ]; + ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 07c966cbbfcd..984c11d55b9b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook, substituteAll , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages, libffi, libomxil-bellagio, libva +, llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 , libglvnd , grsecEnabled ? false @@ -151,7 +151,7 @@ let self = stdenv.mkDerivation { glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC - libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ + libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ valgrind-light python2 ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index b1a0ba5809f9..db58c398526a 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses - ++ lib.optional vaSupport pkgs.libva-full + ++ lib.optional vaSupport pkgs.libva ++ lib.optional pcapSupport pkgs.libpcap ++ lib.optional v4lSupport pkgs.libv4l ++ lib.optional saneSupport pkgs.sane-backends diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b06840e429e2..cba774ac2b94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10328,7 +10328,8 @@ with pkgs; }); libva = callPackage ../development/libraries/libva { }; - libva-full = libva.override { minimal = false; }; + libva-minimal = libva.override { minimal = true; }; + libva-full = libva; libva-utils = callPackage ../development/libraries/libva-utils { }; libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; @@ -10336,9 +10337,7 @@ with pkgs; libvdpau = callPackage ../development/libraries/libvdpau { }; - libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { - libva = libva-full; # also wants libva-{x11} - }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; libvirt = callPackage ../development/libraries/libvirt { }; @@ -11109,9 +11108,7 @@ with pkgs; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; - libqtav = callPackage ../development/libraries/libqtav { - libva = libva-full; # also wants libva-x11 - }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { }; @@ -11644,13 +11641,9 @@ with pkgs; v8_static = lowPrio (self.v8.override { static = true; }); - vaapiIntel = callPackage ../development/libraries/vaapi-intel { - libva = libva-full; # also wants libva-{x11,drm,wayland} - }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; - vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { - libva = libva-full; # needs libva-{x11,glx} - }; + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; vale = callPackage ../tools/text/vale { }; @@ -14706,9 +14699,7 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - avidemux = libsForQt5.callPackage ../applications/video/avidemux { - libva = libva-full; - }; + avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avogadro = callPackage ../applications/science/chemistry/avogadro { eigen = eigen2; @@ -16732,7 +16723,6 @@ with pkgs; mpv = callPackage ../applications/video/mpv rec { inherit (luaPackages) luasocket; youtube-dl = pythonPackages.youtube-dl; - libva = libva-full; waylandSupport = stdenv.isLinux; alsaSupport = !stdenv.isDarwin; pulseSupport = !stdenv.isDarwin; @@ -18142,7 +18132,6 @@ with pkgs; vlc = callPackage ../applications/video/vlc { ffmpeg = ffmpeg_2; - libva = libva-full; # also wants libva-x11 }; vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { @@ -18399,9 +18388,7 @@ with pkgs; gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { - libva = libva-full; - }; + kodiPlain = callPackage ../applications/video/kodi { }; xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); From 9258cea7e0487174077a6951ee9bee39d7fd7572 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 26 Mar 2018 14:10:35 +0300 Subject: [PATCH 0218/2743] libva1: full by default This follows similar changes for libva. Also move `libva-full` to aliases.nix with an intent to deprecate it later. --- pkgs/development/libraries/libva/1.0.0.nix | 4 ++-- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 47464d225e81..04d621e29c84 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi , libGL, libGL_driver -, minimal ? true, libva +, minimal ? false, libva1-minimal }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ]; + ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them configureFlags = diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 729bc91c7743..7f6d55f3808c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -236,6 +236,10 @@ mapAliases (rec { wineStable = winePackages.stable; wineUnstable = winePackages.unstable; + # added 2018-03-26 + libva-full = libva; + libva1-full = libva1; + inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cba774ac2b94..dec6117048fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10329,11 +10329,10 @@ with pkgs; libva = callPackage ../development/libraries/libva { }; libva-minimal = libva.override { minimal = true; }; - libva-full = libva; libva-utils = callPackage ../development/libraries/libva-utils { }; libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; - libva1-full = libva1.override { minimal = false; }; + libva1-minimal = libva1.override { minimal = true; }; libvdpau = callPackage ../development/libraries/libvdpau { }; From 59a53aada0965bbbfa79349f4d7eed9ff50b4058 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 26 Mar 2018 10:09:00 -0400 Subject: [PATCH 0219/2743] haskell.compiler.ghc8{22,41}: Fix abi-depends non-determinism. See https://github.com/haskell/cabal/issues/4728 for symptoms, https://phabricator.haskell.org/D4159 for the base of the fix. --- pkgs/development/compilers/ghc/8.2.2.nix | 2 ++ pkgs/development/compilers/ghc/8.4.1.nix | 5 ++++- .../compilers/ghc/abi-depends-determinism.nix | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ghc/abi-depends-determinism.nix diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 1c3f260da1c1..6520daa4d42c 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy, hscolour , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx +, runCommand , libffi, libiconv ? null, ncurses @@ -89,6 +90,7 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index dd0e5e4b0572..df23f660147a 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy , autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 +, runCommand , libffi, libiconv ? null, ncurses @@ -85,7 +86,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - patches = stdenv.lib.optional deterministicProfiling + patches = [ + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) + ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix new file mode 100644 index 000000000000..afa272d03a8e --- /dev/null +++ b/pkgs/development/compilers/ghc/abi-depends-determinism.nix @@ -0,0 +1,10 @@ +# https://phabricator.haskell.org/D4159 to fix non-determinism in +# cached abi-depends fields in package databases, modified to only +# contain hunks that exist in distribution tarballs. +{ fetchpatch, runCommand }: let + base = fetchpatch { # Non-determinism in cached abi-depends fields + url = https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff; + sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; + }; +in runCommand base.name {} + "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" From e9de38eb61e159e36ce4d905b02b8f4898ddae89 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 26 Mar 2018 17:18:08 +0200 Subject: [PATCH 0220/2743] 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 5e3e3e985d9046b661b79fec99d657578525d37a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 13:30:33 -0500 Subject: [PATCH 0221/2743] netcat-openbsd: fix w/musl by providing b64_ntop It seems many projects have copies of this code-- and AFAICT all are derived from ISC's BIND[2] although it does not appear present in recent versions. This is a curious function as it is not documented nor part of any standard[1]. [1] https://www.lemoda.net/unix/base64/index.html [2] for example, glibc's copy: https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/README;h=514e9bb617e710f16126c1474561965a2b35653d;hb=HEAD#l104 --- pkgs/tools/networking/netcat-openbsd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 8c9247013778..2d9776abfcfc 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libbsd}: +{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: stdenv.mkDerivation rec { version = "1.187"; @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { done ''; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; + sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; + }) + ]; + installPhase = '' runHook preInstall install -Dm0755 nc $out/bin/nc From da0da6177dce9c06b9201ef06bff96f5f590635d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 13:57:24 -0500 Subject: [PATCH 0222/2743] nilfs-utils: apply upstream patches to fix w/musl --- pkgs/tools/filesystems/nilfs-utils/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 977add39b94b..5bce33065192 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libuuid, libselinux }: +{ stdenv, fetchurl, fetchpatch, libuuid, libselinux }: let sourceInfo = rec { version = "2.2.7"; @@ -23,6 +23,18 @@ stdenv.mkDerivation rec { sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./lib/cleaner*.c ''; + patches = [ + # Fix w/musl + (fetchpatch { + url = "https://github.com/nilfs-dev/nilfs-utils/commit/115fe4b976858c487cf83065f513d8626089579a.patch"; + sha256 = "0h89jz9l5d4rqj647ljbnv451l4ncqpsvzj0v70mn5391hfwsjlv"; + }) + (fetchpatch { + url = "https://github.com/nilfs-dev/nilfs-utils/commit/51b32c614be9e98c32de7f531ee600ca0740946f.patch"; + sha256 = "1ycq83c6jjy74aif47v075k5y2szzwhq6mbcrpd1z4b4i1x6yhpn"; + }) + ]; + # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv # still doesn't use it # From ebf04d83c028906570d6cd09fc29780732888a50 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 13:50:01 -0500 Subject: [PATCH 0223/2743] musl-fts: add setup-hook to add -lfts --- pkgs/os-specific/linux/musl/fts-setup-hook.sh | 17 +++++++++++++++++ pkgs/os-specific/linux/musl/fts.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/os-specific/linux/musl/fts-setup-hook.sh diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh new file mode 100644 index 000000000000..3962dcb19a20 --- /dev/null +++ b/pkgs/os-specific/linux/musl/fts-setup-hook.sh @@ -0,0 +1,17 @@ +ftsLdflags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -lfts" +} + +addEnvHooks "$hostOffset" ftsLdflags + diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix index 083541e5e935..0f16e8cc79bf 100644 --- a/pkgs/os-specific/linux/musl/fts.nix +++ b/pkgs/os-specific/linux/musl/fts.nix @@ -11,4 +11,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + setupHook = ./fts-setup-hook.sh; } From 69ca33057e489012b87b93771193862c744fc097 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 13:50:20 -0500 Subject: [PATCH 0224/2743] xar, libselinux: use musl-fts on musl, fix --- pkgs/os-specific/linux/libselinux/default.nix | 4 +++- pkgs/tools/compression/xar/default.nix | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 541ead7258f6..c276f56dd8b2 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libsepol, pcre , enablePython ? true, swig ? null, python ? null +, musl-fts }: assert enablePython -> swig != null && python != null; @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libsepol pcre ] - ++ optionals enablePython [ swig python ]; + ++ optionals enablePython [ swig python ] + ++ optional stdenv.hostPlatform.isMusl musl-fts; # Avoid this false warning: # avc_internal.c: In function 'avc_netlink_receive': diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index c62eead3cb73..01d18fe6ad7d 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }: +{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, musl-fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 ]; + buildInputs = [ libxml2 openssl zlib bzip2 ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts; meta = { homepage = https://mackyle.github.io/xar/; From 06e093c270f01981ff1b835bc995425adbdeea79 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 14:29:57 -0500 Subject: [PATCH 0225/2743] xfsprogs: replace glibc-2.27 patch w/upstream variant This version also works w/musl :) https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/patch/?id=8041435de7ed028a27ecca64302945ad455c69a6 --- .../filesystems/xfsprogs/glibc-2.27.patch | 66 ++++++++++++------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch b/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch index 757ea81c9279..1f398b1daa85 100644 --- a/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch +++ b/pkgs/tools/filesystems/xfsprogs/glibc-2.27.patch @@ -1,37 +1,53 @@ -diff -Naur a/io/copy_file_range.c b/io/copy_file_range.c ---- a/io/copy_file_range.c 1969-12-31 19:00:01.000000000 -0500 -+++ b/io/copy_file_range.c 2018-02-26 07:39:21.533535821 -0500 -@@ -42,24 +42,6 @@ +From 8041435de7ed028a27ecca64302945ad455c69a6 Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" +Date: Mon, 5 Feb 2018 14:38:02 -0600 +Subject: xfs_io: fix copy_file_range symbol name collision + +glibc 2.27 has a copy_file_range wrapper, so we need to change our +internal function out of the way to avoid compiler warnings. + +Reported-by: fredrik@crux.nu +Signed-off-by: Darrick J. Wong +Reviewed-by: Eric Sandeen +Signed-off-by: Eric Sandeen +--- + io/copy_file_range.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/io/copy_file_range.c b/io/copy_file_range.c +index d1dfc5a..99fba20 100644 +--- a/io/copy_file_range.c ++++ b/io/copy_file_range.c +@@ -42,13 +42,18 @@ copy_range_help(void) ")); } --static loff_t ++/* ++ * Issue a raw copy_file_range syscall; for our test program we don't want the ++ * glibc buffered copy fallback. ++ */ + static loff_t -copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len) --{ -- loff_t ret; -- -- do { -- ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0); -- if (ret == -1) { -- perror("copy_range"); -- return errno; -- } else if (ret == 0) -- break; -- len -= ret; -- } while (len > 0); -- -- return 0; --} -- - static off64_t - copy_src_filesize(int fd) ++copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len) { -@@ -130,7 +112,7 @@ + loff_t ret; + + do { +- ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0); ++ ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, ++ len, 0); + if (ret == -1) { + perror("copy_range"); + return errno; +@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv) copy_dst_truncate(); } - ret = copy_file_range(fd, &src, &dst, len); -+ ret = copy_file_range(fd, &src, file->fd, &dst, len, 0); ++ ret = copy_file_range_cmd(fd, &src, &dst, len); close(fd); return ret; } +-- +cgit v1.1 + From 23ace056286697a343082b8ee683bbacba78e155 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 11:38:19 -0500 Subject: [PATCH 0226/2743] usbredir: -Wno-error --- pkgs/development/libraries/usbredir/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 507c494ea27d..515c3b2ca3b9 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; - # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings - NIX_CFLAGS_COMPILE = stdenv.lib.optional (!stdenv.is64bit) "-Wno-error=format" - ++ [ "-Wno-error=format-truncation" ]; # newly detected with gcc-7 + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb ]; From 4037d68db4c74bbc4000067ac8c3a30577604a28 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 15:31:01 -0500 Subject: [PATCH 0227/2743] virglrenderer: fix missing include --- pkgs/development/libraries/virglrenderer/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 38b473673a54..2cd3b5a20c0c 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + # Fix use of fd_set without proper include + prePatch = '' + sed -e '1i#include ' -i vtest/util.c + ''; + meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; homepage = https://virgil3d.github.io/; From e78900213b259f37363eb2619cc59b6684195cbc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 15:53:38 -0500 Subject: [PATCH 0228/2743] grub2: extend platforms to include all linux This works (and is needed) on musl-based linux too! --- pkgs/tools/misc/grub/2.0x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 78c9056db7a2..96ce38ea9e85 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -123,6 +123,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; }) From 2355189b15ae4e1f2805a2a230fc515edc2ac693 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 27 Mar 2018 07:35:36 +0900 Subject: [PATCH 0229/2743] 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 ce8ce600ae41d3899e4a556fa9ff8a1a34374063 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 25 Mar 2018 23:01:31 -0500 Subject: [PATCH 0230/2743] unix-tools: introduce unix-tools.nix unix-tools.nix has a collection of tools that are commonly installed by default in Unix derivatives. This is intended to provide compatibility between macOS and Linux users. Three Linux-only derivations are provided for compatbility: - procps - utillinux - nettools More tools are also provided. Also: treewide: use unixtools Non-comprehensive replace of Linux-only procps and util-linux with 'unixtools'. --- .../version-management/gitlab/default.nix | 6 +- pkgs/servers/nosql/cassandra/generic.nix | 3 +- pkgs/servers/xmpp/biboumi/default.nix | 7 +- pkgs/servers/xmpp/ejabberd/default.nix | 3 +- pkgs/tools/misc/keychain/default.nix | 5 +- pkgs/tools/misc/parallel/default.nix | 2 +- pkgs/tools/networking/i2p/default.nix | 4 +- pkgs/tools/security/pass/default.nix | 2 +- pkgs/tools/security/sshuttle/default.nix | 4 +- pkgs/top-level/all-packages.nix | 21 +++-- pkgs/top-level/unix-tools.nix | 89 +++++++++++++++++++ 11 files changed, 119 insertions(+), 27 deletions(-) create mode 100644 pkgs/top-level/unix-tools.nix diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 1c3d1928a8b0..7cfaeff33827 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv -, ruby, tzdata, git, procps, dpkg, nettools +, ruby, tzdata, git, ps, dpkg, nettools }: /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - rubyEnv ruby bundler tzdata git procps dpkg nettools + rubyEnv ruby bundler tzdata git ps dpkg nettools ]; patches = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${procps}/bin/ps -U" + --replace "ps -U" "${ps}/bin/ps -U" sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 50b56213b308..48875b093a8d 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -10,7 +10,8 @@ let gawk which jre - ] ++ stdenv.lib.optional stdenv.isLinux procps); + procps + ]); in stdenv.mkDerivation rec { diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index f46b3189edfe..7ef6242d2b25 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkgconfig, udns, pandoc, procps } : + libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : stdenv.mkDerivation rec { name = "biboumi-${version}"; @@ -20,12 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig pandoc ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd - udns procps ]; + udns ]; - inherit procps; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - substituteInPlace unit/biboumi.service.cmake --replace /bin/kill $procps/bin/kill + substituteInPlace unit/biboumi.service.cmake --replace /bin/kill ${coreutils}/bin/kill cp $louiz_catch/single_include/catch.hpp tests/ # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg # TODO include conf/biboumi.cfg as example somewhere diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index cd27f69e5f4b..f95b5efe3d38 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,5 +1,6 @@ { stdenv, writeScriptBin, lib, fetchurl, git, cacert , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd +, flock , withMysql ? false , withPgsql ? false , withSqlite ? false, sqlite @@ -101,7 +102,7 @@ in stdenv.mkDerivation rec { postInstall = '' sed -i \ -e '2iexport PATH=${ctlpath}:$PATH' \ - -e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \ + -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \ -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 7fd9897a71bb..133a461964bd 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, perl, procps, gnugrep, gawk, findutils, gnused -, withProcps ? stdenv.isLinux }: +, perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { name = "keychain-${version}"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${gnused}/bin" \ --prefix PATH ":" "${findutils}/bin" \ --prefix PATH ":" "${gawk}/bin" \ - ${if withProcps then ("--prefix PATH \":\" ${procps}/bin") else ""} + --prefix PATH ":" "${procps}/bin" ''; meta = { diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 7287da2079a1..b7116b53b114 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/parallel \ - ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ + --prefix PATH : "${procps}/bin" \ --prefix PATH : "${perl}/bin" \ ''; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index ec268d5d77f6..58533f683e71 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: +{ stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: let wrapper = stdenv.mkDerivation rec { name = "wrapper-${version}"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { -e "s#uname#${coreutils}/bin/uname#" \ -e "s#which#${which}/bin/which#" \ -e "s#%gettext%#${gettext}/bin/gettext#" \ - -e "s#/usr/ucb/ps#${procps}/bin/ps#" \ + -e "s#/usr/ucb/ps#${ps}/bin/ps#" \ -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ -e "s#%INSTALL_PATH#$out#" \ -e 's#%USER_HOME#$HOME#' \ diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index ad2afa8ed912..4f9e6c06697c 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -74,8 +74,8 @@ in stdenv.mkDerivation rec { tree which qrencode + procps ] ++ optional tombPluginSupport tomb - ++ optional stdenv.isLinux procps ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index d344f95573dd..c3bf4f69a46d 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc; buildInputs = - [ coreutils openssh ] ++ - stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; + [ coreutils openssh procps nettools ] + ++ stdenv.lib.optionals stdenv.isLinux [ iptables ]; checkInputs = with python3Packages; [ mock pytest pytestrunner ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4726f59b893..e14eb820d725 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12380,12 +12380,7 @@ with pkgs; jetty = callPackage ../servers/http/jetty { }; knot-dns = callPackage ../servers/dns/knot-dns { }; - knot-resolver = callPackage ../servers/dns/knot-resolver { - # TODO: vimNox after it gets fixed on Darwin or something lighter - hexdump = if stdenv.isLinux then utillinux.bin - else if stdenv.isDarwin then darwin.shell_cmds - else vim/*xxd*/; - }; + knot-resolver = callPackage ../servers/dns/knot-resolver { }; rdkafka = callPackage ../development/libraries/rdkafka { }; @@ -13694,7 +13689,8 @@ with pkgs; if hostPlatform.isMusl then musl-getconf else lib.getBin stdenv.cc.libc; - nettools = callPackage ../os-specific/linux/net-tools { }; + nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } + else unixtools.nettools; nftables = callPackage ../os-specific/linux/nftables { }; @@ -13817,7 +13813,8 @@ with pkgs; procps = procps-ng; - procps-ng = callPackage ../os-specific/linux/procps-ng { }; + procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } + else unixtools.procps; watch = callPackage ../os-specific/linux/procps/watch.nix { }; @@ -14010,7 +14007,9 @@ with pkgs; usermount = callPackage ../os-specific/linux/usermount { }; - utillinux = callPackage ../os-specific/linux/util-linux { }; + utillinux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } + else unixtools.utillinux; + utillinuxCurses = utillinux; utillinuxMinimal = appendToName "minimal" (utillinux.override { @@ -21140,4 +21139,8 @@ with pkgs; xml2rfc = callPackage ../tools/typesetting/xml2rfc { }; mmark = callPackage ../tools/typesetting/mmark { }; + + # Unix tools + unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); + inherit (unixtools) hexdump ps; } diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix new file mode 100644 index 000000000000..706cd061b591 --- /dev/null +++ b/pkgs/top-level/unix-tools.nix @@ -0,0 +1,89 @@ +{ pkgs, buildEnv, runCommand, hostPlatform }: + +let + + singleBinary = cmd: providers: + if builtins.hasAttr hostPlatform.parsed.kernel.name providers then + runCommand cmd {} '' + mkdir -p $out/bin + + if ! [ -x "${providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}" ]; then + echo "Cannot find command ${cmd}" + exit 1 + fi + + ln -s ${providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd} $out/bin/${cmd} + '' + else throw "${hostPlatform.parsed.kernel.name} does not have ${cmd}"; + +in rec { + arp = singleBinary "arp" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + getopt = singleBinary "getopt" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + hexdump = singleBinary "hexdump" { + linux = pkgs.procps; + darwin = pkgs.darwin.shell_cmds; + }; + hostname = singleBinary "hostname" { + linux = pkgs.nettools; + darwin = pkgs.darwin.shell_cmds; + }; + ifconfig = singleBinary "ifconfig" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + netstat = singleBinary "netstat" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + ping = singleBinary "ping" { + linux = pkgs.iputils; + darwin = pkgs.darwin.network_cmds; + }; + ps = singleBinary "ps" { + linux = pkgs.procps; + darwin = pkgs.darwin.adv_cmds; + }; + route = singleBinary "route" { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + script = singleBinary "script" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + sysctl = singleBinary "sysctl" { + linux = pkgs.procps; + darwin = pkgs.darwin.system_cmds; + }; + whereis = singleBinary "whereis" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + write = singleBinary "write" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.basic_cmds; + }; + + # Compatibility derivations + + procps = buildEnv { + name = "procps-compat"; + paths = [ sysctl ps ]; + }; + + utillinux = buildEnv { + name = "utillinux-compat"; + paths = [ getopt hexdump script whereis write ]; + }; + + nettools = buildEnv { + name = "nettools-compat"; + paths = [ arp hostname netstat route ]; + }; +} From b2be363fea1016a28085de22dd386307edbe0409 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 27 Mar 2018 19:43:11 +0300 Subject: [PATCH 0231/2743] nixos/hans: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/hans.nix | 132 +++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 nixos/modules/services/networking/hans.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7f28c670bed..f9e73acbc531 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -483,6 +483,7 @@ ./services/networking/gnunet.nix ./services/networking/gogoclient.nix ./services/networking/gvpe.nix + ./services/networking/hans.nix ./services/networking/haproxy.nix ./services/networking/heyefi.nix ./services/networking/hostapd.nix diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix new file mode 100644 index 000000000000..24a7edaea454 --- /dev/null +++ b/nixos/modules/services/networking/hans.nix @@ -0,0 +1,132 @@ +# NixOS module for hans, ip over icmp daemon + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.hans; + + hansUser = "hans"; + +in +{ + + ### configuration + + options = { + + services.hans = { + clients = mkOption { + default = {}; + description = '' + Each attribute of this option defines a systemd service that + runs hans. Many or none may be defined. + The name of each service is + hans-name + where name is the name of the + corresponding attribute name. + ''; + example = literalExample '' + { + foo = { + server = "192.0.2.1"; + extraConfig = "-p mysecurepassword"; + } + } + ''; + type = types.attrsOf (types.submodule ( + { + options = { + server = mkOption { + type = types.str; + default = ""; + description = "IP address of server running hans"; + example = "192.0.2.1"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Additional command line parameters"; + example = "-p mysecurepassword"; + }; + }; + })); + }; + + server = { + enable = mkOption { + type = types.bool; + default = false; + description = "enable hans server"; + }; + + ip = mkOption { + type = types.str; + default = ""; + description = "The assigned ip range"; + example = "198.51.100.0"; + }; + + systemPings = mkOption { + type = types.bool; + default = false; + description = "Respond to ordinary pings"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Additional command line parameters"; + example = "-p mysecurepassword"; + }; + }; + + }; + }; + + ### implementation + + config = mkIf (cfg.server.enable || cfg.clients != {}) { + boot.kernel.sysctl = optionalAttrs cfg.server.systemPings { + "net.ipv4.icmp_echo_ignore_all" = 1; + }; + + boot.kernelModules = [ "tun" ]; + + systemd.services = + let + createHansClientService = name: cfg: + { + description = "hans client - ${name}"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + RestartSec = "30s"; + Restart = "always"; + ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server}"; + }; + }; + in + listToAttrs ( + mapAttrsToList + (name: value: nameValuePair "hans-${name}" (createHansClientService name value)) + cfg.clients + ) // { + hans = mkIf (cfg.server.enable) { + description = "hans, ip over icmp server daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"}"; + }; + }; + + users.extraUsers = singleton { + name = hansUser; + description = "Hans daemon user"; + }; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} From 16c5866ceced4a9f0c5c4ea0f09d6e7d9dd5693b Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 27 Mar 2018 22:23:36 +0300 Subject: [PATCH 0232/2743] nixos/hans: passwordFile option #24288 --- nixos/modules/services/networking/hans.nix | 39 +++++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index 24a7edaea454..1b54a822aaee 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -31,7 +31,7 @@ in { foo = { server = "192.0.2.1"; - extraConfig = "-p mysecurepassword"; + extraConfig = "-v"; } } ''; @@ -49,8 +49,15 @@ in type = types.str; default = ""; description = "Additional command line parameters"; - example = "-p mysecurepassword"; + example = "-v"; }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; + }; + }; })); }; @@ -79,7 +86,13 @@ in type = types.str; default = ""; description = "Additional command line parameters"; - example = "-p mysecurepassword"; + example = "-v"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; }; }; @@ -102,10 +115,18 @@ in description = "hans client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + cat > /run/hans/${name}-script << EOF + #!/bin/sh + ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"} + EOF + chmod 700 /run/hans/${name}-script + ''; + script = "/run/hans/${name}-script"; serviceConfig = { RestartSec = "30s"; Restart = "always"; - ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server}"; + RuntimeDirectory = [ "hans" ]; }; }; in @@ -118,7 +139,15 @@ in description = "hans, ip over icmp server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"}"; + preStart = '' + cat > /run/hans/script << EOF + #!/bin/sh + ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"} + EOF + chmod 700 /run/hans/script + ''; + script = "/run/hans/script"; + serviceConfig.RuntimeDirectory = [ "hans" ]; }; }; From 276d10dae6b14e457c8206e9e292ce8341434520 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 27 Mar 2018 22:42:37 +0300 Subject: [PATCH 0233/2743] nixos/iodine: passwordFile option #24288 --- nixos/modules/services/networking/iodine.nix | 38 +++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 512dbd77ae4b..66569a7e9127 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -32,7 +32,7 @@ in foo = { server = "tunnel.mdomain.com"; relay = "8.8.8.8"; - extraConfig = "-P mysecurepassword"; + extraConfig = "-v"; } } ''; @@ -57,7 +57,13 @@ in type = types.str; default = ""; description = "Additional command line parameters"; - example = "-P mysecurepassword -l 192.168.1.10 -p 23"; + example = "-l 192.168.1.10 -p 23"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; }; }; })); @@ -88,7 +94,13 @@ in type = types.str; default = ""; description = "Additional command line parameters"; - example = "-P mysecurepassword -l 192.168.1.10 -p 23"; + example = "-l 192.168.1.10 -p 23"; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = "File that containts password"; }; }; @@ -108,10 +120,18 @@ in description = "iodine client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + cat > /run/iodine/${name}-script << EOF + #!/bin/sh + ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server} + EOF + chmod 700 /run/iodine/${name}-script + ''; + script = "/run/iodine/${name}-script"; serviceConfig = { RestartSec = "30s"; Restart = "always"; - ExecStart = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.relay} ${cfg.server}"; + RuntimeDirectory = [ "iodine" ]; }; }; in @@ -124,7 +144,15 @@ in description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${cfg.server.ip} ${cfg.server.domain}"; + preStart = '' + cat > /run/iodined/script << EOF + #!/bin/sh + ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain} + EOF + chmod 700 /run/iodined/script + ''; + script = "/run/iodined/script"; + serviceConfig.RuntimeDirectory = [ "iodined" ]; }; }; From ee9ad96898048b35b040fb4e02101f180462183d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Mar 2018 17:31:32 -0500 Subject: [PATCH 0234/2743] parted: add missing fnctl include, fix w/musl Disable tests on musl, maybe fix or refine this in the future. --- pkgs/tools/misc/parted/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 68240210e746..3a05a1927dbc 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python2 +{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2 , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; }; - patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch; + patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; + sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; + }); postPatch = stdenv.lib.optionalString doCheck '' patchShebangs tests @@ -31,7 +36,7 @@ stdenv.mkDerivation rec { # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. - doCheck = true; + doCheck = !stdenv.hostPlatform.isMusl; /* translation test */ preCheck = stdenv.lib.optionalString doCheck From fdd1625d1792399703f30036271f4448e319d4d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 6 Mar 2018 03:29:07 +0100 Subject: [PATCH 0235/2743] =?UTF-8?q?meson:=200.44.0=20=E2=86=92=200.45.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http://mesonbuild.com/Release-notes-for-0-45-0.html --- .../meson/allow-dirs-outside-of-prefix.patch | 6 +++--- .../tools/build-managers/meson/default.nix | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index b44289d74f54..bef89c881b5a 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -266,18 +266,13 @@ +@@ -282,18 +282,13 @@ ''' if option.endswith('dir') and os.path.isabs(value) and \ option not in builtin_dir_noprefix_options: @@ -8,7 +8,7 @@ # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -- if commonpath([value, prefix]) != str(PurePath(prefix)): +- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)): - m = 'The value of the {!r} option is {!r} which must be a ' \ - 'subdir of the prefix {!r}.\nNote that if you pass a ' \ - 'relative path, it is assumed to be a subdir of prefix.' @@ -16,7 +16,7 @@ - # Convert path to be relative to prefix - skip = len(prefix) + 1 - value = value[skip:] -+ if commonpath([value, prefix]) == str(PurePath(prefix)): ++ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)): + # Convert path to be relative to prefix + skip = len(prefix) + 1 + value = value[skip:] diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index aa642ffa727f..298c669e690b 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,14 +1,14 @@ -{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let +{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.44.0"; + version = "0.45.1"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1rpqp9iwbvr4xvfdh3iyfh1ha274hbb66jbgw3pa5a73x4d4ilqn"; + sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14"; }; postFixup = '' @@ -69,6 +69,11 @@ in python3Packages.buildPythonApplication rec { endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"} ''; + # 0.45 update enabled tests but they are failing + doCheck = false; + # checkInputs = [ ninja pkgconfig ]; + # checkPhase = "python ./run_project_tests.py"; + inherit (stdenv) cc isCross; meta = with lib; { From ef428ab202322b93930c3db0d66573c16f692c5f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 26 Mar 2018 18:42:46 -0500 Subject: [PATCH 0236/2743] treewide: cleanup procps uses --- pkgs/applications/misc/qsyncthingtray/default.nix | 2 +- pkgs/development/compilers/go/1.10.nix | 3 +-- pkgs/development/compilers/go/1.9.nix | 3 +-- pkgs/development/compilers/rust/rustc.nix | 6 ++---- pkgs/os-specific/linux/checksec/default.nix | 4 ++-- pkgs/os-specific/linux/gogoclient/default.nix | 4 ++-- pkgs/shells/grml-zsh-config/default.nix | 4 ++-- pkgs/tools/networking/network-manager/openconnect.nix | 5 ++--- pkgs/tools/networking/network-manager/strongswan.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 10 files changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 88628c63c9ce..6ae8f380fe28 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null +{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps , qtbase, qtwebengine, qtwebkit , cmake , syncthing diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 145f6a17978d..1be94ba5c6ca 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] - ++ optionals stdenv.isLinux [ procps ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index c866212170c4..47c1d1fdc951 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] - ++ optionals stdenv.isLinux [ procps ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 92b149865fa2..f678286eadea 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,5 @@ { stdenv, targetPackages -, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps +, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps , llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version @@ -19,8 +19,6 @@ let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - procps = if stdenv.isDarwin then darwin.ps else args.procps; - llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); @@ -127,7 +125,7 @@ stdenv.mkDerivation { # ps is needed for one of the test cases nativeBuildInputs = - [ file python2 procps rustPlatform.rust.rustc git cmake + [ file python2 ps rustPlatform.rust.rustc git cmake which libffi ] # Only needed for the debuginfo tests diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 1a879ba33304..1ef18f703d3f 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils }: +{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }: stdenv.mkDerivation rec { name = "checksec-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -" substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -" substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf" - substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -" + substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${sysctl}/bin/sysctl -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" ''; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 521b81cd690d..53895faa66cb 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, nettools, iproute, procps}: +{stdenv, fetchurl, openssl, nettools, iproute, sysctl}: let baseName = "gogoclient"; version = "1.2"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ --replace "/sbin/route" "${nettools}/bin/route" \ --replace "/sbin/ip" "${iproute}/sbin/ip" \ - --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix index d49e13e1eb35..635077a611cf 100644 --- a/pkgs/shells/grml-zsh-config/default.nix +++ b/pkgs/shells/grml-zsh-config/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm"; }; - buildInputs = [ zsh coreutils txt2tags ] - ++ optional stdenv.isLinux [ inetutils procps ]; + buildInputs = [ zsh coreutils txt2tags procps ] + ++ optional stdenv.isLinux [ inetutils ]; buildPhase = '' cd doc diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index efaa146c72f3..27fd4c4adc30 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, kmod }: +, withGnome ? true, gnome3, sysctl, kmod }: let pname = "NetworkManager-openconnect"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \ --replace "/sbin/modprobe" "${kmod}/bin/modprobe" @@ -42,4 +42,3 @@ in stdenv.mkDerivation rec { inherit (networkmanager.meta) maintainers platforms; }; } - diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index cfa304901b48..fb3ba2bbdf5a 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl , gnome3, libgnome-keyring, libsecret }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/bin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" ''; configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e14eb820d725..009830a01d2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14012,12 +14012,12 @@ with pkgs; utillinuxCurses = utillinux; - utillinuxMinimal = appendToName "minimal" (utillinux.override { + utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override { minimal = true; ncurses = null; perl = null; systemd = null; - }); + }) else throw "utillinux is unsupported on non-Linux"; v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; From 35d6688a1b1e4941344cdbc1b46e4fc2c8cd1255 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 26 Mar 2018 21:33:42 -0500 Subject: [PATCH 0237/2743] top-level: add sysctl --- 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 009830a01d2e..860d049e8650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21142,5 +21142,5 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); - inherit (unixtools) hexdump ps; + inherit (unixtools) hexdump ps sysctl; } From 4a9fddc59863c3c2077e35bff913dd664c8b6e1a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 26 Mar 2018 22:37:49 -0500 Subject: [PATCH 0238/2743] unixtools: cleanup --- pkgs/os-specific/linux/autofs/default.nix | 8 ++--- pkgs/servers/apcupsd/default.nix | 7 ++-- pkgs/top-level/all-packages.nix | 15 +++----- pkgs/top-level/perl-packages.nix | 2 +- pkgs/top-level/unix-tools.nix | 42 +++++++++++++++++++++++ 5 files changed, 55 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 79e12dd0f437..a7472de1d025 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs +{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, modprobe, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let @@ -17,10 +17,10 @@ in stdenv.mkDerivation { export sssldir="${sssd}/lib/sssd/modules" export HAVE_SSS_AUTOFS=1 - export MOUNT=${utillinux}/bin/mount + export MOUNT=${mount}/bin/mount export MOUNT_NFS=${nfs-utils}/bin/mount.nfs - export UMOUNT=${utillinux}/bin/umount - export MODPROBE=${utillinux}/bin/modprobe + export UMOUNT=${umount}/bin/umount + export MODPROBE=${modprobe}/bin/modprobe export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E4FSCK=${e2fsprogs}/bin/fsck.ext4 diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 3b67171a474e..5f0440fc6913 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, nettools, man +{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man +, utillinux , enableCgiScripts ? true, gd }: @@ -46,8 +47,8 @@ stdenv.mkDerivation rec { postInstall = '' for file in "$out"/etc/apcupsd/*; do - sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \ - -e 's|^HOSTNAME=.*|HOSTNAME=`${nettools}/bin/hostname`|g' \ + sed -i -e 's|^WALL=.*|WALL="${wall}/bin/wall"|g' \ + -e 's|^HOSTNAME=.*|HOSTNAME=`${hostname}/bin/hostname`|g' \ "$file" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 860d049e8650..c1f9e198aafa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4608,11 +4608,7 @@ with pkgs; v8 = v8_static; }; - rsnapshot = callPackage ../tools/backup/rsnapshot { - # For the `logger' command, we can use either `utillinux' or - # GNU Inetutils. The latter is more portable. - logger = if stdenv.isLinux then utillinux else inetutils; - }; + rsnapshot = callPackage ../tools/backup/rsnapshot { }; rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -7659,7 +7655,6 @@ with pkgs; inherit (perlPackages) perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; inherit (llvmPackages_4) llvm clang-unwrapped; - utillinux = if stdenv.isLinux then utillinuxMinimal else null; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -13091,7 +13086,7 @@ with pkgs; }) else if stdenv.isLinux then utillinuxMinimal - else null; + else libossp_uuid; light = callPackage ../os-specific/linux/light { }; @@ -13099,8 +13094,6 @@ with pkgs; ebtables = callPackage ../os-specific/linux/ebtables { }; - eject = utillinux; - facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; fatrace = callPackage ../os-specific/linux/fatrace { }; @@ -14017,7 +14010,7 @@ with pkgs; ncurses = null; perl = null; systemd = null; - }) else throw "utillinux is unsupported on non-Linux"; + }) else utillinux; v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; @@ -21142,5 +21135,5 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); - inherit (unixtools) hexdump ps sysctl; + inherit (unixtools) hexdump ps logger eject modprobe umount mount wall hostname more; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13554ff6ee68..91e3581b6835 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7328,7 +7328,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-${version}.tgz"; sha256 = "0ksldcw0hydfy9k70i6q6fm1wgbc54kx0lbwlkrszsbd7q72dlfg"; }; - propagatedBuildInputs = [pkgs.utillinux.bin]; # `more` used in tests + propagatedBuildInputs = [pkgs.more]; # `more` used in tests }; IOPrompt = buildPerlPackage { diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 706cd061b591..0c6b9e261dd8 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,5 +1,15 @@ { pkgs, buildEnv, runCommand, hostPlatform }: +# These are some unix tools that are commonly included in the /usr/bin +# and /usr/sbin directory under more normal distributions. Along with +# coreutils, these are commonly assumed to be available by build +# systems, but we can't assume they are available. In Nix, we list +# each program by name directly through this unixtools attribute. + +# You should always try to use single binaries when available. For +# instance, if your program needs to use "ps", just list it as a build +# input, not "procps" which requires Linux. + let singleBinary = cmd: providers: @@ -17,10 +27,22 @@ let else throw "${hostPlatform.parsed.kernel.name} does not have ${cmd}"; in rec { + + # more is unavailable in darwin + # just use less + more_compat = runCommand "more" {} '' + mkdir -p $out/bin + ln -s ${pkgs.less}/bin/less $out/bin/more + ''; + + # singular binaries arp = singleBinary "arp" { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; }; + eject = singleBinary "eject" { + linux = pkgs.utillinux; + }; getopt = singleBinary "getopt" { linux = pkgs.utillinux; darwin = pkgs.darwin.shell_cmds; @@ -37,6 +59,19 @@ in rec { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; }; + logger = singleBinary "logger" { + linux = pkgs.utillinux; + }; + modprobe = singleBinary "modprobe" { + linux = pkgs.utillinux; + }; + more = singleBinary "more" { + linux = pkgs.utillinux; + darwin = pkgs.more_compat; + }; + mount = singleBinary "mount" { + linux = pkgs.utillinux; + }; netstat = singleBinary "netstat" { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; @@ -61,16 +96,23 @@ in rec { linux = pkgs.procps; darwin = pkgs.darwin.system_cmds; }; + umount = singleBinary "umount" { + linux = pkgs.utillinux; + }; whereis = singleBinary "whereis" { linux = pkgs.utillinux; darwin = pkgs.darwin.shell_cmds; }; + wall = singleBinary "wall" { + linux = pkgs.utillinux; + }; write = singleBinary "write" { linux = pkgs.utillinux; darwin = pkgs.darwin.basic_cmds; }; # Compatibility derivations + # Provided for old usage of these commands. procps = buildEnv { name = "procps-compat"; From 80aec24b92707daf5ae2cd954e08ccd8c68ef3ad Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 27 Mar 2018 12:33:34 -0500 Subject: [PATCH 0239/2743] Update default.nix --- pkgs/servers/apcupsd/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 5f0440fc6913..04285621e5c9 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man -, utillinux , enableCgiScripts ? true, gd }: From 00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 27 Mar 2018 12:39:56 -0500 Subject: [PATCH 0240/2743] Cleanup all-packages.nix --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1f9e198aafa..d7e581eff7ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13086,7 +13086,7 @@ with pkgs; }) else if stdenv.isLinux then utillinuxMinimal - else libossp_uuid; + else null; light = callPackage ../os-specific/linux/light { }; @@ -21135,5 +21135,6 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); - inherit (unixtools) hexdump ps logger eject modprobe umount mount wall hostname more; + inherit (unixtools) hexdump ps logger eject modprobe umount + mount wall hostname more sysctl; } From 11f0e07d4fc3791a3318950bc70bc53b2828af6b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 27 Mar 2018 13:02:24 -0500 Subject: [PATCH 0241/2743] unixtools: replace darwin.ps --- pkgs/development/tools/build-managers/cmake/2.8.nix | 5 ++--- pkgs/top-level/all-packages.nix | 9 ++------- pkgs/top-level/unix-tools.nix | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index fcf06782e4dd..c87fe1cc5ace 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 -, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +, useNcurses ? false, ncurses, useQt4 ? false, qt4 , buildPlatform, hostPlatform }: with stdenv.lib; -assert wantPS -> (ps != null); assert stdenv ? cc; assert stdenv.cc ? libc; @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { ++ optional useNcurses ncurses ++ optional useQt4 qt4; - propagatedBuildInputs = optional wantPS ps; + propagatedBuildInputs = [ ps ]; CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7e581eff7ed..961b6cdfe171 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7620,14 +7620,9 @@ with pkgs; ctodo = callPackage ../applications/misc/ctodo { }; - cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { - wantPS = stdenv.isDarwin; - inherit (darwin) ps; - }; + cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { - inherit (darwin) ps; - }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; cmakeCurses = cmake.override { useNcurses = true; }; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 0c6b9e261dd8..ab807290b7c1 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -82,7 +82,7 @@ in rec { }; ps = singleBinary "ps" { linux = pkgs.procps; - darwin = pkgs.darwin.adv_cmds; + darwin = pkgs.darwin.ps; }; route = singleBinary "route" { linux = pkgs.nettools; From 49455d7bae2f81c5c984faa6728c9017123fa798 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 27 Mar 2018 13:17:10 -0500 Subject: [PATCH 0242/2743] treewide: replace utillinux refs of {u,}mount umount and mount are now provided top-level --- pkgs/development/tools/build-managers/cmake/2.8.nix | 2 +- pkgs/development/tools/misc/creduce/default.nix | 2 -- pkgs/development/tools/misc/csmith/default.nix | 2 +- pkgs/servers/apcupsd/default.nix | 2 +- pkgs/servers/interlock/default.nix | 9 +++++---- pkgs/servers/search/elasticsearch/2.x.nix | 9 +++------ pkgs/servers/search/elasticsearch/5.x.nix | 9 +++------ pkgs/servers/search/elasticsearch/6.x.nix | 9 +++------ pkgs/servers/search/elasticsearch/default.nix | 9 +++------ pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/unix-tools.nix | 4 ++-- 11 files changed, 22 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index c87fe1cc5ace..5fcd6b341653 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 -, useNcurses ? false, ncurses, useQt4 ? false, qt4 +, useNcurses ? false, ncurses, useQt4 ? false, qt4, ps , buildPlatform, hostPlatform }: diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 37ec63627b15..cbf5883b2973 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -6,8 +6,6 @@ , utillinux }: -assert stdenv.isLinux -> (utillinux != null); - stdenv.mkDerivation rec { name = "creduce-${version}"; version = "2.7.0"; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 9a8c24fa1685..c4994ad24d79 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 makeWrapper ]; - buildInputs = [ libbsd perl SysCPU ]; + buildInputs = [ perl SysCPU libbsd ]; postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 04285621e5c9..bec61d460a7a 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # There is no real reason for a bin/sbin split, so just use bin. preConfigure = '' export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown - export ac_cv_path_WALL=${utillinux}/bin/wall + export ac_cv_path_WALL=${wall}/bin/wall sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure export configureFlags="\ --bindir=$out/bin \ diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index a0b59d332a3f..0df055f9690f 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup, - buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +, mount, umount +, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "interlock-${version}"; @@ -23,8 +24,8 @@ buildGoPackage rec { buildFlags = [ "-tags textsecure" ]; postPatch = '' grep -lr '/s\?bin/' | xargs sed -i \ - -e 's|/bin/mount|${utillinux}/bin/mount|' \ - -e 's|/bin/umount|${utillinux}/bin/umount|' \ + -e 's|/bin/mount|${mount}/bin/mount|' \ + -e 's|/bin/umount|${umount}/bin/umount|' \ -e 's|/bin/cp|${coreutils}/bin/cp|' \ -e 's|/bin/mv|${coreutils}/bin/mv|' \ -e 's|/bin/chown|${coreutils}/bin/chown|' \ diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index 30beec7b873d..28244d1b3dcd 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux }: with stdenv.lib; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ]; - buildInputs = [ makeWrapper jre ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre utillinux ]; installPhase = '' mkdir -p $out @@ -24,9 +23,7 @@ stdenv.mkDerivation rec { mv $out/bin/plugin $out/bin/elasticsearch-plugin wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" ''; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 0d27e4fefcc8..f46ca9c0cb3f 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }: +{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }: with stdenv.lib; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; - buildInputs = [ makeWrapper jre_headless ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out @@ -24,9 +23,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 6057c2dee82c..5594fe35b737 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux, getopt }: +{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }: with stdenv.lib; @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env ''; - buildInputs = [ makeWrapper jre_headless ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out @@ -27,9 +26,7 @@ stdenv.mkDerivation rec { chmod -x $out/bin/*.* wrapProgram $out/bin/elasticsearch \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin/" \ --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 16f010302902..f4780603f502 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux }: with stdenv.lib; @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home.patch ]; - buildInputs = [ makeWrapper jre ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre utillinux ]; installPhase = '' mkdir -p $out @@ -25,9 +24,7 @@ stdenv.mkDerivation rec { # set ES_CLASSPATH and JAVA_HOME wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 961b6cdfe171..a3f388da1ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7656,9 +7656,6 @@ with pkgs; csmith = callPackage ../development/tools/misc/csmith { inherit (perlPackages) perl SysCPU; - # Workaround optional dependency on libbsd that's - # currently broken on Darwin. - libbsd = if stdenv.isDarwin then null else libbsd; }; csslint = callPackage ../development/web/csslint { }; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index ab807290b7c1..2e2cc3cea880 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -45,7 +45,7 @@ in rec { }; getopt = singleBinary "getopt" { linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; + darwin = pkgs.getopt; }; hexdump = singleBinary "hexdump" { linux = pkgs.procps; @@ -67,7 +67,7 @@ in rec { }; more = singleBinary "more" { linux = pkgs.utillinux; - darwin = pkgs.more_compat; + darwin = more_compat; }; mount = singleBinary "mount" { linux = pkgs.utillinux; From 52f4be2c1fd6d430437f917ec886cb12798efdb4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 27 Mar 2018 20:26:10 -0400 Subject: [PATCH 0243/2743] unixtools: Utilize meta.platforms --- pkgs/top-level/unix-tools.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 2e2cc3cea880..0d6e8d1c6c2d 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -12,19 +12,20 @@ let - singleBinary = cmd: providers: - if builtins.hasAttr hostPlatform.parsed.kernel.name providers then - runCommand cmd {} '' - mkdir -p $out/bin + singleBinary = cmd: providers: let + provider = "${providers.${hostPlatform.parsed.kernel.name} or "missing-package"}/bin/${cmd}"; + in runCommand cmd { + meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); + } '' + mkdir -p $out/bin - if ! [ -x "${providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}" ]; then - echo "Cannot find command ${cmd}" - exit 1 - fi + if ! [ -x "${provider}" ]; then + echo "Cannot find command ${cmd}" + exit 1 + fi - ln -s ${providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd} $out/bin/${cmd} - '' - else throw "${hostPlatform.parsed.kernel.name} does not have ${cmd}"; + ln -s "${provider}" "$out/bin/${cmd}" + ''; in rec { From 1f8382547f6d84b8eed9d81b93e8679c2ae4f4b6 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 19 Mar 2018 15:24:45 -0400 Subject: [PATCH 0244/2743] 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 33c34aff2fb42268f45c5563f767266e27c58a9b Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 28 Mar 2018 08:32:29 +0300 Subject: [PATCH 0245/2743] hans, iodine: correct script --- nixos/modules/services/networking/hans.nix | 20 ++------------------ nixos/modules/services/networking/iodine.nix | 20 ++------------------ 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index 1b54a822aaee..4579154d78fa 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -115,18 +115,10 @@ in description = "hans client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - cat > /run/hans/${name}-script << EOF - #!/bin/sh - ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"} - EOF - chmod 700 /run/hans/${name}-script - ''; - script = "/run/hans/${name}-script"; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; - RuntimeDirectory = [ "hans" ]; }; }; in @@ -139,15 +131,7 @@ in description = "hans, ip over icmp server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - cat > /run/hans/script << EOF - #!/bin/sh - ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"} - EOF - chmod 700 /run/hans/script - ''; - script = "/run/hans/script"; - serviceConfig.RuntimeDirectory = [ "hans" ]; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; }; }; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 66569a7e9127..709c36ee54f0 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -120,18 +120,10 @@ in description = "iodine client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - cat > /run/iodine/${name}-script << EOF - #!/bin/sh - ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server} - EOF - chmod 700 /run/iodine/${name}-script - ''; - script = "/run/iodine/${name}-script"; + script = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; - RuntimeDirectory = [ "iodine" ]; }; }; in @@ -144,15 +136,7 @@ in description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - cat > /run/iodined/script << EOF - #!/bin/sh - ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain} - EOF - chmod 700 /run/iodined/script - ''; - script = "/run/iodined/script"; - serviceConfig.RuntimeDirectory = [ "iodined" ]; + script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}"; }; }; From 30a56d72db90914272d023eb5ede7fb5d8c842fb Mon Sep 17 00:00:00 2001 From: gnidorah Date: Wed, 28 Mar 2018 09:13:09 +0300 Subject: [PATCH 0246/2743] hans: rename option --- nixos/modules/services/networking/hans.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index 4579154d78fa..56c30a6b96e1 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -76,10 +76,10 @@ in example = "198.51.100.0"; }; - systemPings = mkOption { + respondToSystemPings = mkOption { type = types.bool; default = false; - description = "Respond to ordinary pings"; + description = "Force hans respond to ordinary pings"; }; extraConfig = mkOption { @@ -102,7 +102,7 @@ in ### implementation config = mkIf (cfg.server.enable || cfg.clients != {}) { - boot.kernel.sysctl = optionalAttrs cfg.server.systemPings { + boot.kernel.sysctl = optionalAttrs cfg.server.respondToSystemPings { "net.ipv4.icmp_echo_ignore_all" = 1; }; @@ -131,7 +131,7 @@ in description = "hans, ip over icmp server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; }; }; From dff672ec7c3044928c838e973e4e82fe212f7e2c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 19 Mar 2018 16:43:03 +0100 Subject: [PATCH 0247/2743] paraview: include numpy in python environment The Python filter functionality in Paraview requires numpy, which is currently not included. Changes are based on the discussion in issue #37118. --- .../graphics/paraview/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 42b69e249267..e5385c752804 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,5 +1,5 @@ { -stdenv, fetchFromGitHub, cmake +stdenv, fetchFromGitHub, cmake, makeWrapper ,qtbase, qttools, python, libGLU_combined ,libXt, qtx11extras, qtxmlpatterns }: @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = [ - "-DPARAVIEW_ENABLE_PYTHON=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" - ]; + cmakeFlags = [ + "-DPARAVIEW_ENABLE_PYTHON=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" + "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by @@ -35,10 +35,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + makeWrapper ]; buildInputs = [ python + python.pkgs.numpy libGLU_combined libXt qtbase @@ -47,6 +49,16 @@ stdenv.mkDerivation rec { qtxmlpatterns ]; + # Paraview links into the Python library, resolving symbolic links on the way, + # so we need to put the correct sitePackages (with numpy) back on the path + postInstall = '' + wrapProgram $out/bin/paraview \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvbatch \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + wrapProgram $out/bin/pvpython \ + --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + ''; meta = { homepage = http://www.paraview.org/; From 0402877344a80eae04073fa3d8ddb8906977d100 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 15:40:48 +0300 Subject: [PATCH 0248/2743] systemd: disable EFI support on AArch64 It seemingly isn't used by NixOS and currently breaks AArch64 build. --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0bb9f509b38a..d815203f8450 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" From 8d0f47098464a9241c97a2c7c6dceb16a5e2cec4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:23:28 +0300 Subject: [PATCH 0249/2743] kvfb: fix build --- pkgs/applications/kde/krfb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index d6de25215339..d2b96bf6100e 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kdelibs4support, kdnssd, libvncserver, libXtst, qtx11extras + kdelibs4support, kdnssd, libvncserver, libXtst, libXdamage, qtx11extras }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { maintainers = with lib.maintainers; [ jerith666 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libvncserver libXtst qtx11extras ]; + buildInputs = [ libvncserver libXtst libXdamage qtx11extras ]; propagatedBuildInputs = [ kdelibs4support kdnssd ]; } From 7fec6c8cd3e9e1d6d014f95e95b40e74b969c082 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:23:32 +0300 Subject: [PATCH 0250/2743] weston: fix build --- 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..0a5e601b012d 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wayland, libGLU_combined, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - wayland libGLU_combined libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva libwebp wayland-protocols ]; From 133c5cee4474c7449abd3b792d10092578df3b55 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:23:42 +0300 Subject: [PATCH 0251/2743] enlightenment.efl: fix build --- pkgs/desktops/enlightenment/efl.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 190ee6c3574e..6fca4c84c53f 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig -, fribidi, SDL2, SDL, libGLU_combined, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio +, fribidi, SDL2, SDL, libGL, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp -, curl, libinput, systemd, writeText +, curl, libinput, systemd, mesa_noglu, writeText }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGLU_combined + buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev systemd ]; From 7d9969cb514d02245d1e7630a7c3d078c00af821 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:23:48 +0300 Subject: [PATCH 0252/2743] lumina: fix build --- pkgs/desktops/lumina/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 0ada9af3b5e0..7563e3447504 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libxcb + xorg.libXdamage xorg.xcbutilwm xorg.xcbutilimage qtbase From e86ca6181525aaf8d22972de2f99c661e354f75c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:24:02 +0300 Subject: [PATCH 0253/2743] lxqt.lxqt-panel: fix build --- pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index 77a49410bb60..9a8e6e7a5ca9 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -4,7 +4,7 @@ qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data, pcre + lxmenu-data, pcre, libXdamage }: stdenv.mkDerivation rec { @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { menu-cache lxmenu-data pcre + libXdamage ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; From c6a3380445236e720030d27f06a956400325a48d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:24:15 +0300 Subject: [PATCH 0254/2743] kdeApplications.kgamma5: fix build --- pkgs/desktops/plasma-5/kgamma5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index ea58cad12ae0..ccbf3820b908 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,11 +1,11 @@ { mkDerivation, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtx11extras, + kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm }: mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ]; + buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; } From 9bcc905edafc3fce3e6cf14aa06cf1a8393a885b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:24:26 +0300 Subject: [PATCH 0255/2743] wlc: fix build --- pkgs/development/libraries/wlc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 846e710b0a48..a672bbf52a90 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus_libs, wayland-protocols -, libpthreadstubs, libXdmcp, libXext +, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu +, libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL - libX11 dbus_libs wayland-protocols - libpthreadstubs libXdmcp libXext ] + libX11 libXfixes dbus_libs wayland-protocols + libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; From 8330fdaa09b68f3104389691a412756832c63137 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:24:33 +0300 Subject: [PATCH 0256/2743] wlroots: fix build --- pkgs/development/libraries/wlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 3fdaeb824382..3349506c5754 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors +, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu }: let pname = "wlroots"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors + xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu ]; # Install rootston (the reference compositor) to $bin From e47482ddfe6836e265097f247fe1f710ae842432 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:24:39 +0300 Subject: [PATCH 0257/2743] mar1d: fix build --- pkgs/games/mar1d/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 9e1e512d711e..dce52d4c2957 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.libXi xorg.xinput + xorg.libXxf86vm ]; preConfigure = '' From 82712d2d0bbfa501736488c106dea7a3dd16783f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:24:46 +0300 Subject: [PATCH 0258/2743] kmscube: fix build --- pkgs/os-specific/linux/kmscube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 2fb4fe93cc81..27ffaca61e71 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa_noglu, pkgconfig }: stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libdrm libX11 libGL ]; + buildInputs = [ libdrm libX11 libGL mesa_noglu ]; meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; From 7998c18a7ba6c1a2d2a3b88cf787ef331533305b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:24:55 +0300 Subject: [PATCH 0259/2743] xwinmosaic: fix build --- pkgs/tools/X11/xwinmosaic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index e36808db0b8c..b6b87fffb47b 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, gtk2, cmake, pkgconfig }: +{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ gtk2 ]; + buildInputs = [ gtk2 libXdamage ]; meta = { inherit version; From 5e7b710a717055ebccff14db7f6db4efd38de8ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 28 Mar 2018 16:25:00 +0300 Subject: [PATCH 0260/2743] glmark2: fix build --- pkgs/tools/graphics/glmark2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 8a75fea33ce8..43da52634e68 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGLU_combined, libdrm, - python27, wayland, libudev }: +{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, + python27, wayland, libudev, mesa_noglu }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGLU_combined libdrm python27 wayland libudev + libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu ]; buildPhase = '' From fbe8deb2827759f459815da3f06e0e3353019cb8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 28 Mar 2018 12:31:40 -0400 Subject: [PATCH 0261/2743] ghc: Use persistent URL for abi-depends determinism patch. --- pkgs/development/compilers/ghc/abi-depends-determinism.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix index afa272d03a8e..bc803b74617f 100644 --- a/pkgs/development/compilers/ghc/abi-depends-determinism.nix +++ b/pkgs/development/compilers/ghc/abi-depends-determinism.nix @@ -2,8 +2,10 @@ # cached abi-depends fields in package databases, modified to only # contain hunks that exist in distribution tarballs. { fetchpatch, runCommand }: let - base = fetchpatch { # Non-determinism in cached abi-depends fields - url = https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff; + base = fetchpatch rec { # Non-determinism in cached abi-depends fields + # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D4159.diff"; sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; }; in runCommand base.name {} From f8d38c31aef63ce5629048b10fc52e2cd23e0f4b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 28 Mar 2018 12:40:44 -0400 Subject: [PATCH 0262/2743] binutils: Add comment about the limited lifetime of gold-symbol-visibility.patch --- pkgs/development/tools/misc/binutils/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index ec0a5b4e9eb1..5c88902a68c4 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -5,6 +5,9 @@ }: let + # Remove gold-symbol-visibility patch when updating, the proper fix + # is now upstream. + # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 version = "2.30"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; From f2d6702e20177a02329e94dfee5fda101c93bfb7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 28 Mar 2018 21:40:53 +0300 Subject: [PATCH 0263/2743] perlPackages.YAMLLibYAML: Remove obsolete build fix Commit 4270c5c7be22576b37b6a6411e0f294ebfdbcb82 added this hunk which apparently is making the build fail now. --- pkgs/top-level/perl-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7deb2330c9aa..e071cb4afde3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16533,9 +16533,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; sha256 = "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33"; }; - preBuild = '' - sed -i 's/FULLPERL *= "/FULLPERL = /' LibYAML/Makefile - ''; }; WebServiceLinode = buildPerlModule rec { From ceb66c90ef1580853bd1da1219b56060a674577a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Wed, 28 Mar 2018 10:17:20 -0700 Subject: [PATCH 0264/2743] bluez: 5.48 -> 5.49 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/bluez/versions. These checks were done: - built on NixOS - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl -h` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl --help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl -V` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl -v` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl --version` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl version` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl -h` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluetoothctl --help` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btmon -h` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btmon --help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btmon -v` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btmon --version` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bccmd -h` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bccmd --help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bccmd -V` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bccmd -v` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bccmd --version` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluemoon -h` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluemoon --help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluemoon -v` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/bluemoon --version` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/hex2hcd -h` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/hex2hcd --help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/hex2hcd help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/hex2hcd -v` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/hex2hcd --version` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/mpris-proxy -h` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/mpris-proxy --help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/mpris-proxy -v` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/mpris-proxy --version` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btattach -h` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btattach --help` got 0 exit code - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btattach -v` and found version 5.49 - ran `/nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49/bin/btattach --version` and found version 5.49 - found 5.49 with grep in /nix/store/il6jjsm4s96wn87y7jalbsasnh70f2gx-bluez-5.49 - directory tree listing: https://gist.github.com/29a23518ac04729281c02f4a2e81e310 --- pkgs/os-specific/linux/bluez/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 62c3986569d0..a0c240dfd46c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.48"; + name = "bluez-5.49"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "140fjyxa2q4y35d9n52vki649jzb094pf71hxkkvlrpgf8q75a5r"; + sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k"; }; pythonPath = with pythonPackages; From e022366fb7e8a58d5dc07f8b19a087f76f3cc0c2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 28 Mar 2018 09:55:33 -0500 Subject: [PATCH 0265/2743] busybox: 1.28.1 -> 1.28.2 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index d4c4582ffb22..b4d4d93b1d5d 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.28.1"; + name = "busybox-1.28.2"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0bk52cxxlya5hg9va87snr9caz9ppdrpdyjwrnbwamhi64y1vzlq"; + sha256 = "03abp2n08xk32x8lhdinpxb8gk3faxjmgrv0xqw6ijbp12k98jmn"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; From da9b564bede5539a392576223805cf4399ffe640 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 28 Mar 2018 14:51:01 +0100 Subject: [PATCH 0266/2743] ppp: fix build with newer kernel headers The package would build but with some components missing, see https://github.com/NixOS/nixpkgs/issues/37926 and https://hydra.nixos.org/build/70939248/nixlog/1 -> CTRL-F error: --- pkgs/tools/networking/ppp/default.nix | 15 +++++++++++++++ pkgs/tools/networking/ppp/musl-fix-headers.patch | 10 +++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 570e85c32815..96016ee7b4f3 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -23,15 +23,30 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4"; sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh"; }) + (fetchurl { + url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; + sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; + }) ./musl-fix-headers.patch ]; buildInputs = [ libpcap ]; + postPatch = '' + # strip is not found when cross compiling with seemingly no way to point + # make to the right place, fixup phase will correctly strip + # everything anyway so we remove it from the Makefiles + for file in $(find -name Makefile.linux); do + substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)' + done + ''; + installPhase = '' + runHook preInstall mkdir -p $out/bin make install install -D -m 755 scripts/{pon,poff,plog} $out/bin + runHook postInstall ''; postFixup = '' diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch index d24f62896840..030cc97d157f 100644 --- a/pkgs/tools/networking/ppp/musl-fix-headers.patch +++ b/pkgs/tools/networking/ppp/musl-fix-headers.patch @@ -89,12 +89,12 @@ index 3d3bf4e..b5f82d3 100644 use different frame types... sigh... */ diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..4d68147 100644 +index c4aaa6e..70aef85 100644 --- a/pppd/plugins/rp-pppoe/pppoe.h +++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t; - - #include +@@ -88,18 +88,6 @@ typedef unsigned long UINT32_t; + #include + #endif -#ifdef HAVE_NETINET_IF_ETHER_H -#include @@ -108,9 +108,9 @@ index 9ab2eee..4d68147 100644 -#endif - - - /* Ethernet frame types according to RFC 2516 */ #define ETH_PPPOE_DISCOVERY 0x8863 + #define ETH_PPPOE_SESSION 0x8864 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index 6d71530..86d224e 100644 --- a/pppd/sys-linux.c From 166a6321249d32dc15a2d4dd56fad312fc0b0988 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Mar 2018 16:46:32 -0500 Subject: [PATCH 0267/2743] go: 1.9.4 -> 1.9.5 --- pkgs/development/compilers/go/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 47c1d1fdc951..829309f94268 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "15d9lfiy1cjfz6nqnig5884ykqckx58cynd1bva1xna7bwcwwp2r"; + sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; }; # perl is used for testing go vet From 1661c0b2c6140c583b4361e683a59dde43b946d5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Mar 2018 16:24:02 -0500 Subject: [PATCH 0268/2743] go: 1.10 -> 1.10.1 --- pkgs/development/compilers/go/1.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 1be94ba5c6ca..7ba547552907 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.10"; + version = "1.10.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l"; + sha256 = "1wqwy52ibb343a4v7b9q26xa6r5jk4khfxd90wbpcayws8cxly8m"; }; # perl is used for testing go vet From 01fb1af4f507a2249668d664575717d84b6c1d89 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 30 Mar 2018 01:07:06 +0200 Subject: [PATCH 0269/2743] libidn2: remove dependency on ronn This is only needed if built from the source repository, since we are using the release tarball the generated manpage is included. This removes the "wild" dependency on ruby very deep in the dependency tree. (util-linux -> systemd -> libidn2 -> ronn -> ruby) --- pkgs/development/libraries/libidn2/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index d375785e497e..46cb579c56c4 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./fix-error-darwin.patch; - nativeBuildInputs = [ ronn ] - ++ optional stdenv.isDarwin help2man; + nativeBuildInputs = optional stdenv.isDarwin help2man; buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv; depsBuildBuild = [ buildPackages.stdenv.cc ]; From cf45cfc58c20faa12c0a93c9c9b5328aa4cbdf4e Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Fri, 30 Mar 2018 08:08:29 +0200 Subject: [PATCH 0270/2743] 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 402a074cfe0d7855261e3dd84c829d8db3ab686e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 30 Mar 2018 08:16:37 +0200 Subject: [PATCH 0271/2743] python3: 3.6.4 -> 3.6.5 --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 63a70b7496db..cc8f6228f623 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "4"; + minorVersion = "5"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1fna7g8jxzl4kd2pqmmqhva5724c5m920x3fsrpsgskaylmr76qm"; + sha256 = "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 743e685d98f7c84da46a9648bea23f3194500f10 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 29 Mar 2018 17:03:17 -0700 Subject: [PATCH 0272/2743] isocodes: 3.74 -> 3.79 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/iso-codes/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.79 with grep in /nix/store/v3cwlccrh7g5m03wj8j7fhwc9xyrdj1q-iso-codes-3.79 - directory tree listing: https://gist.github.com/0636a62cebb498fde2d51579ff9c3e99 --- pkgs/development/libraries/iso-codes/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 7d07408236e6..4dfe190124b1 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, gettext, python3, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.74"; + name = "iso-codes-${version}"; + version = "3.79"; src = fetchurl { - url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11"; + url = "https://salsa.debian.org/iso-codes-team/iso-codes/uploads/ef8de8bc12e0512d26ed73436a477871/${name}.tar.xz"; + sha256 = "08i8hjy0qjlw9kd9i87jx967ihwh45l2xi55q1aa5265sind7byb"; }; patchPhase = '' for i in `find . -name \*.py` From 6dc900c06896168f1e93fb3952b5a37f2228d12a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 30 Mar 2018 05:57:01 -0400 Subject: [PATCH 0273/2743] libatomic_ops: 7.6.2 -> 7.6.4. Inspired by #38083. Closes #38083. --- .../libraries/libatomic_ops/default.nix | 7 +--- .../libraries/libatomic_ops/riscv.patch | 40 ------------------- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/libatomic_ops/riscv.patch diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 04cf1c1e696e..fde8a06eb416 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,21 +2,18 @@ stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; - version = "7.6.2"; + version = "7.6.4"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 ="1rif2hjscq5mh639nsnjhb90c01gnmy1sbmj6x6hsn1xmpnj95r1"; + sha256 = "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv"; }; outputs = [ "out" "dev" "doc" ]; - # https://github.com/ivmai/libatomic_ops/pull/32 - patches = if hostPlatform.isRiscV then [ ./riscv.patch ] else null; - nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; preConfigure = stdenv.lib.optionalString stdenv.isCygwin '' diff --git a/pkgs/development/libraries/libatomic_ops/riscv.patch b/pkgs/development/libraries/libatomic_ops/riscv.patch deleted file mode 100644 index 27f2408c34c6..000000000000 --- a/pkgs/development/libraries/libatomic_ops/riscv.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur libatomic_ops-7.6.2-orig/src/atomic_ops/sysdeps/gcc/riscv.h libatomic_ops-7.6.2/src/atomic_ops/sysdeps/gcc/riscv.h ---- libatomic_ops-7.6.2-orig/src/atomic_ops/sysdeps/gcc/riscv.h 1969-12-31 19:00:00.000000000 -0500 -+++ libatomic_ops-7.6.2/src/atomic_ops/sysdeps/gcc/riscv.h 2018-02-18 00:48:53.581721375 -0500 -@@ -0,0 +1 @@ -+#include "generic.h" -diff -Naur libatomic_ops-7.6.2-orig/src/atomic_ops.h libatomic_ops-7.6.2/src/atomic_ops.h ---- libatomic_ops-7.6.2-orig/src/atomic_ops.h 2017-12-24 03:31:12.000000000 -0500 -+++ libatomic_ops-7.6.2/src/atomic_ops.h 2018-02-18 00:48:53.580721359 -0500 -@@ -352,6 +352,9 @@ - # if defined(__tile__) - # include "atomic_ops/sysdeps/gcc/tile.h" - # endif -+# if defined(__riscv) -+# include "atomic_ops/sysdeps/gcc/riscv.h" -+# endif - #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */ - - #if (defined(__IBMC__) || defined(__IBMCPP__)) && !defined(__GNUC__) \ -diff -Naur libatomic_ops-7.6.2-orig/src/Makefile.am libatomic_ops-7.6.2/src/Makefile.am ---- libatomic_ops-7.6.2-orig/src/Makefile.am 2017-12-24 03:31:12.000000000 -0500 -+++ libatomic_ops-7.6.2/src/Makefile.am 2018-02-18 00:48:53.579721342 -0500 -@@ -92,6 +92,7 @@ - atomic_ops/sysdeps/gcc/mips.h \ - atomic_ops/sysdeps/gcc/nios2.h \ - atomic_ops/sysdeps/gcc/powerpc.h \ -+ atomic_ops/sysdeps/gcc/riscv.h \ - atomic_ops/sysdeps/gcc/s390.h \ - atomic_ops/sysdeps/gcc/sh.h \ - atomic_ops/sysdeps/gcc/sparc.h \ -diff -Naur libatomic_ops-7.6.2-orig/src/Makefile.in libatomic_ops-7.6.2/src/Makefile.in ---- libatomic_ops-7.6.2-orig/src/Makefile.in 2017-12-24 03:32:23.000000000 -0500 -+++ libatomic_ops-7.6.2/src/Makefile.in 2018-02-18 00:49:14.005062121 -0500 -@@ -446,6 +446,7 @@ - atomic_ops/sysdeps/gcc/mips.h \ - atomic_ops/sysdeps/gcc/nios2.h \ - atomic_ops/sysdeps/gcc/powerpc.h \ -+ atomic_ops/sysdeps/gcc/riscv.h \ - atomic_ops/sysdeps/gcc/s390.h \ - atomic_ops/sysdeps/gcc/sh.h \ - atomic_ops/sysdeps/gcc/sparc.h \ From 1f1ab16e42e55ebacfbd070bdfd99d676b7bd867 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 30 Mar 2018 12:48:36 +0200 Subject: [PATCH 0274/2743] gtk-doc: 1.27 -> 1.28 --- pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5414abff66ae..a52afd6c39ad 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation rec { name = "gtk-doc-${version}"; - version = "1.27"; + version = "1.28"; src = fetchurl { url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz"; - sha256 = "0vwsdl61nvnmqswlz5j9m4hg7qirhazwcikcnqf9nx0c13vx6sz2"; + sha256 = "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"; }; patches = [ From 5b8455c338b1e1f0aac71e77307ad1140636d2e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Mar 2018 08:52:21 -0700 Subject: [PATCH 0275/2743] vim: 8.0.1605 -> 8.0.1655 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/vim/versions. These checks were done: - built on NixOS - ran `/nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655/bin/vim -h` got 0 exit code - ran `/nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655/bin/vim --help` got 0 exit code - ran `/nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655/bin/vim --version` and found version 8.0.1655 - found 8.0.1655 with grep in /nix/store/j6w96w36f0naab7fffqri1cmspaa3mnb-vim-8.0.1655 - directory tree listing: https://gist.github.com/b65f9cb4045c205c8c3ee68503c42596 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 00b2b23c6f47..5b4f631987f2 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.1605"; + version = "8.0.1655"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0a8zf43q806py14vq1frm350wycn47cmanj1hn1i7bqx1gdgcal9"; + sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1"; }; enableParallelBuilding = true; From 3f36f6095fef0b83b9e8f5fc9d0b8ad42dfccaa6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Mar 2018 08:05:41 -0700 Subject: [PATCH 0276/2743] zziplib: 0.13.68 -> 0.13.69 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/zziplib/versions. These checks were done: - built on NixOS - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat -h` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzdir --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzdir --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat -h` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxordir -h` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxordir --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxordir --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcopy -h` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcopy --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcopy --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip -v` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mix --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mix -v` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mix --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mem --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mem -v` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mem --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-big --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-big -v` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-big --version` and found version 0.13.69 - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzip-mem -h` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzip-mem --help` got 0 exit code - ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzip-mem --version` and found version 0.13.69 - found 0.13.69 with grep in /nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69 - directory tree listing: https://gist.github.com/fec112f9114c98b118a59917224af5ff --- pkgs/development/libraries/zziplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index d43c481c8597..b59cb47eae57 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zziplib-${version}"; - version = "0.13.68"; + version = "0.13.69"; src = fetchurl { url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"; - sha256 = "0chhl6m02562z6c4hjy568mh11pbq2qngw6g2x924ajr8sdr2q4l"; + sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; }; postPatch = '' From 9dbd4ec0f3eee901ef84a9be643e0d5b5113e309 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 23:01:12 -0700 Subject: [PATCH 0277/2743] mercurial: 4.5 -> 4.5.2 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/hg -h` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/hg --help` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/hg help` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/hg --version` and found version 4.5.2 - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/hg version` and found version 4.5.2 - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/..hg-wrapped-wrapped -h` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/..hg-wrapped-wrapped --help` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/..hg-wrapped-wrapped help` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/..hg-wrapped-wrapped --version` and found version 4.5.2 - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/..hg-wrapped-wrapped version` and found version 4.5.2 - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/.hg-wrapped -h` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/.hg-wrapped --help` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/.hg-wrapped help` got 0 exit code - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/.hg-wrapped --version` and found version 4.5.2 - ran `/nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2/bin/.hg-wrapped version` and found version 4.5.2 - found 4.5.2 with grep in /nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2 - found 4.5.2 in filename of file in /nix/store/vr3mxrjhmmpqydkd69z3fdc7qjdsafgz-mercurial-4.5.2 - directory tree listing: https://gist.github.com/7a681b5af1e240918913ffd718e9b3e9 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 68750bb9e6e7..a00393abf270 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.5"; + version = "4.5.2"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "0rgjy42zdlbzgp4qq49amzplfcvycyijf4kdhc5wk3fqz7cki4sd"; + sha256 = "14732hhw2ibvy5khqxjc8a983z3rib5vp9lqfbws80lm3kyryjm4"; }; inherit python; # pass it so that the same version can be used in hg2git From a283292df03fc638320ba1ba25027ad4c88125f3 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 15 Mar 2018 10:42:56 -0700 Subject: [PATCH 0278/2743] tortoisehg: 4.5 -> 4.5.2 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/.thg-wrapped -h` got 0 exit code - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/.thg-wrapped --help` got 0 exit code - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/.thg-wrapped help` got 0 exit code - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/.thg-wrapped version` and found version 4.5.2 - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/thg -h` got 0 exit code - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/thg --help` got 0 exit code - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/thg help` got 0 exit code - ran `/nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2/bin/thg version` and found version 4.5.2 - found 4.5.2 with grep in /nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2 - found 4.5.2 in filename of file in /nix/store/zffgxhajwm899w5ybwhr35j16xbx6lh7-tortoisehg-4.5.2 --- pkgs/applications/version-management/tortoisehg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 437062f7f5e1..3f33410f1b1b 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.5"; + version = "4.5.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk"; + sha256 = "0q12zjpgafdch4ns31k4afy25g837xm7v2qwj62806l2dz4rm4h9"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; From 38f7daebdb3b51ef977b5a4ac21e2dd38b96f0b8 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 30 Mar 2018 22:40:36 +0100 Subject: [PATCH 0279/2743] 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 2367250cfb8debb11389a742865acc85fee486b1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 28 Mar 2018 13:35:42 -0500 Subject: [PATCH 0280/2743] libglvnd: patch from upstream for libdl --- pkgs/development/libraries/libglvnd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 3740fd5569ad..4bc1d1addcfb 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: let driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; @@ -22,6 +22,13 @@ in stdenv.mkDerivation rec { "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ]; + # Upstream patch fixing use of libdl, should be in next release. + patches = [ + (fetchpatch { + url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; + sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; + }) + ]; outputs = [ "out" "dev" ]; passthru = { inherit driverLink; }; From 462ab6d9dec5e43eabdfd44f094bea16333c9358 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 27 Mar 2018 21:16:33 -0500 Subject: [PATCH 0281/2743] icewm: rename strlcat/strlcpy to avoid conflicts, patch to fix w/musl --- .../window-managers/icewm/default.nix | 5 + .../icewm/fix-strlcat_strlcpy.patch | 236 ++++++++++++++++++ .../window-managers/icewm/musl.patch | 23 ++ 3 files changed, 264 insertions(+) create mode 100644 pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch create mode 100644 pkgs/applications/window-managers/icewm/musl.patch diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ffd1d995e87b..67189a88570d 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm" ''; + patches = [ ./fix-strlcat_strlcpy.patch ] ++ + stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch; + + patchFlags = [ "-p0" ]; + meta = { description = "A simple, lightweight X window manager"; longDescription = '' diff --git a/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch b/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch new file mode 100644 index 000000000000..9721e125b051 --- /dev/null +++ b/pkgs/applications/window-managers/icewm/fix-strlcat_strlcpy.patch @@ -0,0 +1,236 @@ +--- src/apppstatus.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/apppstatus.cc 2017-08-09 09:12:54.332052762 +0200 +@@ -366,7 +366,7 @@ + sscanf(p, "%s %s %s %s %s", val[0], val[1], val[2], val[3], val[4]); + for (i = 0; i < 4; i++) { + if (strncmp(val[i+1], "?", 1) != 0) +- strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); ++ my_strlcpy(phoneNumber, val[i+1], sizeof phoneNumber); + } + } + +--- src/base.h 2017-07-30 10:59:06.000000000 +0200 ++++ src/base.h 2017-08-09 09:11:13.082025484 +0200 +@@ -44,9 +44,9 @@ + /*** String Functions *********************************************************/ + + /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ +-size_t strlcpy(char *dest, const char *from, size_t dest_size); ++size_t my_strlcpy(char *dest, const char *from, size_t dest_size); + /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ +-size_t strlcat(char *dest, const char *from, size_t dest_size); ++size_t my_strlcat(char *dest, const char *from, size_t dest_size); + + char *newstr(char const *str); + char *newstr(char const *str, int len); +--- src/gnome2.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/gnome2.cc 2017-08-09 09:11:21.819027846 +0200 +@@ -158,8 +158,8 @@ + const int plen = strlen(fPath); + + char tmp[256]; +- strlcpy(tmp, fPath, sizeof tmp); +- strlcat(tmp, "/.directory", sizeof tmp); ++ my_strlcpy(tmp, fPath, sizeof tmp); ++ my_strlcat(tmp, "/.directory", sizeof tmp); + + if (isDir && !stat(tmp, &sb)) { // looks like kde/gnome1 style + +@@ -279,8 +279,8 @@ + + while ((file = readdir(dir)) != NULL) { + char fullpath[256]; +- strlcpy(fullpath, dirname, sizeof fullpath); +- strlcat(fullpath, file->d_name, sizeof fullpath); ++ my_strlcpy(fullpath, dirname, sizeof fullpath); ++ my_strlcat(fullpath, file->d_name, sizeof fullpath); + GnomeDesktopItem *ditem = + gnome_desktop_item_new_from_file(fullpath, + (GnomeDesktopItemLoadFlags)0, +--- src/icehelp.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icehelp.cc 2017-08-09 09:11:31.490030459 +0200 +@@ -1790,8 +1790,8 @@ + const size_t size = 9 + strlen(cfmt) + strlen(cstr) + strlen(crea); + char *cbuf = (char *)malloc(size); + snprintf(cbuf, size, cfmt, cstr); +- strlcat(cbuf, ":\n ", size); +- strlcat(cbuf, crea, size); ++ my_strlcat(cbuf, ":\n ", size); ++ my_strlcat(cbuf, crea, size); + + node *root = new node(node::div); + flist nodes(root); +--- src/icesm.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icesm.cc 2017-08-09 09:13:12.946057758 +0200 +@@ -28,10 +28,10 @@ + wordexp_t w; + if (wordexp(trim(buf), &w, 0) != 0 || w.we_wordc == 0) + return false; +- size_t len = strlcpy(buf, trim(w.we_wordv[0]), bufsiz); ++ size_t len = my_strlcpy(buf, trim(w.we_wordv[0]), bufsiz); + for (size_t k = 1; k < w.we_wordc && len < bufsiz; ++k) { +- strlcat(buf, " ", bufsiz); +- len = strlcat(buf, trim(w.we_wordv[k]), bufsiz); ++ my_strlcat(buf, " ", bufsiz); ++ len = my_strlcat(buf, trim(w.we_wordv[k]), bufsiz); + } + wordfree(&w); + if (len >= bufsiz) +@@ -39,7 +39,7 @@ + #else + char *str = trim(buf); + if (str > buf) +- strlcpy(buf, str, bufsiz); ++ my_strlcpy(buf, str, bufsiz); + #endif + if (buf[0] == '#' || buf[0] == '=') + buf[0] = 0; +--- src/icesound.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/icesound.cc 2017-08-09 09:11:26.686029161 +0200 +@@ -145,8 +145,8 @@ + char * findSample(int sid) { + char basefname[1024]; + +- strlcpy(basefname, gui_events[sid].name, sizeof basefname); +- strlcat(basefname, ".wav", sizeof basefname); ++ my_strlcpy(basefname, gui_events[sid].name, sizeof basefname); ++ my_strlcat(basefname, ".wav", sizeof basefname); + + return findSample(basefname); + } +--- src/misc.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/misc.cc 2017-08-09 09:13:39.372064834 +0200 +@@ -448,7 +448,7 @@ + #endif + + /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ +-size_t strlcpy(char *dest, const char *from, size_t dest_size) ++size_t my_strlcpy(char *dest, const char *from, size_t dest_size) + { + const char *in = from; + if (dest_size > 0) { +@@ -463,12 +463,12 @@ + } + + /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ +-size_t strlcat(char *dest, const char *from, size_t dest_size) ++size_t my_strlcat(char *dest, const char *from, size_t dest_size) + { + char *to = dest; + char *const stop = to + dest_size - 1; + while (to < stop && *to) ++to; +- return to - dest + strlcpy(to, from, dest_size - (to - dest)); ++ return to - dest + my_strlcpy(to, from, dest_size - (to - dest)); + } + + char *newstr(char const *str) { +--- src/strtest.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/strtest.cc 2017-08-09 09:13:24.395060823 +0200 +@@ -286,63 +286,63 @@ + strtest tester("strlc"); + char d[10] = "@"; + size_t n; +- n = strlcpy(d, "", 0); ++ n = my_strlcpy(d, "", 0); + sequal(d, "@"); + assert(d, n == 0); + +- n = strlcpy(d, "a", 0); ++ n = my_strlcpy(d, "a", 0); + sequal(d, "@"); + assert(d, n == 1); + +- n = strlcpy(d, "", 1); ++ n = my_strlcpy(d, "", 1); + sequal(d, ""); + assert(d, n == 0); + +- n = strlcpy(d, "a", 1); ++ n = my_strlcpy(d, "a", 1); + sequal(d, ""); + assert(d, n == 1); + +- n = strlcpy(d, "a", 2); ++ n = my_strlcpy(d, "a", 2); + sequal(d, "a"); + assert(d, n == 1); + +- n = strlcpy(d, "ab", 2); ++ n = my_strlcpy(d, "ab", 2); + sequal(d, "a"); + assert(d, n == 2); + +- n = strlcpy(d, "ab", 3); ++ n = my_strlcpy(d, "ab", 3); + sequal(d, "ab"); + assert(d, n == 2); + +- n = strlcpy(d, "abc", sizeof d); ++ n = my_strlcpy(d, "abc", sizeof d); + sequal(d, "abc"); + assert(d, n == 3); + +- n = strlcat(d, "def", 4); ++ n = my_strlcat(d, "def", 4); + sequal(d, "abc"); + assert(d, n == 6); + +- n = strlcat(d, "def", sizeof d); ++ n = my_strlcat(d, "def", sizeof d); + sequal(d, "abcdef"); + assert(d, n == 6); + +- n = strlcat(d, "ghijkl", sizeof d); ++ n = my_strlcat(d, "ghijkl", sizeof d); + sequal(d, "abcdefghi"); + assert(d, n == 12); + +- n = strlcpy(d, "123", sizeof d); ++ n = my_strlcpy(d, "123", sizeof d); + sequal(d, "123"); + assert(d, n == 3); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, "23"); + assert(d, n == 2); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, "3"); + assert(d, n == 1); + +- n = strlcpy(d, d + 1, sizeof d); ++ n = my_strlcpy(d, d + 1, sizeof d); + sequal(d, ""); + assert(d, n == 0); + } +@@ -418,7 +418,7 @@ + while (a.next()) { + const char *e = a.entry(); + assert(e, strcoll(buf, e) < 0); +- strlcpy(buf, e, sizeof buf); ++ my_strlcpy(buf, e, sizeof buf); + } + assert(buf, strcoll(buf, "~~~~~~~~~") < 0); + } +@@ -437,7 +437,7 @@ + cstring c(s.entry()); + const char *e = c.c_str(); + assert(e, strcoll(buf, e) < 0); +- strlcpy(buf, e, sizeof buf); ++ my_strlcpy(buf, e, sizeof buf); + } + assert(buf, strcoll(buf, "~~~~~~~~~") < 0); + } +--- src/udir.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/udir.cc 2017-08-09 09:13:28.346061883 +0200 +@@ -66,7 +66,7 @@ + if (impl) { + DirPtr dirp(impl); + if (dirp.next()) { +- strlcpy(fEntry, dirp.name(), sizeof fEntry); ++ my_strlcpy(fEntry, dirp.name(), sizeof fEntry); + return true; + } + } diff --git a/pkgs/applications/window-managers/icewm/musl.patch b/pkgs/applications/window-managers/icewm/musl.patch new file mode 100644 index 000000000000..e7d18e312874 --- /dev/null +++ b/pkgs/applications/window-managers/icewm/musl.patch @@ -0,0 +1,23 @@ +--- src/ylocale.cc 2017-07-30 10:59:06.000000000 +0200 ++++ src/ylocale.cc 2017-08-09 08:15:50.938841549 +0200 +@@ -55,6 +55,8 @@ + int const codesetItems[] = { + #ifdef CONFIG_NL_CODESETS + CONFIG_NL_CODESETS ++#elif !defined(__GLIBC__) ++ CODESET, 0 + #else + CODESET, _NL_CTYPE_CODESET_NAME, 0 + #endif +--- src/globit.c 2017-07-30 10:59:06.000000000 +0200 ++++ src/globit.c 2017-08-09 08:17:18.691824584 +0200 +@@ -143,7 +143,9 @@ + } else if (*pattern == '~') { + /* yes, tilde */ + is_absolute = 2; ++#if defined(__GLIBC__) + glob_flags |= GLOB_TILDE; ++#endif + /* any slash in the pattern? */ + while (*cp && *cp != '/') + ++cp; From 09eaddf4eb5aa9abef4e0326ec60f8f6a82c6c7e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Mar 2018 22:24:03 -0500 Subject: [PATCH 0282/2743] sddm: add missing include for gettimeofday, fix w/musl --- pkgs/applications/display-managers/sddm/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index a7e8799c9c1c..a41f917a7ec2 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -22,6 +22,10 @@ in mkDerivation rec { # Module Qt5::Test must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|' + '' + # Fix missing include for gettimeofday() + + '' + sed -e '1i#include ' -i src/helper/HelperApp.cpp ''; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; From a3df96b38176b392c5bc175cbdb2863969005279 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Mar 2018 23:14:09 -0500 Subject: [PATCH 0283/2743] powertop: patch for musl --- pkgs/os-specific/linux/powertop/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 7679262a9899..5ec708dd69fd 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: +{ stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { name = "powertop-${version}"; @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( + fetchpatch { + name = "strerror_r.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; + sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; + } + ); + postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" From ddd10e0836ba3f16f3d28cec8da929157154600a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Mar 2018 22:27:53 -0500 Subject: [PATCH 0284/2743] nixos testing: significantly reduce deps needed for OCR tests Instead of imagemagick built with many libraries (notably librsvg which these days requires rust) use imagemagick_light with support for libtiff added. --- nixos/lib/testing.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index d990a5f8b6ac..57acc990a48f 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -111,6 +111,8 @@ in rec { ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; }; + imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; + # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. @@ -128,7 +130,7 @@ in rec { wrapProgram $out/bin/nixos-test-driver \ --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \ + "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ --run "export testScript=\"\$(cat $out/test-script)\"" \ --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms From e3a91b050bfb227ce0643518c78931a99cd65f1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 00:23:07 -0700 Subject: [PATCH 0285/2743] 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 0286/2743] 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 c40d1d80ac94c73454f030d1cc309e25ce9365c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 05:45:50 -0700 Subject: [PATCH 0287/2743] libdrm: 2.4.90 -> 2.4.91 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdrm/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.4.91 with grep in /nix/store/rff4bpz0j9w5fgxsd5qq1vdv5wpdlwxy-libdrm-2.4.91 - directory tree listing: https://gist.github.com/c13751993f64b3543f93979f9450e5d1 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3eb7325132a8..82307e9ab163 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.90"; + name = "libdrm-2.4.91"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b"; + sha256 = "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3"; }; outputs = [ "out" "dev" "bin" ]; From 73b1c9cfb5d5eec99b8ededec42edbaad6ddf5f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 12:15:59 -0700 Subject: [PATCH 0288/2743] automake: 1.16 -> 1.16.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/automake/versions. These checks were done: - built on NixOS - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake --help` got 0 exit code - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake --version` and found version 1.16.1 - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake --help` and found version 1.16.1 - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/aclocal --help` got 0 exit code - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/aclocal --version` and found version 1.16.1 - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake-1.16 --help` got 0 exit code - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake-1.16 --version` and found version 1.16.1 - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake-1.16 --help` and found version 1.16.1 - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/aclocal-1.16 --help` got 0 exit code - ran `/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/aclocal-1.16 --version` and found version 1.16.1 - found 1.16.1 with grep in /nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1 - found 1.16.1 in filename of file in /nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1 - directory tree listing: https://gist.github.com/7557568756588aab7da2228ba50c2261 --- pkgs/development/tools/misc/automake/automake-1.16.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 43efcf462800..affc400a9ed0 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.16"; + name = "automake-1.16.1"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr"; + sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; }; nativeBuildInputs = [ autoconf 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 0289/2743] 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 2e70f7a9e05423cf6b65bac461037193eb9fc78b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 1 Apr 2018 13:48:13 +0200 Subject: [PATCH 0290/2743] python: pytest: 3.4.1 -> 3.4.2 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7288ad0332b5..71696085b094 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,7 +2,7 @@ , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k }: buildPythonPackage rec { - version = "3.4.1"; + version = "3.4.2"; pname = "pytest"; preCheck = '' @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9ddcb879c8cc859d2540204b5399011f842e5e8823674bf429f70ada281b3cc6"; + sha256 = "1idq7s8da2p82ynf9fcg77rzj1dsagg3bpsrlslf31x7q4vasyqi"; }; checkInputs = [ hypothesis ]; From 00ffbc4b8c97072a414ce47ad7c66d5d7d9cc3c5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 16 Mar 2018 11:11:43 -0700 Subject: [PATCH 0291/2743] fluidsynth: 1.1.9 -> 1.1.10 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth -h` got 0 exit code - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth --help` got 0 exit code - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth help` got 0 exit code - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth -V` and found version 1.1.10 - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth -v` and found version 1.1.10 - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth --version` and found version 1.1.10 - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth version` and found version 1.1.10 - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth -h` and found version 1.1.10 - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth --help` and found version 1.1.10 - ran `/nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10/bin/fluidsynth help` and found version 1.1.10 - found 1.1.10 with grep in /nix/store/23kh3gax6a023mi2r3q31fd1mixa1k14-fluidsynth-1.1.10 - directory tree listing: https://gist.github.com/fbd821b325f18bdbc65812caeb1e0ecc --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 789ee35f260e..27ca539850e2 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q"; + sha256 = "04jlgq1d1hd8r9cnmkl3lgf1fgm7kgy4hh9nfddap41fm1wp121p"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 75f79581736c4f233fcca354118479c5a4f4ecdd Mon Sep 17 00:00:00 2001 From: DJP Date: Sun, 1 Apr 2018 18:10:05 -0400 Subject: [PATCH 0292/2743] 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 0293/2743] 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 0294/2743] 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 d1dfe27ad9d4e7acb4c3ba6382e4526b33ed3552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Mon, 2 Apr 2018 11:54:58 +0000 Subject: [PATCH 0295/2743] darwin.opencflite: fix build --- pkgs/os-specific/darwin/opencflite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 09a346e4446d..960e0677da1e 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; }; - configureFlags = [ "--with-uuid=${libuuid}" ]; + configureFlags = [ "--with-uuid=${libuuid.dev}" ]; buildInputs = [ icu tzdata.dev ]; enableParallelBuilding = true; From 503f8efbcd2734eedaf3d0913dc4d1e5f7e89052 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Mar 2018 07:47:07 -0500 Subject: [PATCH 0296/2743] epoxy: explicitly search libGL path as fallback Don't rely on questionable impact of DT_RPATH on dlopen(). This is a bit of a messy subject, but probably the clearest reference to motivate *not* relying on how dlopen() behaves in the presence of RPATH or RUNPATH is the following: https://sourceware.org/ml/libc-hacker/2002-11/msg00011.html FWIW the dlopen() manpage only mentions the the RPATH and RUNPATH in the "executable file for the calling program"; no mention of the executable files for libraries-- this has been brought to the attention of the relevant parties and AFAICT nothing has been done. The best reference for glibc behavior is apparently to ... "try it and see". Luckily a generous soul did exactly that and reported the findings: https://www.spinics.net/lists/linux-man/msg02291.html Qt wrote on the subject a bit when they were bit by this, linking to the above articles (directly or indirectly). See: http://blog.qt.io/blog/2011/10/28/rpath-and-runpath/ -------- Since we know the path of libGL at build-time for libepoxy, there's a simple solution we can use to avoid all of this: simply teach libepoxy to explicitly look in the libGL path. This commit patches libepoxy to accomplish this, looking to "LIBGL_PATH" as a fallback if it cannot find the libraries otherwise. --------- This fixes use of libepoxy w/musl on NixOS! --- pkgs/development/libraries/epoxy/default.nix | 7 ++-- .../libraries/epoxy/libgl-path.patch | 35 +++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/epoxy/libgl-path.patch diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 81966f14a568..e0f8e9ff8c76 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -25,10 +25,9 @@ stdenv.mkDerivation rec { substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" ''; - # add libGL to rpath because libepoxy dlopen()s libEGL - postFixup = optionalString stdenv.isLinux '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libGL ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0 - ''; + patches = [ ./libgl-path.patch ]; + + NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; meta = { description = "A library for handling OpenGL function pointer management"; diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch new file mode 100644 index 000000000000..6f50b9d262b5 --- /dev/null +++ b/pkgs/development/libraries/epoxy/libgl-path.patch @@ -0,0 +1,35 @@ +From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 29 Mar 2018 07:21:02 -0500 +Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined. + +--- + src/dispatch_common.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/dispatch_common.c b/src/dispatch_common.c +index bc2fb94..776237b 100644 +--- a/src/dispatch_common.c ++++ b/src/dispatch_common.c +@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail) + pthread_mutex_lock(&api.mutex); + if (!*handle) { + *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL); ++#ifdef LIBGL_PATH ++ if (!*handle) { ++ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; ++ int l = snprintf(pathbuf, sizeof(pathbuf), "%s/%s", LIBGL_PATH, lib_name); ++ if (l < 0 || l >= sizeof(pathbuf)) { ++ // This really shouldn't happen ++ fprintf(stderr, "Error prefixing library pathname\n"); ++ exit(1); ++ } ++ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL); ++ } ++#endif + if (!*handle) { + if (exit_on_fail) { + fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); +-- +2.16.3 + From 162224942f6f8165d5fce36c1695cc7015e58178 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 2 Apr 2018 11:12:15 -0700 Subject: [PATCH 0297/2743] http-parser: 2.8.0 -> 2.8.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/http-parser/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/e3b01495c51d0693ee8c9d07b2b46ac5 --- pkgs/development/libraries/http-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index b17fc48c7e9a..5d4eae4e0639 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }: let - version = "2.8.0"; + version = "2.8.1"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "17a7k3nxv2p1sp2x5d89wr51vk770753vz6qnlp2gz7nkgwwcxvj"; + sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai"; }; patches = [ ./build-shared.patch ]; From cd9b6a56158eb5ea728e531c8c433cb597539ab2 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sat, 31 Mar 2018 17:52:03 +0200 Subject: [PATCH 0298/2743] prometheus: 2.1.0 -> 2.2.1 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 86218a57284f..081e2777b524 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -50,7 +50,7 @@ in rec { }; prometheus_2 = generic { - version = "2.1.0"; - sha256 = "01pbqfp43qrqcgyidyg2lw9jnjdrv140vnmqmm49z0vhlkxkwlvw"; + version = "2.2.1"; + sha256 = "1zwxjmj8jh02i4y3i3zrkz7ml66zyhg3ad1npjzf3319mglsp7ch"; }; } From b34d6f90b1b15b3a43687ded0d3a22d57787d23c Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Mon, 2 Apr 2018 16:43:48 +0200 Subject: [PATCH 0299/2743] prometheus: actually run tests as remarked in #36782 --- pkgs/servers/monitoring/prometheus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 081e2777b524..3287bc6f2583 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -17,7 +17,7 @@ let inherit sha256; }; - docheck = true; + doCheck = true; buildFlagsArray = let t = "${goPackagePath}/version"; in '' -ldflags= From dee77f7e43318894921100b0888f6a5041512f13 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 2 Apr 2018 16:40:08 -0500 Subject: [PATCH 0300/2743] git: 2.16.3 -> 2.17.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..de2c67ddc59d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.3"; + version = "2.17.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; + sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; }; hardeningDisable = [ "format" ]; From e9fc2558f95152020e8b588f92563d6664f4c3c3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 3 Apr 2018 00:36:52 +0200 Subject: [PATCH 0301/2743] 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 2b29239eff30269217957ac220b1454d41f49bbf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 3 Apr 2018 07:52:38 -0500 Subject: [PATCH 0302/2743] Revert "git: 2.16.3 -> 2.17.0" --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 de2c67ddc59d..b336f72c7ac1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.17.0"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; hardeningDisable = [ "format" ]; From 4cee817a313be0073ce8cb5f01809749d0f2c85e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 3 Apr 2018 07:58:38 -0500 Subject: [PATCH 0303/2743] gnumake42HEAD: remove attribute to fix eval This was removed as part of 519f0b8db2f91e73964375ee81fc411153bf3aa3 but is still present for whatever reason. Remove since the file no longer exists. --- 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 473a25875b3e..a4c68fc15c7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7798,7 +7798,6 @@ with pkgs; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake42HEAD = lowPrio (callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { }); gnumake = gnumake42; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); From 231cdaf159bb2e1c19cd36c68850f81b918abf56 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 28 Mar 2018 11:07:09 -0500 Subject: [PATCH 0304/2743] mesa: 17.3.6 -> 17.3.7 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 984c11d55b9b..c325bb9e1d5e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.3.6"; + version = "17.3.7"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8"; + sha256 = "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585"; }; prePatch = "patchShebangs ."; From 1d16384bb68e471e51ad2204b9628ce66e943802 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 31 Mar 2018 03:38:39 -0500 Subject: [PATCH 0305/2743] mesa: use llvm6 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4c68fc15c7e..da3f5d9076ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10520,6 +10520,7 @@ with pkgs; # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM + llvmPackages = llvmPackages_6; }; mesa_glu = callPackage ../development/libraries/mesa-glu { }; From adaa110a72175c4f841722ab7d2bee7564656e91 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 3 Apr 2018 12:50:25 -0400 Subject: [PATCH 0306/2743] binutils: No more darwin conditionals Since at least d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410, we've had a situation where one should depend on: - `stdenv.cc.bintools`: for executables at build time - `libbfd` or `libiberty`: for those libraries - `targetPackages.cc.bintools`: for exectuables at *run* time - `binutils`: only for specifically GNU Binutils's executables, regardless of the host platform, at run time. and that commit cleaned up this usage to reflect that. This PR flips the switch so that: - `binutils` is indeed unconditionally GNU Binutils - `binutils-raw`, which previously served that role, is gone. so that the correct usage will be enforced going forward and everything is simple. N.B. In a few cases `binutils-unwrapped` (which before and now was unconditionally actual GNU binutils), rather than `binutils` was used to replace old `binutils-raw` as it is friendly towards some cross compilation usage by avoiding a reference to the next bootstrapping change. --- .../compilers/emscripten-fastcomp/default.nix | 4 ++-- pkgs/development/libraries/libbfd/default.nix | 8 +++----- pkgs/development/libraries/libopcodes/default.nix | 6 +++--- pkgs/os-specific/darwin/binutils/default.nix | 14 +++++++------- pkgs/stdenv/darwin/default.nix | 6 +++--- pkgs/stdenv/linux/default.nix | 2 +- pkgs/top-level/all-packages.nix | 13 ++++--------- 7 files changed, 23 insertions(+), 30 deletions(-) diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index 490dace2faaf..10c1107da026 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, binutils-raw, wrapCCWith, symlinkJoin }: +{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }: let callPackage = newScope (self // {inherit stdenv;}); @@ -7,7 +7,7 @@ let emscriptenfastcomp-wrapped = wrapCCWith { cc = self.emscriptenfastcomp-unwrapped; # Never want Apple's cctools for WASM target - bintools = binutils-raw; + bintools = binutils; libc = stdenv.cc.libc; extraBuildCommands = '' # hardening flags break WASM support diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index ac508908e8f2..3f244d399f7e 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,17 +1,15 @@ { stdenv, buildPackages -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped , libiberty, zlib }: -let inherit (buildPackages.buildPackages) binutils-raw; in - stdenv.mkDerivation rec { name = "libbfd-${version}"; - inherit (binutils-raw.bintools) version src; + inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; - patches = binutils-raw.bintools.patches ++ [ + patches = binutils-unwrapped.patches ++ [ ../../tools/misc/binutils/build-components-separately.patch (fetchpatch { url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index d6d6989761bc..c918c61abf0d 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages -, fetchurl, autoreconfHook264, bison, binutils-raw +, fetchurl, autoreconfHook264, bison, binutils-unwrapped , libiberty, libbfd }: stdenv.mkDerivation rec { name = "libopcodes-${version}"; - inherit (binutils-raw.bintools) version src; + inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; - patches = binutils-raw.bintools.patches ++ [ + patches = binutils-unwrapped.patches ++ [ ../../tools/misc/binutils/build-components-separately.patch ]; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 1fff4915da3c..21d64979d7ea 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,13 +1,13 @@ -{ stdenv, binutils-raw, cctools +{ stdenv, binutils-unwrapped, cctools , hostPlatform, targetPlatform }: # Make sure both underlying packages claim to have prepended their binaries # with the same targetPrefix. -assert binutils-raw.targetPrefix == cctools.targetPrefix; +assert binutils-unwrapped.targetPrefix == cctools.targetPrefix; let - inherit (binutils-raw) targetPrefix; + inherit (binutils-unwrapped) targetPrefix; cmds = [ "ar" "ranlib" "as" "dsymutil" "install_name_tool" "ld" "strip" "otool" "lipo" "nm" "strings" "size" @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin $out/include - ln -s ${binutils-raw.bintools.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt + ln -s ${binutils-unwrapped.out}/bin/${targetPrefix}c++filt $out/bin/${targetPrefix}c++filt # We specifically need: # - ld: binutils doesn't provide it on darwin @@ -38,15 +38,15 @@ stdenv.mkDerivation { ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - ln -s ${binutils-raw.bintools.out}/share $out/share + ln -s ${binutils-unwrapped.out}/share $out/share ln -s ${cctools}/libexec $out/libexec mkdir -p "$info/nix-support" "$man/nix-support" - printWords ${binutils-raw.bintools.info} \ + printWords ${binutils-unwrapped.info} \ >> $info/nix-support/propagated-build-inputs # FIXME: cctools missing man pages - printWords ${binutils-raw.bintools.man} \ + printWords ${binutils-unwrapped.man} \ >> $man/nix-support/propagated-build-inputs ''; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index dfa190ee984e..9563f52ea263 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -321,11 +321,11 @@ in rec { darwin = super.darwin // { inherit (darwin) dyld ICU Libsystem libiconv; } // lib.optionalAttrs (super.targetPlatform == localSystem) { - inherit (darwin) cctools; + inherit (darwin) binutils cctools; }; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. - inherit binutils binutils-raw; + inherit binutils binutils-unwrapped; }; in import ../generic rec { name = "stdenv-darwin"; @@ -380,7 +380,7 @@ in rec { bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext - binutils-raw.bintools binutils binutils.bintools + binutils.bintools darwin.binutils darwin.binutils.bintools cc.expand-response-params ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools ICU libiconv locale diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d61675aed927..2eb55ae439b5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -374,7 +374,7 @@ in ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. - inherit (prevStage) binutils binutils-raw; + inherit (prevStage) binutils binutils-unwrapped; gcc = cc; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da3f5d9076ca..e25ef0e10cef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7464,22 +7464,17 @@ with pkgs; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = - if targetPlatform.isDarwin - then darwin.binutils - else binutils-raw; - binutils-unwrapped = callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; }; - binutils-raw = wrapBintoolsWith { + binutils = wrapBintoolsWith { libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; bintools = binutils-unwrapped; }; - - binutils_nogold = lowPrio (binutils-raw.override { - bintools = binutils-raw.bintools.override { + binutils_nogold = lowPrio (wrapBintoolsWith { + libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; + bintools = binutils-unwrapped.override { gold = false; }; }); From 0086036141f59d80bb2ff534fed59caabb19c8bc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Mar 2018 09:27:38 -0500 Subject: [PATCH 0307/2743] Machine.pm: tweak to look for graphical target in waitForX Current message may not be printed (nothing in systemd contains that string, it comes from elsewhere) --- nixos/lib/test-driver/Machine.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 78598b3efb4b..7e269b43e70f 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -612,7 +612,7 @@ sub waitForX { my ($self, $regexp) = @_; $self->nest("waiting for the X11 server", sub { retry sub { - my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'"); + my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'"); return 0 if $status != 0; ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); return 1 if $status == 0; From af86bf34ff2d7a6e31280921461a241f4b043aac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 16 Mar 2018 16:05:56 -0400 Subject: [PATCH 0308/2743] 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 0309/2743] 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 3bd496faa884d045af23146ee7d3bdc04d133074 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 3 Apr 2018 18:16:27 -0400 Subject: [PATCH 0310/2743] git: 2.16.3 -> 2.17.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..de2c67ddc59d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.3"; + version = "2.17.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; + sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; }; hardeningDisable = [ "format" ]; From 2bb28e1f0199d0b371fd10fe339042712dc77a75 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 4 Apr 2018 08:35:19 -0400 Subject: [PATCH 0311/2743] Revert "git: 2.16.3 -> 2.17.0" This reverts commit 3bd496faa884d045af23146ee7d3bdc04d133074. --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 de2c67ddc59d..b336f72c7ac1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.17.0"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; hardeningDisable = [ "format" ]; From f9192c542467085dee4b817ea753ae40916cbf62 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 18 Mar 2018 20:13:16 -0400 Subject: [PATCH 0312/2743] 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 0313/2743] 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 4623b2d349a6702dfdc05d56f0a2cad4c90023fd Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:06:58 +0200 Subject: [PATCH 0314/2743] pythonPackages.amqp: Move to own file --- .../python-modules/amqp/default.nix | 20 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/amqp/default.nix diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix new file mode 100644 index 000000000000..eb2b6a8058ae --- /dev/null +++ b/pkgs/development/python-modules/amqp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, case, vine }: + +buildPythonPackage rec { + pname = "amqp"; + version = "2.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; + }; + + buildInputs = [ pytest case ]; + propagatedBuildInputs = [ vine ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/py-amqp; + description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 044444a8c713..e339ccbcc8ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -484,26 +484,7 @@ in { anyjson = callPackage ../development/python-modules/anyjson {}; - amqp = buildPythonPackage rec { - name = "amqp-${version}"; - version = "2.1.4"; - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/amqp/${name}.tar.gz"; - sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; - }; - - buildInputs = with self; [ pytest case ]; - propagatedBuildInputs = with self; [ vine ]; - - meta = { - homepage = https://github.com/celery/py-amqp; - description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; - license = licenses.lgpl21; - }; - }; - + amqp = callPackage ../development/python-modules/amqp {}; amqplib = callPackage ../development/python-modules/amqplib {}; From 1943bf73a42eb6ad73e1e20aefb157eaaa805076 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:12:05 +0200 Subject: [PATCH 0315/2743] pythonPackages.application: Move to own file --- .../python-modules/application/default.nix | 15 +++++++++++++++ pkgs/top-level/python-packages.nix | 15 +-------------- 2 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/application/default.nix diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix new file mode 100644 index 000000000000..32314b81edca --- /dev/null +++ b/pkgs/development/python-modules/application/default.nix @@ -0,0 +1,15 @@ +{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: + +buildPythonPackage rec { + pname = "python-application"; + version = "2.0.2"; + disabled = isPy3k; + + src = fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; + }; + + buildInputs = [ zope_interface ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e339ccbcc8ac..63a24c9eae87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -494,20 +494,7 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; - application = buildPythonPackage rec { - pname = "python-application"; - name = "${pname}-${version}"; - version = "2.0.2"; - disabled = isPy3k; - - src = pkgs.fetchdarcs { - url = "http://devel.ag-projects.com/repositories/${pname}"; - rev = "release-${version}"; - sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; - }; - buildInputs = with self; [ zope_interface ]; - - }; + application = callPackage ../development/python-modules/application { }; appnope = buildPythonPackage rec { version = "0.1.0"; From 0ddbc518ebfe5014f773d456767604d32ab1d618 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:22:04 +0200 Subject: [PATCH 0316/2743] pythonPackages.asyncio: Move to own file --- .../python-modules/asyncio/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/asyncio/default.nix diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix new file mode 100644 index 000000000000..c3ed7bed7426 --- /dev/null +++ b/pkgs/development/python-modules/asyncio/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }: + +buildPythonPackage rec { + pname = "asyncio"; + version = "3.4.3"; + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; + }; + + meta = with stdenv.lib; { + description = "Reference implementation of PEP 3156"; + homepage = http://www.python.org/dev/peps/pep-3156; + license = licenses.free; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63a24c9eae87..86bfe600fba3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -517,22 +517,7 @@ in { astor = callPackage ../development/python-modules/astor {}; - asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec { - name = "asyncio-${version}"; - version = "3.4.3"; - - - src = pkgs.fetchurl { - url = "mirror://pypi/a/asyncio/${name}.tar.gz"; - sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; - }; - - meta = { - description = "Reference implementation of PEP 3156"; - homepage = http://www.python.org/dev/peps/pep-3156; - license = licenses.free; - }; - } else null; + asyncio = callPackage ../development/python-modules/asyncio {}; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; From 258fee9987871603f622cd983e143158612a1eac Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:26:19 +0200 Subject: [PATCH 0317/2743] pythonPackages.atomiclong: Move to own file --- .../python-modules/atomiclong/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/atomiclong/default.nix diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix new file mode 100644 index 000000000000..8f3aae7b19dd --- /dev/null +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, cffi }: + +buildPythonPackage rec { + pname = "atomiclong"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ cffi ]; + + meta = with stdenv.lib; { + description = "Long data type with atomic operations using CFFI"; + homepage = https://github.com/dreid/atomiclong; + license = licenses.mit; + maintainers = with maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86bfe600fba3..de5c441cc46a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -555,25 +555,7 @@ in { asn1ate = callPackage ../development/python-modules/asn1ate { }; - atomiclong = buildPythonPackage rec { - version = "0.1.1"; - name = "atomiclong-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/atomiclong/atomiclong-${version}.tar.gz"; - sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb"; - }; - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ cffi ]; - - meta = { - description = "Long data type with atomic operations using CFFI"; - homepage = https://github.com/dreid/atomiclong; - license = licenses.mit; - maintainers = with maintainers; [ robbinch ]; - }; - - }; + atomiclong = callPackage ../development/python-modules/atomiclong { }; atomicwrites = buildPythonPackage rec { version = "0.1.9"; From db6d615e6e0c01a62b7d48ca0e2b33cb5587b2c5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:31:12 +0200 Subject: [PATCH 0318/2743] pythonPackages.atomicwrites: Move to own file --- .../python-modules/atomicwrites/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/atomicwrites/default.nix diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix new file mode 100644 index 000000000000..724f662e5d3c --- /dev/null +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "atomicwrites"; + version = "0.1.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw"; + }; + + meta = with stdenv.lib; { + description = "Atomic file writes on POSIX"; + homepage = https://pypi.python.org/pypi/atomicwrites; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de5c441cc46a..9da99a4b8add 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -557,22 +557,7 @@ in { atomiclong = callPackage ../development/python-modules/atomiclong { }; - atomicwrites = buildPythonPackage rec { - version = "0.1.9"; - name = "atomicwrites-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/atomicwrites/atomicwrites-${version}.tar.gz"; - sha256 = "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw"; - }; - - meta = { - description = "Atomic file writes on POSIX"; - homepage = https://pypi.python.org/pypi/atomicwrites/0.1.0; - maintainers = with maintainers; [ matthiasbeyer ]; - }; - - }; + atomicwrites = callPackage ../development/python-modules/atomicwrites { }; # argparse is part of stdlib in 2.7 and 3.2+ argparse = null; From 4e2d86cf7fc4b6b0452d3f256d7349868c5bf199 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:35:57 +0200 Subject: [PATCH 0319/2743] pythonPackages.attrdict: Move to own file --- .../python-modules/attrdict/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/attrdict/default.nix diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix new file mode 100644 index 000000000000..c6a9151d9111 --- /dev/null +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, nose, six }: + +buildPythonPackage rec { + pname = "attrdict"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6"; + }; + + propagatedBuildInputs = [ coverage nose six ]; + + meta = with stdenv.lib; { + description = "A dict with attribute-style access"; + homepage = https://github.com/bcj/AttrDict; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9da99a4b8add..6753c0aaab81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -564,22 +564,7 @@ in { astroid = callPackage ../development/python-modules/astroid { }; - attrdict = buildPythonPackage (rec { - name = "attrdict-2.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/attrdict/${name}.tar.gz"; - sha256 = "86aeb6d3809e0344409f8148d7cac9eabce5f0b577c160b5e90d10df3f8d2ad3"; - }; - - propagatedBuildInputs = with self; [ coverage nose six ]; - - meta = { - description = "A dict with attribute-style access"; - homepage = https://github.com/bcj/AttrDict; - license = licenses.mit; - }; - }); + attrdict = callPackage ../development/python-modules/attrdict { }; attrs = callPackage ../development/python-modules/attrs { }; From a5c4679befa6b5e024a072d10a50425206c2f785 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:40:49 +0200 Subject: [PATCH 0320/2743] pythonPackages.avro: Move to own file --- .../development/python-modules/avro/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/avro/default.nix diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix new file mode 100644 index 000000000000..ab95120f8dfc --- /dev/null +++ b/pkgs/development/python-modules/avro/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "avro"; + version = "1.7.6"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1mbsf1y7gnzmnfmqh8aw62yrwnpwm5bhmmkkbbq92a5vr91l3wgd"; + }; + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = https://pypi.python.org/pypi/avro/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6753c0aaab81..65b3c8147cfb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -617,21 +617,7 @@ in { }; }; - avro = buildPythonPackage (rec { - name = "avro-1.7.6"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/avro/${name}.tar.gz"; - sha256 = "edf14143cabb2891f05a73d60a57a9fc5a9ebd305c2188abb3f5db777c707ad5"; - }; - - meta = { - description = "A serialization and RPC framework"; - homepage = "https://pypi.python.org/pypi/avro/"; - }; - }); + avro = callPackage ../development/python-modules/avro {}; avro3k = pkgs.lowPrio (buildPythonPackage (rec { name = "avro3k-1.7.7-SNAPSHOT"; From f79f9561a20b68a1cf6a86aeb6079f78d4d8a540 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:45:05 +0200 Subject: [PATCH 0321/2743] pythonPackages.avro3k: Move to own file --- .../python-modules/avro3k/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/avro3k/default.nix diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix new file mode 100644 index 000000000000..3a5b34ebb85d --- /dev/null +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "avro3k"; + version = "1.7.7-SNAPSHOT"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; + }; + + doCheck = false; # No such file or directory: './run_tests.py + + meta = with stdenv.lib; { + description = "A serialization and RPC framework"; + homepage = https://pypi.python.org/pypi/avro3k/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65b3c8147cfb..5ea79eae9b8c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -619,23 +619,7 @@ in { avro = callPackage ../development/python-modules/avro {}; - avro3k = pkgs.lowPrio (buildPythonPackage (rec { - name = "avro3k-1.7.7-SNAPSHOT"; - - disabled = (!isPy3k); - - src = pkgs.fetchurl { - url = "mirror://pypi/a/avro3k/${name}.tar.gz"; - sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; - }; - - doCheck = false; # No such file or directory: './run_tests.py - - meta = { - description = "A serialization and RPC framework"; - homepage = "https://pypi.python.org/pypi/avro3k/"; - }; - })); + avro3k = callPackage ../development/python-modules/avro3k {}; python-slugify = callPackage ../development/python-modules/python-slugify { }; From 07f611a12de5d6213048c78fff2e2bba92cf1161 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:48:34 +0200 Subject: [PATCH 0322/2743] pythonPackages.noise: Move to own file --- .../python-modules/noise/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/noise/default.nix diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix new file mode 100644 index 000000000000..d136c41aa370 --- /dev/null +++ b/pkgs/development/python-modules/noise/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "noise"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/caseman/noise; + description = "Native-code and shader implementations of Perlin noise"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ea79eae9b8c..f06ccd31df19 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -625,22 +625,7 @@ in { awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; - noise = buildPythonPackage rec { - name = "noise-${version}"; - version = "1.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/noise/${name}.tar.gz"; - sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/caseman/noise"; - description = "Native-code and shader implementations of Perlin noise"; - license = licenses.mit; - platforms = platforms.all; - }; - }; + noise = callPackage ../development/python-modules/noise {}; azure = buildPythonPackage rec { version = "0.11.0"; From f14c61c9334caae5d56a883715972a7d1699487a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 11:56:30 +0200 Subject: [PATCH 0323/2743] pythonPackages.babelfish: Move to own file --- .../python-modules/babelfish/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/babelfish/default.nix diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix new file mode 100644 index 000000000000..003f996d29a2 --- /dev/null +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "babelfish"; + version = "0.5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; + }; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/babelfish; + description = "A module to work with countries and languages"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f06ccd31df19..459a5a95568f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -897,21 +897,7 @@ in { backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; - babelfish = buildPythonPackage rec { - version = "0.5.5"; - name = "babelfish-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/babelfish/${name}.tar.gz"; - sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/babelfish; - description = "A module to work with countries and languages"; - license = licenses.bsd3; - }; - }; + babelfish = callPackage ../development/python-modules/babelfish {}; basiciw = buildPythonPackage rec { name = "${pname}-${version}"; From fd159532728ed946b74b76179382e5fb97c78d91 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:00:18 +0200 Subject: [PATCH 0324/2743] pythonPackages.batinfo: Move to own file --- .../python-modules/batinfo/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/batinfo/default.nix diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix new file mode 100644 index 000000000000..6240186f0688 --- /dev/null +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "batinfo"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gyzkxzvj5l6qrw706bnm3cckqzzzbrjr7jkxc087d7775a73499"; + }; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/nicolargo/batinfo; + description = "A simple Python lib to retrieve battery information"; + license = licenses.lgpl3; + platforms = platforms.all; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 459a5a95568f..658e8af9227e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -921,26 +921,7 @@ in { }; }; - batinfo = buildPythonPackage rec { - version = "0.3"; - name = "batinfo-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/batinfo/${name}.tar.gz"; - sha256 = "0gyzkxzvj5l6qrw706bnm3cckqzzzbrjr7jkxc087d7775a73499"; - }; - - # No tests included - doCheck = false; - - meta = { - homepage = https://github.com/nicolargo/batinfo; - description = "A simple Python lib to retrieve battery information"; - license = licenses.lgpl3; - platforms = platforms.all; - maintainers = with maintainers; [ koral ]; - }; - }; + batinfo = callPackage ../development/python-modules/batinfo {}; bcdoc = buildPythonPackage rec { name = "bcdoc-0.14.0"; From 5fe48723faa216c2a6b1198c720d432fb1b19302 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:03:55 +0200 Subject: [PATCH 0325/2743] pythonPackages.bcdoc: Move to own file --- .../python-modules/bcdoc/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------------- 2 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/bcdoc/default.nix diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix new file mode 100644 index 000000000000..c13fce802655 --- /dev/null +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, docutils, six }: + +buildPythonPackage rec { + pname = "bcdoc"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8"; + }; + + buildInputs = [ docutils six ]; + + # Tests fail due to nix file timestamp normalization. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/botocore/bcdoc; + license = licenses.asl20; + description = "ReST document generation tools for botocore"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 658e8af9227e..3c283a02ddb5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -923,25 +923,7 @@ in { batinfo = callPackage ../development/python-modules/batinfo {}; - bcdoc = buildPythonPackage rec { - name = "bcdoc-0.14.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bcdoc/${name}.tar.gz"; - sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8"; - }; - - buildInputs = with self; [ docutils six ]; - - # Tests fail due to nix file timestamp normalization. - doCheck = false; - - meta = { - homepage = https://github.com/botocore/bcdoc; - license = licenses.asl20; - description = "ReST document generation tools for botocore"; - }; - }; + bcdoc = callPackage ../development/python-modules/bcdoc {}; beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; From 27270b2ea6981e0e9b8a18f296858b2d83c29f19 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:07:33 +0200 Subject: [PATCH 0326/2743] pythonPackages.betamax: Move to own file --- .../python-modules/betamax/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------------- 2 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/betamax/default.nix diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix new file mode 100644 index 000000000000..8051ed0beff5 --- /dev/null +++ b/pkgs/development/python-modules/betamax/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "betamax"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hki1c2vs7adq7zr56wi6i5bhrkia4s2ywpv2c98ibnczz709w2v"; + }; + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://betamax.readthedocs.org/en/latest/; + description = "A VCR imitation for requests"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c283a02ddb5..7aa4c28d6da6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -959,25 +959,7 @@ in { }; }; - betamax = buildPythonPackage rec { - name = "betamax-0.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/betamax/${name}.tar.gz"; - sha256 = "1hki1c2vs7adq7zr56wi6i5bhrkia4s2ywpv2c98ibnczz709w2v"; - }; - - propagatedBuildInputs = [ self.requests ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://betamax.readthedocs.org/en/latest/; - description = "A VCR imitation for requests"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - }; - }; + betamax = callPackage ../development/python-modules/betamax {}; betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; From e4fe13701b6253c9214df92ae5403ab7ca05cd4c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:11:47 +0200 Subject: [PATCH 0327/2743] pythonPackages.buttersink: Move to own file --- .../python-modules/buttersink/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------------ 2 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/buttersink/default.nix diff --git a/pkgs/development/python-modules/buttersink/default.nix b/pkgs/development/python-modules/buttersink/default.nix new file mode 100644 index 000000000000..29f5ff5dccd2 --- /dev/null +++ b/pkgs/development/python-modules/buttersink/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, boto, crcmod, psutil }: + +buildPythonPackage rec { + pname = "buttersink"; + version = "0.6.8"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3"; + }; + + propagatedBuildInputs = [ boto crcmod psutil ]; + + meta = with stdenv.lib; { + description = "Synchronise btrfs snapshots"; + longDescription = '' + ButterSink is like rsync, but for btrfs subvolumes instead of files, + which makes it much more efficient for things like archiving backup + snapshots. It is built on top of btrfs send and receive capabilities. + Sources and destinations can be local btrfs file systems, remote btrfs + file systems over SSH, or S3 buckets. + ''; + homepage = https://github.com/AmesCornish/buttersink/wiki; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7aa4c28d6da6..9e4f4317eea0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1067,33 +1067,7 @@ in { enablePython = true; }); - buttersink = buildPythonPackage rec { - name = "buttersink-0.6.8"; - - src = pkgs.fetchurl { - sha256 = "04gc63kfcqkw4qba5rijqk01xiphf04yk7hky9180ii64v2ip0j3"; - url = "mirror://pypi/b/buttersink/${name}.tar.gz"; - }; - - # Python 2 syntax - disabled = isPy3k; - - meta = { - description = "Synchronise btrfs snapshots"; - longDescription = '' - ButterSink is like rsync, but for btrfs subvolumes instead of files, - which makes it much more efficient for things like archiving backup - snapshots. It is built on top of btrfs send and receive capabilities. - Sources and destinations can be local btrfs file systems, remote btrfs - file systems over SSH, or S3 buckets. - ''; - homepage = https://github.com/AmesCornish/buttersink/wiki; - license = licenses.gpl3; - platforms = platforms.linux; - }; - - propagatedBuildInputs = with self; [ boto crcmod psutil ]; - }; + buttersink = callPackage ../development/python-modules/buttersink {}; cached-property = callPackage ../development/python-modules/cached-property { }; From 04da3ea5fbdecccaaae04de880e5267dcb2aa9d7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:15:13 +0200 Subject: [PATCH 0328/2743] pythonPackages.cgroup-utils: Remove postPatch that seems to have been forgotten to be moved --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e4f4317eea0..d0f337de7f0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1108,9 +1108,6 @@ in { cement = callPackage ../development/python-modules/cement {}; cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; - postPatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; From cbc5202c1b90899006c226f57d1381997a250943 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:18:28 +0200 Subject: [PATCH 0329/2743] pythonPackages.circus: Move to own file --- .../python-modules/circus/default.nix | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +------------ 2 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/circus/default.nix diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix new file mode 100644 index 000000000000..93350a60b7db --- /dev/null +++ b/pkgs/development/python-modules/circus/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi +, iowait, psutil, pyzmq, tornado, mock }: + +buildPythonPackage rec { + pname = "circus"; + version = "0.11.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ip87wlq864k2rhk2r0rqq12ard1iggb61r6dsga4gh7lm538mrp"; + }; + + doCheck = false; # weird error + + propagatedBuildInputs = [ iowait psutil pyzmq tornado mock ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0f337de7f0b..77c8fc86208d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1117,18 +1117,7 @@ in { cheroot = callPackage ../development/python-modules/cheroot {}; - circus = buildPythonPackage rec { - name = "circus-0.11.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/circus/${name}.tar.gz"; - sha256 = "3757344aa5073ea29e6e2607b3de8ba1652502c61964316116931884293fe846"; - }; - - doCheck = false; # weird error - - propagatedBuildInputs = with self; [ iowait psutil pyzmq tornado mock ]; - }; + circus = callPackage ../development/python-modules/circus {}; colorclass = buildPythonPackage rec { pname = "colorclass"; From ece5086d0e1d73e74c9188684f3bd30fe84d2cdf Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:21:11 +0200 Subject: [PATCH 0330/2743] pythonPackages.colorclass: Move to own file --- .../python-modules/colorclass/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/colorclass/default.nix diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix new file mode 100644 index 000000000000..b035bb9b57c9 --- /dev/null +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "colorclass"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/Robpol86/colorclass; + license = licenses.mit; + description = "Automatic support for console colors"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77c8fc86208d..41bf23998077 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1119,25 +1119,7 @@ in { circus = callPackage ../development/python-modules/circus {}; - colorclass = buildPythonPackage rec { - pname = "colorclass"; - version = "2.2.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = "https://github.com/Robpol86/colorclass"; - license = licenses.mit; - description = "Automatic support for console colors"; - }; - }; + colorclass = callPackage ../development/python-modules/colorclass {}; colorlog = callPackage ../development/python-modules/colorlog { }; From 921934f458008cab518c2c8f0370f37d8896654b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:24:00 +0200 Subject: [PATCH 0331/2743] pythonPackages.colour: Move to own file --- .../python-modules/colour/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------------ 2 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/colour/default.nix diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix new file mode 100644 index 000000000000..527696622831 --- /dev/null +++ b/pkgs/development/python-modules/colour/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, d2to1 }: + +buildPythonPackage rec { + pname = "colour"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w1j43l76zw10dvs2kk7jz7kqj2ss7gfgfdxyls27pckwin89gxb"; + }; + + buildInputs = [ d2to1 ]; + + meta = with stdenv.lib; { + description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; + homepage = https://github.com/vaab/colour; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41bf23998077..c32dd5ad9e77 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1123,24 +1123,7 @@ in { colorlog = callPackage ../development/python-modules/colorlog { }; - colour = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "colour"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/${pname}/${name}.tar.gz"; - sha256 = "0w1j43l76zw10dvs2kk7jz7kqj2ss7gfgfdxyls27pckwin89gxb"; - }; - - buildInputs = with self; [ d2to1 ]; - - meta = { - description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; - homepage = https://github.com/vaab/colour; - license = licenses.bsd2; - }; - }; + colour = callPackage ../development/python-modules/colour {}; constantly = callPackage ../development/python-modules/constantly { }; From 15ae9cfeca571e1a9d0f468c7a1d927d9b677a09 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:40:01 +0200 Subject: [PATCH 0332/2743] pythonPackages.datadog: Move to own file --- .../python-modules/datadog/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------------- 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/datadog/default.nix diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix new file mode 100644 index 000000000000..20d6db20404a --- /dev/null +++ b/pkgs/development/python-modules/datadog/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pillow, tox, mock, six, nose, requests, decorator, simplejson }: + +buildPythonPackage rec { + pname = "datadog"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y2if4jj43n5jis20imragvhhyhr840w4m1g7j7fxh9bn7h273zp"; + }; + + buildInputs = [ pillow tox mock six nose ]; + propagatedBuildInputs = [ requests decorator simplejson ]; + + meta = with stdenv.lib; { + description = "The Datadog Python library"; + license = licenses.bsd3; + homepage = https://github.com/DataDog/datadogpy; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c32dd5ad9e77..1cf28276c23e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1193,24 +1193,7 @@ in { checkInputs = with self; [ pytest ]; }; - datadog = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "datadog"; - version = "0.10.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/${pname}/${name}.tar.gz"; - sha256 = "0y2if4jj43n5jis20imragvhhyhr840w4m1g7j7fxh9bn7h273zp"; - }; - - buildInputs = with self; [ pillow tox mock six nose ]; - propagatedBuildInputs = with self; [ requests decorator simplejson ]; - - meta = { - description = "The Datadog Python library "; - license = licenses.bsd3; - homepage = https://github.com/DataDog/datadogpy; - }; - }; + datadog = callPackage ../development/python-modules/datadog {}; debian = buildPythonPackage rec { name = "${pname}-${version}"; From adb19caa9dacd5f8fb52369165cc8877ac7fa674 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:42:10 +0200 Subject: [PATCH 0333/2743] pythonPackages.debian: Move to own file --- pkgs/development/python-modules/debian/default.nix | 14 ++++++++++++++ pkgs/top-level/python-packages.nix | 11 +---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/debian/default.nix diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix new file mode 100644 index 000000000000..38d81c1f16b5 --- /dev/null +++ b/pkgs/development/python-modules/debian/default.nix @@ -0,0 +1,14 @@ +{ stdenv, buildPythonPackage, fetchPypi +, chardet, six}: + +buildPythonPackage rec { + pname = "python-debian"; + version = "0.1.23"; + + src = fetchPypi { + inherit pname version; + sha256 = "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh"; + }; + + propagatedBuildInputs = [ chardet six ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cf28276c23e..ac1066f811ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1195,16 +1195,7 @@ in { datadog = callPackage ../development/python-modules/datadog {}; - debian = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "python-debian"; - version = "0.1.23"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh"; - }; - propagatedBuildInputs = with self; [ chardet six ]; - }; + debian = callPackage ../development/python-modules/debian {}; defusedxml = buildPythonPackage rec { name = "${pname}-${version}"; From b21f68f0c08ed4627ee89b95a41e6318f1f43c04 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:44:09 +0200 Subject: [PATCH 0334/2743] pythonPackages.defusedxml: Move to own file --- .../development/python-modules/defusedxml/default.nix | 11 +++++++++++ pkgs/top-level/python-packages.nix | 10 +--------- 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/defusedxml/default.nix diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix new file mode 100644 index 000000000000..6426333ed26a --- /dev/null +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -0,0 +1,11 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "defusedxml"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac1066f811ea..98b58d335587 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1197,15 +1197,7 @@ in { debian = callPackage ../development/python-modules/debian {}; - defusedxml = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "defusedxml"; - version = "0.5.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/${pname}/${name}.tar.gz"; - sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; - }; - }; + defusedxml = callPackage ../development/python-modules/defusedxml {}; dosage = buildPythonPackage rec { name = "${pname}-${version}"; From 8958b5132e4463a7ce7b49ee47b80b2375d38d9b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:47:05 +0200 Subject: [PATCH 0335/2743] pythonPackages.dugong: Move to own file --- pkgs/development/python-modules/dugong/default.nix | 13 +++++++++++++ pkgs/top-level/python-packages.nix | 12 +----------- 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/dugong/default.nix diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix new file mode 100644 index 000000000000..27b1a3e6122c --- /dev/null +++ b/pkgs/development/python-modules/dugong/default.nix @@ -0,0 +1,13 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "dugong"; + version = "3.5"; + + disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + + src = fetchPypi { + inherit pname version; + sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98b58d335587..35190ba97d27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1222,17 +1222,7 @@ in { }; }; - dugong = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "dugong"; - version = "3.5"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/${pname}/${name}.tar.bz2"; - sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; - }; - - disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 - }; + dugong = callPackage ../development/python-modules/dugong {}; iowait = buildPythonPackage rec { name = "iowait-0.2"; From 760af870e90513862e3c609acc890febd25787b9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:49:02 +0200 Subject: [PATCH 0336/2743] pythonPackages.iowait: Move to own file --- .../python-modules/iowait/default.nix | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------- 2 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/iowait/default.nix diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix new file mode 100644 index 000000000000..ef2444c0d2f0 --- /dev/null +++ b/pkgs/development/python-modules/iowait/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "iowait"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "16djvxd9sxm7cr57clhqkyrq3xvdzgwj803sy5hwyb62hkmw46xb"; + }; + + meta = { + description = "Platform-independent module for I/O completion events"; + homepage = https://launchpad.net/python-iowait; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35190ba97d27..eea999ca3e13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1224,19 +1224,7 @@ in { dugong = callPackage ../development/python-modules/dugong {}; - iowait = buildPythonPackage rec { - name = "iowait-0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/iowait/${name}.tar.gz"; - sha256 = "ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299"; - }; - - meta = { - description = "Platform-independent module for I/O completion events"; - homepage = https://launchpad.net/python-iowait; - }; - }; + iowait = callPackage ../development/python-modules/iowait {}; responses = self.buildPythonPackage rec { name = "responses-0.4.0"; From 111b4b859f3f71e18e37147b4324320afdea3e29 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:52:47 +0200 Subject: [PATCH 0337/2743] pythonPackages.responses: Move to own file --- .../python-modules/responses/default.nix | 16 ++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------- 2 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/responses/default.nix diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix new file mode 100644 index 000000000000..193c116fe55a --- /dev/null +++ b/pkgs/development/python-modules/responses/default.nix @@ -0,0 +1,16 @@ +{ stdenv, buildPythonPackage, fetchPypi +, cookies, mock, requests, six }: + +buildPythonPackage rec { + pname = "responses"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; + }; + + propagatedBuildInputs = [ cookies mock requests six ]; + + doCheck = false; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eea999ca3e13..742ea0300dac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1226,19 +1226,7 @@ in { iowait = callPackage ../development/python-modules/iowait {}; - responses = self.buildPythonPackage rec { - name = "responses-0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/responses/${name}.tar.gz"; - sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; - }; - - propagatedBuildInputs = with self; [ cookies mock requests six ]; - - doCheck = false; - - }; + responses = callPackage ../development/python-modules/responses {}; rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; From 85e3b5bd41ff691022b40669800b1a0127c25a0d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:56:12 +0200 Subject: [PATCH 0338/2743] pythonPackages.pyechonest: Move to own file Also disable on Py3k due to syntax errors. --- .../python-modules/pyechonest/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +------------- 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/pyechonest/default.nix diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix new file mode 100644 index 000000000000..6a2559710a90 --- /dev/null +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "pyechonest"; + version = "8.0.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; + }; + + meta = with stdenv.lib; { + description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; + homepage = https://github.com/echonest/pyechonest; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 742ea0300dac..ba632662bb67 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1234,19 +1234,7 @@ in { py4j = callPackage ../development/python-modules/py4j { }; - pyechonest = self.buildPythonPackage rec { - name = "pyechonest-8.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyechonest/pyechonest-8.0.2.tar.gz"; - sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; - }; - - meta = { - description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; - homepage = https://github.com/echonest/pyechonest; - }; - }; + pyechonest = callPackage ../development/python-modules/pyechonest { }; billiard = buildPythonPackage rec { name = "billiard-${version}"; From 0fdebd98b92c625e2954173508235e27a363194a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 12:59:02 +0200 Subject: [PATCH 0339/2743] pythonPackages.billiard: Move to own file --- .../python-modules/billiard/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/billiard/default.nix diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix new file mode 100644 index 000000000000..fa68a8497f14 --- /dev/null +++ b/pkgs/development/python-modules/billiard/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }: + +buildPythonPackage rec { + pname = "billiard"; + version = "3.5.0.2"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; + }; + + buildInputs = [ pytest case ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/billiard; + description = "Python multiprocessing fork with improvements and bugfixes"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba632662bb67..335c7c9e1994 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1236,25 +1236,7 @@ in { pyechonest = callPackage ../development/python-modules/pyechonest { }; - billiard = buildPythonPackage rec { - name = "billiard-${version}"; - version = "3.5.0.2"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/billiard/${name}.tar.gz"; - sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; - }; - - buildInputs = with self; [ pytest case ]; - - meta = { - homepage = https://github.com/celery/billiard; - description = "Python multiprocessing fork with improvements and bugfixes"; - license = licenses.bsd3; - }; - }; + billiard = callPackage ../development/python-modules/billiard { }; binaryornot = callPackage ../development/python-modules/binaryornot { }; From 9ae3047c2f4c7925e0df12ba13ef5fbf242880f3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 13:04:00 +0200 Subject: [PATCH 0340/2743] pythonPackages.bitbucket_api: Move to own file --- .../python-modules/bitbucket-api/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------------- 2 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/bitbucket-api/default.nix diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix new file mode 100644 index 000000000000..86ce1262f6c7 --- /dev/null +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, requests_oauthlib, nose, sh }: + +buildPythonPackage rec { + pname = "bitbucket-api"; + version = "0.4.4"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1cl5xa55ijjd23xs8znsd4w4vb3q1vkbmchy7hh6z6nmjcwbr478"; + }; + + propagatedBuildInputs = [ requests_oauthlib nose sh ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/Sheeprider/BitBucket-api; + description = "Python library to interact with BitBucket REST API"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 335c7c9e1994..15375faa1505 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1240,26 +1240,7 @@ in { binaryornot = callPackage ../development/python-modules/binaryornot { }; - bitbucket_api = buildPythonPackage rec { - name = "bitbucket-api-0.4.4"; - # python3 does not support relative imports - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bitbucket-api/${name}.tar.gz"; - sha256 = "e890bc3893d59a6f203c1eb2bae60e78ac4d3869da7ea4fb104dca588aea85b2"; - }; - - propagatedBuildInputs = with self; [ requests_oauthlib nose sh ]; - - doCheck = false; - - meta = { - homepage = https://github.com/Sheeprider/BitBucket-api; - description = "Python library to interact with BitBucket REST API"; - license = licenses.mit; - }; - }; + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; # Should be moved out of python-packages.nix bitbucket-cli = buildPythonPackage rec { From 03fa93875c02cedeaec6e091da0652d629dff1a3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 13:07:27 +0200 Subject: [PATCH 0341/2743] pythonPackages.bitbucket-cli: Move to own file --- .../python-modules/bitbucket-cli/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/bitbucket-cli/default.nix diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix new file mode 100644 index 000000000000..b5d115f4d0bb --- /dev/null +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, requests }: + +buildPythonPackage rec { + pname = "bitbucket-cli"; + version = "0.5.1"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; + }; + + propagatedBuildInputs = [ requests ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Bitbucket command line interface"; + homepage = https://bitbucket.org/zhemao/bitbucket-cli; + maintainers = with maintainers; [ refnil ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 15375faa1505..9bb2408f2acf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1242,27 +1242,7 @@ in { bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - # Should be moved out of python-packages.nix - bitbucket-cli = buildPythonPackage rec { - name = "bitbucket-cli-0.5.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/b/bitbucket-cli/${name}.tar.gz"; - sha256 = "d881e21ec7ebfa006cfca6d10a5b7229aa59990568f8c6b8e3364769fa38b6f6"; - }; - - propagatedBuildInputs = [ self.requests ]; - - # No tests - doCheck = false; - - disabled = isPy3k; - - meta = { - description = "Bitbucket command line interface"; - homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; - maintainers = with maintainers; [ refnil ]; - }; - }; + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; bitstring = callPackage ../development/python-modules/bitstring { }; From c2eb72294858228019ce27c1692b706be90c5f59 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 13:11:43 +0200 Subject: [PATCH 0342/2743] pythonPackages.blinker: Move to own file --- .../python-modules/blinker/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/blinker/default.nix diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix new file mode 100644 index 000000000000..5dd9d10961bb --- /dev/null +++ b/pkgs/development/python-modules/blinker/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "blinker"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; + }; + + meta = with stdenv.lib; { + homepage = http://pythonhosted.org/blinker/; + description = "Fast, simple object-to-object and broadcast signaling"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bb2408f2acf..315e054acae9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1289,22 +1289,7 @@ in { }; }; - blinker = buildPythonPackage rec { - name = "blinker-${version}"; - version = "1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/blinker/${name}.tar.gz"; - sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; - }; - - meta = { - homepage = http://pythonhosted.org/blinker/; - description = "Fast, simple object-to-object and broadcast signaling"; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + blinker = callPackage ../development/python-modules/blinker { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; From 8f59a8fea66b8991198627d845f4f0251ed4ed60 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:17:55 +0200 Subject: [PATCH 0343/2743] pythonPackages.bottle: Move to own file --- .../python-modules/bottle/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/bottle/default.nix diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix new file mode 100644 index 000000000000..6b3d5d6dff81 --- /dev/null +++ b/pkgs/development/python-modules/bottle/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools }: + +buildPythonPackage rec { + pname = "bottle"; + version = "0.12.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1"; + }; + + propagatedBuildInputs = [ setuptools ]; + + meta = with stdenv.lib; { + homepage = http://bottlepy.org; + description = "A fast and simple micro-framework for small web-applications"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 315e054acae9..dee284dea8c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1364,25 +1364,7 @@ in { botocore = callPackage ../development/python-modules/botocore { }; - bottle = buildPythonPackage rec { - version = "0.12.11"; - name = "bottle-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bottle/${name}.tar.gz"; - sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1"; - }; - - propagatedBuildInputs = with self; [ setuptools ]; - - meta = { - homepage = http://bottlepy.org; - description = "A fast and simple micro-framework for small web-applications"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ koral ]; - }; - }; + bottle = callPackage ../development/python-modules/bottle { }; box2d = buildPythonPackage rec { name = "box2d-${version}"; From 5178a0a626f3b2c64e4977e6c19a0e06d1337c11 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:23:11 +0200 Subject: [PATCH 0344/2743] pythonPackages.bugwarrior: Move to own file --- .../python-modules/bugwarrior/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +--------------- 2 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/bugwarrior/default.nix diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix new file mode 100644 index 000000000000..ada8397f9754 --- /dev/null +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, unittest2, nose +, twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six +, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future15 }: + +buildPythonPackage rec { + pname = "bugwarrior"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kxknjbw5kchd88i577vlzibg8j60r7zzdhbnragj9wg5s3w60xb"; + }; + + buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; + propagatedBuildInputs = [ + twiggy requests offtrac bugzilla taskw dateutil pytz keyring six + jinja2 pycurl dogpile_cache lockfile click pyxdg future15 + ]; + + # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ralphbean/bugwarrior; + description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dee284dea8c8..2e2199e0d377 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1394,32 +1394,7 @@ in { branca = callPackage ../development/python-modules/branca { }; - bugwarrior = buildPythonPackage rec { - name = "bugwarrior-${version}"; - version = "1.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bugwarrior/${name}.tar.gz"; - sha256 = "0kxknjbw5kchd88i577vlzibg8j60r7zzdhbnragj9wg5s3w60xb"; - }; - - buildInputs = with self; [ mock unittest2 nose /* jira megaplan */ ]; - propagatedBuildInputs = with self; [ - twiggy requests offtrac bugzilla taskw dateutil pytz keyring six - jinja2 pycurl dogpile_cache lockfile click pyxdg future15 - ]; - - # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. - doCheck = false; - - meta = { - homepage = https://github.com/ralphbean/bugwarrior; - description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; - }; - }; + bugwarrior = callPackage ../development/python-modules/bugwarrior { }; # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; From 160d69a831c48843fec924a37a9093cf3bf635a8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:29:49 +0200 Subject: [PATCH 0345/2743] pythonPackages.bugzilla: Move to own file --- .../python-modules/bugzilla/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +---------------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/bugzilla/default.nix diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix new file mode 100644 index 000000000000..b57fdd5625be --- /dev/null +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pep8, coverage, logilab_common, requests }: + +buildPythonPackage rec { + pname = "bugzilla"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ikx21nm7cch4lz9agv5h1hx6zvg2alkpfdrl01khqgilhsicdhi"; + }; + + patches = [ ./checkPhase-fix-cookie-compare.patch ]; + + buildInputs = [ pep8 coverage logilab_common ]; + propagatedBuildInputs = [ requests ]; + + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + homepage = https://fedorahosted.org/python-bugzilla/; + description = "Bugzilla XMLRPC access module"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ pierron ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e2199e0d377..c39a5dc3e43d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1414,33 +1414,7 @@ in { # }; # }); - bugzilla = buildPythonPackage rec { - name = "bugzilla-${version}"; - version = "1.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-bugzilla/python-${name}.tar.gz"; - sha256 = "11361635a4f1613803a0b9b93ba9126f7fd36180653f953e2590b1536d107d46"; - }; - - patches = [ ../development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch ]; - - buildInputs = with self; [ pep8 coverage logilab_common ]; - propagatedBuildInputs = [ self.requests ]; - - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - meta = { - homepage = https://fedorahosted.org/python-bugzilla/; - description = "Bugzilla XMLRPC access module"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; - }; - }; + bugzilla = callPackage ../development/python-modules/bugzilla { }; check-manifest = buildPythonPackage rec { name = "check-manifest"; From 4c6bf74628486c405d3bfb34b64f2f9b759ee19a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:32:41 +0200 Subject: [PATCH 0346/2743] pythonPackages.check-manifest: Move to own file --- .../python-modules/check-manifest/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/check-manifest/default.nix diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix new file mode 100644 index 000000000000..04f2b9ccc7fc --- /dev/null +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "check-manifest"; + version = "0.30"; + + src = fetchPypi { + inherit pname version; + sha256 = "0005vp3r7wh87pf41cr4rw015lbnzn228a607nx34r98p7cd17xi"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/mgedmin/check-manifest; + description = "Check MANIFEST.in in a Python source package for completeness"; + license = licenses.mit; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c39a5dc3e43d..7e7b62c5d82e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1416,24 +1416,7 @@ in { bugzilla = callPackage ../development/python-modules/bugzilla { }; - check-manifest = buildPythonPackage rec { - name = "check-manifest"; - version = "0.30"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/check-manifest/check-manifest-${version}.tar.gz"; - sha256 = "b19fd0d8b9286532ba3dc0282484fd76d11200cf24b340dc3d08f293c7dd0500"; - }; - - doCheck = false; - - meta = { - homepage = https://github.com/mgedmin/check-manifest; - description = "Check MANIFEST.in in a Python source package for completeness"; - license = licenses.mit; - maintainers = with maintainers; [ lewo ]; - }; - }; + check-manifest = callPackage ../development/python-modules/check-manifest { }; devpi-common = callPackage ../development/python-modules/devpi-common { }; # A patched version of buildout, useful for buildout based development on Nix From 84cccee36fd717ac068304055de1ecce9defc6a1 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:36:33 +0200 Subject: [PATCH 0347/2743] pythonPackages.zc_buildout: Move to own file --- .../python-modules/buildout/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/buildout/default.nix diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix new file mode 100644 index 000000000000..080fd2f2a790 --- /dev/null +++ b/pkgs/development/python-modules/buildout/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "zc.buildout"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xafi6ndlm964qj7pnmzmvhp719c8pgs7r7wkr508v3cq2jjw4m6"; + }; + + meta = with stdenv.lib; { + homepage = http://www.buildout.org; + description = "A software build and configuration system"; + license = licenses.zpl21; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e7b62c5d82e..e587af2cb9c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1424,21 +1424,7 @@ in { zc_buildout = self.zc_buildout221; - zc_buildout221 = buildPythonPackage rec { - name = "zc.buildout-2.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zc.buildout/${name}.tar.gz"; - sha256 = "a6122ea5c06c6c044a9efce4a3df452c8573e1aebfda7b24262655daac894ef5"; - }; - - meta = { - homepage = "http://www.buildout.org"; - description = "A software build and configuration system"; - license = licenses.zpl21; - maintainers = with maintainers; [ garbas ]; - }; - }; + zc_buildout221 = callPackage ../development/python-modules/buildout { }; bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; From 007525282b6dded8152ceebe5e7f81ecd785aff4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:39:08 +0200 Subject: [PATCH 0348/2743] pythonPackages.bunch: Move to own file --- .../python-modules/bunch/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 11 +---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/bunch/default.nix diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix new file mode 100644 index 000000000000..42918f023398 --- /dev/null +++ b/pkgs/development/python-modules/bunch/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bunch"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e587af2cb9c7..e5d406d47f68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1426,16 +1426,7 @@ in { zc_buildout221 = callPackage ../development/python-modules/buildout { }; - bunch = buildPythonPackage (rec { - name = "bunch-1.0.1"; - meta.maintainers = with maintainers; [ ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bunch/${name}.tar.gz"; - sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; - }; - doCheck = false; - }); + bunch = callPackage ../development/python-modules/bunch { }; can = callPackage ../development/python-modules/can {}; From a8327fe5b458a8204aa8cc0b591989674a198614 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:42:33 +0200 Subject: [PATCH 0349/2743] pythonPackages.cairosvg: Move to own file --- .../python-modules/cairosvg/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------------ 2 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/cairosvg/default.nix diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix new file mode 100644 index 000000000000..73e648378f5f --- /dev/null +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, cairocffi }: + +buildPythonPackage rec { + pname = "cairosvg"; + version = "1.0.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "01lpm38qp7xlnv8jv7qg48j44p5088dwfsrcllgs5fz355lrfds1"; + }; + + propagatedBuildInputs = [ cairocffi ]; + + meta = with stdenv.lib; { + homepage = https://cairosvg.org; + license = licenses.lgpl3; + description = "SVG converter based on Cairo"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5d406d47f68..5ad9259740e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1436,24 +1436,7 @@ in { cairocffi = callPackage ../development/python-modules/cairocffi {}; - cairosvg = buildPythonPackage rec { - version = "1.0.18"; - name = "cairosvg-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/CairoSVG/CairoSVG-${version}.tar.gz"; - sha256 = "01lpm38qp7xlnv8jv7qg48j44p5088dwfsrcllgs5fz355lrfds1"; - }; - - propagatedBuildInputs = with self; [ cairocffi ]; - - meta = { - homepage = https://cairosvg.org; - license = licenses.lgpl3; - description = "SVG converter based on Cairo"; - }; - }; - + cairosvg = callPackage ../development/python-modules/cairosvg {}; carrot = buildPythonPackage rec { name = "carrot-0.10.7"; From 788cdea3c93993955460de949fa3e9c2699bc0e2 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:46:19 +0200 Subject: [PATCH 0350/2743] pythonPackages.carrot: Move to own file --- .../python-modules/carrot/default.nix | 22 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------------ 2 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/carrot/default.nix diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix new file mode 100644 index 000000000000..3b976fb7ad9a --- /dev/null +++ b/pkgs/development/python-modules/carrot/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, amqplib, anyjson }: + +buildPythonPackage rec { + pname = "carrot"; + version = "0.10.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s14rs2fgp1s2qa0avn8gj33lwc3k1hd4y9a2h6mhg487i7kfinb"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ amqplib anyjson ]; + + doCheck = false; # depends on the network + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/carrot; + description = "AMQP Messaging Framework for Python"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ad9259740e2..f16e32436c62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1438,28 +1438,7 @@ in { cairosvg = callPackage ../development/python-modules/cairosvg {}; - carrot = buildPythonPackage rec { - name = "carrot-0.10.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/carrot/${name}.tar.gz"; - sha256 = "cb46374f3c883c580d142a79d2609883713a867cc86e0514163adce784ce2468"; - }; - - buildInputs = with self; [ self.nose ]; - - propagatedBuildInputs = - [ self.amqplib - self.anyjson - ]; - - doCheck = false; # depends on the network - - meta = { - homepage = https://pypi.python.org/pypi/carrot; - description = "AMQP Messaging Framework for Python"; - }; - }; + carrot = callPackage ../development/python-modules/carrot {}; case = buildPythonPackage rec { name = "case-${version}"; From 743b229c867d958061d8355b816f105a0a7521a2 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 17:49:30 +0200 Subject: [PATCH 0351/2743] pythonPackages.case: Move to own file --- .../python-modules/case/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/case/default.nix diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix new file mode 100644 index 000000000000..7b90b1561c0d --- /dev/null +++ b/pkgs/development/python-modules/case/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, nose, unittest2, mock }: + +buildPythonPackage rec { + pname = "case"; + version = "1.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zbhbw87izcxj9rvqg432a7r69ps2ks20mqq3g3hgd42sckcy3ca"; + }; + + propagatedBuildInputs = [ six nose unittest2 mock ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/case; + description = "unittests utilities"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f16e32436c62..751d427ecfd0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1440,24 +1440,7 @@ in { carrot = callPackage ../development/python-modules/carrot {}; - case = buildPythonPackage rec { - name = "case-${version}"; - version = "1.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/case/${name}.tar.gz"; - sha256 = "1zbhbw87izcxj9rvqg432a7r69ps2ks20mqq3g3hgd42sckcy3ca"; - }; - - propagatedBuildInputs = with self; [ six nose unittest2 mock ]; - - meta = { - homepage = https://github.com/celery/case; - description = "unittests utilities"; - license = licenses.bsd3; - }; - - }; + case = callPackage ../development/python-modules/case {}; cassandra-driver = buildPythonPackage rec { name = "cassandra-driver-3.6.0"; From 6565c7cf7a852c384d1756f81628e7e1f8670764 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:13:52 +0200 Subject: [PATCH 0352/2743] pythonPackages.cerberus: Move to own file --- .../python-modules/cerberus/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/cerberus/default.nix diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix new file mode 100644 index 000000000000..6b3128cac9c3 --- /dev/null +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "Cerberus"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1km7hvns1snrmcwz58bssi4wv3gwd34zm1z1hwjylmpqrfrcf8mi"; + }; + + meta = with stdenv.lib; { + homepage = http://python-cerberus.org/; + description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 751d427ecfd0..6d970abc6acc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1522,21 +1522,7 @@ in { celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; }; - cerberus = buildPythonPackage rec { - name = "Cerberus-${version}"; - version = "0.9.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/Cerberus/${name}.tar.gz"; - sha256 = "1km7hvns1snrmcwz58bssi4wv3gwd34zm1z1hwjylmpqrfrcf8mi"; - }; - - meta = { - homepage = http://python-cerberus.org/; - description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; - license = licenses.mit; - }; - }; + cerberus = callPackage ../development/python-modules/cerberus { }; certifi = callPackage ../development/python-modules/certifi { }; From 3c991104a0d29bbdb5c79cc10a8be8dc95952fae Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:21:14 +0200 Subject: [PATCH 0353/2743] pythonPackages.cjson: Move to own file --- .../python-modules/cjson/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/cjson/default.nix diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix new file mode 100644 index 000000000000..60f38e4e0907 --- /dev/null +++ b/pkgs/development/python-modules/cjson/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPyPy }: + +buildPythonPackage rec { + pname = "python-cjson"; + version = "1.1.0"; + disabled = isPy3k || isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1cz87pd411h1fj5am99i19jp53yizcz9mkg1a7cc6a1pb6vsn7x0"; + }; + + meta = with stdenv.lib; { + description = "A very fast JSON encoder/decoder for Python"; + homepage = http://ag-projects.com/; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d970abc6acc..c5dd913d7386 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1532,23 +1532,7 @@ in { cherrypy = callPackage ../development/python-modules/cherrypy {}; - cjson = buildPythonPackage rec { - name = "python-cjson-${version}"; - version = "1.1.0"; - disabled = isPy3k || isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-cjson/${name}.tar.gz"; - sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3"; - }; - - meta = { - description = "A very fast JSON encoder/decoder for Python"; - homepage = "http://ag-projects.com/"; - license = licenses.lgpl2; - platforms = platforms.all; - }; - }; + cjson = callPackage ../development/python-modules/cjson { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; From 0c82d6899193789954b2e82ce30abe5e57a5d018 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:26:30 +0200 Subject: [PATCH 0354/2743] pythonPackages.clf: Move to own file --- .../python-modules/clf/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +---------------- 2 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/clf/default.nix diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix new file mode 100644 index 000000000000..ca91829adef2 --- /dev/null +++ b/pkgs/development/python-modules/clf/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, docopt, requests, pygments }: + +buildPythonPackage rec { + pname = "clf"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5"; + }; + + patchPhase = '' + sed -i 's/==/>=/' requirements.txt + ''; + + propagatedBuildInputs = [ docopt requests pygments ]; + + # Error when running tests: + # No local packages or download links found for requests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ncrocfer/clf; + description = "Command line tool to search snippets on Commandlinefu.com"; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5dd913d7386..04268fc97080 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1536,32 +1536,7 @@ in { cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; - clf = buildPythonPackage rec { - name = "clf-${version}"; - version = "0.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/clf/${name}.tar.gz"; - sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5"; - }; - - patchPhase = '' - sed -i 's/==/>=/' requirements.txt - ''; - - propagatedBuildInputs = with self; [ docopt requests pygments ]; - - # Error when running tests: - # No local packages or download links found for requests - doCheck = false; - - meta = { - homepage = https://github.com/ncrocfer/clf; - description = "Command line tool to search snippets on Commandlinefu.com"; - license = licenses.mit; - maintainers = with maintainers; [ koral ]; - }; - }; + clf = callPackage ../development/python-modules/clf {}; click = buildPythonPackage rec { name = "click-6.7"; From 88d0f7ef8fc0c0947e7248797c41a9b4c85ac1ec Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:30:40 +0200 Subject: [PATCH 0355/2743] pythonPackages.click: Move to own file --- .../python-modules/click/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +---------------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/click/default.nix diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix new file mode 100644 index 000000000000..d5dfba61010c --- /dev/null +++ b/pkgs/development/python-modules/click/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "click"; + version = "6.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; + }; + + buildInputs = [ pytest ]; + + checkPhase = '' + py.test tests + ''; + + # https://github.com/pallets/click/issues/823 + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://click.pocoo.org/; + description = "Create beautiful command line interfaces in Python"; + longDescription = '' + A Python package for creating beautiful command line interfaces in a + composable way, with as little code as necessary. + ''; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04268fc97080..5bc4432c9d71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1538,33 +1538,7 @@ in { clf = callPackage ../development/python-modules/clf {}; - click = buildPythonPackage rec { - name = "click-6.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/click/${name}.tar.gz"; - sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = '' - py.test tests - ''; - - # https://github.com/pallets/click/issues/823 - doCheck = false; - - meta = { - homepage = http://click.pocoo.org/; - description = "Create beautiful command line interfaces in Python"; - longDescription = '' - A Python package for creating beautiful command line interfaces in a - composable way, with as little code as necessary. - ''; - license = licenses.bsd3; - }; - }; + click = callPackage ../development/python-modules/click {}; click_5 = buildPythonPackage rec { name = "click-5.1"; From 54c4b040850580a520de7f54ce1a106d3e9fb40d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:33:31 +0200 Subject: [PATCH 0356/2743] pythonPackages.click_5: Move to own file --- pkgs/development/python-modules/click/5_1.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------------- 2 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/click/5_1.nix diff --git a/pkgs/development/python-modules/click/5_1.nix b/pkgs/development/python-modules/click/5_1.nix new file mode 100644 index 000000000000..d1c39cc5d2c1 --- /dev/null +++ b/pkgs/development/python-modules/click/5_1.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "click"; + version = "5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"; + }; + + meta = with stdenv.lib; { + homepage = http://click.pocoo.org/; + description = "Create beautiful command line interfaces in Python"; + longDescription = '' + A Python package for creating beautiful command line interfaces in a + composable way, with as little code as necessary. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bc4432c9d71..d68f0db7e245 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1540,25 +1540,7 @@ in { click = callPackage ../development/python-modules/click {}; - click_5 = buildPythonPackage rec { - name = "click-5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/click/${name}.tar.gz"; - sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"; - }; - - meta = { - homepage = http://click.pocoo.org/; - description = "Create beautiful command line interfaces in Python"; - longDescription = '' - A Python package for creating beautiful command line interfaces in a - composable way, with as little code as necessary. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ mog ]; - }; - }; + click_5 = callPackage ../development/python-modules/click/5_1.nix {}; click-log = buildPythonPackage rec { version = "0.2.1"; From 0ac0cf46ec3f9df06b8b5d3783ef4375f94caf82 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:38:06 +0200 Subject: [PATCH 0357/2743] pythonPackages.click-log: Move to own file --- .../python-modules/click-log/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/click-log/default.nix diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix new file mode 100644 index 000000000000..7229488a700f --- /dev/null +++ b/pkgs/development/python-modules/click-log/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, click }: + +buildPythonPackage rec { + pname = "click-log"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; + }; + + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + homepage = https://github.com/click-contrib/click-log/; + description = "Logging integration for Click"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d68f0db7e245..122e9947928d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1542,24 +1542,7 @@ in { click_5 = callPackage ../development/python-modules/click/5_1.nix {}; - click-log = buildPythonPackage rec { - version = "0.2.1"; - name = "click-log-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/click-log/${name}.tar.gz"; - sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; - }; - - propagatedBuildInputs = with self; [ click ]; - - meta = { - homepage = https://github.com/click-contrib/click-log/; - description = "Logging integration for Click"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }; + click-log = callPackage ../development/python-modules/click-log {}; click-plugins = callPackage ../development/python-modules/click-plugins {}; From 66a578aa23b3a15378aef230feddf6979dcd05f6 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:43:11 +0200 Subject: [PATCH 0358/2743] pythonPackages.cloudpickle: Move to own file --- .../python-modules/cloudpickle/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +----------------- 2 files changed, 28 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/cloudpickle/default.nix diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix new file mode 100644 index 000000000000..b7c79bbc2827 --- /dev/null +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }: + +buildPythonPackage rec { + pname = "cloudpickle"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x4fbycipkhfax7lydaxcnc14g42g274qba17j51shr5gbq6m8lx"; + }; + + buildInputs = [ pytest mock ]; + + # See README for tests invocation + checkPhase = '' + PYTHONPATH=$PYTHONPATH:'.:tests' py.test + ''; + + # TypeError: cannot serialize '_io.FileIO' object + doCheck = false; + + meta = with stdenv.lib; { + description = "Extended pickling support for Python objects"; + homepage = https://github.com/cloudpipe/cloudpickle; + license = with licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 122e9947928d..404555430cbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1574,31 +1574,7 @@ in { }; }; - cloudpickle = buildPythonPackage rec { - name = "cloudpickle-${version}"; - version = "0.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cloudpickle/${name}.tar.gz"; - sha256 = "0x4fbycipkhfax7lydaxcnc14g42g274qba17j51shr5gbq6m8lx"; - }; - - buildInputs = with self; [ pytest mock ]; - - # See README for tests invocation - checkPhase = '' - PYTHONPATH=$PYTHONPATH:'.:tests' py.test - ''; - - # TypeError: cannot serialize '_io.FileIO' object - doCheck = false; - - meta = { - description = "Extended pickling support for Python objects"; - homepage = https://github.com/cloudpipe/cloudpickle; - license = with licenses; [ bsd3 ]; - }; - }; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; cmdline = buildPythonPackage rec { pname = "cmdline"; From 8635a1074935e2b58668fbed04a26dd33dce2bac Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:49:00 +0200 Subject: [PATCH 0359/2743] pythonPackages.cmdline: Move to own file --- .../python-modules/cmdline/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/cmdline/default.nix diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix new file mode 100644 index 000000000000..4c53126cf5c2 --- /dev/null +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml }: + +buildPythonPackage rec { + pname = "cmdline"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sjkcfp4w3rxy2lm2n60dbfkc33kdb3f6254hrrvn4ci3rqv8b5y"; + }; + + # No tests, https://github.com/rca/cmdline/issues/1 + doCheck = false; + propagatedBuildInputs = [ pyyaml ]; + + meta = with stdenv.lib; { + description = "Utilities for consistent command line tools"; + homepage = https://github.com/rca/cmdline; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 404555430cbd..c4909bc40043 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1576,25 +1576,7 @@ in { cloudpickle = callPackage ../development/python-modules/cloudpickle { }; - cmdline = buildPythonPackage rec { - pname = "cmdline"; - version = "0.1.6"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/${pname}/${name}.tar.gz"; - sha256 = "be2cb4711e9111bb7386a408e3c66a730c36dd6ac05851a9f03d0f4eae63536a"; - }; - - # No tests, https://github.com/rca/cmdline/issues/1 - doCheck = false; - propagatedBuildInputs = with self; [ pyyaml ]; - meta = { - description = "Utilities for consistent command line tools"; - homepage = https://github.com/rca/cmdline; - license = licenses.asl20; - }; - }; + cmdline = callPackage ../development/python-modules/cmdline { }; codecov = callPackage ../development/python-modules/codecov {}; From d2829d7693586f492e7fcd925b526357e626b8b3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 18:57:31 +0200 Subject: [PATCH 0360/2743] pythonPackages.cogapp: Move to own file --- .../python-modules/cogapp/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/cogapp/default.nix diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix new file mode 100644 index 000000000000..5f70437ec4fb --- /dev/null +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cogapp"; + version = "2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn"; + }; + + # there are no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A code generator for executing Python snippets in source files"; + homepage = http://nedbatchelder.com/code/cog; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4909bc40043..03bec1631223 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1580,26 +1580,7 @@ in { codecov = callPackage ../development/python-modules/codecov {}; - cogapp = buildPythonPackage rec { - version = "2.3"; - name = "cogapp-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cogapp/${name}.tar.gz"; - sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn"; - }; - - # there are no tests - doCheck = false; - - meta = { - description = "A code generator for executing Python snippets in source files"; - homepage = http://nedbatchelder.com/code/cog; - license = licenses.mit; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - }; + cogapp = callPackage ../development/python-modules/cogapp {}; colorama = callPackage ../development/python-modules/colorama { }; From 869d9afd21cefe20d853e6d39dbfe0c67d61a317 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:03:12 +0200 Subject: [PATCH 0361/2743] pythonPackages.coilmq: Move to own file --- .../python-modules/coilmq/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------------ 2 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/coilmq/default.nix diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix new file mode 100644 index 000000000000..ea008e46631d --- /dev/null +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, stompclient, pythondaemon, redis, pid, pytest, six, click, coverage +, sqlalchemy }: + +buildPythonPackage rec { + pname = "CoilMQ"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wwa6fsqw1mxsryvgp0yrdjil8axyj0kslzi7lr45cnhgp5ab375"; + }; + + propagatedBuildInputs = [ stompclient pythondaemon redis pid ]; + buildInputs = [ pytest six click coverage sqlalchemy ]; + + # The teste data is not included in the distribution + doCheck = false; + + meta = with stdenv.lib; { + description = "Simple, lightweight, and easily extensible STOMP message broker"; + homepage = http://code.google.com/p/coilmq/; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03bec1631223..141690249ebd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1596,30 +1596,7 @@ in { }; }); - - coilmq = buildPythonPackage (rec { - name = "CoilMQ-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/CoilMQ/${name}.tar.gz"; - sha256 = "0wwa6fsqw1mxsryvgp0yrdjil8axyj0kslzi7lr45cnhgp5ab375"; - }; - - propagatedBuildInputs = with self; [ stompclient pythondaemon redis pid]; - - buildInputs = with self; [ pytest six click coverage sqlalchemy ]; - - # The teste data is not included in the distribution - doCheck = false; - - meta = { - description = "Simple, lightweight, and easily extensible STOMP message broker"; - homepage = http://code.google.com/p/coilmq/; - license = licenses.asl20; - }; - }); - + coilmq = callPackage ../development/python-modules/coilmq { }; colander = callPackage ../development/python-modules/colander { }; From ecc939eb194b49f86707c8a215b60968f9b8a335 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:08:32 +0200 Subject: [PATCH 0362/2743] pythonPackages.configparser: Move to own file --- .../python-modules/configparser/default.nix | 24 +++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------------ 2 files changed, 25 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/configparser/default.nix diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix new file mode 100644 index 000000000000..8d1539c241d1 --- /dev/null +++ b/pkgs/development/python-modules/configparser/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "configparser"; + version = "3.5.0"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k"; + }; + + # No tests available + doCheck = false; + + # Fix issue when used together with other namespace packages + # https://github.com/NixOS/nixpkgs/issues/23855 + patches = [ + ./0001-namespace-fix.patch + ]; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 141690249ebd..abc198029113 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1601,34 +1601,7 @@ in { colander = callPackage ../development/python-modules/colander { }; # Backported version of the ConfigParser library of Python 3.3 - configparser = if isPy3k then null else buildPythonPackage rec { - name = "configparser-${version}"; - version = "3.5.0"; - - # running install_egg_info - # error: [Errno 9] Bad file descriptor: '' - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/configparser/${name}.tar.gz"; - sha256 = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"; - }; - - # No tests available - doCheck = false; - - # Fix issue when used together with other namespace packages - # https://github.com/NixOS/nixpkgs/issues/23855 - patches = [ - ./../development/python-modules/configparser/0001-namespace-fix.patch - ]; - - meta = { - maintainers = [ ]; - platforms = platforms.all; - }; - }; - + configparser = callPackage ../development/python-modules/configparser { }; ColanderAlchemy = buildPythonPackage rec { name = "ColanderAlchemy-${version}"; From bf363467f0bdd0966a4dfc3b75df5aefd9a8f30b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:23:04 +0200 Subject: [PATCH 0363/2743] pythonPackages.configobj: Move to own file --- .../python-modules/configobj/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/configobj/default.nix diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix new file mode 100644 index 000000000000..98631b6920b3 --- /dev/null +++ b/pkgs/development/python-modules/configobj/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "configobj"; + version = "5.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Config file reading, writing and validation"; + homepage = https://pypi.python.org/pypi/configobj; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abc198029113..4e7fe2a3a811 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1631,27 +1631,7 @@ in { conda = callPackage ../development/python-modules/conda { }; - configobj = buildPythonPackage (rec { - name = "configobj-5.0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/configobj/${name}.tar.gz"; - sha256 = "a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902"; - }; - - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Config file reading, writing and validation"; - homepage = https://pypi.python.org/pypi/configobj; - license = licenses.bsd3; - maintainers = with maintainers; [ garbas ]; - }; - }); - + configobj = callPackage ../development/python-modules/configobj { }; confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; From ab557fcd673437dae14b93f375236286851a55d5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:27:28 +0200 Subject: [PATCH 0364/2743] pythonPackages.consul: Move to own file --- .../python-modules/consul/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/consul/default.nix diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix new file mode 100644 index 000000000000..4a4b351e20ca --- /dev/null +++ b/pkgs/development/python-modules/consul/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, six, pytest }: + +buildPythonPackage rec { + pname = "python-consul"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm"; + }; + + buildInputs = [ requests six pytest ]; + + # No tests distributed. https://github.com/cablehead/python-consul/issues/133 + doCheck = false; + + meta = with stdenv.lib; { + description = "Python client for Consul (https://www.consul.io/)"; + homepage = https://github.com/cablehead/python-consul; + license = licenses.mit; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e7fe2a3a811..148bbdb157d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1639,26 +1639,7 @@ in { construct = callPackage ../development/python-modules/construct {}; - consul = buildPythonPackage (rec { - name = "python-consul-0.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-consul/${name}.tar.gz"; - sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm"; - }; - - buildInputs = with self; [ requests six pytest ]; - - # No tests distributed. https://github.com/cablehead/python-consul/issues/133 - doCheck = false; - - meta = { - description = "Python client for Consul (https://www.consul.io/)"; - homepage = https://github.com/cablehead/python-consul; - license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; - }; - }); + consul = callPackage ../development/python-modules/consul { }; contexter = buildPythonPackage rec { name = "contexter-${version}"; From eb3fc6df2a66c1071f7e3fa986b017e83e87ce2f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:31:30 +0200 Subject: [PATCH 0365/2743] pythonPackages.contexter: Move to own file --- .../python-modules/contexter/default.nix | 14 ++++++++++++++ pkgs/top-level/python-packages.nix | 11 +---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/python-modules/contexter/default.nix diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix new file mode 100644 index 000000000000..c5d35087eaad --- /dev/null +++ b/pkgs/development/python-modules/contexter/default.nix @@ -0,0 +1,14 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "contexter"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xrnkjya29ya0hkj8y4k9ni2mnr58i6r0xfqlj7wk07v4jfrkc8n"; + }; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 148bbdb157d3..fd9ed2fccdda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1641,16 +1641,7 @@ in { consul = callPackage ../development/python-modules/consul { }; - contexter = buildPythonPackage rec { - name = "contexter-${version}"; - version = "0.1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/contexter/${name}.tar.gz"; - sha256 = "0xrnkjya29ya0hkj8y4k9ni2mnr58i6r0xfqlj7wk07v4jfrkc8n"; - }; - }; - + contexter = callPackage ../development/python-modules/contexter { }; contextlib2 = callPackage ../development/python-modules/contextlib2 { }; From d1d13aa137491c22df8c63750d9f463863af221c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:38:14 +0200 Subject: [PATCH 0366/2743] pythonPackages.cookiecutter: Move to own file --- .../python-modules/cookiecutter/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/cookiecutter/default.nix diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix new file mode 100644 index 000000000000..bcbda3653273 --- /dev/null +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy +, itsdangerous, pytest, freezegun, docutils, jinja2, future, binaryornot, click +, whichcraft, poyo, jinja2_time }: + +buildPythonPackage rec { + pname = "cookiecutter"; + version = "1.4.0"; + + # not sure why this is broken + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1clxnabmc5s4b519r1sxyj1163x833ir8xcypmdfpf6r9kbb35vn"; + }; + + buildInputs = [ itsdangerous pytest freezegun docutils ]; + propagatedBuildInputs = [ + jinja2 future binaryornot click whichcraft poyo jinja2_time + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/audreyr/cookiecutter; + description = "A command-line utility that creates projects from project templates"; + license = licenses.bsd3; + maintainers = with maintainers; [ kragniz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd9ed2fccdda..60d529709315 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1645,29 +1645,7 @@ in { contextlib2 = callPackage ../development/python-modules/contextlib2 { }; - cookiecutter = buildPythonPackage rec { - version = "1.4.0"; - name = "cookiecutter-${version}"; - - # not sure why this is broken - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz"; - sha256 = "1clxnabmc5s4b519r1sxyj1163x833ir8xcypmdfpf6r9kbb35vn"; - }; - - buildInputs = with self; [ itsdangerous pytest freezegun docutils ]; - propagatedBuildInputs = with self; [ - jinja2 future binaryornot click whichcraft poyo jinja2_time ]; - - meta = { - homepage = https://github.com/audreyr/cookiecutter; - description = "A command-line utility that creates projects from project templates"; - license = licenses.bsd3; - maintainers = with maintainers; [ kragniz ]; - }; - }; + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; cookies = buildPythonPackage rec { name = "cookies-2.2.1"; From 9b0e26624971085519bad2db86da50e4bf2c009a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:43:58 +0200 Subject: [PATCH 0367/2743] pythonPackages.cookies: Move to own file --- .../python-modules/cookies/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/cookies/default.nix diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix new file mode 100644 index 000000000000..1b8e5b6061d7 --- /dev/null +++ b/pkgs/development/python-modules/cookies/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cookies"; + version = "2.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Friendlier RFC 6265-compliant cookie parser/renderer"; + homepage = https://github.com/sashahart/cookies; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60d529709315..3bbdd68c7fec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1647,22 +1647,7 @@ in { cookiecutter = callPackage ../development/python-modules/cookiecutter { }; - cookies = buildPythonPackage rec { - name = "cookies-2.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cookies/${name}.tar.gz"; - sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; - }; - - doCheck = false; - - meta = { - description = "Friendlier RFC 6265-compliant cookie parser/renderer"; - homepage = https://github.com/sashahart/cookies; - license = licenses.mit; - }; - }; + cookies = callPackage ../development/python-modules/cookies { }; coveralls = callPackage ../development/python-modules/coveralls { }; From a7b6d5c9606799bec0e5cb6dcb4295a4575f1f14 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:49:26 +0200 Subject: [PATCH 0368/2743] pythonPackages.covCore: Move to own file --- .../python-modules/cov-core/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +----------- 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/cov-core/default.nix diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix new file mode 100644 index 000000000000..ad85218709e8 --- /dev/null +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage }: + +buildPythonPackage rec { + pname = "cov-core"; + version = "1.15.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a"; + }; + + propagatedBuildInputs = [ coverage ]; + + meta = with stdenv.lib; { + description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bbdd68c7fec..6be44b18c098 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1653,17 +1653,7 @@ in { coverage = callPackage ../development/python-modules/coverage { }; - covCore = buildPythonPackage rec { - name = "cov-core-1.15.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cov-core/${name}.tar.gz"; - sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c"; - }; - meta = { - description = "Plugin core for use by pytest-cov, nose-cov and nose2-cov"; - }; - propagatedBuildInputs = with self; [ self.coverage ]; - }; + covCore = callPackage ../development/python-modules/cov-core { }; crcmod = buildPythonPackage rec { name = "crcmod-1.7"; From 6361a501034032dfc0663c34a8ac9fc3c31648a8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 19:52:57 +0200 Subject: [PATCH 0369/2743] pythonPackages.crcmod: Move to own file --- .../python-modules/crcmod/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +------------ 2 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/crcmod/default.nix diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix new file mode 100644 index 000000000000..f85e045d525e --- /dev/null +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "crcmod"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"; + }; + + meta = with stdenv.lib; { + description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; + homepage = http://crcmod.sourceforge.net/; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6be44b18c098..14393c3c5784 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1655,18 +1655,7 @@ in { covCore = callPackage ../development/python-modules/cov-core { }; - crcmod = buildPythonPackage rec { - name = "crcmod-1.7"; - src = pkgs.fetchurl { - url = mirror://pypi/c/crcmod/crcmod-1.7.tar.gz; - sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"; - }; - meta = { - description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; - homepage = http://crcmod.sourceforge.net/; - license = licenses.mit; - }; - }; + crcmod = callPackage ../development/python-modules/crcmod { }; credstash = callPackage ../development/python-modules/credstash { }; From 594868a7a6e7552d16a549c75a654931881ce4b2 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 20:00:26 +0200 Subject: [PATCH 0370/2743] pythonPackages.cryptacular: Move to own file --- .../python-modules/cryptacular/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +--------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/cryptacular/default.nix diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix new file mode 100644 index 000000000000..e81426a892d6 --- /dev/null +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, coverage, nose, pbkdf2 }: + +buildPythonPackage rec { + pname = "cryptacular"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "18fl7phl6r9xiwz8f1jpkahkv21wimmiq72gmrqncccv7z806gr7"; + }; + + buildInputs = [ coverage nose ]; + propagatedBuildInputs = [ pbkdf2 ]; + + # TODO: tests fail: TypeError: object of type 'NoneType' has no len() + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14393c3c5784..2a85b1b33b21 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1663,24 +1663,7 @@ in { cytoolz = callPackage ../development/python-modules/cytoolz { }; - cryptacular = buildPythonPackage rec { - name = "cryptacular-1.4.1"; - - buildInputs = with self; [ coverage nose ]; - propagatedBuildInputs = with self; [ pbkdf2 ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cryptacular/${name}.tar.gz"; - sha256 = "273f03d03f9b316671ae4f1c1c6b8d3c883da19a5706873e8f3d6543e13dd4a1"; - }; - - # TODO: tests fail: TypeError: object of type 'NoneType' has no len() - doCheck = false; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + cryptacular = callPackage ../development/python-modules/cryptacular { }; cryptography = callPackage ../development/python-modules/cryptography { }; From 86f0a6eb2b8a9028ddda6848b66511e6eb9eada4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 20:05:08 +0200 Subject: [PATCH 0371/2743] pythonPackages: Cleanup by not specifying default.nix --- pkgs/top-level/python-packages.nix | 37 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a85b1b33b21..d342b3a71724 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -353,7 +353,7 @@ in { pyjwkest = callPackage ../development/python-modules/pyjwkest { }; - pykde4 = callPackage ../development/python-modules/pykde4/default.nix { + pykde4 = callPackage ../development/python-modules/pykde4 { inherit (self) pyqt4; callPackage = pkgs.callPackage; }; @@ -1473,7 +1473,7 @@ in { }; }; - cccolutils = callPackage ../development/python-modules/cccolutils/default.nix {}; + cccolutils = callPackage ../development/python-modules/cccolutils {}; CDDB = buildPythonPackage rec { name = "CDDB-1.4"; @@ -1726,8 +1726,7 @@ in { pythonPackages = self; }); - openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {}; - + openidc-client = callPackage ../development/python-modules/openidc-client {}; idna = callPackage ../development/python-modules/idna { }; @@ -2007,7 +2006,7 @@ in { pytest = self.pytest_34; - pytest_34 = callPackage ../development/python-modules/pytest/default.nix{ + pytest_34 = callPackage ../development/python-modules/pytest { hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -3901,9 +3900,9 @@ in { }; }; - idna-ssl = callPackage ../development/python-modules/idna-ssl/default.nix { }; + idna-ssl = callPackage ../development/python-modules/idna-ssl { }; - ijson = callPackage ../development/python-modules/ijson/default.nix {}; + ijson = callPackage ../development/python-modules/ijson {}; imagesize = buildPythonPackage rec { name = "imagesize-${version}"; @@ -7859,7 +7858,7 @@ in { keyutils = callPackage ../development/python-modules/keyutils { }; klein = callPackage ../development/python-modules/klein { }; - + koji = callPackage ../development/python-modules/koji { }; kombu = buildPythonPackage rec { @@ -7892,13 +7891,13 @@ in { konfig = callPackage ../development/python-modules/konfig { }; - kitchen = callPackage ../development/python-modules/kitchen/default.nix { }; + kitchen = callPackage ../development/python-modules/kitchen { }; - kubernetes = callPackage ../development/python-modules/kubernetes/default.nix { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; - pylast = callPackage ../development/python-modules/pylast/default.nix { }; + pylast = callPackage ../development/python-modules/pylast { }; - pylru = callPackage ../development/python-modules/pylru/default.nix { }; + pylru = callPackage ../development/python-modules/pylru { }; lark-parser = callPackage ../development/python-modules/lark-parser { }; @@ -8156,7 +8155,7 @@ in { }; }); - py_scrypt = callPackage ../development/python-modules/py_scrypt/default.nix { }; + py_scrypt = callPackage ../development/python-modules/py_scrypt { }; python_magic = callPackage ../development/python-modules/python-magic { }; @@ -8369,13 +8368,13 @@ in { }; - matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { + matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; - matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { }; + matrix-client = callPackage ../development/python-modules/matrix-client { }; maya = callPackage ../development/python-modules/maya { }; @@ -8403,7 +8402,7 @@ in { }; }); - MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup/default.nix { }; + MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; @@ -12346,7 +12345,7 @@ in { }; }; - python_fedora = callPackage ../development/python-modules/python_fedora/default.nix {}; + python_fedora = callPackage ../development/python-modules/python_fedora {}; python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; python_simple_hipchat = self.python-simple-hipchat; @@ -13449,9 +13448,9 @@ in { }; }; - rpkg = callPackage ../development/python-modules/rpkg/default.nix {}; + rpkg = callPackage ../development/python-modules/rpkg {}; - rply = callPackage ../development/python-modules/rply/default.nix {}; + rply = callPackage ../development/python-modules/rply {}; rpm = toPythonModule (pkgs.rpm.override{inherit python;}); From 902f7f2b87eabfae626849f7c0eb30c5eeeb51f6 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 20:19:57 +0200 Subject: [PATCH 0372/2743] pythonPackages.pkginfo: Move to own file --- .../python-modules/pkginfo/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +----------------- 2 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/pkginfo/default.nix diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix new file mode 100644 index 000000000000..2e01b8479ff4 --- /dev/null +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pkginfo"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qg4sq3m0pxvjahc3sncwhw42z5rfw22k0ybskmdqkl2agykay7q"; + }; + + doCheck = false; # I don't know why, but with doCheck = true it fails. + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/pkginfo; + license = licenses.mit; + description = "Query metadatdata from sdists / bdists / installed packages"; + + longDescription = '' + This package provides an API for querying the distutils metadata + written in the PKG-INFO file inside a source distriubtion (an sdist) + or a binary distribution (e.g., created by running bdist_egg). It can + also query the EGG-INFO directory of an installed distribution, and the + *.egg-info stored in a “development checkout” (e.g, created by running + setup.py develop). + ''; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d342b3a71724..0a886e58e3fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1826,32 +1826,7 @@ in { portpicker = callPackage ../development/python-modules/portpicker { }; - pkginfo = buildPythonPackage rec { - version = "1.3.2"; - name = "pkginfo-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pkginfo/${name}.tar.gz"; - sha256 = "0qg4sq3m0pxvjahc3sncwhw42z5rfw22k0ybskmdqkl2agykay7q"; - }; - - doCheck = false; # I don't know why, but with doCheck = true it fails. - - meta = { - homepage = https://pypi.python.org/pypi/pkginfo; - license = licenses.mit; - description = "Query metadatdata from sdists / bdists / installed packages"; - - longDescription = '' - This package provides an API for querying the distutils metadata - written in the PKG-INFO file inside a source distriubtion (an sdist) - or a binary distribution (e.g., created by running bdist_egg). It can - also query the EGG-INFO directory of an installed distribution, and the - *.egg-info stored in a “development checkout” (e.g, created by running - setup.py develop). - ''; - }; - }; + pkginfo = callPackage ../development/python-modules/pkginfo { }; pretend = buildPythonPackage rec { name = "pretend-1.0.8"; From 0132eaa86a1809454069adf92abd745718a761e4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 20:35:43 +0200 Subject: [PATCH 0373/2743] pythonPackages.pretend: Move to own file --- .../python-modules/pretend/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pretend/default.nix diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix new file mode 100644 index 000000000000..3572d938a0dc --- /dev/null +++ b/pkgs/development/python-modules/pretend/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pretend"; + version = "1.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; + }; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/alex/pretend; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a886e58e3fd..125d6ba32895 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1828,23 +1828,7 @@ in { pkginfo = callPackage ../development/python-modules/pkginfo { }; - pretend = buildPythonPackage rec { - name = "pretend-1.0.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pretend/pretend-1.0.8.tar.gz"; - sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = https://github.com/alex/pretend; - license = licenses.bsd3; - }; - }; - + pretend = callPackage ../development/python-modules/pretend { }; detox = self.buildPythonPackage rec { name = "detox-0.10.0"; From 9a42fdef9062561171eccaf103dc4dd23c30812b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 20:56:14 +0200 Subject: [PATCH 0374/2743] pythonPackages.detox: Move to own file --- .../python-modules/detox/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +---------------- 2 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/detox/default.nix diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix new file mode 100644 index 000000000000..faf59978fdc0 --- /dev/null +++ b/pkgs/development/python-modules/detox/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, tox, py, eventlet }: + +buildPythonPackage rec { + pname = "detox"; + version = "0.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v5sq3ak1b6388k1q31cd4pds56z76l2myvj022ncwv5lp109drk"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ tox py eventlet ]; + + checkPhase = '' + py.test + ''; + + # eventlet timeout, and broken invokation 3.5 + doCheck = false; + + meta = with stdenv.lib; { + description = "What is detox?"; + homepage = https://bitbucket.org/hpk42/detox; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 125d6ba32895..361d62676d8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1830,30 +1830,7 @@ in { pretend = callPackage ../development/python-modules/pretend { }; - detox = self.buildPythonPackage rec { - name = "detox-0.10.0"; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ tox py eventlet ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/detox/${name}.tar.gz"; - sha256 = "33b704c2a5657366850072fb2aa839df14dd2e692c0c1c2642c3ac30d5c0baec"; - }; - - checkPhase = '' - py.test - ''; - - # eventlet timeout, and broken invokation 3.5 - doCheck = false; - - meta = { - description = "What is detox?"; - homepage = https://bitbucket.org/hpk42/detox; - }; - }; - + detox = callPackage ../development/python-modules/detox { }; pbkdf2 = buildPythonPackage rec { name = "pbkdf2-1.3"; From e72e47c666b2af85312299b2b5cbdedf3a523323 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 21:03:11 +0200 Subject: [PATCH 0375/2743] pythonPackages.pbkdf2: Move to own file --- .../python-modules/pbkdf2/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/pbkdf2/default.nix diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix new file mode 100644 index 000000000000..c83cada08f2e --- /dev/null +++ b/pkgs/development/python-modules/pbkdf2/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pbkdf2"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yb99rl2mbsaamj571s1mf6vgniqh23v98k4632150hjkwv9fqxc"; + }; + + # ImportError: No module named test + doCheck = false; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 361d62676d8b..c76d963fe930 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1832,21 +1832,7 @@ in { detox = callPackage ../development/python-modules/detox { }; - pbkdf2 = buildPythonPackage rec { - name = "pbkdf2-1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pbkdf2/${name}.tar.gz"; - sha256 = "ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979"; - }; - - # ImportError: No module named test - doCheck = false; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; bcrypt = callPackage ../development/python-modules/bcrypt { }; From 1c69fccc81d55ab134aeb61b277506321ee3808a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 21:11:37 +0200 Subject: [PATCH 0376/2743] pythonPackages.pycontracts: Move to own file --- .../python-modules/pycontracts/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pycontracts/default.nix diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix new file mode 100644 index 000000000000..bd933b872ab5 --- /dev/null +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, pyparsing, decorator, six }: + +buildPythonPackage rec { + pname = "PyContracts"; + version = "1.7.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ pyparsing decorator six ]; + + meta = with stdenv.lib; { + description = "Allows to declare constraints on function parameters and return values"; + homepage = https://pypi.python.org/pypi/PyContracts; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c76d963fe930..7605f7fe028b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1840,25 +1840,7 @@ in { pycollada = callPackage ../development/python-modules/pycollada { }; - pycontracts = buildPythonPackage rec { - version = "1.7.9"; - name = "PyContracts-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyContracts/${name}.tar.gz"; - sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf"; - }; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [ pyparsing decorator six ]; - - meta = { - description = "Allows to declare constraints on function parameters and return values"; - homepage = https://pypi.python.org/pypi/PyContracts; - license = licenses.lgpl2; - }; - }; + pycontracts = callPackage ../development/python-modules/pycontracts { }; pycparser = buildPythonPackage rec { name = "pycparser-${version}"; From 8fab23d694c58e3c63b3ab1431d9090b50c88a07 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 21:16:10 +0200 Subject: [PATCH 0377/2743] pythonPackages.pycparser: Move to own file --- .../python-modules/pycparser/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pycparser/default.nix diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix new file mode 100644 index 000000000000..afc3bc42dc2a --- /dev/null +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, python }: + +buildPythonPackage rec { + pname = "pycparser"; + version = "2.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wvzyb6rxsfj3xcnpa4ynbh9qc7rrbk2277d5wqpphmx9akv8nbr"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with stdenv.lib; { + description = "C parser in Python"; + homepage = https://github.com/eliben/pycparser; + license = licenses.bsd3; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7605f7fe028b..dd9d9d42ed8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1842,26 +1842,7 @@ in { pycontracts = callPackage ../development/python-modules/pycontracts { }; - pycparser = buildPythonPackage rec { - name = "pycparser-${version}"; - version = "2.14"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pycparser/${name}.tar.gz"; - sha256 = "7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests - ''; - - meta = { - description = "C parser in Python"; - homepage = https://github.com/eliben/pycparser; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + pycparser = callPackage ../development/python-modules/pycparser { }; pydub = callPackage ../development/python-modules/pydub {}; From e805ce8d5c50953cddf261959d7525a8c6e6740d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 31 Mar 2018 21:28:02 +0200 Subject: [PATCH 0378/2743] pythonPackages.pytestcache: Move to own file --- .../python-modules/pytestcache/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pytestcache/default.nix diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix new file mode 100644 index 000000000000..2875bf88340f --- /dev/null +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, execnet }: + +buildPythonPackage rec { + pname = "pytest-cache"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ execnet ]; + + checkPhase = '' + py.test + ''; + + # Too many failing tests. Are they maintained? + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-cache/; + description = "pytest plugin with mechanisms for caching across test runs"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd9d9d42ed8b..28bd69d55272 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1914,29 +1914,7 @@ in { pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; - pytestcache = buildPythonPackage rec { - name = "pytest-cache-1.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz"; - sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y"; - }; - - buildInputs = with self; [ pytest]; - propagatedBuildInputs = with self ; [ execnet ]; - - checkPhase = '' - py.test - ''; - - # Too many failing tests. Are they maintained? - doCheck = false; - - meta = { - license = licenses.mit; - homepage = "https://pypi.python.org/pypi/pytest-cache/"; - description = "pytest plugin with mechanisms for caching across test runs"; - }; - }; + pytestcache = callPackage ../development/python-modules/pytestcache { }; pytest-catchlog = buildPythonPackage rec { name = "pytest-catchlog-1.2.2"; From e0b97819b7b6351ccd269c390f39a6f58fe86a45 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 1 Apr 2018 13:59:27 +0200 Subject: [PATCH 0379/2743] pythonPackages.pytest-catchlog: Move to own file --- .../pytest-catchlog/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------------- 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-catchlog/default.nix diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix new file mode 100644 index 000000000000..fb020ba471fc --- /dev/null +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, unzip }: + +buildPythonPackage rec { + pname = "pytest-catchlog"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; + extension = "zip"; + }; + + buildInputs = [ pytest unzip ]; + checkPhase = "make test"; + + # Requires pytest < 3.1 + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-catchlog/; + description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28bd69d55272..08c36236c633 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1916,26 +1916,7 @@ in { pytestcache = callPackage ../development/python-modules/pytestcache { }; - pytest-catchlog = buildPythonPackage rec { - name = "pytest-catchlog-1.2.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-catchlog/${name}.zip"; - sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = "make test"; - - # Requires pytest < 3.1 - doCheck = false; - - meta = { - license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-catchlog/; - description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; - }; - }; + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; From f648930a0b3ad1afe9242fa1b342c6991d6c6367 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 1 Apr 2018 14:04:29 +0200 Subject: [PATCH 0380/2743] pythonPackages.pytest-fixture-config: Move to own file --- .../pytest-fixture-config/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------------ 2 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-fixture-config/default.nix diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix new file mode 100644 index 000000000000..db2e1768afa7 --- /dev/null +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, coverage, virtualenv, pytestcov, six }: + +buildPythonPackage rec { + pname = "pytest-fixture-config"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dpdf36hpkfhgmca4rwmf0vnzz7xqbiw479v11zp12pq4p5w2z3x"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ coverage virtualenv pytestcov six ]; + + checkPhase = '' + py.test -k "not test_yield_requires_config_doesnt_skip and not test_yield_requires_config_skips" + ''; + + meta = with stdenv.lib; { + description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; + homepage = https://github.com/manahl/pytest-plugins; + license = licenses.mit; + maintainers = with maintainers; [ ryansydnor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08c36236c633..9b8e13d0288d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1924,31 +1924,7 @@ in { pytest-django = callPackage ../development/python-modules/pytest-django { }; - pytest-fixture-config = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-fixture-config"; - version = "1.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "7d7cc1cb25f88a707f083b1dc2e3c2fdfc6f37709567a2587dd0cd0bcd70edb6"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ coverage virtualenv pytestcov six ]; - - checkPhase = '' - py.test -k "not test_yield_requires_config_doesnt_skip and not test_yield_requires_config_skips" - ''; - - meta = { - description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; - homepage = https://github.com/manahl/pytest-plugins; - license = licenses.mit; - maintainers = with maintainers; [ ryansydnor ]; - platforms = platforms.all; - }; - }; + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; pytest-forked = callPackage ../development/python-modules/pytest-forked { }; From e346024ce92b789428780652f3facbe4cdc45d69 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 1 Apr 2018 14:09:20 +0200 Subject: [PATCH 0381/2743] pythonPackages.pytestflakes: Move to own file --- .../python-modules/pytest-flakes/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +---------------- 2 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-flakes/default.nix diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix new file mode 100644 index 000000000000..ce6ed5b110b9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytestpep8, pytest, pyflakes, pytestcache }: + +buildPythonPackage rec { + pname = "pytest-flakes"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0flag3n33kbhyjrhzmq990rvg4yb8hhhl0i48q9hw0ll89jp28lw"; + }; + + buildInputs = [ pytestpep8 pytest ]; + propagatedBuildInputs = [ pyflakes pytestcache ]; + + checkPhase = '' + py.test test_flakes.py + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-flakes; + description = "pytest plugin to check source code with pyflakes"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b8e13d0288d..47691529ef2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1932,28 +1932,7 @@ in { pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - pytestflakes = buildPythonPackage rec { - name = "pytest-flakes-${version}"; - version = "1.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-flakes/${name}.tar.gz"; - sha256 = "9c2271654294020e134624020a2144cb93b7334809d70fb3f470cd31ec788a3a"; - }; - - buildInputs = with self; [ pytestpep8 pytest ]; - propagatedBuildInputs = with self; [ pyflakes pytestcache ]; - - checkPhase = '' - py.test test_flakes.py - ''; - - meta = { - license = licenses.mit; - homepage = "https://pypi.python.org/pypi/pytest-flakes"; - description = "pytest plugin to check source code with pyflakes"; - }; - }; + pytestflakes = callPackage ../development/python-modules/pytest-flakes { }; pytest-mock = callPackage ../development/python-modules/pytest-mock { }; From f9beba2c06dd1df0bf5802d23197ddc876f75009 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 1 Apr 2018 14:12:43 +0200 Subject: [PATCH 0382/2743] pythonPackages.pytestpep8: Move to own file and add version --- .../python-modules/pytest-pep8/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-pep8/default.nix diff --git a/pkgs/development/python-modules/pytest-pep8/default.nix b/pkgs/development/python-modules/pytest-pep8/default.nix new file mode 100644 index 000000000000..1fcb99574b2a --- /dev/null +++ b/pkgs/development/python-modules/pytest-pep8/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcache, pep8 }: + +buildPythonPackage rec { + pname = "pytest-pep8"; + version = "1.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pytestcache pep8 ]; + + checkPhase = '' + py.test + ''; + + # Fails + doCheck = false; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://pypi.python.org/pypi/pytest-pep8; + description = "pytest plugin to check PEP8 requirements"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47691529ef2b..a6e09ba9ff40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1940,29 +1940,7 @@ in { pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; - pytestpep8 = buildPythonPackage rec { - name = "pytest-pep8"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz"; - sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ pytestcache pep8 ]; - - checkPhase = '' - py.test - ''; - - # Fails - doCheck = false; - - meta = { - license = licenses.mit; - homepage = "https://pypi.python.org/pypi/pytest-pep8"; - description = "pytest plugin to check PEP8 requirements"; - }; - }; + pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; From 9fc3f7f12dfd0885129b898038338804e8d29732 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 1 Apr 2018 14:16:24 +0200 Subject: [PATCH 0383/2743] pythonPackages.pytest-raisesregexp: Move to own file --- .../pytest-raisesregexp/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +---------------- 2 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-raisesregexp/default.nix diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix new file mode 100644 index 000000000000..485729364331 --- /dev/null +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, py, pytest }: + +buildPythonPackage rec { + pname = "pytest-raisesregexp"; + version = "2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0q8yby4g3il86rp7rhk89792wm17cykzsqcwbxpbbyal3an8mphg"; + }; + + buildInputs = [ py pytest ]; + + # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3 + prePatch = '' + sed -i '3i\import io' setup.py + substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," + ''; + + meta = with stdenv.lib; { + description = "Simple pytest plugin to look for regex in Exceptions"; + homepage = https://github.com/Walkman/pytest_raisesregexp; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6e09ba9ff40..1082faa838de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1944,29 +1944,7 @@ in { pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - pytest-raisesregexp = buildPythonPackage rec { - name = "pytest-raisesregexp-${version}"; - version = "2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-raisesregexp/${name}.tar.gz"; - sha256 = "0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61"; - }; - - buildInputs = with self; [ py pytest ]; - - # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3 - prePatch = '' - sed -i '3i\import io' setup.py - substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," - ''; - - meta = { - description = "Simple pytest plugin to look for regex in Exceptions"; - homepage = https://github.com/Walkman/pytest_raisesregexp; - license = with licenses; [ mit ]; - }; - }; + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; pytestrunner = callPackage ../development/python-modules/pytestrunner { }; From 1a5ad29c48223cb9796f72b16440bcc08f0d101c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 12:39:57 +0200 Subject: [PATCH 0384/2743] pythonPackages.pytest-server-fixtures: Move to own file --- .../pytest-server-fixtures/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +----------------- 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-server-fixtures/default.nix diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix new file mode 100644 index 000000000000..a6e5f45c5d99 --- /dev/null +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, setuptools-git, pytest-shutil, pytest-fixture-config, psutil +, requests}: + +buildPythonPackage rec { + pname = "pytest-server-fixtures"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gs9qimcn8q6xi9d6i5624l0dziwvn6nj2rda07fg15g1cq66s8l"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests ]; + + # RuntimeError: Unable to find a free server number to start Xvfb + doCheck = false; + + meta = with stdenv.lib; { + description = "Extensible server fixures for py.test"; + homepage = "https://github.com/manahl/pytest-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1082faa838de..0b99b69b15d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1950,30 +1950,7 @@ in { pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; - pytest-server-fixtures = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-server-fixtures"; - version = "1.1.0"; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests ]; - - meta = { - description = "Extensible server fixures for py.test"; - homepage = "https://github.com/manahl/pytest-plugins"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - - doCheck = false; - # RuntimeError: Unable to find a free server number to start Xvfb - - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "1gs9qimcn8q6xi9d6i5624l0dziwvn6nj2rda07fg15g1cq66s8l"; - }; - }; + pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; pytest-shutil = buildPythonPackage rec { name = "pytest-shutil-${version}"; From 50c36d1fb331ec280ea5b223f2619a8690094e76 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 12:45:49 +0200 Subject: [PATCH 0385/2743] pythonPackages.pytest-shutil: Move to own file --- .../python-modules/pytest-shutil/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-shutil/default.nix diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix new file mode 100644 index 000000000000..6eb5f95217cb --- /dev/null +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, contextlib2 }: + +buildPythonPackage rec { + pname = "pytest-shutil"; + version = "1.2.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gdzarg3l7d80lj0gh9bcsw9r12gmf306n4y2cb18y7kqfpcqjlj"; + }; + + buildInputs = [ cmdline pytest ]; + propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "A goodie-bag of unix shell and environment tools for py.test"; + homepage = https://github.com/manahl/pytest-plugins; + maintainers = with maintainers; [ ryansydnor ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b99b69b15d2..8f11440e789a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1952,27 +1952,7 @@ in { pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; - pytest-shutil = buildPythonPackage rec { - name = "pytest-shutil-${version}"; - version = "1.2.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz"; - sha256 = "924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d"; - }; - buildInputs = with self; [ cmdline pytest ]; - propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; - meta = { - description = "A goodie-bag of unix shell and environment tools for py.test"; - homepage = https://github.com/manahl/pytest-plugins; - maintainers = with maintainers; [ ryansydnor ]; - platforms = platforms.all; - license = licenses.mit; - }; - - checkPhase = '' - py.test - ''; - }; + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; pytestcov = buildPythonPackage rec { name = "pytest-cov-2.4.0"; From f1a83151df32262e420d85de2eaa0ae17b7c0c4a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 12:51:10 +0200 Subject: [PATCH 0386/2743] pythonPackages.pytestcov: Move to own file --- .../python-modules/pytest-cov/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +---------------- 2 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-cov/default.nix diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix new file mode 100644 index 000000000000..1bb47c3c9dfb --- /dev/null +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytest_xdist, virtualenv, process-tests, coverage }: + +buildPythonPackage rec { + pname = "pytest-cov"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k"; + }; + + buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; + propagatedBuildInputs = [ coverage ]; + + # xdist related tests fail with the following error + # OSError: [Errno 13] Permission denied: 'py/_code' + doCheck = false; + checkPhase = '' + # allow to find the module helper during the test run + export PYTHONPATH=$PYTHONPATH:$PWD/tests + py.test tests + ''; + + meta = with stdenv.lib; { + description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + homepage = https://github.com/pytest-dev/pytest-cov; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f11440e789a..b033f3e30939 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1954,32 +1954,7 @@ in { pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; - pytestcov = buildPythonPackage rec { - name = "pytest-cov-2.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-cov/${name}.tar.gz"; - sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k"; - }; - - buildInputs = with self; [ pytest pytest_xdist virtualenv process-tests ]; - propagatedBuildInputs = with self; [ coverage ]; - - # xdist related tests fail with the following error - # OSError: [Errno 13] Permission denied: 'py/_code' - doCheck = false; - checkPhase = '' - # allow to find the module helper during the test run - export PYTHONPATH=$PYTHONPATH:$PWD/tests - py.test tests - ''; - - meta = { - description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; - homepage = https://github.com/pytest-dev/pytest-cov; - license = licenses.mit; - }; - }; + pytestcov = callPackage ../development/python-modules/pytest-cov { }; pytest-expect = callPackage ../development/python-modules/pytest-expect { }; From 17f96f382d9137ad31ebe98f8797a9374d95b9d8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 12:56:35 +0200 Subject: [PATCH 0387/2743] pythonPackages.pytest-virtualenv: Move to own file --- .../pytest-virtualenv/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-virtualenv/default.nix diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix new file mode 100644 index 000000000000..1338cbb153f3 --- /dev/null +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: + +buildPythonPackage rec { + pname = "pytest-virtualenv"; + version = "1.2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mb76zhlak4qjjq2h7kaxbihk1b9plmimbzcb8qv4906cxl69ysi"; + }; + + buildInputs = [ pytest pytestcov mock cmdline ]; + propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ]; + checkPhase = '' py.test tests/unit ''; + + meta = with stdenv.lib; { + description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; + homepage = https://github.com/manahl/pytest-plugins; + license = licenses.mit; + maintainers = with maintainers; [ ryansydnor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b033f3e30939..4cdaa7ffb466 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1958,25 +1958,7 @@ in { pytest-expect = callPackage ../development/python-modules/pytest-expect { }; - pytest-virtualenv = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-virtualenv"; - version = "1.2.7"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755"; - }; - buildInputs = with self; [ pytest pytestcov mock cmdline ]; - propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ]; - checkPhase = '' py.test tests/unit ''; - meta = { - description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; - homepage = https://github.com/manahl/pytest-plugins; - license = licenses.mit; - maintainers = with maintainers; [ ryansydnor ]; - platforms = platforms.all; - }; - }; + pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; pytest_xdist = callPackage ../development/python-modules/pytest-xdist { }; From 1e44e2f095608f3b42ad3313f2dcffd401a4103e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:00:53 +0200 Subject: [PATCH 0388/2743] pythonPackages.python-subtesthack: Move to own file --- .../pytest-subtesthack/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/pytest-subtesthack/default.nix diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix new file mode 100644 index 000000000000..b639b61ad4d3 --- /dev/null +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "pytest-subtesthack"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; + }; + + buildInputs = [ pytest ]; + + # no upstream test + doCheck = false; + + meta = with stdenv.lib; { + description = "Terrible plugin to set up and tear down fixtures within the test function itself"; + homepage = https://github.com/untitaker/pytest-subtesthack; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cdaa7ffb466..407b8f2b2fc6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1964,26 +1964,7 @@ in { pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; - pytest-subtesthack = buildPythonPackage rec { - name = "pytest-subtesthack-${version}"; - version = "0.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-subtesthack/${name}.tar.gz"; - sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; - }; - - buildInputs = with self; [ pytest ]; - - # no upstream test - doCheck = false; - - meta = { - description = "Terrible plugin to set up and tear down fixtures within the test function itself"; - homepage = https://github.com/untitaker/pytest-subtesthack; - license = licenses.publicDomain; - }; - }; + pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; From 434c31e825b6496aa3877e239aa51c429b70dbf0 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:08:49 +0200 Subject: [PATCH 0389/2743] pythonPackages.cssselect: Move to own file --- .../python-modules/cssselect/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +----------- 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/cssselect/default.nix diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix new file mode 100644 index 000000000000..e9a6239971aa --- /dev/null +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "cssselect"; + version = "0.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "10h623qnp6dp1191jri7lvgmnd4yfkl36k9smqklp1qlf3iafd85"; + }; + + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + + meta = with stdenv.lib; { + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 407b8f2b2fc6..586bca178c60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1995,17 +1995,7 @@ in { }; }; - - cssselect = buildPythonPackage rec { - name = "cssselect-${version}"; - version = "0.9.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/c/cssselect/${name}.tar.gz"; - sha256 = "10h623qnp6dp1191jri7lvgmnd4yfkl36k9smqklp1qlf3iafd85"; - }; - # AttributeError: 'module' object has no attribute 'tests' - doCheck = false; - }; + cssselect = callPackage ../development/python-modules/cssselect { }; cssutils = buildPythonPackage (rec { name = "cssutils-1.0.1"; From 4cf18fc2c5ec9c4e18d16db223f4e7c05ac87c68 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:13:12 +0200 Subject: [PATCH 0390/2743] pythonPackages.cssutils: Move to own file --- .../python-modules/cssutils/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/cssutils/default.nix diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix new file mode 100644 index 000000000000..30398fd50062 --- /dev/null +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, mock }: + +buildPythonPackage rec { + pname = "cssutils"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq"; + }; + + buildInputs = [ mock ]; + + # couple of failing tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python package to parse and build CSS"; + homepage = http://code.google.com/p/cssutils/; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 586bca178c60..ca1484e7abf3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1997,27 +1997,7 @@ in { cssselect = callPackage ../development/python-modules/cssselect { }; - cssutils = buildPythonPackage (rec { - name = "cssutils-1.0.1"; - - src = pkgs.fetchurl { - url = mirror://pypi/c/cssutils/cssutils-1.0.1.tar.gz; - sha256 = "0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq"; - }; - - buildInputs = with self; [ self.mock ]; - - # couple of failing tests - doCheck = false; - - meta = { - description = "A Python package to parse and build CSS"; - - homepage = http://code.google.com/p/cssutils/; - - license = licenses.lgpl3Plus; - }; - }); + cssutils = callPackage ../development/python-modules/cssutils { }; darcsver = buildPythonPackage (rec { name = "darcsver-1.7.4"; From 6794cb750c81f4518a18c3fc8220859af5bb14b7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:18:13 +0200 Subject: [PATCH 0391/2743] pythonPackages.darcsver: Move to own file --- .../python-modules/darcsver/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +----------------- 2 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/darcsver/default.nix diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix new file mode 100644 index 000000000000..753b592a4c59 --- /dev/null +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, mock }: + +buildPythonPackage rec { + pname = "darcsver"; + version = "1.7.4"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6"; + }; + + buildInputs = [ mock ]; + + # Note: We don't actually need to provide Darcs as a build input. + # Darcsver will DTRT when Darcs isn't available. See news.gmane.org + # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a + # discussion. + + # AttributeError: 'module' object has no attribute 'test_darcsver' + doCheck = false; + + meta = with stdenv.lib; { + description = "Darcsver, generate a version number from Darcs history"; + homepage = https://pypi.python.org/pypi/darcsver; + license = "BSD-style"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca1484e7abf3..1923fe8a9c19 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1999,33 +1999,7 @@ in { cssutils = callPackage ../development/python-modules/cssutils { }; - darcsver = buildPythonPackage (rec { - name = "darcsver-1.7.4"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/darcsver/${name}.tar.gz"; - sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6"; - }; - - buildInputs = with self; [ self.mock ]; - - # Note: We don't actually need to provide Darcs as a build input. - # Darcsver will DTRT when Darcs isn't available. See news.gmane.org - # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a - # discussion. - - # AttributeError: 'module' object has no attribute 'test_darcsver' - doCheck = false; - - meta = { - description = "Darcsver, generate a version number from Darcs history"; - - homepage = https://pypi.python.org/pypi/darcsver; - - license = "BSD-style"; - }; - }); + darcsver = callPackage ../development/python-modules/darcsver { }; dask = callPackage ../development/python-modules/dask { }; From f73b73d6d699b86e84bc72168b1b8e2eb86e1e69 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:23:05 +0200 Subject: [PATCH 0392/2743] pythonPackages.datrie: Move to own file --- .../python-modules/datrie/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/datrie/default.nix diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix new file mode 100644 index 000000000000..f9ac491dc81d --- /dev/null +++ b/pkgs/development/python-modules/datrie/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, pytestrunner, hypothesis}: + +buildPythonPackage rec { + pname = "datrie"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; + }; + + buildInputs = [ pytest pytestrunner hypothesis ]; + + meta = with stdenv.lib; { + description = "Super-fast, efficiently stored Trie for Python"; + homepage = "https://github.com/kmike/datrie"; + license = licenses.lgpl2; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1923fe8a9c19..20e61ca87203 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2003,23 +2003,7 @@ in { dask = callPackage ../development/python-modules/dask { }; - datrie = buildPythonPackage rec { - name = "datrie"; - version = "0.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/datrie/datrie-${version}.tar.gz"; - sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; - }; - - buildInputs = with self; [ pytest pytestrunner hypothesis ]; - meta = { - description = "Super-fast, efficiently stored Trie for Python"; - homepage = "https://github.com/kmike/datrie"; - license = licenses.lgpl2; - maintainers = with maintainers; [ lewo ]; - }; - }; + datrie = callPackage ../development/python-modules/datrie { }; heapdict = buildPythonPackage rec { name = "HeapDict-${version}"; From 37b4051b05f18aa3eb91a03b26bddb3ab59e3c91 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:28:05 +0200 Subject: [PATCH 0393/2743] pythonPackages.heapdict: Move to own file --- .../python-modules/heapdict/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +--------------- 2 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/heapdict/default.nix diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix new file mode 100644 index 000000000000..34c01091ddf2 --- /dev/null +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "HeapDict"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nhvxyjq6fp6zd7jzmk5x4fg6xhakqx9lhkp5yadzkqn0rlf7ja0"; + }; + + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "a heap with decrease-key and increase-key operations."; + homepage = http://stutzbachenterprises.com; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20e61ca87203..02b90ec0ba5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2005,22 +2005,7 @@ in { datrie = callPackage ../development/python-modules/datrie { }; - heapdict = buildPythonPackage rec { - name = "HeapDict-${version}"; - version = "1.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/H/HeapDict/${name}.tar.gz"; - sha256 = "0nhvxyjq6fp6zd7jzmk5x4fg6xhakqx9lhkp5yadzkqn0rlf7ja0"; - }; - doCheck = !isPy3k; - meta = { - description = "a heap with decrease-key and increase-key operations."; - homepage = http://stutzbachenterprises.com; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; + heapdict = callPackage ../development/python-modules/heapdict { }; zict = buildPythonPackage rec { From 3e023aa50776ebf402be20c26775f7491fa3b976 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:33:13 +0200 Subject: [PATCH 0394/2743] pythonPackages.zict: Move to own file --- .../python-modules/zict/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/zict/default.nix diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix new file mode 100644 index 000000000000..0d1a806b2f86 --- /dev/null +++ b/pkgs/development/python-modules/zict/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, heapdict }: + +buildPythonPackage rec { + pname = "zict"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "12h95vbkbar1hc6cr1kpr6zr486grj3mpx4lznvmnai0iy6pbqp4"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ heapdict ]; + + meta = with stdenv.lib; { + description = "Mutable mapping tools."; + homepage = https://github.com/dask/zict; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02b90ec0ba5d..4d42e632efd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2007,26 +2007,7 @@ in { heapdict = callPackage ../development/python-modules/heapdict { }; - zict = buildPythonPackage rec { - - name = "zict-${version}"; - version = "0.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zict/${name}.tar.gz"; - sha256 = "12h95vbkbar1hc6cr1kpr6zr486grj3mpx4lznvmnai0iy6pbqp4"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ heapdict ]; - - meta = { - description = "Mutable mapping tools."; - homepage = https://github.com/dask/zict; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; + zict = callPackage ../development/python-modules/zict { }; distributed = buildPythonPackage rec { From c6d8004fd77c6ea6033485c2199a0c664b67c928 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:39:28 +0200 Subject: [PATCH 0395/2743] pythonPackages.digital-ocean: Move to own file --- .../python-modules/digitalocean/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +---------------- 2 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/digitalocean/default.nix diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix new file mode 100644 index 000000000000..0e4bb15fe18f --- /dev/null +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "python-digitalocean"; + version = "1.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "12qybflfnl08acspz7rpaprmlabgrzimacbd7gm9qs5537hl3qnp"; + }; + + propagatedBuildInputs = [ requests ]; + + # Package doesn't distribute tests. + doCheck = false; + + meta = with stdenv.lib; { + description = "digitalocean.com API to manage Droplets and Images"; + homepage = https://pypi.python.org/pypi/python-digitalocean; + license = licenses.lgpl3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d42e632efd7..89f2a3f9480d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2037,26 +2037,7 @@ in { }; }; - digital-ocean = buildPythonPackage rec { - name = "python-digitalocean-1.10.1"; - - propagatedBuildInputs = with self; [ requests ]; - - # Package doesn't distribute tests. - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-digitalocean/${name}.tar.gz"; - sha256 = "12qybflfnl08acspz7rpaprmlabgrzimacbd7gm9qs5537hl3qnp"; - }; - - meta = { - description = "digitalocean.com API to manage Droplets and Images"; - homepage = https://pypi.python.org/pypi/python-digitalocean; - license = licenses.lgpl3; - maintainers = with maintainers; [ teh ]; - }; - }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; leather = callPackage ../development/python-modules/leather { }; From 1b659167f39976a8e788a1e6bece69042bb34baf Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:44:10 +0200 Subject: [PATCH 0396/2743] pythonPackages.locket: Move to own file --- .../python-modules/locket/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------------ 2 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/locket/default.nix diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix new file mode 100644 index 000000000000..a4d7a8ce7062 --- /dev/null +++ b/pkgs/development/python-modules/locket/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "locket"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz"; + }; + + buildInputs = [ pytest ]; + + # weird test requirements (spur.local>=0.3.7,<0.4) + doCheck = false; + + meta = with stdenv.lib; { + description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; + homepage = https://github.com/mwilliamson/locket.py; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89f2a3f9480d..67223829ae48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2049,28 +2049,7 @@ in { linuxfd = callPackage ../development/python-modules/linuxfd { }; - locket = buildPythonPackage rec { - name = "locket-${version}"; - version = "0.2.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/locket/${name}.tar.gz"; - sha256 = "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ ]; - - # weird test requirements (spur.local>=0.3.7,<0.4) - doCheck = false; - - meta = { - description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; - homepage = "https://github.com/mwilliamson/locket.py"; - license = licenses.bsd2; - maintainers = with maintainers; [ teh ]; - }; - }; + locket = callPackage ../development/python-modules/locket { }; tblib = buildPythonPackage rec { name = "tblib-${version}"; From 9bff9d10ffe07a81bf5f947b822e615d95358494 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:47:57 +0200 Subject: [PATCH 0397/2743] pythonPackages.tblib: Move to own file --- .../python-modules/tblib/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/tblib/default.nix diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix new file mode 100644 index 000000000000..1ba3c98492c5 --- /dev/null +++ b/pkgs/development/python-modules/tblib/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "tblib"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"; + }; + + meta = with stdenv.lib; { + description = "Traceback fiddling library. Allows you to pickle tracebacks."; + homepage = https://github.com/ionelmc/python-tblib; + license = licenses.bsd2; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67223829ae48..376972f161fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2051,22 +2051,7 @@ in { locket = callPackage ../development/python-modules/locket { }; - tblib = buildPythonPackage rec { - name = "tblib-${version}"; - version = "1.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tblib/${name}.tar.gz"; - sha256 = "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"; - }; - - meta = { - description = "Traceback fiddling library. Allows you to pickle tracebacks."; - homepage = "https://github.com/ionelmc/python-tblib"; - license = licenses.bsd2; - maintainers = with maintainers; [ teh ]; - }; - }; + tblib = callPackage ../development/python-modules/tblib { }; s3fs = buildPythonPackage rec { name = "s3fs-${version}"; From 6851911f92b437f7a915208ba11ff191837cd9ca Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 13:52:46 +0200 Subject: [PATCH 0398/2743] pythonPackages.s3fs: Move to own file --- .../python-modules/s3fs/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +----------------- 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/s3fs/default.nix diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix new file mode 100644 index 000000000000..1412268c42ba --- /dev/null +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3 }: + +buildPythonPackage rec { + pname = "s3fs"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zbdzqrim0zig94fk1hswg4vfdjplw6jpx3pdi42qc830h0nscn8"; + }; + + buildInputs = [ docutils ]; + propagatedBuildInputs = [ boto3 ]; + + # Depends on `moto` which has a long dependency chain with exact + # version requirements that can't be made to work with current + # pythonPackages. + doCheck = false; + + meta = with stdenv.lib; { + description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; + homepage = http://github.com/dask/s3fs/; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 376972f161fc..badb4a7911c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2053,30 +2053,7 @@ in { tblib = callPackage ../development/python-modules/tblib { }; - s3fs = buildPythonPackage rec { - name = "s3fs-${version}"; - version = "0.0.8"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/s3fs/${name}.tar.gz"; - sha256 = "0zbdzqrim0zig94fk1hswg4vfdjplw6jpx3pdi42qc830h0nscn8"; - }; - - buildInputs = with self; [ docutils ]; - propagatedBuildInputs = with self; [ boto3 ]; - - # Depends on `moto` which has a long dependency chain with exact - # version requirements that can't be made to work with current - # pythonPackages. - doCheck = false; - - meta = { - description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; - homepage = "http://github.com/dask/s3fs/"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; - }; + s3fs = callPackage ../development/python-modules/s3fs { }; datashape = callPackage ../development/python-modules/datashape { }; From f86567c92ecd7fc01664bea6cff556f74e2c81c3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:03:30 +0200 Subject: [PATCH 0399/2743] pythonPackages.request-cache: Move to own file --- .../python-modules/requests-cache/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/requests-cache/default.nix diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix new file mode 100644 index 000000000000..c8886b75d644 --- /dev/null +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, requests, six, urllib3 }: + +buildPythonPackage rec { + pname = "requests-cache"; + version = "0.4.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ requests six urllib3 ]; + + meta = with stdenv.lib; { + description = "Persistent cache for requests library"; + homepage = https://pypi.python.org/pypi/requests-cache; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index badb4a7911c5..9cd94f5be915 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2057,25 +2057,7 @@ in { datashape = callPackage ../development/python-modules/datashape { }; - requests-cache = buildPythonPackage (rec { - name = "requests-cache-${version}"; - version = "0.4.13"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests-cache/${name}.tar.gz"; - sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; - }; - - buildInputs = with self; [ mock ]; - - propagatedBuildInputs = with self; [ requests six urllib3 ]; - - meta = { - description = "Persistent cache for requests library"; - homepage = https://pypi.python.org/pypi/requests-cache; - license = licenses.bsd3; - }; - }); + requests-cache = callPackage ../development/python-modules/requests-cache { }; requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; From 86d3371521c842f04f5c8ed3122e1cf4915b9805 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:08:17 +0200 Subject: [PATCH 0400/2743] pythonPackages.howdoi: Move to own file --- .../python-modules/howdoi/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------------- 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/howdoi/default.nix diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix new file mode 100644 index 000000000000..a72338143a14 --- /dev/null +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, requests-cache, pygments, pyquery }: + +buildPythonPackage rec { + pname = "howdoi"; + version = "1.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dx9ms0b3z3bx02paj78cyi788d8l6cpd3jqbn3j88w736i4jknz"; + }; + + propagatedBuildInputs = [ six requests-cache pygments pyquery ]; + + meta = with stdenv.lib; { + description = "Instant coding answers via the command line"; + homepage = https://pypi.python.org/pypi/howdoi; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cd94f5be915..1b7ff1d23fb3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2061,23 +2061,7 @@ in { requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; - howdoi = buildPythonPackage (rec { - name = "howdoi-${version}"; - version = "1.1.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/howdoi/${name}.tar.gz"; - sha256 = "df4e49a219872324875d588e7699a1a82174a267e8487505e86bfcb180aea9b7"; - }; - - propagatedBuildInputs = with self; [ self.six requests-cache pygments pyquery ]; - - meta = { - description = "Instant coding answers via the command line"; - homepage = https://pypi.python.org/pypi/howdoi; - license = licenses.mit; - }; - }); + howdoi = callPackage ../development/python-modules/howdoi {}; neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; From 0fe45ad2c3030991fdaff6876ce2c85e2f9896b9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:13:34 +0200 Subject: [PATCH 0401/2743] pythonPackages.neurotools: Move to own file --- .../python-modules/neurotools/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +----------------- 2 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/neurotools/default.nix diff --git a/pkgs/development/python-modules/neurotools/default.nix b/pkgs/development/python-modules/neurotools/default.nix new file mode 100644 index 000000000000..b117d7a79a37 --- /dev/null +++ b/pkgs/development/python-modules/neurotools/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, scipy, numpy, matplotlib, tables, pyaml, urllib3, rpy2, mpi4py }: + +buildPythonPackage rec { + pname = "NeuroTools"; + version = "0.3.1"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4"; + }; + + # Tests are not automatically run + # Many tests fail (using py.test), and some need R + doCheck = false; + + propagatedBuildInputs = [ + scipy + numpy + matplotlib + tables + pyaml + urllib3 + rpy2 + mpi4py + ]; + + meta = with stdenv.lib; { + description = "Collection of tools to support analysis of neural activity"; + homepage = https://pypi.python.org/pypi/NeuroTools; + license = licenses.gpl2; + maintainers = with maintainers; [ nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b7ff1d23fb3..430bf0792139 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2063,39 +2063,7 @@ in { howdoi = callPackage ../development/python-modules/howdoi {}; - neurotools = buildPythonPackage (rec { - name = "NeuroTools-${version}"; - version = "0.3.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/N/NeuroTools/${name}.tar.gz"; - sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4"; - }; - - disabled = isPy3k; - - # Tests are not automatically run - # Many tests fail (using py.test), and some need R - doCheck = false; - - propagatedBuildInputs = with self; [ - scipy - numpy - matplotlib - tables - pyaml - urllib3 - rpy2 - mpi4py - ]; - - meta = { - description = "Collection of tools to support analysis of neural activity"; - homepage = https://pypi.python.org/pypi/NeuroTools; - license = licenses.gpl2; - maintainers = with maintainers; [ nico202 ]; - }; - }); + neurotools = callPackage ../development/python-modules/neurotools {}; jdatetime = buildPythonPackage (rec { name = "jdatetime-${version}"; From b3d8cb9051f1b01cb70a7d182629e3dd9355313e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:17:01 +0200 Subject: [PATCH 0402/2743] pythonPackages.jdatetime: Move to own file --- .../python-modules/jdatetime/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/jdatetime/default.nix diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix new file mode 100644 index 000000000000..bf7ba56eb4ea --- /dev/null +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "jdatetime"; + version = "1.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b1ksspm86r272ar8v0v4ip1821i4azpix6xhxpb4l133iwsb2y0"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Jalali datetime binding for python"; + homepage = https://pypi.python.org/pypi/jdatetime; + license = licenses.psfl; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 430bf0792139..8af3054e7db4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2065,23 +2065,7 @@ in { neurotools = callPackage ../development/python-modules/neurotools {}; - jdatetime = buildPythonPackage (rec { - name = "jdatetime-${version}"; - version = "1.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jdatetime/${name}.tar.gz"; - sha256 = "c08ba5791c2350b26e87ddf478bf223108146e241b6c949538221b54afd633ac"; - }; - - propagatedBuildInputs = with self; [ self.six ]; - - meta = { - description = "Jalali datetime binding for python"; - homepage = https://pypi.python.org/pypi/jdatetime; - license = licenses.psfl; - }; - }); + jdatetime = callPackage ../development/python-modules/jdatetime {}; daphne = callPackage ../development/python-modules/daphne { }; From 7ebc5dfad2dd878e8e7952a05816230bb2e4427e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:21:07 +0200 Subject: [PATCH 0403/2743] pythonPackages.dateutil_1_5: Move to own file --- .../python-modules/dateutil/1_5.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/dateutil/1_5.nix diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix new file mode 100644 index 000000000000..6580b0e10070 --- /dev/null +++ b/pkgs/development/python-modules/dateutil/1_5.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }: + +buildPythonPackage rec { + pname = "python-dateutil"; + version = "1.5"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Powerful extensions to the standard datetime module"; + homepage = https://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8af3054e7db4..d0159a61c6da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2077,24 +2077,7 @@ in { dateutil = self.python-dateutil; # Buildbot 0.8.7p1 needs dateutil==1.5 - dateutil_1_5 = buildPythonPackage (rec { - name = "dateutil-1.5"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; - }; - - propagatedBuildInputs = with self; [ self.six ]; - - meta = { - description = "Powerful extensions to the standard datetime module"; - homepage = https://pypi.python.org/pypi/python-dateutil; - license = "BSD-style"; - }; - }); + dateutil_1_5 = callPackage ../development/python-modules/dateutil/1_5.nix { }; decorator = callPackage ../development/python-modules/decorator { }; From 1be2158445fec685b56e11c08b0af097700fa5d8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:27:23 +0200 Subject: [PATCH 0404/2743] pythonPackages.derpconf: Move to own file --- .../python-modules/derpconf/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/derpconf/default.nix diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix new file mode 100644 index 000000000000..9968ab044af2 --- /dev/null +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "derpconf"; + version = "0.4.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0si3xnhyjk8dykr377v35bldsjv1ikgx4ff3crizwxv47ag42aci"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "derpconf abstracts loading configuration files for your app"; + homepage = https://github.com/globocom/derpconf; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0159a61c6da..5ecbea55122b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2085,22 +2085,7 @@ in { demjson = callPackage ../development/python-modules/demjson { }; - derpconf = self.buildPythonPackage rec { - name = "derpconf-0.4.9"; - - propagatedBuildInputs = with self; [ six ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/derpconf/${name}.tar.gz"; - sha256 = "9129419e3a6477fe6366c339d2df8c614bdde82a639f33f2f40d4de9a1ed236a"; - }; - - meta = { - description = "derpconf abstracts loading configuration files for your app"; - homepage = https://github.com/globocom/derpconf; - license = licenses.mit; - }; - }; + derpconf = callPackage ../development/python-modules/derpconf { }; deskcon = self.buildPythonPackage rec { name = "deskcon-0.3"; From a919c28d0ab0c6ba7b5d6e47ff07f782029569ee Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:32:37 +0200 Subject: [PATCH 0405/2743] pythonPackages.dockerpty: Move to own file --- .../python-modules/dockerpty/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/dockerpty/default.nix diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix new file mode 100644 index 000000000000..f7a64481c663 --- /dev/null +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "dockerpty"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; + homepage = https://github.com/d11wtq/dockerpty; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ecbea55122b..fa521895ff0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2132,22 +2132,7 @@ in { docker = callPackage ../development/python-modules/docker {}; - dockerpty = buildPythonPackage rec { - name = "dockerpty-0.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dockerpty/${name}.tar.gz"; - sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; - }; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; - homepage = https://github.com/d11wtq/dockerpty; - license = licenses.asl20; - }; - }; + dockerpty = callPackage ../development/python-modules/dockerpty {}; docker_pycreds = buildPythonPackage rec { name = "docker-pycreds-${version}"; From f6bfb10c7f53554e3084a400af640748d8140467 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:41:30 +0200 Subject: [PATCH 0406/2743] pythonPackages.docker_pycreds: Move to own file --- .../python-modules/docker-pycreds/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/docker-pycreds/default.nix diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix new file mode 100644 index 000000000000..a19b9876e811 --- /dev/null +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "docker-pycreds"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0j3k5wk3bww5y0f2rvgzsin0q98k0i9j308vpsmxidw0y8n3m0wk"; + }; + + # require docker-credential-helpers binaries + doCheck = false; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Python bindings for the docker credentials store API."; + homepage = https://github.com/shin-/dockerpy-creds; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa521895ff0d..667123ba8f30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2134,27 +2134,7 @@ in { dockerpty = callPackage ../development/python-modules/dockerpty {}; - docker_pycreds = buildPythonPackage rec { - name = "docker-pycreds-${version}"; - version = "0.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-pycreds/${name}.tar.gz"; - sha256 = "0j3k5wk3bww5y0f2rvgzsin0q98k0i9j308vpsmxidw0y8n3m0wk"; - }; - - doCheck = false; # require docker-credential-helpers binaries - - propagatedBuildInputs = with self; [ - six - ]; - - meta = { - description = "Python bindings for the docker credentials store API."; - homepage = https://github.com/shin-/dockerpy-creds; - license = licenses.asl20; - }; - }; + docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; docker_registry_core = buildPythonPackage rec { name = "docker-registry-core-2.0.3"; From 7cc875b947541a9d14e09830e064c5ef23e5ad35 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:47:43 +0200 Subject: [PATCH 0407/2743] pythonPackages.docker_registry_core: Move to own file --- .../docker-registry-core/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +----------------- 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/docker-registry-core/default.nix diff --git a/pkgs/development/python-modules/docker-registry-core/default.nix b/pkgs/development/python-modules/docker-registry-core/default.nix new file mode 100644 index 000000000000..ad9968af173c --- /dev/null +++ b/pkgs/development/python-modules/docker-registry-core/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, boto, redis, setuptools, simplejson }: + +buildPythonPackage rec { + pname = "docker-registry-core"; + version = "2.0.3"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0q036rr0b5734szkj883hkb2kjhgcc5pm3dz4yz8vcim3x7q0zil"; + }; + + DEPS = "loose"; + + doCheck = false; + propagatedBuildInputs = [ boto redis setuptools simplejson ]; + + patchPhase = "> requirements/main.txt"; + + meta = with stdenv.lib; { + description = "Docker registry core package"; + homepage = https://github.com/docker/docker-registry; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 667123ba8f30..c6dcbcafeaec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2136,30 +2136,7 @@ in { docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; - docker_registry_core = buildPythonPackage rec { - name = "docker-registry-core-2.0.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-registry-core/${name}.tar.gz"; - sha256 = "347e804f1f35b28dbe27bf8d7a0b630fca29d684032139bf26e3940572360360"; - }; - - DEPS = "loose"; - - doCheck = false; - propagatedBuildInputs = with self; [ - boto redis setuptools simplejson - ]; - - patchPhase = "> requirements/main.txt"; - - meta = { - description = "Docker registry core package"; - homepage = https://github.com/docker/docker-registry; - license = licenses.asl20; - }; - }; + docker_registry_core = callPackage ../development/python-modules/docker-registry-core {}; docker_registry = buildPythonPackage rec { name = "docker-registry-0.9.1"; From 98c682e0d2b3dcf16e1f2b77f266e34a1e264e69 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 14:57:59 +0200 Subject: [PATCH 0408/2743] pythonPackages.docopt: Move to own file --- .../python-modules/docopt/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/docopt/default.nix diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix new file mode 100644 index 000000000000..61c71d87c533 --- /dev/null +++ b/pkgs/development/python-modules/docopt/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "docopt"; + version = "0.6.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "14f4hn6d1j4b99svwbaji8n2zj58qicyz19mm0x6pmhb50jsics9"; + }; + + meta = with stdenv.lib; { + description = "Pythonic argument parser, that will make you smile"; + homepage = http://docopt.org/; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6dcbcafeaec..f180eaa0dde1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2169,20 +2169,7 @@ in { }; }; - docopt = buildPythonPackage rec { - name = "docopt-0.6.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docopt/${name}.tar.gz"; - sha256 = "49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"; - }; - - meta = { - description = "Pythonic argument parser, that will make you smile"; - homepage = http://docopt.org/; - license = licenses.mit; - }; - }; + docopt = callPackage ../development/python-modules/docopt { }; doctest-ignore-unicode = buildPythonPackage rec { name = "doctest-ignore-unicode-${version}"; From 1a09c2bf200c48b889c0d9cbb789e43c13720e5e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 15:02:46 +0200 Subject: [PATCH 0409/2743] pythonPackages.doctest-ignore-unicode: Move to own file --- .../doctest-ignore-unicode/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +----------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/doctest-ignore-unicode/default.nix diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix new file mode 100644 index 000000000000..f3be88987606 --- /dev/null +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "doctest-ignore-unicode"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m9aa4qnyj21lbq4sbvmv1vcz7zksss4rz37ddf2hxv4hk8b547w"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Add flag to ignore unicode literal prefixes in doctests"; + license = with licenses; [ asl20 ]; + homepage = https://github.com/gnublade/doctest-ignore-unicode; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f180eaa0dde1..e846d82f6888 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2171,23 +2171,7 @@ in { docopt = callPackage ../development/python-modules/docopt { }; - doctest-ignore-unicode = buildPythonPackage rec { - name = "doctest-ignore-unicode-${version}"; - version = "0.1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/doctest-ignore-unicode/${name}.tar.gz"; - sha256= "fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - description = "Add flag to ignore unicode literal prefixes in doctests"; - license = with licenses; [ asl20 ]; - homepage = https://github.com/gnublade/doctest-ignore-unicode; - }; - }; + doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; From 9bbba780dfccce7607d982007c815abe89b9798a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 15:07:25 +0200 Subject: [PATCH 0410/2743] pythonPackages.dogpile_core: Move to own file --- .../python-modules/dogpile.core/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------------- 2 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/dogpile.core/default.nix diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix new file mode 100644 index 000000000000..622954f61449 --- /dev/null +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dogpile.core"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; + homepage = https://bitbucket.org/zzzeek/dogpile.core; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e846d82f6888..e9fac82ffc16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2175,22 +2175,7 @@ in { dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; - dogpile_core = buildPythonPackage rec { - name = "dogpile.core-0.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dogpile.core/dogpile.core-0.4.1.tar.gz"; - sha256 = "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76"; - }; - - doCheck = false; - - meta = { - description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = https://bitbucket.org/zzzeek/dogpile.core; - license = licenses.bsd3; - }; - }; + dogpile_core = callPackage ../development/python-modules/dogpile.core { }; dopy = buildPythonPackage rec { version = "2016-01-04"; From 681c0a21d8b0bb7b9f49b01a435d3d37f6df09d5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 15:12:22 +0200 Subject: [PATCH 0411/2743] pythonPackages.dropbox: Move to own file --- .../python-modules/dropbox/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/dropbox/default.nix diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix new file mode 100644 index 000000000000..bdb406ffd6d5 --- /dev/null +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytestrunner, requests, urllib3, mock, setuptools }: + +buildPythonPackage rec { + pname = "dropbox"; + version = "8.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bixx80zjq0286dwm4zhg8bdhc8pqlrqy4n2jg7i6m6a4gv4gak5"; + }; + + # Set DROPBOX_TOKEN environment variable to a valid token. + doCheck = false; + + buildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ requests urllib3 mock setuptools ]; + + meta = with stdenv.lib; { + description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = https://www.dropbox.com/developers/core/docs; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9fac82ffc16..cb26a1c870d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2203,25 +2203,7 @@ in { urllib3 = callPackage ../development/python-modules/urllib3 {}; - dropbox = buildPythonPackage rec { - name = "dropbox-${version}"; - version = "8.0.0"; - doCheck = false; # Set DROPBOX_TOKEN environment variable to a valid token. - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dropbox/${name}.tar.gz"; - sha256 = "0bixx80zjq0286dwm4zhg8bdhc8pqlrqy4n2jg7i6m6a4gv4gak5"; - }; - - buildInputs = with self; [ pytestrunner ]; - propagatedBuildInputs = with self; [ requests urllib3 mock setuptools ]; - - meta = { - description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = https://www.dropbox.com/developers/core/docs; - license = licenses.mit; - }; - }; + dropbox = callPackage ../development/python-modules/dropbox {}; ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; From ef4a84007ed752f4214f4bcab3c501ddd10c184a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 3 Apr 2018 15:20:06 +0200 Subject: [PATCH 0412/2743] pythonPackages.EasyProcess: Move to own file --- .../python-modules/easyprocess/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------------- 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/easyprocess/default.nix diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix new file mode 100644 index 000000000000..dc5784aafb7e --- /dev/null +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "EasyProcess"; + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "07z6485bjxkmx26mp1p1ww19d10qavw0s006bidzailsvk543qll"; + }; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Easy to use python subprocess interface"; + homepage = https://github.com/ponty/EasyProcess; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb26a1c870d9..1fde0b383d73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2213,24 +2213,7 @@ in { easydict = callPackage ../development/python-modules/easydict { }; - EasyProcess = buildPythonPackage rec { - name = "EasyProcess-0.2.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/E/EasyProcess/${name}.tar.gz"; - sha256 = "94e241cadc9a46f55b5c06000df85618849602e7e1865b8de87576b90a22e61f"; - }; - - # No tests - doCheck = false; - - meta = { - description = "Easy to use python subprocess interface"; - homepage = "https://github.com/ponty/EasyProcess"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ layus ]; - }; - }; + EasyProcess = callPackage ../development/python-modules/easyprocess { }; easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; From a6774198364239267e418d98c7094830010c31c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Apr 2018 22:54:24 +0200 Subject: [PATCH 0413/2743] pythonPackages.requests-mock: 1.3.0 -> 1.4.0 --- .../python-modules/requests-mock/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/requests-mock/default.nix diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix new file mode 100644 index 000000000000..ef87c4f10195 --- /dev/null +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, python +, mock, testrepository, testtools +, requests, six }: + +buildPythonPackage rec { + pname = "requests-mock"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b"; + }; + + patchPhase = '' + sed -i 's@python@${python.interpreter}@' .testr.conf + ''; + + checkInputs = [ mock testrepository testtools ]; + + propagatedBuildInputs = [ requests six ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1fde0b383d73..bd24d8a185da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9567,22 +9567,7 @@ in { olefile = callPackage ../development/python-modules/olefile { }; - requests-mock = buildPythonPackage rec { - name = "requests-mock-${version}"; - version = "1.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/requests-mock/${name}.tar.gz"; - sha256 = "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx"; - }; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - buildInputs = with self; [ pbr testtools testrepository mock ]; - propagatedBuildInputs = with self; [ six requests ]; - }; + requests-mock = callPackage ../development/python-modules/requests-mock { }; mox3 = buildPythonPackage rec { name = "mox3-${version}"; From bd9b576de5ca46830f857b4f9f8a7495bee4b5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Apr 2018 19:20:32 +0200 Subject: [PATCH 0414/2743] pythonPackages.async_generator: init at 1.9 --- .../async_generator/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/async_generator/default.nix diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix new file mode 100644 index 000000000000..4f46376b62de --- /dev/null +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "async_generator"; + version = "1.9"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "b7d5465c6174fe86dba498ececb175f93a6097ffb7cc91946405e1f05b848371"; + }; + + checkInputs = [ pytest pytest-asyncio ]; + + checkPhase = '' + pytest -W error -ra -v --pyargs async_generator + ''; + + meta = with lib; { + description = "Async generators and context managers for Python 3.5+"; + homepage = https://github.com/python-trio/async_generator; + license = with licenses; [ mit asl20 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd24d8a185da..235a3129032c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -553,6 +553,8 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; + async_generator = callPackage ../development/python-modules/async_generator { }; + asn1ate = callPackage ../development/python-modules/asn1ate { }; atomiclong = callPackage ../development/python-modules/atomiclong { }; From 861283c3b34569f329a808b1a18d513fcdcfac9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Apr 2018 19:31:03 +0200 Subject: [PATCH 0415/2743] pythonPackages.aiohttp: 3.0.9 -> 3.1.1 --- pkgs/development/python-modules/aiohttp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 67bf5a115938..19c616b3cfa8 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -11,20 +11,21 @@ , pytest , gunicorn , pytest-mock +, async_generator }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.0.9"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b"; + sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f"; }; disabled = pythonOlder "3.5"; - checkInputs = [ pytest gunicorn pytest-mock ]; + checkInputs = [ pytest gunicorn pytest-mock async_generator ]; propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optional (pythonOlder "3.7") idna-ssl; From c2743956eb235b6d1bb7cfab6b591f4995f0bf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Mar 2018 23:23:53 +0100 Subject: [PATCH 0416/2743] pythonPackages.cython: 0.27.3 -> 0.28.1 --- .../python-modules/Cython/default.nix | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 751e064ad706..cffad983a450 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -13,26 +13,17 @@ buildPythonPackage rec { pname = "Cython"; - name = "${pname}-${version}"; - version = "0.27.3"; + version = "0.28.1"; src = fetchPypi { inherit pname version; - sha256 = "6a00512de1f2e3ce66ba35c5420babaef1fe2d9c43a8faab4080b0dbcc26bc64"; + sha256 = "152ee5f345012ca3bb7cc71da2d3736ee20f52cd8476e4d49e5e25c5a4102b12"; }; - # With Python 2.x on i686-linux or 32-bit ARM this test fails because the - # result is "3L" instead of "3", so let's fix it in-place. - # - # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' - sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ - tests/run/cpdef_enums.pyx - ''; - nativeBuildInputs = [ pkgconfig - # For testing + ]; + checkInputs = [ numpy ncurses ]; buildInputs = [ glibcLocales gdb ]; @@ -46,10 +37,6 @@ buildPythonPackage rec { ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""} ''; - # Disable tests temporarily - # https://github.com/cython/cython/issues/1676 - doCheck = false; - meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = http://cython.org; From 9b9796a497d3e298e46d6e4d1ffa008c74c1645b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 19:51:03 +0200 Subject: [PATCH 0417/2743] python.pkgs.scipy: improve expression --- pkgs/development/python-modules/scipy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index df2e569076a2..9523b08ed728 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,12 +1,11 @@ -{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}: buildPythonPackage rec { pname = "scipy"; version = "1.0.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10"; }; From a4952261af706fbdd3b315b8858a497b73dc1253 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 19:51:31 +0200 Subject: [PATCH 0418/2743] python.pkgs.numpy: improve expression --- pkgs/development/python-modules/numpy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index b561149b2abd..4022115e9a0e 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "numpy"; version = "1.14.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; From cdf612bc0d86f02a9f2d837656366872ed4e9376 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 4 Apr 2018 14:35:47 -0400 Subject: [PATCH 0419/2743] 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 30bff42231ae088d7f567bda5b9af9a3905999bf Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 5 Apr 2018 16:58:50 +0200 Subject: [PATCH 0420/2743] linux module handling: support kernels without modules --- pkgs/build-support/kernel/modules-closure.sh | 14 ++++++++++++++ pkgs/os-specific/linux/kmod/aggregator.nix | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 8287c1672d06..9a49d42cdc1a 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -1,5 +1,19 @@ source $stdenv/setup +# When no modules are built, the $out/lib/modules directory will not +# exist. Because the rest of the script assumes it does exist, we +# handle this special case first. +if ! test -d "$out/lib/modules"; then + if test -z "$rootModules" || test -n "$allowMissing"; then + mkdir -p "$out" + exit 0 + else + echo "Required modules: $rootModules" + echo "Can not derive a closure of kernel modules because no modules were provided." + exit 1 + fi +fi + version=$(cd $kernel/lib/modules && ls -d *) echo "kernel version is $version" diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index 9bd7c8480c1c..7d46a13f3562 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -9,6 +9,12 @@ buildEnv { '' source ${stdenv}/setup + if ! test -d "$out/lib/modules"; then + echo "No modules found." + # To support a kernel without modules + exit 0 + fi + kernelVersion=$(cd $out/lib/modules && ls -d *) if test "$(echo $kernelVersion | wc -w)" != 1; then echo "inconsistent kernel versions: $kernelVersion" From fd79c269941b06ee0470f9881d7be63f350dab21 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 5 Apr 2018 16:33:51 +0100 Subject: [PATCH 0421/2743] tt-rss: 2018-01-05 -> 2018-04-05 --- pkgs/servers/tt-rss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index a6c75439ca9c..6f584bfabd3d 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tt-rss-${version}"; - version = "2018-01-05"; - rev = "c30f5e18119d1935e8fe6d422053b127e8f4f1b3"; + version = "2018-04-05"; + rev = "963c22646b3e1bd544bd957bf34175b996bd6e53"; src = fetchurl { url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz"; - sha256 = "18pc1l0dbjr7d5grcrb70y6j7cr2zb9575yqmy6zfwzrlvw0pa0l"; + sha256 = "02vjw5cag5x0rpiqalfrqf7iz21rp8ml5wnfd8pdkxbr8182bw3h"; }; installPhase = '' From 0de00d57995832feaa3de8a5ea033978c27c607f Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 5 Apr 2018 17:45:41 +0200 Subject: [PATCH 0422/2743] systemd 238: bump revision for upstream bugfixes fixes #37744, #38341 --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 43eb8331730c..7c9514883093 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -27,8 +27,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "3a439bcdb5706dbb44215ef4e70f07b09aaac040"; - sha256 = "0qkk5891068pkxmxqvm07bwl597i8lfp89c23yxp11m21cjq0f4b"; + rev = "02042d012c4d6c0a2854d8436dd6636d4327774f"; + sha256 = "0iv6fygzac0z6dagbmw1nf8dx7rrr6d9cxp0fr304rn3ir58g5f0"; }; outputs = [ "out" "lib" "man" "dev" ]; From cbcb9eb909bf6001889ef86e80c931ee6db7b593 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Wed, 4 Apr 2018 18:19:53 -0700 Subject: [PATCH 0423/2743] wine: 3.4 -> 3.5 (and staging likewise) --- pkgs/misc/emulators/wine/sources.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index d17c0f295e80..f86e34a5d542 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.4"; + version = "3.5"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4"; + sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2"; + sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -62,5 +62,4 @@ in rec { repo = "winetricks"; rev = version; }; - } From bf44cf71b7f73287f68f9fe9af85dc662c576112 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 5 Apr 2018 11:39:51 -0500 Subject: [PATCH 0424/2743] mesa: 17.3.7 -> 17.3.8 https://www.mesa3d.org/relnotes/17.3.8.html Remove upstreamed portion of musl patch, always add remaining fix (missing include). --- pkgs/development/libraries/mesa/default.nix | 7 +++--- .../libraries/mesa/missing-include.patch | 11 ++++++++++ .../libraries/mesa/musl-fixes.patch | 22 ------------------- 3 files changed, 15 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/libraries/mesa/missing-include.patch delete mode 100644 pkgs/development/libraries/mesa/musl-fixes.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c325bb9e1d5e..e77a4e1414e9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.3.7"; + version = "17.3.8"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585"; + sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg"; }; prePatch = "patchShebangs ."; @@ -92,7 +92,8 @@ let self = stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; + ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl + ]; outputs = [ "out" "dev" "drivers" "osmesa" ]; diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch new file mode 100644 index 000000000000..dd3e6bb64af8 --- /dev/null +++ b/pkgs/development/libraries/mesa/missing-include.patch @@ -0,0 +1,11 @@ +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + diff --git a/pkgs/development/libraries/mesa/musl-fixes.patch b/pkgs/development/libraries/mesa/musl-fixes.patch deleted file mode 100644 index 60140d445ae8..000000000000 --- a/pkgs/development/libraries/mesa/musl-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - ---- a/src/util/u_endian.h.orig 2016-11-04 12:16:00.480356454 +0100 -+++ b/src/util/u_endian.h 2016-11-04 12:16:11.984347944 +0100 -@@ -27,7 +27,7 @@ - #ifndef U_ENDIAN_H - #define U_ENDIAN_H - --#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) -+#if defined(__linux__) || defined(ANDROID) || defined(__CYGWIN__) - #include - - #if __BYTE_ORDER == __LITTLE_ENDIAN From ce4a423499832d8680d9d77dfb277b7b72fa5662 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 5 Apr 2018 12:00:51 -0500 Subject: [PATCH 0425/2743] busybox: 1.28.2 -> 1.28.3 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index b4d4d93b1d5d..b844bf72d82a 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.28.2"; + name = "busybox-1.28.3"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "03abp2n08xk32x8lhdinpxb8gk3faxjmgrv0xqw6ijbp12k98jmn"; + sha256 = "0via6faqj9xcyi8r39r4n0wxlk8r2292yk0slzwrdri37w1j43dd"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; From c95720ca142b209e0106c56f39f6fa8619090ae5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 5 Apr 2018 12:28:44 -0500 Subject: [PATCH 0426/2743] procps-ng: 3.3.12 -> 3.3.13 https://gitlab.com/procps-ng/procps/tags/v3.3.13 Patch to fix new version w/musl. --- pkgs/os-specific/linux/procps-ng/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index dd09a9c52999..316f0ad1a28d 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,19 +1,33 @@ -{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: +{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; - version = "3.3.12"; + version = "3.3.13"; src = fetchFromGitLab { owner ="procps-ng"; repo = "procps"; rev = "v${version}"; - sha256 = "0k5vvvjn954xqnhk97j62ilwmipbi4gqjcznllmk6ilfmszqczzz"; + sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ]; + # https://gitlab.com/procps-ng/procps/issues/88 + # Patches needed for musl and glibc 2.28 + patches = [ + (fetchpatch { + url = "https://gitlab.com/procps-ng/procps/uploads/f91ff094be1e4638aeffb67bdbb751ba/numa.h.diff"; + sha256 = "16r537d2wfrvbv6dg9vyfck8n31xa58903mnssw1s4kb5ap83yd5"; + extraPrefix = ""; + }) + (fetchpatch { + url = "https://gitlab.com/procps-ng/procps/uploads/6a7bdea4d82ba781451316fda74192ae/libio_detection.diff"; + sha256 = "0qp0j60kiycjsv213ih10imjirmxz8zja3rk9fq5lr5xf7k2lr3p"; + }) + ]; + # autoreconfHook doesn't quite get, what procps-ng buildprocss does # with po/Makefile.in.in and stuff. preConfigure = '' From 75e41e34ed2b2b8f6e43e65b7310fd38b15bf89e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 19:40:39 +0200 Subject: [PATCH 0427/2743] python.pkgs.configparser: build with all Python versions I think the disabled condition was accidentally modified in ecc939eb194b49f86707c8a215b60968f9b8a335 configparser is a backport of 3.2 functionality. While it is only intended for Python < 3.2, it works fine with other versions. Even with pypy, nowadays. --- pkgs/development/python-modules/configparser/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 8d1539c241d1..8e770c504c3b 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "configparser"; version = "3.5.0"; - disabled = isPy3k; src = fetchPypi { inherit pname version; From 1d981edf81e1a5bc5bb32ade3bac3a565f56499a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 19:42:25 +0200 Subject: [PATCH 0428/2743] python.pkgs.entrypoints: configparser is a backport --- pkgs/development/python-modules/entrypoints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index d812fd55a887..c4f5410bc518 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -3,12 +3,12 @@ , fetchPypi , configparser , pytest +, isPy3k }: buildPythonPackage rec { pname = "entrypoints"; version = "0.2.3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest]; - propagatedBuildInputs = [ configparser ]; + propagatedBuildInputs = [] ++ lib.optional (!isPy3k) [ configparser ]; checkPhase = '' py.test tests From 1bc0727417cda354681449c7f85a8cea1b9f1f64 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 19:42:43 +0200 Subject: [PATCH 0429/2743] python.pkgs.send2trash: configparser is a backport --- pkgs/development/python-modules/send2trash/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 7ea0705f8154..35115a45716e 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytest , configparser +, isPy3k }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; checkPhase = "HOME=. py.test"; - checkInputs = [ pytest configparser ]; + checkInputs = [ pytest ] ++ lib.optional (!isPy3k) configparser; meta = with lib; { description = "Send file to trash natively under macOS, Windows and Linux"; From c6f7d4367894047592cc412740f0c1f5b2ca2b59 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 5 Apr 2018 15:22:45 -0400 Subject: [PATCH 0430/2743] 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 13b36b8f98b2809c4a27a27163da8a25b7b95c5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Apr 2018 13:01:07 -0700 Subject: [PATCH 0431/2743] libedit: 20160903-3.1 -> 20170329-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/libedit/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 20170329-3.1 with grep in /nix/store/ypc37byfr7pqh02h1wwmlxn0qxfqm1rc-libedit-20170329-3.1 - directory tree listing: https://gist.github.com/f77554015e717beead00f8cfe7d57d8e --- pkgs/development/libraries/libedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index bd230c61028f..154128144201 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation rec { - name = "libedit-20160903-3.1"; + name = "libedit-20170329-3.1"; src = fetchurl { url = "http://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "0rvmm8z6hal5bbp5pljp7yvkpqi4pkas1amizhvg35v0skkx5jqc"; + sha256 = "1gnlgl0x8g9ky59s70nriy5gv47676d1s4ypvbv8y11apl7xkwli"; }; outputs = [ "out" "dev" ]; From fdbd53e97c9821420a14cd814d92f5f0ca1947b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Apr 2018 14:12:19 -0700 Subject: [PATCH 0432/2743] 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 6b69f22f137bbc42cc32d7f95fc9c5121e3b38de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 7 Apr 2018 08:26:53 +0100 Subject: [PATCH 0433/2743] iana-etc: 20180108 -> 20180405 --- pkgs/data/misc/iana-etc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 6b1abad02d74..d5ab50f0b8c2 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iana-etc-${version}"; - version = "20180108"; + version = "20180405"; src = fetchurl { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "1x4jacrvjwcsan88rg2wf2a8bajsglg6w4396vbr18zh0sya84a2"; + sha256 = "0x6i95arrc4lcq2il3r05hbnd9vsi87z4yc8s3agkvbj74d6hfhj"; }; installPhase = '' From 70260beaf8d18cee3c81d706dbfcf9cc4fbc2dbb Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 9 Mar 2018 14:45:45 +0000 Subject: [PATCH 0434/2743] perlPackages: MIMEtools and MIMETools --- pkgs/top-level/perl-packages.nix | 44 ++++++++++++-------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index acd38aaaebe8..1fbf8988cf96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8848,6 +8848,22 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ProcWaitStat ]; }; + MIMELite = buildPerlPackage rec { + name = "MIME-Lite-3.030"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "8f39901bc580bc3dce69e10415305e4435ff90264c63d29f707b4566460be962"; + }; + propagatedBuildInputs = [ EmailDateFormat MailTools MIMETypes ]; + meta = { + description = "Low-calorie MIME generator (DEPRECATED)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; + }; + + MIMEtools = MIMETools; + MIMETools = buildPerlPackage rec { name = "MIME-tools-5.509"; src = fetchurl { @@ -8871,34 +8887,6 @@ let self = _self // overrides; _self = with self; { }; }; - MIMELite = buildPerlPackage rec { - name = "MIME-Lite-3.030"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "8f39901bc580bc3dce69e10415305e4435ff90264c63d29f707b4566460be962"; - }; - propagatedBuildInputs = [ EmailDateFormat MailTools MIMETypes ]; - meta = { - description = "Low-calorie MIME generator (DEPRECATED)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; - }; - }; - - MIMEtools = buildPerlPackage { - name = "MIME-tools-5.507"; - src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.507.tar.gz; - sha256 = "2f43683e1d5bed21179207d81c0caf1d5b5d480d018ac812f4ab950879fe7793"; - }; - buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ MailTools ]; - meta = { - description = "Tools to manipulate MIME messages"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - MIMETypes = buildPerlPackage rec { name = "MIME-Types-2.13"; src = fetchurl { From 3a17fab5f3cfdde767e37d8ae1581fb14455e87d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 9 Mar 2018 16:58:36 +0000 Subject: [PATCH 0435/2743] perlPackages: simplifications for the update bot --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1fbf8988cf96..ffb75c7ae744 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3877,7 +3877,7 @@ let self = _self // overrides; _self = with self; { \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h - \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi + \$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi # --- '; @@ -6245,7 +6245,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AL/ALEXMV/${name}.tar.gz"; sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; }; - buildInputs = with pkgs; [ which gnupg1compat ]; + buildInputs = [ pkgs.which pkgs.gnupg1compat ]; propagatedBuildInputs = [ Moo MooXHandlesVia MooXlate ]; doCheck = false; meta = { @@ -10781,7 +10781,7 @@ let self = _self // overrides; _self = with self; { }; # FIXME: try with libGL + libGLU instead of libGLU_combined - buildInputs = with pkgs; [ libGLU_combined libGLU freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; + buildInputs = with pkgs; [ pkgs.libGLU_combined pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -15578,7 +15578,7 @@ let self = _self // overrides; _self = with self; { sha256 = "84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; - buildInputs = with pkgs; [ xorg.libX11 libpng ]; + buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ]; doCheck = false; # Expects working X11. meta = { homepage = https://metacpan.org/pod/distribution/Tk/Tk.pod; From 25a57bfe969bc266d7c2811374f5749f325b706f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:05 +0000 Subject: [PATCH 0436/2743] [cpan2nix] perlPackages.XMLSAX: cleanup dependencies: perlPackages.XMLNamespaceSupport: cleanup perlPackages.XMLSAXBase: cleanup --- pkgs/top-level/perl-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffb75c7ae744..7a92ccb72704 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16295,8 +16295,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz; sha256 = "1vz5pbi4lm5fhq2slrs2hlp6bnk29863abgjlcx43l4dky2rbsa7"; }; - propagatedBuildInputs = [ constant ]; - buildInputs = [ ExtUtilsMakeMaker ]; }; XMLParser = buildPerlPackage { @@ -16371,7 +16369,6 @@ let self = _self // overrides; _self = with self; { postInstall = '' perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()" ''; - buildInputs = [ ExtUtilsMakeMaker ]; }; XMLSAXBase = buildPerlPackage { @@ -16385,7 +16382,6 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/grantm/XML-SAX-Base; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ ExtUtilsMakeMaker TestSimple13 ]; }; XMLSAXWriter = buildPerlPackage { From 125c7c13579a3cf036aae0d26d8eb80760cc5827 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:05 +0000 Subject: [PATCH 0437/2743] [cpan2nix] perlPackages.JSON: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7a92ccb72704..0e75308ea8e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7683,11 +7683,11 @@ let self = _self // overrides; _self = with self; { postConfigure = '' cp lib/JSON/backportPP.pm{orig,} ''; - buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; JSONAny = buildPerlPackage { From 9af1aa8f4707a85a76f3a7bf3d0c5b35ff093120 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:06 +0000 Subject: [PATCH 0438/2743] [cpan2nix] perlPackages.Appcpanminus: 1.7040 -> 1.7043 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e75308ea8e8..4c87beab642b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -272,10 +272,10 @@ let self = _self // overrides; _self = with self; { }; Appcpanminus = buildPerlPackage rec { - name = "App-cpanminus-1.7040"; + name = "App-cpanminus-1.7043"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "fc8e5cde17cc5f4cc13aea8781c1e9425f76abc684cc720e9253f47ab3529556"; + sha256 = "68a06f7da80882a95bc02c92c7ee305846fb6ab648cf83678ea945e44ad65c65"; }; meta = { homepage = https://github.com/miyagawa/cpanminus; From 2428b41fc9bbe55277a1521d896a3219c41e221f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:07 +0000 Subject: [PATCH 0439/2743] [cpan2nix] perlPackages.ArchiveTar: 2.08 -> 2.26 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4c87beab642b..4b1669bc6dec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -446,10 +446,10 @@ let self = _self // overrides; _self = with self; { }; ArchiveTar = buildPerlPackage rec { - name = "Archive-Tar-2.08"; + name = "Archive-Tar-2.26"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "62e34feffd51e21b24f2ba5b15adf3ca3bd084163bfec40fe30f8f8e8963066b"; + sha256 = "01246ffbadb6e76a04a32bf689894cf56ef9d34d58101ff1c51af8f6f1ef5843"; }; meta = { description = "Manipulates TAR archives"; From a8a60b1eadf1aa63c1c2f91e984137455714361e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:08 +0000 Subject: [PATCH 0440/2743] [cpan2nix] perlPackages.BFlags: 0.14 -> 0.17 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b1669bc6dec..434f9d9743c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -671,10 +671,10 @@ let self = _self // overrides; _self = with self; { }; BFlags = buildPerlPackage rec { - name = "B-Flags-0.14"; + name = "B-Flags-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "07inzxvvf4bkl4iliys9rfdiz309nccpbr82a7g57bhcylj7qhzn"; + sha256 = "1chhgkaw2h3qniz71dykynggqp0r6b6mi2f4nh4x3ghm2g89gny1"; }; meta = { description = "Friendlier flags for B"; From c5f07bfd0b1bf0a98a89f53ffef49cd80d63c93e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:09 +0000 Subject: [PATCH 0441/2743] [cpan2nix] perlPackages.BKeywords: 1.14 -> 1.18 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 434f9d9743c6..4dbb5f815462 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -742,10 +742,10 @@ let self = _self // overrides; _self = with self; { }; BKeywords = buildPerlPackage rec { - name = "B-Keywords-1.14"; + name = "B-Keywords-1.18"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "1llaqhx6711lsf6mxmvrhjigpy3ymmf3wl8kvn7l0fsppnmn45lw"; + sha256 = "0f5bb2fpbq5jzdb2jfs73hrggrq2gnpacd2kkxgifjl7q7xd9ck5"; }; meta = { description = "Lists of reserved barewords and symbol names"; From fc8238d7ff7aaba831d087a46f7d7baf04e0d30f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:09 +0000 Subject: [PATCH 0442/2743] [cpan2nix] perlPackages.BSDResource: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4dbb5f815462..e065c1b916c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -783,10 +783,9 @@ let self = _self // overrides; _self = with self; { BSDResource = buildPerlPackage rec { name = "BSD-Resource-1.2911"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz"; + url = mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz; sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x"; }; - buildInputs = [ TestPod TestPodCoverage ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "BSD process resource limit and priority functions"; From eedc8ea027dd753483a97ce4e9e4b5c730015132 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:09 +0000 Subject: [PATCH 0443/2743] [cpan2nix] perlPackages.BusinessISBNData: 20140910.002 -> 20140910.003 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e065c1b916c1..e8eccf3966b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -820,10 +820,10 @@ let self = _self // overrides; _self = with self; { }; BusinessISBNData = buildPerlPackage rec { - name = "Business-ISBN-Data-20140910.002"; + name = "Business-ISBN-Data-20140910.003"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "1bnbiv4vsz0hr1bm3nq9pjsjnf0mndp2vahwsvxbnv1gczb1691y"; + sha256 = "1jc5jrjwkr6pqga7998zkgw0yrxgb5n1y7lzgddawxibkf608mn7"; }; meta = { description = "Data pack for Business::ISBN"; From 100ef241446de695f823b8ea7db12f5ac71ec3e3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:11 +0000 Subject: [PATCH 0444/2743] [cpan2nix] perlPackages.CPANMeta: 2.150005 -> 2.150010 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8eccf3966b5..e2c3d748e302 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2588,12 +2588,11 @@ let self = _self // overrides; _self = with self; { }; CPANMeta = buildPerlPackage rec { - name = "CPAN-Meta-2.150005"; + name = "CPAN-Meta-2.150010"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "04g7cfbx7vi8kqc9pwv7n3z95vimkbv0h7v6p1ky37gzz3nsw66j"; + sha256 = "1mm3dfw3ffyzb2ikpqn9l6zyqrxijb4vyywmbx2l21ryqwp0zy74"; }; - propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements JSONPP ]; meta = { homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta; description = "The distribution metadata for a CPAN dist"; From 85fd4029c1201928a5f16e4581c7eac995be6e95 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:11 +0000 Subject: [PATCH 0445/2743] [cpan2nix] perlPackages.CPANMetaRequirements: 2.128 -> 2.140 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e2c3d748e302..f5b4c1db6126 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2615,10 +2615,10 @@ let self = _self // overrides; _self = with self; { }; CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.128"; + name = "CPAN-Meta-Requirements-2.140"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.128.tar.gz; - sha256 = "ff0ae309ed76d8c7381fdb8436659a594e6884eeac1c9a742ba9aa7ee2a1d52d"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.140.tar.gz; + sha256 = "0898645e8e86f0922f0f0502b503f592a8eb3d3176b4fd87adcc7ba51e751fa9"; }; meta = { homepage = https://github.com/dagolden/CPAN-Meta-Requirements; From f0e1b6399b1e22ebf44556fbabf22b6ffbe5e9b6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:11 +0000 Subject: [PATCH 0446/2743] [cpan2nix] perlPackages.CPANMetaYAML: 0.016 -> 0.018 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f5b4c1db6126..fa4f0cd20287 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2628,12 +2628,11 @@ let self = _self // overrides; _self = with self; { }; CPANMetaYAML = buildPerlPackage rec { - name = "CPAN-Meta-YAML-0.016"; + name = "CPAN-Meta-YAML-0.018"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "195v3lrfjzqxfiqi1zp02xmhp6mg9y3p7abmlfk2nj1rb28p0yrl"; + sha256 = "150jh9l7baddl2587m23qs2l0pb395qsx9bhsgdsnn6y9k4zgjik"; }; - buildInputs = [ JSONPP ]; doCheck = true; meta = { homepage = https://github.com/dagolden/CPAN-Meta-YAML; From 5750a94f90e377339988f9e7e6b51c6fb0eee4bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:11 +0000 Subject: [PATCH 0447/2743] [cpan2nix] perlPackages.CPANPLUS: 0.9154 -> 0.9172 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fa4f0cd20287..a846206e422c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2655,12 +2655,11 @@ let self = _self // overrides; _self = with self; { }; CPANPLUS = buildPerlPackage rec { - name = "CPANPLUS-0.9154"; + name = "CPANPLUS-0.9172"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "1mz20qlk0wjl4mwi4b9nji4hyh9a0l7m1v5bmypwwmhzpac5rq5c"; + sha256 = "1q4b0fkdn4sh8ym9dig21w96p7kzrhq66lqhn0dy1l3pgx413zlc"; }; - propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ]; doCheck = false; meta = { homepage = https://github.com/jib/cpanplus-devel; From 4e6c787a0cad854c88e9a81e54d322e43399eabb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:12 +0000 Subject: [PATCH 0448/2743] [cpan2nix] perlPackages.CPANPerlReleases: 2.36 -> 3.50 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a846206e422c..2de7c1b0163e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2642,10 +2642,10 @@ let self = _self // overrides; _self = with self; { }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-2.36"; + name = "CPAN-Perl-Releases-3.50"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "092nr3x2bs0lb3k8vk0mkghqzcw05s0gyyvfnmvx4fwwza8kya85"; + sha256 = "1nr739rnrw58p9r9z26pr4sc4s5z7wbhgyva3r2b2spyaylp5qkz"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; From 7a50654bf3ef24d80daaab4ab3235c7e34d24dc5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:12 +0000 Subject: [PATCH 0449/2743] [cpan2nix] perlPackages.CSSMinifierXP: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2de7c1b0163e..5dc5fd58afb6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2905,10 +2905,10 @@ let self = _self // overrides; _self = with self; { buildInputs = [ Clone ]; }; - CSSMinifierXP = buildPerlPackage rec { + CSSMinifierXP = buildPerlModule rec { name = "CSS-Minifier-XS-0.09"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; + url = mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; meta = { From 8bb5b56e74df39f9128d50063220d731669cf248 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:12 +0000 Subject: [PATCH 0450/2743] [cpan2nix] perlPackages.CacheFastMmap: 1.43 -> 1.46 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5dc5fd58afb6..59824f0d54e9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -867,10 +867,10 @@ let self = _self // overrides; _self = with self; { }; CacheFastMmap = buildPerlPackage rec { - name = "Cache-FastMmap-1.43"; + name = "Cache-FastMmap-1.46"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; - sha256 = "18k10bhi67iyy8igw8hwb339miwscgnsh9y2pbncw6gdr2b610vi"; + url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.46.tar.gz; + sha256 = "0061kwlbv398b2hb0kx1r6lmqf4kb6dnq9j4lsikczyk981sxs98"; }; }; From 8c3fdae392775859487c943249600aba9e241f7c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:13 +0000 Subject: [PATCH 0451/2743] [cpan2nix] perlPackages.CacheMemcachedFast: 0.21 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59824f0d54e9..a3116d2be510 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -889,10 +889,10 @@ let self = _self // overrides; _self = with self; { }; CacheMemcachedFast = buildPerlPackage { - name = "Cache-Memcached-Fast-0.21"; + name = "Cache-Memcached-Fast-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KROKI/Cache-Memcached-Fast-0.21.tar.gz; - sha256 = "0lvwkkyazbb7i6c5ga5ms3gsvy721njpcbc2icxcsvc8bz32nz5i"; + url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz; + sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq"; }; meta = { description = "Perl client for B, in C language"; From 0c6d139a29372fc7679d675da690f497d087a5f3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:14 +0000 Subject: [PATCH 0452/2743] [cpan2nix] perlPackages.CaptureTiny: 0.30 -> 0.46 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a3116d2be510..2cb3f79eacc9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -978,10 +978,10 @@ let self = _self // overrides; _self = with self; { }; CaptureTiny = buildPerlPackage rec { - name = "Capture-Tiny-0.30"; + name = "Capture-Tiny-0.46"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "1siswsz63wcvldnq1ns1gm5kbs768agsgcgh1papfzkmg19fbd53"; + sha256 = "05bhlx6d4nzamhkkh0pkckg7wlvaq6mazf7q1fbb5wpp1j1nlyjx"; }; meta = { homepage = https://metacpan.org/release/Capture-Tiny; From 16d887cb3d4fa6da591da39bd5e5ba3f08a07cd6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:14 +0000 Subject: [PATCH 0453/2743] [cpan2nix] perlPackages.CarpAssert: 0.20 -> 0.21 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2cb3f79eacc9..48db3c686bb2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1015,10 +1015,10 @@ let self = _self // overrides; _self = with self; { }; CarpAssert = buildPerlPackage { - name = "Carp-Assert-0.20"; + name = "Carp-Assert-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Carp-Assert-0.20.tar.gz; - sha256 = "1wzy4lswvwi45ybsm65zlq17rrqx84lsd7rajvd0jvd5af5lmlqd"; + url = mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz; + sha256 = "0km5fc6r6whxh6h5yd7g1j0bi96sgk0gkda6cardicrw9qmqwkwj"; }; meta = { }; From 283a03b05a7d9ac6f395a84c9976a2f24d3fcb15 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:15 +0000 Subject: [PATCH 0454/2743] [cpan2nix] perlPackages.ClassAccessor: 0.34 -> 0.51 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 48db3c686bb2..87c88b535496 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1812,10 +1812,10 @@ let self = _self // overrides; _self = with self; { }; ClassAccessor = buildPerlPackage { - name = "Class-Accessor-0.34"; + name = "Class-Accessor-0.51"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz; - sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; + url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz; + sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 096afefe7b56e68500d6b83ee37ad035d400780c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:18 +0000 Subject: [PATCH 0455/2743] [cpan2nix] perlPackages.ClassFactoryUtil: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 87c88b535496..46b8d7923b6a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1965,13 +1965,12 @@ let self = _self // overrides; _self = with self; { }; }; - ClassFactoryUtil = buildPerlPackage rec { + ClassFactoryUtil = buildPerlModule rec { name = "Class-Factory-Util-1.7"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc"; }; - buildInputs = [ ModuleBuild ]; meta = { description = "Provide utility methods for factory classes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 49591fb91a92ad2cc7b398c07f16cb3bdc485616 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:18 +0000 Subject: [PATCH 0456/2743] [cpan2nix] perlPackages.ClassInspector: 1.28 -> 1.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46b8d7923b6a..baf12b5a93f5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1978,10 +1978,10 @@ let self = _self // overrides; _self = with self; { }; ClassInspector = buildPerlPackage { - name = "Class-Inspector-1.28"; + name = "Class-Inspector-1.32"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.28.tar.gz; - sha256 = "04iij8dbcgaim7g109frpyf7mh4ydsd8zh53r53chk0zxnivg91w"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz; + sha256 = "0d85rihxahdvhj8cysqrgg0kbmcqghz5hgy41dbkxr1qaf5xrynf"; }; meta = { description = "Get information about a class and its structure"; From 0212152fd30ebb943fa45cb5be4e1aed3459abe1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:19 +0000 Subject: [PATCH 0457/2743] [cpan2nix] perlPackages.ClassMakeMethods: 1.009 -> 1.01 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index baf12b5a93f5..ffe2d5113f7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2008,10 +2008,10 @@ let self = _self // overrides; _self = with self; { }; ClassMakeMethods = buildPerlPackage rec { - name = "Class-MakeMethods-1.009"; + name = "Class-MakeMethods-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz"; - sha256 = "10f65j4ywrnwyz0dm1q5ymmpv875drj40mj1xvsjv0bnjinnwzj8"; + sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c"; }; }; From f59c5c7dd9333563dcb5ca6ad12a00b5be248b9e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:20 +0000 Subject: [PATCH 0458/2743] [cpan2nix] perlPackages.ClassStd: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffe2d5113f7f..de984b5ed009 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2127,7 +2127,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassISA ]; }; - ClassStd = buildPerlPackage { + ClassStd = buildPerlModule { name = "Class-Std-0.013"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz; From 039229714b632f3bb0d49d3327addca23f4a6388 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:22 +0000 Subject: [PATCH 0459/2743] [cpan2nix] perlPackages.Clone: 0.38 -> 0.39 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de984b5ed009..a0469eecf880 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2194,10 +2194,10 @@ let self = _self // overrides; _self = with self; { Clone = buildPerlPackage rec { - name = "Clone-0.38"; + name = "Clone-0.39"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GARU/${name}.tar.gz"; - sha256 = "1s5xrv9zlckqqzyhxi0l9lwj9m6na2bz5hqxrkva2v7gnx5m7c4z"; + sha256 = "0bgsidb96gxzf3zhy6v1ksj1c200vxbwykk32fqm1mj97rl4dc5c"; }; meta = { description = "Recursively copy Perl datatypes"; From 377be2631eded8a21e5000455d0b91d523574c8b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:22 +0000 Subject: [PATCH 0460/2743] [cpan2nix] perlPackages.CompressBzip2: 2.22 -> 2.26 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a0469eecf880..17b416ca566f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2222,15 +2222,16 @@ let self = _self // overrides; _self = with self; { }; CompressBzip2 = buildPerlPackage { - name = "Compress-Bzip2-2.22"; + name = "Compress-Bzip2-2.26"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.22.tar.gz; - sha256 = "1603e284e07953415b8eaa132698db8b03f46383f883c0902926f36eecb7e895"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz; + sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c"; }; meta = { description = "Interface to Bzip2 compression library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; CompressRawBzip2 = buildPerlPackage rec { From dec0b47361717cf0084d24f4cbea557b29f96ca6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:23 +0000 Subject: [PATCH 0461/2743] [cpan2nix] perlPackages.CompressRawBzip2: 2.070 -> 2.074 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 17b416ca566f..66114a7f3ebe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2235,10 +2235,10 @@ let self = _self // overrides; _self = with self; { }; CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.070"; + name = "Compress-Raw-Bzip2-2.074"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "0rmwpqhnhw5n11gm9mbxrxnardm0jfy7568ln9zw21bq3d7dsmn8"; + sha256 = "0b5jwqf15zr787acnx8sfyy2zavdd7gfkd98n1dgy8fs6r8yb8a4"; }; # Don't build a private copy of bzip2. From e0e377ee84676e187acf98d568dc7e2e8b8b11eb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:23 +0000 Subject: [PATCH 0462/2743] [cpan2nix] perlPackages.CompressUnLZMA: 0.04 -> 0.05 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66114a7f3ebe..385225f09cd7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2261,12 +2261,11 @@ let self = _self // overrides; _self = with self; { CompressZlib = IOCompress; CompressUnLZMA = buildPerlPackage rec { - name = "Compress-unLZMA-0.04"; + name = "Compress-unLZMA-0.05"; src = fetchurl { url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; - sha256 = "0sg9gj3rhif6hgmhwpz6w0g52l65vj5hx9818v5cdhvcif0jhg0b"; + sha256 = "1f0pcpcjjj60whqc5sc5jd0dd7z3si4fnp268w4ykmcjini03s2d"; }; - propagatedBuildInputs = [ IOCompress ]; }; ConfigAny = buildPerlPackage rec { From 8ae66760cc6e352749dfdd3a989c4c4a89fb426a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:23 +0000 Subject: [PATCH 0463/2743] [cpan2nix] perlPackages.ConfigGeneral: 2.60 -> 2.63 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 385225f09cd7..49e1a1f05c9e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2295,10 +2295,10 @@ let self = _self // overrides; _self = with self; { }; ConfigGeneral = buildPerlPackage rec { - name = "Config-General-2.60"; + name = "Config-General-2.63"; src = fetchurl { url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; - sha256 = "1biqzrvxr9cc8m5jaldnqzmj44q07y4pv6izgb7irsij0rn18m2i"; + sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 530e686af00748fe0c156f3747a22a0cb2f5b36a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:25 +0000 Subject: [PATCH 0464/2743] [cpan2nix] perlPackages.CpanelJSONXS: 4.01 -> 4.02 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 49e1a1f05c9e..233f390895df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2562,10 +2562,10 @@ let self = _self // overrides; _self = with self; { }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.01"; + name = "Cpanel-JSON-XS-4.02"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "c8cfd32a8a9508ab7f280452428582c3e46d0bed4ea863c3ec27c34f6920de60"; + sha256 = "e9fe45a0b5bf553076bd395ed04766d58683557f818af559cd82d33409846d20"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From c8ccfd48b2f62afb1a42fddc7fd56e7a43fe0331 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:26 +0000 Subject: [PATCH 0465/2743] [cpan2nix] perlPackages.CryptDES: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 233f390895df..087d2750028e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2703,7 +2703,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz"; sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"; }; - buildInputs = [CryptCBC]; }; CryptDH = buildPerlPackage rec { From eda6f505ad9abc76e27e45773f86dea8a46ff5eb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:26 +0000 Subject: [PATCH 0466/2743] [cpan2nix] perlPackages.CryptOpenSSLBignum: 0.04 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 087d2750028e..111d5e1dc8e3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2853,10 +2853,10 @@ let self = _self // overrides; _self = with self; { }; CryptOpenSSLBignum = buildPerlPackage rec { - name = "Crypt-OpenSSL-Bignum-0.04"; + name = "Crypt-OpenSSL-Bignum-0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IR/IROBERTS/${name}.tar.gz"; - sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk"; + url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz; + sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; From 7ae75c0856ec1291b37d107f9698039b4b5db024 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:27 +0000 Subject: [PATCH 0467/2743] [cpan2nix] perlPackages.CryptPasswdMD5: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 111d5e1dc8e3..e27ff979e5e7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2748,7 +2748,7 @@ let self = _self // overrides; _self = with self; { }; }; - CryptPasswdMD5 = buildPerlPackage { + CryptPasswdMD5 = buildPerlModule { name = "Crypt-PasswdMD5-1.40"; src = fetchurl { url = mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz; From cf9df9ebc28c63559bd0ad3f099e22ad2f81b61e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:29 +0000 Subject: [PATCH 0468/2743] [cpan2nix] perlPackages.CryptUnixCryptXS: 0.10 -> 0.11 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e27ff979e5e7..9391fcf64b4c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2820,10 +2820,10 @@ let self = _self // overrides; _self = with self; { }; CryptUnixCryptXS = buildPerlPackage rec { - name = "Crypt-UnixCrypt_XS-0.10"; + name = "Crypt-UnixCrypt_XS-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; - sha256 = "1d3xamq2mm3v2bfb1ay66crljm0bigfbhay1fqglcsrb75b7ls7r"; + sha256 = "1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2"; }; }; From 9a3e2b648606fd7deeac9e7cf0c7443cd39f6167 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:29 +0000 Subject: [PATCH 0469/2743] [cpan2nix] perlPackages.CryptX: 0.057 -> 0.059 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9391fcf64b4c..e6c8f07727f2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2945,12 +2945,11 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.057"; + name = "CryptX-0.059"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "b85fffbc8ecc0b8f1f768926c6b31e755e6df15556462d101d45ef5c48f9d025"; + sha256 = "3ef0d6493f332b6a2e1b0d20eda034d060d66f19f48d47244c788c26dca09d27"; }; - propagatedBuildInputs = [ JSONMaybeXS ]; meta = { description = "Crypto toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 5f62914e5cda4b15f2bee1511c1ede6f07ae15d0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:29 +0000 Subject: [PATCH 0470/2743] [cpan2nix] perlPackages.Curses: 1.33 -> 1.36 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e6c8f07727f2..a3bac07d26a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2929,11 +2929,11 @@ let self = _self // overrides; _self = with self; { }; }; - Curses = let version = "1.33"; in buildPerlPackage { + Curses = let version = "1.36"; in buildPerlPackage { name = "Curses-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-${version}.tar.gz"; - sha256 = "126fhcyb822vqhszdrr7nmhrnshf06076shxdr7la0fwqzsfn7zb"; + sha256 = "0r6xd9wr0c25rr28zixhqipak575zqsfb7r7f2693i9il1dpj554"; }; propagatedBuildInputs = [ pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lncurses"; From 9b3c1ea4663aa06621d2500c7f26798cac422fa4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:30 +0000 Subject: [PATCH 0471/2743] [cpan2nix] perlPackages.DBI: 1.6.36 -> 1.641 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a3bac07d26a5..f7de3280a378 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3835,10 +3835,10 @@ let self = _self // overrides; _self = with self; { DBI = buildPerlPackage rec { name = "DBI-${version}"; - version = "1.6.36"; + version = "1.641"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c"; + sha256 = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' mkdir -p $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI From 837d87ecbc2f221a38b45b09d50cd8d7b39588ce Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:31 +0000 Subject: [PATCH 0472/2743] [cpan2nix] perlPackages.DataFloat: 0.012 -> 0.013 --- 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 f7de3280a378..fac39252125c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3038,13 +3038,12 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ParamsClassify DataFloat CryptRijndael HTTPLite]; }; - DataFloat = buildPerlPackage rec { - name = "Data-Float-0.012"; + DataFloat = buildPerlModule rec { + name = "Data-Float-0.013"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "698ecb092a3284e260cd3c3208408feb791d7d0f06a02673f9125ab2d51cc2d8"; + sha256 = "e2b1523d858930b8bbdbd196f08235f5e678b84919ba87712e26313b9c27518a"; }; - buildInputs = [ ModuleBuild ]; }; DataFormValidator = buildPerlPackage rec { From a1f97aaec5d3648880907cacf33a7bf7f1c44833 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:32 +0000 Subject: [PATCH 0473/2743] [cpan2nix] perlPackages.DataInteger: 0.005 -> 0.006 --- 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 fac39252125c..5eabf2d9ad18 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3108,13 +3108,12 @@ let self = _self // overrides; _self = with self; { }; }; - DataInteger = buildPerlPackage rec { - name = "Data-Integer-0.005"; + DataInteger = buildPerlModule rec { + name = "Data-Integer-0.006"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "1dk04jf78sv63lww1qzagxlywcc04cfd3cfvzz168d24db9cr5bz"; + sha256 = "0m53zxhx9sn49yqh7azlpyy9m65g54v8cd2ha98y77337gg7xdv3"; }; - buildInputs = [ ModuleBuild ]; }; DataOptList = buildPerlPackage { From f5a7a828febd7c6733b22a7948ba6580d4dd8e47 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:33 +0000 Subject: [PATCH 0474/2743] [cpan2nix] perlPackages.DataSerializer: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5eabf2d9ad18..2dc060bacce8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3190,13 +3190,12 @@ let self = _self // overrides; _self = with self; { }; }; - DataSerializer = buildPerlPackage { + DataSerializer = buildPerlModule { name = "Data-Serializer-0.60"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz; sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; }; - buildInputs = [ ModuleBuild ]; meta = { description = "Modules that serialize data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 7dbcad1c5fd1a459ce2d8696a84762b955e88986 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:34 +0000 Subject: [PATCH 0475/2743] [cpan2nix] perlPackages.DataUUID: 1.220 -> 1.221 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2dc060bacce8..63d89dc041d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3271,10 +3271,10 @@ let self = _self // overrides; _self = with self; { }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.220"; + name = "Data-UUID-1.221"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; - sha256 = "0q7rfi7firwcvkhh9bym3c56hlm63badfli27m77139lwh33nlwr"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz; + sha256 = "0rw60wib0mj5z0v909mplh750y40hzyzf4z0b6h4ajxplyiv5irw"; }; }; From 74cf2bca3c7124d5cbccda6a7013684696daa075 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:35 +0000 Subject: [PATCH 0476/2743] [cpan2nix] perlPackages.DevelCycle: 1.11 -> 1.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 63d89dc041d5..03366fdab87a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4056,10 +4056,10 @@ let self = _self // overrides; _self = with self; { }; DevelCycle = buildPerlPackage { - name = "Devel-Cycle-1.11"; + name = "Devel-Cycle-1.12"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.11.tar.gz; - sha256 = "17c73yx9r32xvrsh8y7q24y0m3b98yihjyf3q4y68j869nh2b4rs"; + url = mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz; + sha256 = "1hhb77kz3dys8yaik452j22cm3510zald2mpvfyv5clqv326aczx"; }; meta = { description = "Find memory cycles in objects"; From f6260a443a693845b0afcb8456716efbfc4845ee Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:35 +0000 Subject: [PATCH 0477/2743] [cpan2nix] perlPackages.DevelFindPerl: cleanup --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03366fdab87a..81f5585bd5e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4089,8 +4089,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; sha256 = "0ns95dsgmr8s0f1dfwd1cyv32vmd22w0vs51ppnnzp5zyi499581"; }; - buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Find the path to your perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c1634aa0408a321a335024cbcdbae035bac939b2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:36 +0000 Subject: [PATCH 0478/2743] [cpan2nix] perlPackages.DevelPPPort: 3.32 -> 3.36 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 81f5585bd5e4..c9e9c763841b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3749,10 +3749,10 @@ let self = _self // overrides; _self = with self; { }; DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.32"; + name = "Devel-PPPort-3.36"; src = fetchurl { url = "mirror://cpan/authors/id/W/WO/WOLFSAGE/${name}.tar.gz"; - sha256 = "257801ef441f317bc79d20cdc72344e5b4ff6f685d65bdf79ff153e733fa3856"; + sha256 = "b70fb1b4e2d48983ad20052fd7ae6df4c10ceffdedbacb2d691ddc9c957afa52"; }; meta = { description = "Perl/Pollution/Portability"; From 19b02ff0721be43ed65d64e65cb33c751e8394fd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:37 +0000 Subject: [PATCH 0479/2743] [cpan2nix] perlPackages.DevelStackTrace: 1.34 -> 2.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9e9c763841b..8e9ae2ff0966 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4144,10 +4144,10 @@ let self = _self // overrides; _self = with self; { }; DevelStackTrace = buildPerlPackage { - name = "Devel-StackTrace-1.34"; + name = "Devel-StackTrace-2.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.34.tar.gz; - sha256 = "e882ccd7f4cbab0d0cdad53897f3f3bf29bdcf47d2bdfde1ac07f1bc7d7ebd16"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.03.tar.gz; + sha256 = "7618cd4ebe24e254c17085f4b418784ab503cb4cb3baf8f48a7be894e59ba848"; }; meta = { homepage = https://metacpan.org/release/Devel-StackTrace; From 7b9abd8355d5c45f7d85afe716fbf23265a61729 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:37 +0000 Subject: [PATCH 0480/2743] [cpan2nix] perlPackages.DevelSymdump: 2.15 -> 2.18 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e9ae2ff0966..f7c4bf0cd9c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4170,10 +4170,10 @@ let self = _self // overrides; _self = with self; { }; DevelSymdump = buildPerlPackage rec { - name = "Devel-Symdump-2.15"; + name = "Devel-Symdump-2.18"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41"; + sha256 = "826f81a107f5592a2516766ed43beb47e10cc83edc9ea48090b02a36040776c0"; }; meta = { description = "Dump symbol names or the symbol table"; From 483667df6cdc8b6713fb9bd18a67f0be42371669 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:40 +0000 Subject: [PATCH 0481/2743] [cpan2nix] perlPackages.DigestMD5: 2.54 -> 2.55 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7c4bf0cd9c0..4d991a432a07 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4253,10 +4253,10 @@ let self = _self // overrides; _self = with self; { }; DigestMD5 = buildPerlPackage { - name = "Digest-MD5-2.54"; + name = "Digest-MD5-2.55"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.54.tar.gz; - sha256 = "90de11e3743ef1c753a5c2032b434e09472046fbcf346996cbe5d135b217f390"; + url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.55.tar.gz; + sha256 = "03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c"; }; meta = { description = "Perl interface to the MD-5 algorithm"; From 2498bfb41d022372538ebc72cd4a60b9c32c26ca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:41 +0000 Subject: [PATCH 0482/2743] [cpan2nix] perlPackages.EmailAddress: 1.908 -> 1.909 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d991a432a07..d0abc94e4afd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4647,10 +4647,10 @@ let self = _self // overrides; _self = with self; { }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.908"; + name = "Email-Address-1.909"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.908.tar.gz; - sha256 = "0i6ljdvpy279hpbqf6lgv4figr376rb2sh4yphj86xkdzsyn1y75"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.909.tar.gz; + sha256 = "0l7x6sl06j9ffgfz5f9vgms2b5axd4cgp5fj03ivb3kia4km6b3g"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; From 01dd7ea881dbcad0eb7f2022b1e32dc7290c5f9d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:41 +0000 Subject: [PATCH 0483/2743] [cpan2nix] perlPackages.EmailMessageID: 1.404 -> 1.406 --- 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 d0abc94e4afd..696fae87b673 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4702,12 +4702,11 @@ let self = _self // overrides; _self = with self; { }; EmailMessageID = buildPerlPackage { - name = "Email-MessageID-1.404"; + name = "Email-MessageID-1.406"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.404.tar.gz; - sha256 = "0lyq9r3x7cs7cncf0yiazbi7aq4c5d4m3wxwgqdd4r5p9gxdjj4n"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz; + sha256 = "1f22sdnfq169qw1l0lg7y74pmiam7j9v95bggjnf3q4mygdmshpc"; }; - propagatedBuildInputs = [ EmailAddress ]; meta = { description = "Generate world unique message-ids"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 5545520597be780ddcda13278003d04b079d61a2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:42 +0000 Subject: [PATCH 0484/2743] [cpan2nix] perlPackages.EncodeDetect: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 696fae87b673..c6e6263abf5a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4891,14 +4891,13 @@ let self = _self // overrides; _self = with self; { }; }; - EncodeDetect = buildPerlPackage rec { + EncodeDetect = buildPerlModule rec { name = "Encode-Detect-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/J/JG/JGMYERS/${name}.tar.gz"; sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; - propagatedBuildInputs = [ ModuleBuild ]; meta = { description = "An Encode::Encoding subclass that detects the encoding of data"; license = stdenv.lib.licenses.free; From 4a783a8c838aa4e5cf79a6dcc99870c45e30e664 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:43 +0000 Subject: [PATCH 0485/2743] [cpan2nix] perlPackages.EncodeJIS2K: 0.02 -> 0.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c6e6263abf5a..13706b5c4299 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4931,10 +4931,10 @@ let self = _self // overrides; _self = with self; { }; EncodeJIS2K = buildPerlPackage { - name = "Encode-JIS2K-0.02"; + name = "Encode-JIS2K-0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz; - sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz; + sha256 = "1ec84d72db39deb4dad6fca95acfcc21033f45a24d347c20f9a1a696896c35cc"; }; outputs = [ "out" ]; meta = { From 687a373be4b9e9249c50b51e92209160de909f60 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:44 +0000 Subject: [PATCH 0486/2743] [cpan2nix] perlPackages.EncodeLocale: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13706b5c4299..2919ad1dbd99 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4944,7 +4944,7 @@ let self = _self // overrides; _self = with self; { EncodeLocale = buildPerlPackage rec { name = "Encode-Locale-1.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz; sha256 = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1"; }; preCheck = if stdenv.isCygwin then '' From 0da2b53f09453430a09e269833e9cad44c12a9c0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:45 +0000 Subject: [PATCH 0487/2743] [cpan2nix] perlPackages.Error: 0.17022 -> 0.17025 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2919ad1dbd99..0fa7cf74f4c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4995,11 +4995,11 @@ let self = _self // overrides; _self = with self; { }; }; - Error = buildPerlPackage rec { - name = "Error-0.17022"; + Error = buildPerlModule rec { + name = "Error-0.17025"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "1vzpz6syb82ir8svp2wjh95x6lpf01lgkxn2xy60ixrszc24zdya"; + sha256 = "1bzgzmf1v4md02vadm46b4j4ilqxrcrfasvbzymhrznlsd54g7vc"; }; }; From e325a65466d0695d81f38ba2132c08bc914ce0af Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:45 +0000 Subject: [PATCH 0488/2743] [cpan2nix] perlPackages.ExporterLite: 0.04 -> 0.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0fa7cf74f4c7..a38d64715141 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5100,10 +5100,10 @@ let self = _self // overrides; _self = with self; { }; ExporterLite = buildPerlPackage { - name = "Exporter-Lite-0.04"; + name = "Exporter-Lite-0.08"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.04.tar.gz; - sha256 = "01g6a2ixgdi825v0l4ny3vx4chzsfxirka741x0i057cf6y5ciir"; + url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz; + sha256 = "1hns15imih8z2h6zv3m1wwmv9fiysacsb52y94v6zf2cmw4kjny0"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 96907ea480e98866df17044c1425333a3f73941d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:46 +0000 Subject: [PATCH 0489/2743] [cpan2nix] perlPackages.ExporterTiny: 0.042 -> 1.000000 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a38d64715141..31dd26ad7780 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5111,10 +5111,10 @@ let self = _self // overrides; _self = with self; { }; ExporterTiny = buildPerlPackage { - name = "Exporter-Tiny-0.042"; + name = "Exporter-Tiny-1.000000"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-0.042.tar.gz; - sha256 = "8f1622c5ebbfbcd519ead81df7917e48cb16cc527b1c46737b0459c3908a023f"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.000000.tar.gz; + sha256 = "ffdd77d57de099e8f64dd942ef12a00a3f4313c2531f342339eeed2d366ad078"; }; meta = { homepage = https://metacpan.org/release/Exporter-Tiny; From c141f82cf90cc73d7988519a1b962764e1948d44 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:46 +0000 Subject: [PATCH 0490/2743] [cpan2nix] perlPackages.ExtUtilsCBuilder: 0.280216 -> 0.280230 --- 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 31dd26ad7780..196f74d371c4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5163,12 +5163,11 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsCBuilder = buildPerlPackage rec { - name = "ExtUtils-CBuilder-0.280216"; + name = "ExtUtils-CBuilder-0.280230"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils/${name}.tar.gz"; - sha256 = "09d5sq9mgcnmjf2yp8rwd0cc1fa8kq7nbwjqxiqdykwmavmgm5ml"; + url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280230.tar.gz; + sha256 = "1mcwvic01x0flcz3jsny5j8j5zz96r63qjwq75hs42cpf3by3ahx"; }; - buildInputs = [ PerlOSType ]; }; ExtUtilsCChecker = buildPerlPackage rec { From cec9cfca9d55778742ebfe39c8eed457d4726f19 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:46 +0000 Subject: [PATCH 0491/2743] [cpan2nix] perlPackages.ExtUtilsConfig: 0.007 -> 0.008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 196f74d371c4..9a3d79fe04b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5184,10 +5184,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsConfig = buildPerlPackage { - name = "ExtUtils-Config-0.007"; + name = "ExtUtils-Config-0.008"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.007.tar.gz; - sha256 = "2c1465078b876fd16a90507092805265528c2532d4937b03547a6dbdb8ac0eef"; + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz; + sha256 = "ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c"; }; meta = { description = "A wrapper for perl's configuration"; From 6bda2d305dd6eda0d39c0aee1629562b9cd8cb49 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:47 +0000 Subject: [PATCH 0492/2743] [cpan2nix] perlPackages.ExtUtilsConstant: 0.23 -> 0.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a3d79fe04b2..37dcae690899 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5196,10 +5196,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsConstant = buildPerlPackage { - name = "ExtUtils-Constant-0.23"; + name = "ExtUtils-Constant-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.23.tar.gz; - sha256 = "23b77025c8a5d3b93c586d4f0e712bcca3ef934edbee00a78c3fad4285f48eab"; + url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.24.tar.gz; + sha256 = "aa9e8c0b564576195a7508374f4a80b97fe3cf4a4c13efe4c949ece3e76b217d"; }; }; From 84d88bcc22729929a0d203f66beaa498212166ae Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:47 +0000 Subject: [PATCH 0493/2743] [cpan2nix] perlPackages.ExtUtilsDepends: 0.306 -> 0.405 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 37dcae690899..0a527c0d49a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5214,10 +5214,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsDepends = buildPerlPackage { - name = "ExtUtils-Depends-0.306"; + name = "ExtUtils-Depends-0.405"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.306.tar.gz; - sha256 = "0s935hmxjl6md47i80abcfaghqwhnv0ikzzqln80w4ydhg5qn9a5"; + url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz; + sha256 = "0b4ab9qmcihsfs2ajhn5qzg7nhazr68v3r0zvb7076smswd41mla"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From bd18cb792ae63cb4143cd60a50036c9d17dfa2b5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:47 +0000 Subject: [PATCH 0494/2743] [cpan2nix] perlPackages.ExtUtilsHelpers: 0.022 -> 0.026 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0a527c0d49a9..9b5c66b74c8a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5227,10 +5227,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsHelpers = buildPerlPackage { - name = "ExtUtils-Helpers-0.022"; + name = "ExtUtils-Helpers-0.026"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz; - sha256 = "15dalfwmpfmifw312i5pwiai8134pxf7b2804shlqhdk1xqczy6k"; + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz; + sha256 = "05ilqcj1rg5izr09dsqmy5di4fvq6ph4k0chxks7qmd4j1kip46y"; }; meta = { description = "Various portability utilities for module builders"; From 1c972bfe58f101a1201a045ec7f242e1ce493f01 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:48 +0000 Subject: [PATCH 0495/2743] [cpan2nix] perlPackages.ExtUtilsInstall: 2.04 -> 2.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b5c66b74c8a..2969cdb25f52 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5239,10 +5239,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsInstall = buildPerlPackage { - name = "ExtUtils-Install-2.04"; + name = "ExtUtils-Install-2.14"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.04.tar.gz; - sha256 = "1b2e5370bc63d93cf99a75feb2b9b67227b693d16ebfb730ca90a483145de3b6"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz; + sha256 = "35412305cbae979aac3b6e2c70cb301ae461979a1d848a8a043f74518eb96aea"; }; meta = { homepage = https://metacpan.org/release/ExtUtils-Install; From ff3f1215871aff813f8da54b716cfd6d3bceaae4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:48 +0000 Subject: [PATCH 0496/2743] [cpan2nix] perlPackages.ExtUtilsMakeMaker: 7.32 -> 7.34 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2969cdb25f52..e8a69662da91 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5278,10 +5278,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsMakeMaker = buildPerlPackage { - name = "ExtUtils-MakeMaker-7.32"; + name = "ExtUtils-MakeMaker-7.34"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.32.tar.gz; - sha256 = "9a269f52ab59b125eb80b968271d9f49da0975d43e51363dbfd1695000ed69de"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.34.tar.gz; + sha256 = "95f1eb44de480d00b28d031b574ec868f7aeeee199eb5abe5666f6bcbbf68480"; }; meta = { homepage = https://metacpan.org/release/ExtUtils-MakeMaker; From 701d61276f1ce7841b2145d79aeda0a63344be06 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:49 +0000 Subject: [PATCH 0497/2743] [cpan2nix] perlPackages.ExtUtilsManifest: 1.63 -> 1.70 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8a69662da91..dc1de9c3cf3d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5291,10 +5291,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.63"; + name = "ExtUtils-Manifest-1.70"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0p4hj03nb5n6mk7pskpw066n1i3hr80nq7k7rc3fgl329v6syfmg"; + url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.70.tar.gz; + sha256 = "159bypwl8xpq1yi39prr49hl7x2xww5aj97nv169c8xja0h0dzzf"; }; }; From c4ee231e10a1b218de9b0191434a5d35054381be Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:50 +0000 Subject: [PATCH 0498/2743] [cpan2nix] perlPackages.ExtUtilsTypemap: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dc1de9c3cf3d..00e5d889b15f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5334,10 +5334,9 @@ let self = _self // overrides; _self = with self; { ExtUtilsTypemap = buildPerlPackage rec { name = "ExtUtils-Typemap-1.00"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz; sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i"; }; - buildInputs = [ ExtUtilsParseXS ]; }; ExtUtilsTypemapsDefault = buildPerlModule rec { From 0355f2152e92f8d0d9695adc44ced3c7a0d1a009 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:51 +0000 Subject: [PATCH 0499/2743] [cpan2nix] perlPackages.ExtUtilsTypemapsDefault: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00e5d889b15f..84b39ae4d116 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5342,10 +5342,9 @@ let self = _self // overrides; _self = with self; { ExtUtilsTypemapsDefault = buildPerlModule rec { name = "ExtUtils-Typemaps-Default-1.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz; sha256 = "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix"; }; - propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ]; }; ExtUtilsXSBuilder = buildPerlPackage { From d378dcd51e86e047b9e03fd96f4b3e450bb7b9b6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:51 +0000 Subject: [PATCH 0500/2743] [cpan2nix] perlPackages.FCGI: 0.74 -> 0.78 --- 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 84b39ae4d116..096c7e8651f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5380,12 +5380,11 @@ let self = _self // overrides; _self = with self; { }; FCGI = buildPerlPackage rec { - name = "FCGI-0.74"; + name = "FCGI-0.78"; src = fetchurl { - url = "mirror://cpan/modules/by-module/FCGI/${name}.tar.gz"; - sha256 = "0m089q07kpsk8y8g2wmi3d8i1jzn5m5m00shs7vnf2lnvvv4d7pm"; + url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz; + sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa"; }; - buildInputs = [ ]; }; FCGIProcManager = buildPerlPackage { From 4d71ba101b9d0d75f4cc684ad3e87e317aecd165 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:51 +0000 Subject: [PATCH 0501/2743] [cpan2nix] perlPackages.FCGIProcManager: 0.25 -> 0.28 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 096c7e8651f1..deed68fc6d1d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5388,10 +5388,10 @@ let self = _self // overrides; _self = with self; { }; FCGIProcManager = buildPerlPackage { - name = "FCGI-ProcManager-0.25"; + name = "FCGI-ProcManager-0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.25.tar.gz; - sha256 = "b9ae1146e2638f3aa477c9ab3ceb728f92c5e36e4cce8f0b5847efad601d024d"; + url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.28.tar.gz; + sha256 = "e1c958c042427a175e051e0008f2025e8ec80613d3c7750597bf8e529b04420e"; }; meta = { description = "A perl-based FastCGI process manager"; From 584901cee3e5b14313020b6d92323bedd41d552e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:52 +0000 Subject: [PATCH 0502/2743] [cpan2nix] perlPackages.FileCheckTree: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index deed68fc6d1d..62dd24367e20 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5472,7 +5472,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz; sha256 = "66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a"; }; - propagatedBuildInputs = [ if_ ]; meta = { homepage = http://search.cpan.org/dist/File-CheckTree; description = "Run many filetest checks on a tree"; From e0525fde26ccafee74bf306a17c727260b15358f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:52 +0000 Subject: [PATCH 0503/2743] [cpan2nix] perlPackages.FileFnMatch: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62dd24367e20..7651ca81ac88 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5581,7 +5581,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MJ/MJP/File-FnMatch-0.02.tar.gz"; sha256 = "05p9m7kpmjv8bmmbs5chb5fqyshcgmskbbzq5c9qpskbx2w5894n"; }; - buildInputs = [ ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "simple filename and pathname matching"; From 6a84ca48073429a15ee0b0f44753cdb301a68cac Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:53 +0000 Subject: [PATCH 0504/2743] [cpan2nix] perlPackages.FileNFSLock: 1.21 -> 1.27 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7651ca81ac88..0611b3ea4a4c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5713,10 +5713,10 @@ let self = _self // overrides; _self = with self; { }; FileNFSLock = buildPerlPackage { - name = "File-NFSLock-1.21"; + name = "File-NFSLock-1.27"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.21.tar.gz; - sha256 = "1kclhmyha2xijq49darlz82f3bn7gq3saycxpfiz3dndqhr5i9iz"; + url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.27.tar.gz; + sha256 = "0hhh3cmbby98b1xh64dvj31wqcr9hsk1zqrq3ci8fjd4xb7xch8g"; }; meta = { maintainers = with maintainers; [ ]; From 8d1a5cf072311303bc358084e91dcdee8ee5496e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:54 +0000 Subject: [PATCH 0505/2743] [cpan2nix] perlPackages.FilePath: 2.12 -> 2.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0611b3ea4a4c..ffa7ea0a81a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5725,10 +5725,10 @@ let self = _self // overrides; _self = with self; { }; FilePath = buildPerlPackage rec { - name = "File-Path-2.12"; + name = "File-Path-2.15"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RICHE/${name}.tar.gz"; - sha256 = "bbf61a0d37c135c694e80f4ea344932bdc5474c213025ae307ea52cb6886d17e"; + url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.15.tar.gz; + sha256 = "1570f3c1cdf93c50f65c2072e8f20ee121550771dfb7f6e563f503a2a7050744"; }; meta = { description = "Create or remove directory trees"; From 1dff833ce6c22a5014318f0f254a2d509563f64d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:55 +0000 Subject: [PATCH 0506/2743] [cpan2nix] perlPackages.FileRemove: 1.52 -> 1.57 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffa7ea0a81a9..e02f5b7439fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5765,10 +5765,10 @@ let self = _self // overrides; _self = with self; { }; FileRemove = buildPerlPackage rec { - name = "File-Remove-1.52"; + name = "File-Remove-1.57"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "1p8bal9qhwkjbghivxn1d5m3qdj2qwm1agrjbmakm6la9dbxqm21"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.57.tar.gz; + sha256 = "1b814lw181kkqh6c1n4p2zlzzsq6ic5pfpr831nphf2w2rhcvgmk"; }; }; From a7b2c5f055c8a62a113ad907ebe2671b961b88c7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:56 +0000 Subject: [PATCH 0507/2743] [cpan2nix] perlPackages.FileType: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e02f5b7439fa..48db7dd2b892 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5829,7 +5829,7 @@ let self = _self // overrides; _self = with self; { FileTemp = null; - FileType = buildPerlPackage { + FileType = buildPerlModule { name = "File-Type-0.22"; src = fetchurl { url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; From 15dc07e88413c3692458843f261e72365e77af7d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:56 +0000 Subject: [PATCH 0508/2743] [cpan2nix] perlPackages.FileWhich: 1.21 -> 1.22 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 48db7dd2b892..72de02bcd0f9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5898,10 +5898,10 @@ let self = _self // overrides; _self = with self; { }; FileWhich = buildPerlPackage rec { - name = "File-Which-1.21"; + name = "File-Which-1.22"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "9def5f10316bfd944e56b7f8a2501be1d44c288325309462aa9345e340854bcc"; + sha256 = "e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4"; }; meta = { homepage = http://perl.wdlabs.com/File-Which; From 4dfa0e63f9587ffef8114953044af20b04cbceaa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:57 +0000 Subject: [PATCH 0509/2743] [cpan2nix] perlPackages.Filechdir: 0.1008 -> 0.1010 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72de02bcd0f9..2c280da76887 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5431,10 +5431,10 @@ let self = _self // overrides; _self = with self; { }; Filechdir = buildPerlPackage rec { - name = "File-chdir-0.1008"; + name = "File-chdir-0.1010"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "0n8dz80fgk3shfxncyr4aff5hnsd846c5np6d68kc0mxqj2g0flr"; + sha256 = "009b8p2fzj4nhl03fpkhrn0rsh7myxqbrf69iqpzd86p1gs23hgg"; }; }; From 420cc35890428e37de704aa42024ffcf2212458b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:57 +0000 Subject: [PATCH 0510/2743] [cpan2nix] perlPackages.Filepushd: 1.005 -> 1.014 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2c280da76887..f415248328c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5737,10 +5737,10 @@ let self = _self // overrides; _self = with self; { }; Filepushd = buildPerlPackage { - name = "File-pushd-1.005"; + name = "File-pushd-1.014"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.005.tar.gz; - sha256 = "50fdcc33e69a50bab1e32d1a7c96753938f6d95a06015e34e662958c58687842"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.014.tar.gz; + sha256 = "b5ab37ffe3acbec53efb7c77b4423a2c79afa30a48298e751b9ebee3fdc6340b"; }; meta = { homepage = https://metacpan.org/release/File-pushd; From 7d215de489417953415cf93420c4d52d7b8a25d2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:57 +0000 Subject: [PATCH 0511/2743] [cpan2nix] perlPackages.Filter: 1.55 -> 1.58 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f415248328c1..56072c8612b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5911,10 +5911,10 @@ let self = _self // overrides; _self = with self; { }; Filter = buildPerlPackage { - name = "Filter-1.55"; + name = "Filter-1.58"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.55.tar.gz; - sha256 = "7855f5f5f16777c14614b5d907794a170ed4cdeb4382bf03ffca825c8c6bc4a0"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.58.tar.gz; + sha256 = "6de91cb4cbfe08d0ccffbca39aed57f9237be602b8183f13fd163fc8cb657f3d"; }; meta = { description = "Source Filters"; From 18515f2017443fa060badc9e3cd8e86280c76aa4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:59 +0000 Subject: [PATCH 0512/2743] [cpan2nix] perlPackages.GD: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56072c8612b8..0f795940191e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6029,8 +6029,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1ampz82kf0ixybncfgpvq2bp9nq5sjsmmw4c8srsv0g5jpz02pfh"; }; - buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype - pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm GetoptLong ]; + buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ]; # Patch needed to get arguments past the first GetOptions call # and to specify libfontconfig search path. From 9e583bac72f40579c0e278010b0cda5671106107 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:51:59 +0000 Subject: [PATCH 0513/2743] [cpan2nix] perlPackages.GeoIP: 1.45 -> 1.51 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f795940191e..64edaccb6f69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6082,10 +6082,10 @@ let self = _self // overrides; _self = with self; { }; GeoIP = buildPerlPackage rec { - name = "Geo-IP-1.45"; + name = "Geo-IP-1.51"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MAXMIND/${name}.tar.gz"; - sha256 = "0qinkq2br1cjicbgqb5bvrhm73h7f9f4fgc6bjfs5r6x7316bdqf"; + sha256 = "1fka8fr7fw6sh3xa9glhs1zjg3s2gfkhi7n7da1l2m2wblqj0c0n"; }; makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; doCheck = false; # seems to access the network From 5b74da03921010403f66dc7ad0e414a71c8cf108 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:00 +0000 Subject: [PATCH 0514/2743] [cpan2nix] perlPackages.GetoptLong: 2.42 -> 2.50 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64edaccb6f69..cc00b2a0d2ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6092,10 +6092,10 @@ let self = _self // overrides; _self = with self; { }; GetoptLong = buildPerlPackage rec { - name = "Getopt-Long-2.42"; + name = "Getopt-Long-2.50"; src = fetchurl { url = "mirror://cpan/authors/id/J/JV/JV/${name}.tar.gz"; - sha256 = "12c5pvmx0jxx0mls8qll9ixb1lbacs7p1rwvmciv0dvw3w25dmr7"; + sha256 = "0rsb7ri8210xv09mnxykw5asbcqivd0v38x0z4jkis3k5gdim210"; }; }; From 352a187d3e83640f65edb5f799d6a2ac402cad7d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:01 +0000 Subject: [PATCH 0515/2743] [cpan2nix] perlPackages.Graph: 0.96 -> 0.9704 --- pkgs/top-level/perl-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cc00b2a0d2ab..c6024d64a71a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6275,13 +6275,11 @@ let self = _self // overrides; _self = with self; { }; Graph = buildPerlPackage rec { - name = "Graph-0.96"; + name = "Graph-0.9704"; src = fetchurl { url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; - sha256 = "09wpiz7v0gv07zb7h8gwgjrwj16cdycs60d08cjlyj1s926zlbl3"; + sha256 = "099a1gca0wj5zs0cffncjqp2mjrdlk9i6325ks89ml72gfq8wpij"; }; - - buildInputs = [ TestPod TestPodCoverage ]; }; GraphViz = buildPerlPackage rec { From a3bf8ed28bbc725441ae3872b741dd4853972f80 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:02 +0000 Subject: [PATCH 0516/2743] [cpan2nix] perlPackages.HTMLTagCloud: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c6024d64a71a..e4e688ad02c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6720,7 +6720,7 @@ let self = _self // overrides; _self = with self; { }; }; - HTMLTagCloud = buildPerlPackage rec { + HTMLTagCloud = buildPerlModule rec { name = "HTML-TagCloud-0.38"; src = fetchurl { url = "mirror://cpan/authors/id/R/RO/ROBERTSD/${name}.tar.gz"; From 6b626f5f20f537575b12994baecf9ef221799f92 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:03 +0000 Subject: [PATCH 0517/2743] [cpan2nix] perlPackages.HTMLTagset: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4e688ad02c1..5eb274ac14e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6792,7 +6792,7 @@ let self = _self // overrides; _self = with self; { HTMLTagset = buildPerlPackage rec { name = "HTML-Tagset-3.20"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz; sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd"; }; }; From ca68c8d3c6269abb4211018f6ac1aa1a3de4bc15 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:04 +0000 Subject: [PATCH 0518/2743] [cpan2nix] perlPackages.HTTPParserXS: 0.16 -> 0.17 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5eb274ac14e1..46bab13147a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7012,12 +7012,11 @@ let self = _self // overrides; _self = with self; { }; HTTPParserXS = buildPerlPackage rec { - name = "HTTP-Parser-XS-0.16"; + name = "HTTP-Parser-XS-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; - sha256 = "1sp9vllf012paslmn11b7z7fbk3hhkcp7gj59yp6qzh11xzpxlai"; + sha256 = "02d84xq1mm53c7jl33qyb7v5w4372vydp74z6qj0vc96wcrnhkkr"; }; - buildInputs = [ TestMore ]; }; HTTPProxy = buildPerlPackage rec { From 3f661f23917ba62fc21862e6c0f0d9b5581e2210 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:05 +0000 Subject: [PATCH 0519/2743] [cpan2nix] perlPackages.HashMultiValue: 0.15 -> 0.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46bab13147a9..4b07e4b76d5c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6491,10 +6491,10 @@ let self = _self // overrides; _self = with self; { }; HashMultiValue = buildPerlPackage { - name = "Hash-MultiValue-0.15"; + name = "Hash-MultiValue-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Hash-MultiValue-0.15.tar.gz; - sha256 = "1jc37kwpa1fl88va8bd1p95h0vjv1gsvmn7pc2pxj62ga6x0wpc0"; + url = mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz; + sha256 = "1x3k7h542xnigz0b8vsfiq580p5r325wi5b8mxppiqk8mbvis636"; }; meta = { description = "Store multiple values per key"; From 390697e43053f8f02dd6d6ba3e294a86a63415d9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:05 +0000 Subject: [PATCH 0520/2743] [cpan2nix] perlPackages.HashUtilFieldHashCompat: 0.07 -> 0.11 --- 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 4b07e4b76d5c..d7ac87cdec3f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6503,12 +6503,11 @@ let self = _self // overrides; _self = with self; { }; HashUtilFieldHashCompat = buildPerlPackage { - name = "Hash-Util-FieldHash-Compat-0.07"; + name = "Hash-Util-FieldHash-Compat-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.07.tar.gz; - sha256 = "1fbqcjvp5slkfyf63g8scrbdpkpw3g9z9557xvfaxn09aki7g1bn"; + url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz; + sha256 = "06vlygjyk7rkkw0di3252mma141w801qn3xk40aa2yskbfklcbk4"; }; - propagatedBuildInputs = [ Testuseok ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; From 28f5354e73c798a696176e1c06c5903f5dfa9667 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:06 +0000 Subject: [PATCH 0521/2743] [cpan2nix] perlPackages.HeapFibonacci: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d7ac87cdec3f..bfab664a35a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6515,7 +6515,7 @@ let self = _self // overrides; _self = with self; { }; HeapFibonacci = buildPerlPackage { - name = "Heap-Fibonacci-0.80"; + name = "Heap-0.80"; src = fetchurl { url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; From 73a14a080cbc6100f816adab7a56fccea2430aba Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:06 +0000 Subject: [PATCH 0522/2743] [cpan2nix] perlPackages.HookLexWrap: 0.25 -> 0.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bfab664a35a8..da46d3a6bddb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6527,12 +6527,12 @@ let self = _self // overrides; _self = with self; { }; HookLexWrap = buildPerlPackage rec { - name = "Hook-LexWrap-0.25"; + name = "Hook-LexWrap-0.26"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "08ab9af6bd9b4560702d9d994ad9d905af0c2fd24090d1480ff640f137c1430d"; + sha256 = "b60bdc5f98f94f9294b06adef82b1d996da192d5f183f9f434b610fd1137ec2d"; }; - buildInputs = [ ModuleBuildTiny pkgs.unzip ]; + buildInputs = [ pkgs.unzip ]; meta = { homepage = https://github.com/chorny/Hook-LexWrap; description = "Lexically scoped subroutine wrappers"; From 3b4ddc629472b3696412fe3f4c1058743c566d5b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:07 +0000 Subject: [PATCH 0523/2743] [cpan2nix] perlPackages.IMAPClient: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index da46d3a6bddb..5f465e7f527c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7158,7 +7158,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz; sha256 = "15fa4hpw2rqg2iadyz10rnv99hns78wph5qlh3257a3mbfjjyyla"; }; - propagatedBuildInputs = [IOSocketSSL URIIMAP]; doCheck = false; # nondeterministic }; From 0cbbe8da5f0471f071624ebcde3ffcb6d50f8f02 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:08 +0000 Subject: [PATCH 0524/2743] [cpan2nix] perlPackages.IOAll: 0.60 -> 0.87 --- 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 5f465e7f527c..6e9f6aa058c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7201,12 +7201,11 @@ let self = _self // overrides; _self = with self; { }; IOAll = buildPerlPackage { - name = "IO-All-0.60"; + name = "IO-All-0.87"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.60.tar.gz; - sha256 = "1bwsd2f5rlivcqyd7rb0ap5vrzv8s8fappi3b1v553yr5vl5pyq9"; + url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz; + sha256 = "0nsd9knlbd7if2v6zwj4q978axq0w5hk8ymp61z14a821hjivqjl"; }; - propagatedBuildInputs = [ IOString ]; meta = { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; From b3c3c478fa9913e03b056f3e4718bba31f53c22b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:09 +0000 Subject: [PATCH 0525/2743] [cpan2nix] perlPackages.IOInteractive: 0.0.6 -> 1.022 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6e9f6aa058c1..9c0a19b0e8da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7279,10 +7279,10 @@ let self = _self // overrides; _self = with self; { }; IOInteractive = buildPerlPackage { - name = "IO-Interactive-0.0.6"; + name = "IO-Interactive-1.022"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-0.0.6.tar.gz; - sha256 = "9cc016cbd94b500027e137cb5070d19487e4431bf822f0cb534c38b6b2c1038c"; + url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz; + sha256 = "0ed53b8ae93ae877e98e0d89b7b429e29ccd1ee4c28e952c4ea9aa73d01febdc"; }; meta = { description = "Utilities for interactive I/O"; From e2ad5cbd29766056902037cefecce30a71818bfa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:09 +0000 Subject: [PATCH 0526/2743] [cpan2nix] perlPackages.IOLockedFile: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9c0a19b0e8da..0e4c728120dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7293,7 +7293,7 @@ let self = _self // overrides; _self = with self; { IOLockedFile = buildPerlPackage rec { name = "IO-LockedFile-0.23"; src = fetchurl { - url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz; sha256 = "1dgq8zfkaszisdb5hz8jgcl0xc3qpv7bbv562l31xgpiddm7xnxi"; }; }; From c65db93a5881d60c444a4cb977ad19baaec049ea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:11 +0000 Subject: [PATCH 0527/2743] [cpan2nix] perlPackages.IOSocketIP: 0.37 -> 0.39 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e4c728120dc..0d1ae1bcadf8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7329,11 +7329,11 @@ let self = _self // overrides; _self = with self; { }; }; - IOSocketIP = buildPerlPackage { - name = "IO-Socket-IP-0.37"; + IOSocketIP = buildPerlModule { + name = "IO-Socket-IP-0.39"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.37.tar.gz; - sha256 = "2adc5f0b641d41f662b4d99c0795780c62f9af9119884d053265fc8858ae6f7b"; + url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.39.tar.gz; + sha256 = "11950da7636cb786efd3bfb5891da4c820975276bce43175214391e5c32b7b96"; }; meta = { description = "Family-neutral IP socket supporting both IPv4 and IPv6"; From 733e691521682aa090c3132d9711f4a64e1e5b4b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:11 +0000 Subject: [PATCH 0528/2743] [cpan2nix] perlPackages.IOStringy: 2.110 -> 2.111 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d1ae1bcadf8..51ffb8414920 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7397,10 +7397,10 @@ let self = _self // overrides; _self = with self; { IOstringy = pkgs.perlPackages.IOStringy; IOStringy = buildPerlPackage rec { - name = "IO-stringy-2.110"; + name = "IO-stringy-2.111"; src = fetchurl { url = "mirror://cpan/authors/id/D/DS/DSKOLL/${name}.tar.gz"; - sha256 = "1vh4n0k22hx20rwvf6h7lp25wb7spg0089shrf92d2lkncwg8g3y"; + sha256 = "178rpx0ym5l2m9mdmpnr92ziscvchm541w94fd7ygi6311kgsrwc"; }; }; From bf6908b4f57f329b8172aa61ff0c76753de689ce Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:12 +0000 Subject: [PATCH 0529/2743] [cpan2nix] perlPackages.IOTee: 0.64 -> 0.65 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51ffb8414920..7c46ae6859b7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7405,10 +7405,10 @@ let self = _self // overrides; _self = with self; { }; IOTee = buildPerlPackage rec { - name = "IO-Tee-0.64"; + name = "IO-Tee-0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KE/KENSHAN/${name}.tar.gz"; - sha256 = "1mjy6hmwrzipzxcm33qs7ja89ljk6zkk499wclw16lfkqaqpdliy"; + url = mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz; + sha256 = "04hc94fk6qlazrarcznw2d8wiqw289js4za0czw65296kc8csgf6"; }; }; From a947f82e18c9b0d90bfc78f5f93ae1f3634cd33b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:12 +0000 Subject: [PATCH 0530/2743] [cpan2nix] perlPackages.IOTieCombine: 1.004 -> 1.005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7c46ae6859b7..e93e8d3ee7ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7413,10 +7413,10 @@ let self = _self // overrides; _self = with self; { }; IOTieCombine = buildPerlPackage { - name = "IO-TieCombine-1.004"; + name = "IO-TieCombine-1.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.004.tar.gz; - sha256 = "0awyyjdbjjawdkzs08rfjhfkkm7pni523x3ddmq9ixa82ibnn430"; + url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz; + sha256 = "1bv9ampayf4bvyxg4ivy18l8k79jvq55x6gl68b2fg8b62w4sba0"; }; meta = { homepage = https://github.com/rjbs/io-tiecombine; From a153b7110aedbede39601129ebfb219f9d2ff716 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:13 +0000 Subject: [PATCH 0531/2743] [cpan2nix] perlPackages.IPCShareLite: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e93e8d3ee7ef..86e723656adf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7487,7 +7487,7 @@ let self = _self // overrides; _self = with self; { IPCShareLite = buildPerlPackage rec { name = "IPC-ShareLite-0.17"; src = fetchurl { - url = "mirror://cpan/modules/by-module/IPC/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz; sha256 = "1gz7dbwxrzbzdsjv11kb49jlf9q6lci2va6is0hnavd93nwhdm0l"; }; }; From b6e21675baab0dcfbfad629c819986010fe6ceb0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:14 +0000 Subject: [PATCH 0532/2743] [cpan2nix] perlPackages.IPCSysV: 2.04 -> 2.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 86e723656adf..7ef1b21b0a77 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7505,10 +7505,10 @@ let self = _self // overrides; _self = with self; { }; IPCSysV = buildPerlPackage { - name = "IPC-SysV-2.04"; + name = "IPC-SysV-2.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.04.tar.gz; - sha256 = "93248930e667034899bf2b09b9a23348e2b800a5437fbb9b4f34c37316da3fcc"; + url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz; + sha256 = "d01a367af771d35e3b11a21366ad6405f8d28e8cbca4c0cf08ab78bf157d052d"; }; meta = { description = "System V IPC constants and system calls"; From 2b26671a9efb9d29155a9ce1d07e417743b71bf5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:15 +0000 Subject: [PATCH 0533/2743] [cpan2nix] perlPackages.JSONMaybeXS: 1.003005 -> 1.003010 --- pkgs/top-level/perl-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7ef1b21b0a77..aa54257c9e22 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7677,13 +7677,11 @@ let self = _self // overrides; _self = with self; { }; JSONMaybeXS = buildPerlPackage rec { - name = "JSON-MaybeXS-1.003005"; + name = "JSON-MaybeXS-1.003010"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "02n8dkj3qpzikkqyki8gvdk1pfdqrs9qcrdr96fla42gar5nkd5x"; + url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.003010.tar.gz; + sha256 = "0hs504x5zsa2vl6r7b3rvbygsak1ly24m1lg636bqp3x7jirmb30"; }; - buildInputs = [ TestWithoutModule ]; - propagatedBuildInputs = [ JSONPP ]; meta = { description = "Use L with a fallback to L and L"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c059baa1197c7e226028b7b5d47e9bb3659e4574 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:15 +0000 Subject: [PATCH 0534/2743] [cpan2nix] perlPackages.JSONPP: 2.27203 -> 2.97001 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa54257c9e22..fcdc29f467b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7689,10 +7689,10 @@ let self = _self // overrides; _self = with self; { }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-2.27203"; + name = "JSON-PP-2.97001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27203.tar.gz; - sha256 = "0ljwya1fb4969pckcq2j1g6axgx8qh9yscxbs6qf62qxf8wkj1mp"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-2.97001.tar.gz; + sha256 = "1d1731yqv2py039qxcr0j9r4jb8m9kq387pj1q6gxawbfwvlmxb7"; }; meta = { description = "JSON::XS compatible pure-Perl module"; From 67c72c030a2ba74eba7a17f8ff12bb9afce1d73a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:16 +0000 Subject: [PATCH 0535/2743] [cpan2nix] perlPackages.JavaScriptMinifierXS: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fcdc29f467b8..5b653521f7c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7629,13 +7629,12 @@ let self = _self // overrides; _self = with self; { }; }; - JavaScriptMinifierXS = buildPerlPackage rec { + JavaScriptMinifierXS = buildPerlModule rec { name = "JavaScript-Minifier-XS-0.11"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; + url = mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; }; - propagatedBuildInputs = [ ]; meta = { description = "XS based JavaScript minifier"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3da010455222180719a10c067dec8bcf0c28d520 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:17 +0000 Subject: [PATCH 0536/2743] [cpan2nix] perlPackages.Later: 0.19 -> 0.21 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b653521f7c7..4f87b77253d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7752,11 +7752,11 @@ let self = _self // overrides; _self = with self; { }; Later = buildPerlPackage rec { - version = "0.19"; + version = "0.21"; name = "Object-Realize-Later-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "0ka0qar51kk5wlvd2s3yis3w9qc14h0ngn0ds0v6c8ssmjvfcgbz"; + sha256 = "1nfqssld7pcdw9sj4mkfnh75w51wl14i1h7npj9fld4fri09cywg"; }; }; From 41917777d9a7da89a0bc49f4c07e693de4f25a88 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:17 +0000 Subject: [PATCH 0537/2743] [cpan2nix] perlPackages.LinguaENInflect: 1.899 -> 1.903 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4f87b77253d3..38904aa8e607 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7852,10 +7852,10 @@ let self = _self // overrides; _self = with self; { }; LinguaENInflect = buildPerlPackage rec { - name = "Lingua-EN-Inflect-1.899"; + name = "Lingua-EN-Inflect-1.903"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; - sha256 = "1599a93020a2fdc0de8db14eea721df8fd772f78dedaf81081081fc93aa6a257"; + sha256 = "fcef4b67b04cc39e427b2d70e7c5b24195edd0ed88dd705a08ecd5cd830b0d49"; }; meta = { description = "Convert singular to plural. Select 'a' or 'an'"; From a66725124ad72901f1eb5a854370f87ee0793d93 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:18 +0000 Subject: [PATCH 0538/2743] [cpan2nix] perlPackages.LinguaTranslit: 0.26 -> 0.28 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38904aa8e607..444897e0b1f4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7942,10 +7942,10 @@ let self = _self // overrides; _self = with self; { }; LinguaTranslit = buildPerlPackage rec { - name = "Lingua-Translit-0.26"; + name = "Lingua-Translit-0.28"; src = fetchurl { url = "mirror://cpan/authors/id/A/AL/ALINKE/${name}.tar.gz"; - sha256 = "2430b5c84927f15570533eb68c56958c580f16044fc413d48bf44f0460422598"; + sha256 = "113f91d8fc2c630437153a49fb7a52b023af8f6278ed96c070b1f60824b8eae1"; }; doCheck = false; }; From 64f72b0ac23a822ab252cf17f1ac9fda4c29ba61 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:18 +0000 Subject: [PATCH 0539/2743] [cpan2nix] perlPackages.LinuxDistribution: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 444897e0b1f4..566dc7ecdfa3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7950,7 +7950,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; - LinuxDistribution = buildPerlPackage { + LinuxDistribution = buildPerlModule { name = "Linux-Distribution-0.23"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz; From 1af2f9f623aefb7eb64b914e519c2ae65fc084ea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:19 +0000 Subject: [PATCH 0540/2743] [cpan2nix] perlPackages.ListUtilsBy: 0.09 -> 0.11 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 566dc7ecdfa3..f4cf37ebb5b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8027,11 +8027,11 @@ let self = _self // overrides; _self = with self; { }; }; - ListUtilsBy = buildPerlPackage rec { - name = "List-UtilsBy-0.09"; + ListUtilsBy = buildPerlModule rec { + name = "List-UtilsBy-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz; - sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1"; + url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz; + sha256 = "0nkpylkqccxanr8wc7j9wg6jdrizybjjd6p8q3jbh7f29cxz9pgs"; }; meta = { maintainers = with maintainers; [ ]; From 94908ade1aaea72770c73089b214964bb88bfd12 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:19 +0000 Subject: [PATCH 0541/2743] [cpan2nix] perlPackages.LocaleCodes: 3.35 -> 3.56 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f4cf37ebb5b1..8787328d978c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8040,10 +8040,10 @@ let self = _self // overrides; _self = with self; { }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.35"; + name = "Locale-Codes-3.56"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.35.tar.gz; - sha256 = "b1a2f944b03972d2b7282767cf88100e3c0d7daa3f4ca7aef8460c1c5e246480"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.56.tar.gz; + sha256 = "d82f3340ecb7f8700493df0273dede0c049fbc44c2fe1e811fc6c5a79b79ae79"; }; meta = { description = "A distribution of modules to handle locale codes"; From 03057d9e85ed7af3981b7ed32f71ceb70d111a71 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:19 +0000 Subject: [PATCH 0542/2743] [cpan2nix] perlPackages.LocaleGettext: 1.05 -> 1.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8787328d978c..20aa02e0e908 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8052,11 +8052,11 @@ let self = _self // overrides; _self = with self; { }; LocaleGettext = buildPerlPackage { - name = "LocaleGettext-1.05"; + name = "gettext-1.07"; buildInputs = [ pkgs.gettext ]; src = fetchurl { - url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; - sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; + url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz; + sha256 = "05cwqjxxary11di03gg3fm6j9lbvg1dr2wpr311c1rwp8salg7ch"; }; LANG="C"; }; From 25b9497ca75e48e861d48b4f0001474f84b346ec Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:20 +0000 Subject: [PATCH 0543/2743] [cpan2nix] perlPackages.LocaleMaketext: 1.23 -> 1.28 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 20aa02e0e908..6db1d73a97bd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8062,10 +8062,10 @@ let self = _self // overrides; _self = with self; { }; LocaleMaketext = buildPerlPackage { - name = "Locale-Maketext-1.23"; + name = "Locale-Maketext-1.28"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.23.tar.gz; - sha256 = "1r1sq7djafvk5abzc4l068p39dz44hlpgdldj3igvn2bjz78cli1"; + url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.28.tar.gz; + sha256 = "1sgpcnh9kqdnsizpwxzsyfv44id7gxsgkd9bmnhmj4g8hfs9712p"; }; }; From 23bead7507da98dc00536ac153df166bd2b87d67 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:23 +0000 Subject: [PATCH 0544/2743] [cpan2nix] perlPackages.LogMessage: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6db1d73a97bd..402a714e9d0c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8216,7 +8216,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz; sha256 = "bd697dd62aaf26d118e9f0a0813429deb1c544e4501559879b61fcbdfe99fe46"; }; - propagatedBuildInputs = [ if_ ]; meta = { description = "Powerful and flexible message logging mechanism"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 880f8352c101f2654fb1d25881f2a3fe436f1379 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:23 +0000 Subject: [PATCH 0545/2743] [cpan2nix] perlPackages.LogTrace: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 402a714e9d0c..ec50d6929076 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8225,7 +8225,7 @@ let self = _self // overrides; _self = with self; { LogTrace = buildPerlPackage rec { name = "Log-Trace-1.070"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Log/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BB/BBC/Log-Trace-1.070.tar.gz; sha256 = "1qrnxn9b05cqyw1286djllnj8wzys10754glxx6z5hihxxc85jwy"; }; }; From 1c9bc68f9b04bd8b06cc19f30e0df2ff10bc667d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:23 +0000 Subject: [PATCH 0546/2743] [cpan2nix] perlPackages.MIMEBase64: 3.14 -> 3.15 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec50d6929076..862ab7562a66 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8788,10 +8788,10 @@ let self = _self // overrides; _self = with self; { }; MIMEBase64 = buildPerlPackage rec { - name = "MIME-Base64-3.14"; + name = "MIME-Base64-3.15"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1qbcipxij7pv25qhnfdc2lnkqi2cf60frlhlh86gjxslc8kr8nhj"; + sha256 = "1f8y78dskf91p4xym73n9lqbj15av5vxpsivm7nr7jx9lrk3b1kz"; }; }; From a3ece845f8196dd50632f11d79388994cd7d518f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:24 +0000 Subject: [PATCH 0547/2743] [cpan2nix] perlPackages.MIMECharset: 1.011.1 -> 1.012.2 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 862ab7562a66..f5f1cb7f822a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8796,10 +8796,10 @@ let self = _self // overrides; _self = with self; { }; MIMECharset = buildPerlPackage { - name = "MIME-Charset-1.011.1"; + name = "MIME-Charset-1.012.2"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.011.1.tar.gz; - sha256 = "2955a3b617fe12654efc2a13ae1dc7d32aad81d35cfae21f74337213cf2435d5"; + url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz; + sha256 = "878c779c0256c591666bd06c0cde4c0d7820eeeb98fd1183082aee9a1e7b1d13"; }; meta = { description = "Charset Information for MIME"; From 9918a8b5bf0223f900636ee591989eeefbb5534f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:24 +0000 Subject: [PATCH 0548/2743] [cpan2nix] perlPackages.MROCompat: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f5f1cb7f822a..475e304db3d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10150,10 +10150,10 @@ let self = _self // overrides; _self = with self; { }; MROCompat = buildPerlPackage { - name = "MRO-Compat-0.12"; + name = "MRO-Compat-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/MRO-Compat-0.12.tar.gz; - sha256 = "1mhma2g83ih9f8nkmg2k9l0x6izhhbb6k5lli4rpllxad4wbk9dv"; + url = mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz; + sha256 = "1y547lr6zccf7919vx01v22zsajy528psanhg5aqschrrin3nb4a"; }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; From 6e0681133f1d4354a5d913495bcdce50a89345b5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:26 +0000 Subject: [PATCH 0549/2743] [cpan2nix] perlPackages.MailSendmail: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 475e304db3d3..ae9969bc30a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8514,7 +8514,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NE/NEILB/Mail-Sendmail-0.80.tar.gz"; sha256 = "1r38qbkj7jwj8cqy1rnqzkk81psxi08b1aiq392817f3bk5ri2jv"; }; - propagatedBuildInputs = [ DigestMD5 MIMEBase64 Socket TimeLocal ]; # The test suite simply loads the module and attempts to send an email to # the module's author, the latter of which is a) more of an integration # test, b) impossible to verify, and c) won't work from a sandbox. Replace From 0875fd9efa4aeaa296b87a9a0822a1154fa347eb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:26 +0000 Subject: [PATCH 0550/2743] [cpan2nix] perlPackages.MathBigInt: 1.999806 -> 1.999811 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae9969bc30a6..f8fef96f16c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8585,10 +8585,10 @@ let self = _self // overrides; _self = with self; { }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999806"; + name = "Math-BigInt-1.999811"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "9b62b2fcfeed5ef42d375778e4ec3b469cab0002b5dc247906dc99f5786fa1fc"; + sha256 = "d4bfa5ad0127b6360ad29971da6fa08bcfb56a471d55db3c7419d05f8a947b8d"; }; meta = { description = "Arbitrary size integer/float math package"; From c39b81869fb61d6027d4c6740f45af7c10979fb0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:27 +0000 Subject: [PATCH 0551/2743] [cpan2nix] perlPackages.MathConvexHullMonotoneChain: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f8fef96f16c6..da9a5397a437 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8642,7 +8642,7 @@ let self = _self // overrides; _self = with self; { MathConvexHullMonotoneChain = buildPerlPackage rec { name = "Math-ConvexHull-MonotoneChain-0.01"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-ConvexHull-MonotoneChain-0.01.tar.gz; sha256 = "1xcl7cz62ydddji9qzs4xsfxss484jqjlj4iixa4aci611cw92r8"; }; }; From cadd583c66c72d66e0fffdef6ccea22ddf1af604 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:28 +0000 Subject: [PATCH 0552/2743] [cpan2nix] perlPackages.MathLibm: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index da9a5397a437..5a488cf1d38c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8567,7 +8567,7 @@ let self = _self // overrides; _self = with self; { MathLibm = buildPerlPackage rec { name = "Math-Libm-1.00"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz; sha256 = "0xn2a950mzzs5q1c4q98ckysn9dz20x7r35g02zvk35chgr0klxz"; }; }; From 5b4538da76b21645d161f640ffaabd58ed948f87 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:28 +0000 Subject: [PATCH 0553/2743] [cpan2nix] perlPackages.MathRound: 0.06 -> 0.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5a488cf1d38c..df862e2435cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8713,10 +8713,10 @@ let self = _self // overrides; _self = with self; { }; MathRound = buildPerlPackage rec { - name = "Math-Round-0.06"; + name = "Math-Round-0.07"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; - sha256 = "194dvggf1cmzc701j4wma38jgrcv2pwwzk69rnysjjdcjdv6y255"; + url = mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz; + sha256 = "09wkvqj4hfq9y0fimri967rmhnq90dc2wf20lhlmqjp5hsd359vk"; }; }; From c9604806ffccb80c031decc15345a88de4f86ba6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:28 +0000 Subject: [PATCH 0554/2743] [cpan2nix] perlPackages.MathVecStat: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df862e2435cb..812a0a4cd79d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8723,7 +8723,7 @@ let self = _self // overrides; _self = with self; { MathVecStat = buildPerlPackage rec { name = "Math-VecStat-0.08"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz; sha256 = "03bdcl9pn2bc9b50c50nhnr7m9wafylnb3v21zlch98h9c78x6j0"; }; }; From 08ce26b68599863d55a576739742b3b0245046fc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:29 +0000 Subject: [PATCH 0555/2743] [cpan2nix] perlPackages.Memoize: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 812a0a4cd79d..a55759a69183 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8729,7 +8729,7 @@ let self = _self // overrides; _self = with self; { }; Memoize = buildPerlPackage { - name = "Memoize-1.03.tgz"; + name = "Memoize-1.03"; src = fetchurl { url = mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz; sha256 = "5239cc5f644a50b0de9ffeaa51fa9991eb06ecb1bf4678873e3ab89af9c0daf3"; From 6646bcf3feaca9203797a804cf25e98085f49f3c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:29 +0000 Subject: [PATCH 0556/2743] [cpan2nix] perlPackages.ModernPerl: 1.20140107 -> 1.20170117 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a55759a69183..ae8e0dd56a73 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8882,13 +8882,12 @@ let self = _self // overrides; _self = with self; { }; }; - ModernPerl = buildPerlPackage { - name = "Modern-Perl-1.20140107"; + ModernPerl = buildPerlModule { + name = "Modern-Perl-1.20170117"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20140107.tar.gz; - sha256 = "9cf66b2f93340dfe1cd7162262a47e7c4ba82475a52dc2a036c2fdc8a65298b8"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20170117.tar.gz; + sha256 = "5df2a83461163212db22b9c3353606a1a123616820fe50675041c34f004b3628"; }; - propagatedBuildInputs = [ perl ]; meta = { homepage = https://github.com/chromatic/Modern-Perl; description = "Enable all of the features of Modern Perl with one import"; From 3dcc785009bd5a7e38c7a3e7cfc009bdf2197b69 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:29 +0000 Subject: [PATCH 0557/2743] [cpan2nix] perlPackages.ModuleBuild: 0.4222 -> 0.4224 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae8e0dd56a73..f55fef2ab753 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8896,12 +8896,11 @@ let self = _self // overrides; _self = with self; { }; ModuleBuild = buildPerlPackage rec { - name = "Module-Build-0.4222"; + name = "Module-Build-0.4224"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "0q5i03lbx52g22bwvyb04ycky4niq379j1c3fhmlfdj7lzclajz7"; + sha256 = "10n7ggpmicwq1n503pg7kiwslda0bz48azzjvc7vb9s4hbbibjm6"; }; - buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3658a323c4c9f1e8dc5d202d33fffe58ac5337f6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:30 +0000 Subject: [PATCH 0558/2743] [cpan2nix] perlPackages.ModuleCoreList: 3.01 -> 5.20180221 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f55fef2ab753..ecfc91603c6e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8985,10 +8985,10 @@ let self = _self // overrides; _self = with self; { }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-3.01"; + name = "Module-CoreList-5.20180221"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-3.01.tar.gz; - sha256 = "10vf18x9qk4hdpwazxq8c0qykals36dxj0bjazqqcbp5xfb4fnyg"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180221.tar.gz; + sha256 = "12gad19gxvrv19938f6hs2i2fanq2s1dx3l1yy8nh0nvc2mwggzl"; }; meta = { homepage = http://dev.perl.org/; From 4b6b535be5559a22bd20bad76ccffeba85b2af39 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:30 +0000 Subject: [PATCH 0559/2743] [cpan2nix] perlPackages.ModuleFind: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ecfc91603c6e..cdffad77b47f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8998,10 +8998,10 @@ let self = _self // overrides; _self = with self; { }; ModuleFind = buildPerlPackage { - name = "Module-Find-0.12"; + name = "Module-Find-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.12.tar.gz; - sha256 = "1lc33jdv4pgmm7nkr9bff0lhwjhhw91kaf6iiy2n7i7mw8dfv47l"; + url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz; + sha256 = "0s45y5lvd9k89g7lds83c0bn1p29c13hfsbrd7x64jfaf8h8cisa"; }; meta = { description = "Find and use installed modules in a (sub)category"; From fda1641827602d863212e876a976c5d7f14473a0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:31 +0000 Subject: [PATCH 0560/2743] [cpan2nix] perlPackages.ModuleMetadata: 1.000027 -> 1.000033 --- 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 cdffad77b47f..2810ebf59524 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9097,12 +9097,11 @@ let self = _self // overrides; _self = with self; { }; ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000027"; + name = "Module-Metadata-1.000033"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "1rrjj48vvv3i1jrmw97i4mvsmknll7hxga4cq2s9qvc2issdrxz2"; + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000033.tar.gz; + sha256 = "13pzydb22693l33rfx6drwbhjxj04q80ds4m2nn2sbmm95wwr5mw"; }; - propagatedBuildInputs = [ version ]; }; ModulePath = buildPerlPackage rec { From 6e88914178af38efec112e676df0fcc26776edec Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:31 +0000 Subject: [PATCH 0561/2743] [cpan2nix] perlPackages.ModuleRuntime: 0.014 -> 0.016 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2810ebf59524..b3899812f079 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9156,13 +9156,12 @@ let self = _self // overrides; _self = with self; { }; }; - ModuleRuntime = buildPerlPackage { - name = "Module-Runtime-0.014"; + ModuleRuntime = buildPerlModule { + name = "Module-Runtime-0.016"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.014.tar.gz; - sha256 = "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz; + sha256 = "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38"; }; - buildInputs = [ ModuleBuild ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Runtime module handling"; From a8d3e61a8864a24856557ed8f9fdea404381065a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:32 +0000 Subject: [PATCH 0562/2743] [cpan2nix] perlPackages.ModuleUtil: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3899812f079..61be8c3b7aa8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9211,13 +9211,12 @@ let self = _self // overrides; _self = with self; { }; }; - ModuleUtil = buildPerlPackage { + ModuleUtil = buildPerlModule { name = "Module-Util-1.09"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz; sha256 = "6cfbcb6a45064446ec8aa0ee1a7dddc420b54469303344187aef84d2c7f3e2c6"; }; - buildInputs = [ ModuleBuild ]; meta = { description = "Module name tools and transformations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3c74f80e00ed6dacc2cf498ab238247e54baf77d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:33 +0000 Subject: [PATCH 0563/2743] [cpan2nix] perlPackages.Mojolicious: 6.56 -> 7.71 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61be8c3b7aa8..5de4820e64b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9263,12 +9263,11 @@ let self = _self // overrides; _self = with self; { }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-6.56"; + name = "Mojolicious-7.71"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "82f73553836ac378edf825fd9f24be982653be9e0d78f8ba38b7841aabdafb02"; + sha256 = "25d8ab46fd7c340abcbbe740f690c197df6ff40a9c3dddf907629211bf3ad905"; }; - propagatedBuildInputs = [ JSONPP ]; meta = { homepage = http://mojolicious.org; description = "Real-time web framework"; From 72f3c775a6a7115668db38b0242423d671c6127b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:33 +0000 Subject: [PATCH 0564/2743] [cpan2nix] perlPackages.MozillaCA: 20160104 -> 20180117 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5de4820e64b2..64de0125a304 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10115,10 +10115,10 @@ let self = _self // overrides; _self = with self; { }; MozillaCA = buildPerlPackage rec { - name = "Mozilla-CA-20160104"; + name = "Mozilla-CA-20180117"; src = fetchurl { url = "mirror://cpan/authors/id/A/AB/ABH/${name}.tar.gz"; - sha256 = "27a7069a243162b65ada4194ff9d21b6ebc304af723eb5d3972fb74c11b03f2a"; + sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; }; meta = { description = "Mozilla's CA cert bundle in PEM format"; From 3ad91e4a3a0c3e5812615faddddc1eed5f5b2a37 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:34 +0000 Subject: [PATCH 0565/2743] [cpan2nix] perlPackages.NetAddrIP: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64de0125a304..825a98bc6df7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10237,6 +10237,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; + doCheck = false; }; NetAmazonAWSSign = buildPerlPackage { From 772ec54630b852f30156a6c25d42f24bd19c6af1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:34 +0000 Subject: [PATCH 0566/2743] [cpan2nix] perlPackages.NetCIDR: 0.17 -> 0.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 825a98bc6df7..42b4fed60269 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10337,10 +10337,10 @@ let self = _self // overrides; _self = with self; { }; NetCIDR = buildPerlPackage { - name = "Net-CIDR-0.17"; + name = "Net-CIDR-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.17.tar.gz; - sha256 = "4a968e700d382cf0946e47df420d0151fbd8e0135f037d404c7c63713b66daf0"; + url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.18.tar.gz; + sha256 = "c3df7ea8d42b2d8ec328c187329c5f8c4db6a2470873f61e3d0dd91430ef1427"; }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; From 2ab46fd5c49b934e8b5e3edecc688bb5dd977869 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:36 +0000 Subject: [PATCH 0567/2743] [cpan2nix] perlPackages.NetOpenSSH: 0.73 -> 0.77 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 42b4fed60269..f32b270ed10c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10779,10 +10779,10 @@ let self = _self // overrides; _self = with self; { }; NetOpenSSH = buildPerlPackage rec { - name = "Net-OpenSSH-0.73"; + name = "Net-OpenSSH-0.77"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; - sha256 = "f45a54b3c6015d4dc44cbff9f9be57bc9d54dfb104fb38bcf3c4eb04789582d9"; + sha256 = "16e965c6ed3dfe0f1288a6ba932d0e8d5c7846ce86de05c0dbd64259df2a2477"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; From a109da6cbce24bf3b4ec07133ef10bf7d9116cea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:36 +0000 Subject: [PATCH 0568/2743] [cpan2nix] perlPackages.NetPing: 2.41 -> 2.66 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f32b270ed10c..e07111cf3c27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10501,10 +10501,10 @@ let self = _self // overrides; _self = with self; { }; NetPing = buildPerlPackage { - name = "Net-Ping-2.41"; + name = "Net-Ping-2.66"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMPETERS/Net-Ping-2.41.tar.gz; - sha256 = "cbff21a8d323f235b70237c7ee56ffa5f22e87511e70608c027e2ec27fce47e0"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.66.tar.gz; + sha256 = "a477b29e543695343513e65f3aff885a353ecebb612741e79f0bad5622e4b9e4"; }; meta = { description = "Check a remote host for reachability"; From 9f3f96940303385822288850a8d241d482d462bd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:37 +0000 Subject: [PATCH 0569/2743] [cpan2nix] perlPackages.NetSNMP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e07111cf3c27..c2b2810e64ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10567,7 +10567,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [NetSSLeay DigestHMAC IOSocketSSL]; }; - NetSNMP = buildPerlPackage rec { + NetSNMP = buildPerlModule rec { name = "Net-SNMP-6.0.1"; src = fetchurl { url = "mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz"; From d2056c699970628f6bb9de9762b15808fe84e1c6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:38 +0000 Subject: [PATCH 0570/2743] [cpan2nix] perlPackages.NetSSLeay: 1.77 -> 1.85 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c2b2810e64ad..f0b37ae5f39e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10577,10 +10577,10 @@ let self = _self // overrides; _self = with self; { }; NetSSLeay = buildPerlPackage rec { - name = "Net-SSLeay-1.77"; + name = "Net-SSLeay-1.85"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKEM/${name}.tar.gz"; - sha256 = "06h6wbr923jxmazmv5shdg1767s7r60bvzcza52dk31yckks6l31"; + sha256 = "1j5h4ycm8538397l204d2d5fkm9595aj174pj7bkpbhwzfwqi0cx"; }; buildInputs = [ pkgs.openssl ]; doCheck = false; # Test performs network access. From 0f229b5625402539b014d9b7cdeb97f92a249b72 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:38 +0000 Subject: [PATCH 0571/2743] [cpan2nix] perlPackages.NetServer: 2.007 -> 2.009 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f0b37ae5f39e..cbdf8c8f78be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10527,10 +10527,10 @@ let self = _self // overrides; _self = with self; { NetServer = buildPerlPackage { - name = "Net-Server-2.007"; + name = "Net-Server-2.009"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.007.tar.gz; - sha256 = "0a03m237cw6j5bvm2yxk2b2gbfx7wj0w2x5zivi9ddqvbcad6vqw"; + url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz; + sha256 = "0gw1k9gcw7habbkxvsfa2gz34brlbwcidk6khgsf1qjm0dbccrw2"; }; doCheck = false; # seems to hang waiting for connections meta = { From a71ccb7a0ff9bbcbb3a441728db46c49e7e27389 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:38 +0000 Subject: [PATCH 0572/2743] [cpan2nix] perlPackages.NetStatsd: 0.11 -> 0.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cbdf8c8f78be..ada3b4cd7034 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10598,10 +10598,10 @@ let self = _self // overrides; _self = with self; { }; NetStatsd = buildPerlPackage { - name = "Net-Statsd-0.11"; + name = "Net-Statsd-0.12"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.11.tar.gz; - sha256 = "0f56c95846c7e65e6d32cec13ab9df65716429141f106d2dc587f1de1e09e163"; + url = mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.12.tar.gz; + sha256 = "63e453603da165bc6d1c4ca0b55eda3d2204f040c59304a47782c5aa7886565c"; }; meta = { description = "Sends statistics to the stats daemon over UDP"; From 153ba5f61afe6e077c087b45c2dbef7e43316ed4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:43 +0000 Subject: [PATCH 0573/2743] [cpan2nix] perlPackages.POETestLoops: cleanup --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ada3b4cd7034..4bbbbb7e1be4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11461,8 +11461,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RC/RCAPUTO/${name}.tar.gz"; sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "Reusable tests for POE::Loop authors"; From e682ff69f684c9e9ed2e039344c02d5337810604 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:43 +0000 Subject: [PATCH 0574/2743] [cpan2nix] perlPackages.POSIXstrftimeCompiler: 0.41 -> 0.42 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4bbbbb7e1be4..b363358ef480 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11937,10 +11937,10 @@ let self = _self // overrides; _self = with self; { }; POSIXstrftimeCompiler = buildPerlModule rec { - name = "POSIX-strftime-Compiler-0.41"; + name = "POSIX-strftime-Compiler-0.42"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "670b89e11500f3808c9e21b1c300089622f68906ff12b1cbfba8e30d3a1c3739"; + sha256 = "26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11"; }; # We cannot change timezones on the fly. prePatch = "rm t/04_tzset.t"; From 0879fe596215520cdac860c82bfd4e3e1383a41a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:44 +0000 Subject: [PATCH 0575/2743] [cpan2nix] perlPackages.PackageConstants: 0.04 -> 0.06 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b363358ef480..fca0aa4be1a0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10791,10 +10791,10 @@ let self = _self // overrides; _self = with self; { }; PackageConstants = buildPerlPackage { - name = "Package-Constants-0.04"; + name = "Package-Constants-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.04.tar.gz; - sha256 = "7e09a88da2c0df24f498eb3a133f7d979404a7bc853f21afa2ba68dfd859a880"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz; + sha256 = "0b58be78706ccc4e4bd9bbad41767470427fd7b2cfad749489de101f85bc5df5"; }; meta = { description = "List constants defined in a package"; From d6a3f3f926a71140ca472e3f238e5c8f59c08373 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:44 +0000 Subject: [PATCH 0576/2743] [cpan2nix] perlPackages.PadWalker: 2.2 -> 2.3 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fca0aa4be1a0..202ef3d1d34c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11621,10 +11621,10 @@ let self = _self // overrides; _self = with self; { }; PadWalker = buildPerlPackage rec { - name = "PadWalker-2.2"; + name = "PadWalker-2.3"; src = fetchurl { url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz"; - sha256 = "fc1df2084522e29e892da393f3719d2c1be0da022fdd89cff4b814167aecfea3"; + sha256 = "2a6c44fb600861e54568e74081a8d1f121f0060076069ceab34b1ae89d6588cf"; }; }; From 9596f1ea359a0a69dd00c3d8ec0f0af575ccc2a5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:45 +0000 Subject: [PATCH 0577/2743] [cpan2nix] perlPackages.ParamsClassify: 0.013 -> 0.015 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 202ef3d1d34c..f24454ec13fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10903,13 +10903,12 @@ let self = _self // overrides; _self = with self; { }; }; - ParamsClassify = buildPerlPackage rec { - name = "Params-Classify-0.013"; + ParamsClassify = buildPerlModule rec { + name = "Params-Classify-0.015"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Params/${name}.tar.gz"; - sha256 = "1d4ysd95flszrxrnjgy6s7b80jkagjsb939h42i2hix4q20sy0a1"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz; + sha256 = "052r198xyrsv8wz21gijdigz2cgnidsa37nvyfzdiz4rv1fc33ir"; }; - buildInputs = [ ModuleBuild ExtUtilsParseXS ]; }; ParamsUtil = buildPerlPackage { From fb34562647e7c090adece14ffec01bc6c657042b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:45 +0000 Subject: [PATCH 0578/2743] [cpan2nix] perlPackages.Parent: 0.228 -> 0.236 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f24454ec13fa..4f1e685ab463 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10952,10 +10952,10 @@ let self = _self // overrides; _self = with self; { }; Parent = buildPerlPackage { - name = "parent-0.228"; + name = "parent-0.236"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz; - sha256 = "0w0i02y4z8465z050kml57mvhv7c5gl8w8ivplhr3cms0zbaq87b"; + url = mirror://cpan/authors/id/C/CO/CORION/parent-0.236.tar.gz; + sha256 = "0yhjps1fprifhvzdwwl09bp1ngyqx85rvyn96j34papn0jypx0rd"; }; }; From bd028f7553b8abc6f56ec41952179b2a851294bc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:46 +0000 Subject: [PATCH 0579/2743] [cpan2nix] perlPackages.ParseRecDescent: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4f1e685ab463..4b64c8734c9f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10987,7 +10987,7 @@ let self = _self // overrides; _self = with self; { }; }; - ParseRecDescent = buildPerlPackage rec { + ParseRecDescent = buildPerlModule rec { name = "Parse-RecDescent-1.967015"; src = fetchurl { url = "mirror://cpan/authors/id/J/JT/JTBRAUN/${name}.tar.gz"; From 2ef9da08e1ef25435857ec3138e981cc24af9479 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:47 +0000 Subject: [PATCH 0580/2743] [cpan2nix] perlPackages.PatchReader: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b64c8734c9f..eddb37e70f68 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10820,7 +10820,7 @@ let self = _self // overrides; _self = with self; { PatchReader = buildPerlPackage rec { name = "PatchReader-0.9.6"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/T/TM/TMANNERM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz; sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c"; }; meta = { From 6212df2fcb2d5ecfd2809e094f588b6e5d91eb62 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:47 +0000 Subject: [PATCH 0581/2743] [cpan2nix] perlPackages.PathClass: 0.33 -> 0.37 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eddb37e70f68..97c2c5e7478f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11007,11 +11007,11 @@ let self = _self // overrides; _self = with self; { }; }; - PathClass = buildPerlPackage { - name = "Path-Class-0.33"; + PathClass = buildPerlModule { + name = "Path-Class-0.37"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.33.tar.gz; - sha256 = "0xy6s04xpslpzbb90x67yvfv0pjqnj1szxlx16vfx690iskcd36d"; + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz; + sha256 = "1kj8q8dmd8jci94w5arav59nkp0pkxrkliz4n8n6yf02hsa82iv5"; }; meta = { description = "Cross-platform path specification manipulation"; From dd7851951b7074cc61198fdea96289c84195c45f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:47 +0000 Subject: [PATCH 0582/2743] [cpan2nix] perlPackages.PathTiny: cleanup --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 97c2c5e7478f..997675b0d053 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11025,8 +11025,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz; sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef"; }; - buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ]; - propagatedBuildInputs = [ autodie ]; meta = { homepage = https://metacpan.org/release/Path-Tiny; description = "File path utility"; From ffb5d020f7c4e8b8c08dcce3f6458fbf9825d7a1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:49 +0000 Subject: [PATCH 0583/2743] [cpan2nix] perlPackages.PerlIOeol: 0.16 -> 0.17 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 997675b0d053..a46fd0872772 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11135,10 +11135,10 @@ let self = _self // overrides; _self = with self; { }; PerlIOeol = buildPerlPackage rec { - name = "PerlIO-eol-0.16"; + name = "PerlIO-eol-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "159zrrf44469sjklsi0pb4c005q74d9242q7mqawvbwnxjqbh0a5"; + sha256 = "1fayp27vcmypqyzcd4003036h3g5zy6jk1ia25frdca58pzcpk6f"; }; }; From 6e7cd729458e2a02abcbb33d75e262d9c777bb51 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:50 +0000 Subject: [PATCH 0584/2743] [cpan2nix] perlPackages.PerlOSType: 1.009 -> 1.010 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a46fd0872772..ef4aeec30ea0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11235,10 +11235,10 @@ let self = _self // overrides; _self = with self; { }; PerlOSType = buildPerlPackage rec { - name = "Perl-OSType-1.009"; + name = "Perl-OSType-1.010"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "01mfvh6x9mgfnwb31bmaw0jkqkxbl8gn50mwqgjwajk1yz4z8p14"; + sha256 = "1ch36kfjwm229xicb9k7b9fhisy58ihdr16vm8iwniymnna4kvg7"; }; }; From 7ed94f36fd6392e10bb552616018ee734e5466d2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:51 +0000 Subject: [PATCH 0585/2743] [cpan2nix] perlPackages.PerlTidy: 20160302 -> 20180220 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef4aeec30ea0..04f614e0cb57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11243,10 +11243,10 @@ let self = _self // overrides; _self = with self; { }; PerlTidy = buildPerlPackage rec { - name = "Perl-Tidy-20160302"; + name = "Perl-Tidy-20180220"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; - sha256 = "6dd04ed8c315bcfea8fe713de8f9de68955795b6864f3be6c177e802fd30dca7"; + sha256 = "e9973ce28b7518108c1e68fa767c6566822480e739df275375a0dfcc9c2b3370"; }; meta = { description = "Indent and reformat perl scripts"; From c6ddd2e31e6b7f90459fa5b432c757c78cb5f2aa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:52 +0000 Subject: [PATCH 0586/2743] [cpan2nix] perlPackages.PodChecker: 1.71 -> 1.73 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 04f614e0cb57..cc8db0a94110 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11677,10 +11677,10 @@ let self = _self // overrides; _self = with self; { }; PodChecker = buildPerlPackage { - name = "Pod-Checker-1.71"; + name = "Pod-Checker-1.73"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.71.tar.gz; - sha256 = "4b90e745f4d6357bb7e8999e0e7d192216b98e3f3c8a86fa6ed446f8c36601df"; + url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz; + sha256 = "7dee443b03d80d0735ec50b6d1caf0209c51ab0a97d64050cfc10e1555cb9305"; }; }; From 474fbcdd03c4f11d723a9f4d8913cb2c75cbdc2c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:53 +0000 Subject: [PATCH 0587/2743] [cpan2nix] perlPackages.PodLaTeX: cleanup --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cc8db0a94110..ed497da2ccda 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11807,8 +11807,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${name}.tar.gz"; sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ self."if" ]; meta = { homepage = https://github.com/timj/perl-Pod-LaTeX/tree/master; description = "Convert Pod data to formatted Latex"; From 0a6691419b3183e5a74d7e1a6cf0d30cbf3950f6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:55 +0000 Subject: [PATCH 0588/2743] [cpan2nix] perlPackages.ProcProcessTable: 0.51 -> 0.55 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed497da2ccda..dadbca71a294 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11523,10 +11523,10 @@ let self = _self // overrides; _self = with self; { }; ProcProcessTable = buildPerlPackage { - name = "Proc-ProcessTable-0.51"; + name = "Proc-ProcessTable-0.55"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.51.tar.gz; - sha256 = "66636e102985a2a05ef4334b53a7893d627c192fac5dd7ff37dd1a0a50c0128d"; + url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.55.tar.gz; + sha256 = "3b9660d940a0c016c5e48108fa9dbf9f30492b505aa0a26d22b09554f05714f5"; }; meta = { description = "Perl extension to access the unix process table"; From 270fc34db59f39050c3648ddc81c21595e81004d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:57 +0000 Subject: [PATCH 0589/2743] [cpan2nix] perlPackages.RegexpAssemble: 0.35 -> 0.38 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dadbca71a294..3ebcbbf22cec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12002,10 +12002,10 @@ let self = _self // overrides; _self = with self; { }; RegexpAssemble = buildPerlPackage rec { - name = "Regexp-Assemble-0.35"; + name = "Regexp-Assemble-0.38"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Regexp/${name}.tar.gz"; - sha256 = "1msxrriq74q8iacn2hkcw6g4qjjwv777avryiyz1w29h55mwq083"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Regexp-Assemble-0.38.tgz; + sha256 = "0hp4v8mghmpflq9l9fqrkjg4cw0d3ha2nrmnsnzwjwqvmvwyfsx0"; }; }; From 9b42a87a3ecd4951120d48c2685bd938155d97b8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:57 +0000 Subject: [PATCH 0590/2743] [cpan2nix] perlPackages.RegexpCommon: 2013031301 -> 2017060201 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3ebcbbf22cec..608d4e4a464c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12010,10 +12010,10 @@ let self = _self // overrides; _self = with self; { }; RegexpCommon = buildPerlPackage { - name = "Regexp-Common-2013031301"; + name = "Regexp-Common-2017060201"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2013031301.tar.gz; - sha256 = "729a8198d264aa64ecbb233ff990507f97fbb66bda746b95f3286f50f5f25c84"; + url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz; + sha256 = "ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b"; }; meta = with stdenv.lib; { description = "Provide commonly requested regular expressions"; From d4116097029b111ee5d806d89e50f40afd68e035 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:57 +0000 Subject: [PATCH 0591/2743] [cpan2nix] perlPackages.RegexpGrammars: 1.045 -> 1.048 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 608d4e4a464c..ed28dd976022 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12041,11 +12041,11 @@ let self = _self // overrides; _self = with self; { }; }; - RegexpGrammars = buildPerlPackage rec { - name = "Regexp-Grammars-1.045"; + RegexpGrammars = buildPerlModule rec { + name = "Regexp-Grammars-1.048"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; - sha256 = "8ab001f5641d03f7acce09ca5826b219b02ce40f8e56c2066737228a9232b594"; + sha256 = "d7718d9bb0d4259eabf326838e3f841b440c4e959faf9615d9ad9c345f4a3d6f"; }; meta = { homepage = http://search.cpan.org/~dconway/Regexp-Grammars-1.045/lib/Regexp/Grammars.pm; From 29882f5f5e5161e3d2b7aae5c0efd33f5b8d29ad Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:58 +0000 Subject: [PATCH 0592/2743] [cpan2nix] perlPackages.RegexpParser: 0.21 -> 0.22 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed28dd976022..79318be1de6f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12066,10 +12066,10 @@ let self = _self // overrides; _self = with self; { }; RegexpParser = buildPerlPackage { - name = "Regexp-Parser-0.21"; + name = "Regexp-Parser-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.21.tar.gz; - sha256 = "d70cb66821f1f67a9b1ff53f0fa33c06aec8693791e0a5943be6760c25d2768d"; + url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.22.tar.gz; + sha256 = "d6d3c711657a380f1cb24d8b54a1cd20f725f7f54665189e9e67bb0b877109a3"; }; meta = { homepage = http://wiki.github.com/toddr/Regexp-Parser; From e23248ff270465328a8aa077d8db357405234289 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:58 +0000 Subject: [PATCH 0593/2743] [cpan2nix] perlPackages.ReturnValue: 1.666004 -> 1.666005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79318be1de6f..429ee706e9b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12105,10 +12105,10 @@ let self = _self // overrides; _self = with self; { }; ReturnValue = buildPerlPackage { - name = "Return-Value-1.666004"; + name = "Return-Value-1.666005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666004.tar.gz; - sha256 = "0xr7ic212p36arzdpph2l2yy1y88c7qaf4nng3gqb29zc9kzy3bc"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz; + sha256 = "1b2hfmdl19zi1z3npzv9wf6dh1g0xd88i70b4233ds9icnln08lf"; }; }; From efdf0db9185ff7196a2f2275ebef6e3a8ec1d97b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:52:59 +0000 Subject: [PATCH 0594/2743] [cpan2nix] perlPackages.RoleBasic: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 429ee706e9b6..140e628efa1c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12112,7 +12112,7 @@ let self = _self // overrides; _self = with self; { }; }; - RoleBasic = buildPerlPackage { + RoleBasic = buildPerlModule { name = "Role-Basic-0.13"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz; From fa663af25d3ab28fb265cafda8487e6132c0985e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:00 +0000 Subject: [PATCH 0595/2743] [cpan2nix] perlPackages.SCGI: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 140e628efa1c..bc2229d021c5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12234,14 +12234,13 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; }; - SCGI = buildPerlPackage rec { + SCGI = buildPerlModule rec { name = "SCGI-0.6"; src = fetchurl { url = "mirror://cpan/authors/id/V/VI/VIPERCODE/${name}.tar.gz"; sha256 = "196rj47mh4fq2vlnw595q391zja5v6qg7s3sy0vy8igfyid8rdsq"; }; preConfigure = "export HOME=$(mktemp -d)"; - buildInputs = [ ModuleBuild ]; }; ScopeGuard = buildPerlPackage { From 3629d9c8c54160a2b3bcbffc8daca175537be6ca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:00 +0000 Subject: [PATCH 0596/2743] [cpan2nix] perlPackages.SQLTokenizer: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bc2229d021c5..fa3c8ebefaa0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12535,7 +12535,7 @@ let self = _self // overrides; _self = with self; { SQLTokenizer = buildPerlPackage rec { name = "SQL-Tokenizer-0.24"; src = fetchurl { - url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IZ/IZUT/SQL-Tokenizer-0.24.tar.gz; sha256 = "1qa2dfbzdlr5qqdam9yn78z5w3al5r8577x06qan8wv58ay6ka7s"; }; }; From 2e268079e46ecdb01c2d8fa85b685eaa26e45ec1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:01 +0000 Subject: [PATCH 0597/2743] [cpan2nix] perlPackages.SafeIsa: 1.000004 -> 1.000008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fa3c8ebefaa0..e25364177bc7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12201,10 +12201,10 @@ let self = _self // overrides; _self = with self; { }; SafeIsa = buildPerlPackage { - name = "Safe-Isa-1.000004"; + name = "Safe-Isa-1.000008"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000004.tar.gz; - sha256 = "0sqwma0xqxrgnsm0jfy17szq87bskzq67cdh7p934qdifh5nfwn9"; + url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000008.tar.gz; + sha256 = "08r74hwxq5b3bibnbwjr9anybg15l3zqdgcirpw1xm2qpvcxgdkx"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; From a5d60ce51e10df3353444a02165c5f524ea199c0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:01 +0000 Subject: [PATCH 0598/2743] [cpan2nix] perlPackages.ScalarListUtils: 1.42 -> 1.50 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e25364177bc7..11773db70fa7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12214,10 +12214,10 @@ let self = _self // overrides; _self = with self; { }; ScalarListUtils = buildPerlPackage { - name = "Scalar-List-Utils-1.42"; + name = "Scalar-List-Utils-1.50"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.42.tar.gz; - sha256 = "3507f72541f66a2dce850b9b56771e5fccda3d215c52f74946c6e370c0f4a4da"; + url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.50.tar.gz; + sha256 = "06aab9c693380190e53be09be7daed20c5d6278f71956989c24cca7782013675"; }; meta = { description = "Common Scalar and List utility subroutines"; From 472c40d72d8bb0aa1b97a4c1dad5641a4dca7bcd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:02 +0000 Subject: [PATCH 0599/2743] [cpan2nix] perlPackages.ScalarString: 0.002 -> 0.003 --- 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 11773db70fa7..ee71450edef6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12225,13 +12225,12 @@ let self = _self // overrides; _self = with self; { }; }; - ScalarString = buildPerlPackage rec { - name = "Scalar-String-0.002"; + ScalarString = buildPerlModule rec { + name = "Scalar-String-0.003"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "d3a45cc137bb9f7d8848d5a10a5142d275a98f8dcfd3adb60593cee9d33fa6ae"; + sha256 = "f54a17c9b78713b02cc43adfadf60b49467e7634d31317e8b9e9e97c26d68b52"; }; - buildInputs = [ ModuleBuild ]; }; SCGI = buildPerlModule rec { From 30b5683b929470bda387680260228ebdbedae86f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:02 +0000 Subject: [PATCH 0600/2743] [cpan2nix] perlPackages.ScopeGuard: 0.20 -> 0.21 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee71450edef6..301507bb1724 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12243,10 +12243,10 @@ let self = _self // overrides; _self = with self; { }; ScopeGuard = buildPerlPackage { - name = "Scope-Guard-0.20"; + name = "Scope-Guard-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.20.tar.gz; - sha256 = "1lsagnz6pli035zvx5c1x4qm9fabi773vns86yd8lzfpldhfv3sv"; + url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz; + sha256 = "0y6jfzvxiz8h5yfz701shair0ilypq2mvimd7wn8wi2nbkm1p6wc"; }; meta = { description = "Lexically-scoped resource management"; From e05a2936be9c248012fea1bb069370adbcba1552 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:02 +0000 Subject: [PATCH 0601/2743] [cpan2nix] perlPackages.ScopeUpper: 0.29 -> 0.30 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 301507bb1724..ad45e107e38f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12255,10 +12255,10 @@ let self = _self // overrides; _self = with self; { }; ScopeUpper = buildPerlPackage rec { - name = "Scope-Upper-0.29"; + name = "Scope-Upper-0.30"; src = fetchurl { url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "4b07360a243ce0ccaacfdfa98ae38ef2686aa908fcf4ef3d669105ac36759e0a"; + sha256 = "7f151582423850d814034404b1e23b5efb281b9dd656b9afe81c761ebb88bbb4"; }; meta = { homepage = http://search.cpan.org/dist/Scope-Upper/; From a420d86482c9090410c254f63db6e22207e12104 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:03 +0000 Subject: [PATCH 0602/2743] [cpan2nix] perlPackages.SelfLoader: 1.20 -> 1.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ad45e107e38f..cc42d14671f5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12280,10 +12280,10 @@ let self = _self // overrides; _self = with self; { }; SelfLoader = buildPerlPackage { - name = "SelfLoader-1.20"; + name = "SelfLoader-1.24"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/SelfLoader-1.20.tar.gz; - sha256 = "79b1e2b8e4081854fba666441287c18b6bd822defb5bbee79067370edba1a042"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/SelfLoader-1.24.tar.gz; + sha256 = "4c7cd20fd82aa10520ac14b05fa003f60c72bb4c95527bd12aec8bf3c4546098"; }; meta = { description = "Load functions only on demand"; From 9fd9897fa163c93b2e9b54e8bebd3d650e4ec9a1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:04 +0000 Subject: [PATCH 0603/2743] [cpan2nix] perlPackages.SetIntSpan: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cc42d14671f5..acae4a6d8162 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12319,7 +12319,7 @@ let self = _self // overrides; _self = with self; { SetIntSpan = buildPerlPackage rec { name = "Set-IntSpan-1.19"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz"; + url = mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz; sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"; }; From 81b859dedb5c80dfeeab2676944e41d79bd4d684 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:04 +0000 Subject: [PATCH 0604/2743] [cpan2nix] perlPackages.SetObject: 1.35 -> 1.39 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index acae4a6d8162..009337564609 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12329,10 +12329,10 @@ let self = _self // overrides; _self = with self; { }; SetObject = buildPerlPackage rec { - name = "Set-Object-1.35"; + name = "Set-Object-1.39"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "189a4d7cc3e583faa8518a63a95cf4aa3a320f79b5c6f5e40970687244080ee7"; + sha256 = "5effcfeb104da334f413a20dee9cdc5e874246096c3b282190a5f44453401810"; }; meta = { description = "Unordered collections (sets) of Perl Objects"; From a48510cdb9619f8936ed1addcb18be715a014c67 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:06 +0000 Subject: [PATCH 0605/2743] [cpan2nix] perlPackages.SortKey: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 009337564609..1abefece22dd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12442,7 +12442,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; sha256 = "1kqs10s2plj6c96srk0j8d7xj8dxk1704r7mck8rqk09mg7lqspd"; }; - buildInputs = [ TestMore ]; meta = { description = "Sort arrays by one or multiple calculated keys"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 98e60ef040f4c622b8aacaf302c353d9ad6c9c5a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:07 +0000 Subject: [PATCH 0606/2743] [cpan2nix] perlPackages.SortVersions: 1.5 -> 1.62 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1abefece22dd..4b9b6a7368eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12449,10 +12449,10 @@ let self = _self // overrides; _self = with self; { }; SortVersions = buildPerlPackage rec { - name = "Sort-Versions-1.5"; + name = "Sort-Versions-1.62"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ED/EDAVIS/${name}.tar.gz"; - sha256 = "1yhyxaakyhcffgr9lwd314badhlc2gh9f6n47013ljshbnkgzhh9"; + url = mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz; + sha256 = "1aifzm79ky03gi2lwxyx4mk6yky8x215j0kz4f0jbgkf803k6pxz"; }; }; From 0fa954b38299b9efca25cafa5040bfd450f1e6b3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:07 +0000 Subject: [PATCH 0607/2743] [cpan2nix] perlPackages.Spiffy: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b9b6a7368eb..2bed636f29e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12462,7 +12462,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; sha256 = "18qxshrjh0ibpzjm2314157mxlibh3smyg64nr4mq990hh564n4g"; }; - buildInputs = [ ExtUtilsMakeMaker ]; }; SpreadsheetParseExcel = buildPerlPackage rec { From 7781c8c29f7fe44f3a4360467d7ae8efa06e99c8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:07 +0000 Subject: [PATCH 0608/2743] [cpan2nix] perlPackages.StatisticsDistributions: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2bed636f29e8..10b7e01753a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12635,7 +12635,7 @@ let self = _self // overrides; _self = with self; { StatisticsDistributions = buildPerlPackage rec { name = "Statistics-Distributions-1.02"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-1.02.tar.gz; sha256 = "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr"; }; }; From f43063a2f23c9623c50a2baf0aaa41a6054a01be Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:08 +0000 Subject: [PATCH 0609/2743] [cpan2nix] perlPackages.StreamBuffered: 0.02 -> 0.03 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 10b7e01753a1..e24c2cbc4b3e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12661,10 +12661,10 @@ let self = _self // overrides; _self = with self; { }; StreamBuffered = buildPerlPackage { - name = "Stream-Buffered-0.02"; + name = "Stream-Buffered-0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.02.tar.gz; - sha256 = "0bfa3h2pryrbrcd1r7235k0ik4gw35r5ig8h8y3dfmk9l3y96vjr"; + url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.03.tar.gz; + sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv"; }; meta = { homepage = http://plackperl.org; From 64e383f93d4a0a59691d5feb4227552e421880e8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:08 +0000 Subject: [PATCH 0610/2743] [cpan2nix] perlPackages.StringApprox: 3.27 -> 3.28 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e24c2cbc4b3e..e2419b417584 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12687,10 +12687,10 @@ let self = _self // overrides; _self = with self; { }; StringApprox = buildPerlPackage rec { - name = "String-Approx-3.27"; + name = "String-Approx-3.28"; src = fetchurl { url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; - sha256 = "2b8c1acd24fa9681ebba0ccb3c49f16289de1d579af8a0c898ea8f8d1baf5d36"; + sha256 = "43201e762d8699cb0ac2c0764a5454bdc2306c0771014d6c8fba821480631342"; }; }; From 6f203fef30272cf8c5b46dc26d357eeb00895130 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:09 +0000 Subject: [PATCH 0611/2743] [cpan2nix] perlPackages.StringCRC32: 1.5 -> 1.6 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e2419b417584..e17a6a0e1f85 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12703,10 +12703,10 @@ let self = _self // overrides; _self = with self; { }; StringCRC32 = buildPerlPackage rec { - name = "String-CRC32-1.5"; + name = "String-CRC32-1.6"; src = fetchurl { - url = mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.5.tar.gz; - sha256 = "0m3hjk292hnxyi8nkfy8hlr1khnbf2clgkb4kzj0ycq8gcd2z0as"; + url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.6.tar.gz; + sha256 = "0mf545w014f9rwp2020h17dn8kfp7q1zgwrsfv0rpn89c61in8bh"; }; meta = { maintainers = with maintainers; [ ]; From 16ca19b9dfde4063809e19eb0d1f495edb337908 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:09 +0000 Subject: [PATCH 0612/2743] [cpan2nix] perlPackages.StringCamelCase: 0.02 -> 0.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e17a6a0e1f85..a8ab518f719f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12695,10 +12695,10 @@ let self = _self // overrides; _self = with self; { }; StringCamelCase = buildPerlPackage rec { - name = "String-CamelCase-0.02"; + name = "String-CamelCase-0.04"; src = fetchurl { - url = "mirror://cpan/modules/by-module/String/${name}.tar.gz"; - sha256 = "17kh8nap2z5g5rqcvw0m7mvbai7wr7h0al39w8l827zhqad8ss42"; + url = mirror://cpan/authors/id/H/HI/HIO/String-CamelCase-0.04.tar.gz; + sha256 = "1a8i4yzv586svd0pbxls7642vvmyiwzh4x2xyij8gbnfxsydxhw9"; }; }; From 256e34bfbcf075dec89520cfd64f54ce73a6ccb1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:10 +0000 Subject: [PATCH 0613/2743] [cpan2nix] perlPackages.StringFormat: 1.17 -> 1.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a8ab518f719f..dcbff25fcf85 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12755,10 +12755,10 @@ let self = _self // overrides; _self = with self; { }; StringFormat = buildPerlPackage rec { - name = "String-Format-1.17"; + name = "String-Format-1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; - sha256 = "0sxfavcsb349rfafxflq2f9h3xpxabrw0q7vhmh9n3hjij8fa1jk"; + url = mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz; + sha256 = "0y77frxzjifd4sw0j19cc346ysas1mya84rdxaz279lyin7plhcy"; }; }; From 1ed63b1c979461acdb84520528b00c8c557a0af0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:11 +0000 Subject: [PATCH 0614/2743] [cpan2nix] perlPackages.SubExporterProgressive: 0.001011 -> 0.001013 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcbff25fcf85..08883c5b71ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12949,10 +12949,10 @@ let self = _self // overrides; _self = with self; { }; SubExporterProgressive = buildPerlPackage { - name = "Sub-Exporter-Progressive-0.001011"; + name = "Sub-Exporter-Progressive-0.001013"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001011.tar.gz; - sha256 = "01kwzbqwdhvadpphnczid03nlyj0h4cxaq3m3v2401bckkkcc606"; + url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz; + sha256 = "0mn0x8mkh36rrsr58s1pk4srwxh2hbwss7sv630imnk49navfdfm"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; From 843fcc9c6ec24447379a2ff9b2ca8acce8c351b9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:11 +0000 Subject: [PATCH 0615/2743] [cpan2nix] perlPackages.SubIdentify: 0.12 -> 0.14 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 08883c5b71ce..5cbc89cc3efc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12977,10 +12977,10 @@ let self = _self // overrides; _self = with self; { }; SubIdentify = buildPerlPackage rec { - name = "Sub-Identify-0.12"; + name = "Sub-Identify-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz"; - sha256 = "83bb785a66113b4a966db0a4186fd1dd07987acdacb4502b1e1558f817dde825"; + sha256 = "068d272086514dd1e842b6a40b1bedbafee63900e5b08890ef6700039defad6f"; }; meta = { description = "Retrieve names of code references"; From fd6a1bc64de97e51b2d9f2d30fd32ecdeb8050e1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:12 +0000 Subject: [PATCH 0616/2743] [cpan2nix] perlPackages.SubInstall: 0.927 -> 0.928 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5cbc89cc3efc..1117d732604c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13004,10 +13004,10 @@ let self = _self // overrides; _self = with self; { }; SubInstall = buildPerlPackage { - name = "Sub-Install-0.927"; + name = "Sub-Install-0.928"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.927.tar.gz; - sha256 = "0nmgsdbwi8f474jkyd6w9jfnpav99xp8biydcdri8qri623f6plm"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz; + sha256 = "03zgk1yh128gciyx3q77zxzxg9kf8yy2gm46gdxqi24mcykngrb1"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; From 546647ac103b1273114b54309465bcb2fe669b75 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:12 +0000 Subject: [PATCH 0617/2743] [cpan2nix] perlPackages.SubUplevel: 0.24 -> 0.2800 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1117d732604c..79568c7432bc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13054,10 +13054,10 @@ let self = _self // overrides; _self = with self; { }; SubUplevel = buildPerlPackage { - name = "Sub-Uplevel-0.24"; + name = "Sub-Uplevel-0.2800"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.24.tar.gz; - sha256 = "1yzxqsim8vpavzqm2wfksh8dpmy6qbr9s3hdqqicp38br3lzd4qg"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz; + sha256 = "14z2xjiw931wizcx3mblmby753jspvfm321d6chs907nh0xzdwxl"; }; meta = { homepage = https://github.com/dagolden/sub-uplevel; From 5d861c2d464f8845795d80940b2300847e576732 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:13 +0000 Subject: [PATCH 0618/2743] [cpan2nix] perlPackages.SymbolUtil: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79568c7432bc..a9841933dc5c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13111,7 +13111,7 @@ let self = _self // overrides; _self = with self; { }; }; - SymbolUtil = buildPerlPackage { + SymbolUtil = buildPerlModule { name = "Symbol-Util-0.0203"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; From 88bc8103812f8e076462038e6fe0658556639a60 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:13 +0000 Subject: [PATCH 0619/2743] [cpan2nix] perlPackages.SysHostnameLong: 1.4 -> 1.5 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9841933dc5c..be2cfd02b2db 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13162,10 +13162,10 @@ let self = _self // overrides; _self = with self; { }; SysHostnameLong = buildPerlPackage rec { - name = "Sys-Hostname-Long-1.4"; + name = "Sys-Hostname-Long-1.5"; src = fetchurl { url = "mirror://cpan/authors/id/S/SC/SCOTT/${name}.tar.gz"; - sha256 = "0hy1225zg2yg11xhgj0wbiapzjyf6slx17ln36zqvfm07k6widlx"; + sha256 = "1jv5n8jv48c1p8svjsigyxndv1ygsq8wgwj9c7ypx1vaf3rns679"; }; doCheck = false; # no `hostname' in stdenv meta = { From f25c132c36760c26c0cbe73fe589481e5f0af150 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:14 +0000 Subject: [PATCH 0620/2743] [cpan2nix] perlPackages.SysSigAction: 0.21 -> 0.23 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index be2cfd02b2db..5fc075b3a76a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13174,10 +13174,10 @@ let self = _self // overrides; _self = with self; { }; SysSigAction = buildPerlPackage { - name = "Sys-SigAction-0.21"; + name = "Sys-SigAction-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.21.tar.gz; - sha256 = "e144207a6fd261eb9f98554c76bea66d95870ee1f62d2d346a1ea95fdccf80db"; + url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz; + sha256 = "c4ef6c9345534031fcbbe2adc347fc7194d47afc945e7a44fac7e9563095d353"; }; meta = { description = "Perl extension for Consistent Signal Handling"; From ae25b4b907256a666617d88e61902964c32ae060 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:15 +0000 Subject: [PATCH 0621/2743] [cpan2nix] perlPackages.TaskWeaken: 1.04 -> 1.05 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5fc075b3a76a..d37ca478c7ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13283,10 +13283,10 @@ let self = _self // overrides; _self = with self; { }; TaskWeaken = buildPerlPackage { - name = "Task-Weaken-1.04"; + name = "Task-Weaken-1.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.04.tar.gz; - sha256 = "1i7kd9v8fjsqyhr4rx4a1jv7n5vfjjm1v4agb24pizh0b72p3qk7"; + url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.05.tar.gz; + sha256 = "0p5ryr3421p5rqj6dk5dcvxsml5gl9skbn7gv4szk50fimrvzww5"; }; meta = { description = "Ensure that a platform has weaken support"; From b402e76dd2943a4bb76cffb25a84e92526463e03 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:16 +0000 Subject: [PATCH 0622/2743] [cpan2nix] perlPackages.TermANSIColor: 4.03 -> 4.06 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d37ca478c7ca..89017fa611f8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13413,10 +13413,10 @@ let self = _self // overrides; _self = with self; { }; TermANSIColor = buildPerlPackage { - name = "Term-ANSIColor-4.03"; + name = "Term-ANSIColor-4.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.03.tar.gz; - sha256 = "e89b6992030fa713f928f653dcdb71d66fa2493f873bacf5653aa121ca862450"; + url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.06.tar.gz; + sha256 = "8161c7434b1984bde588d75f22c786c46cb6d35d264d58111db0b82537de4bad"; }; meta = { description = "Color output using ANSI escape sequences"; From 6140b387be6e6e79cfef609f20e30ac423cb92b7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:17 +0000 Subject: [PATCH 0623/2743] [cpan2nix] perlPackages.TermReadKey: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 89017fa611f8..eb0f66af6995 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13490,7 +13490,7 @@ let self = _self // overrides; _self = with self; { version = "2.37"; src = fetchurl { url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; - sha256 = "1czarrdxgnxmmbaasjnq3sj14nf1cvzhm37padq6xvl7h7r2acb2"; + sha256 = "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa"; }; }; From 633964781a43b54d3e9ee612c4ed00e76439de83 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:17 +0000 Subject: [PATCH 0624/2743] [cpan2nix] perlPackages.TermReadLineGnu: 1.31 -> 1.35 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eb0f66af6995..85e7059ba1be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13495,10 +13495,10 @@ let self = _self // overrides; _self = with self; { }; TermReadLineGnu = buildPerlPackage rec { - name = "Term-ReadLine-Gnu-1.31"; + name = "Term-ReadLine-Gnu-1.35"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz"; - sha256 = "42174b4bc9d3881502d527fc7c8bd1c0a4b266c2f0bbee012e9a604999418f3b"; + sha256 = "575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lreadline -lncursesw"; From 2deec467ba1eeb6dd0755a8abdf0cdb95e715615 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:18 +0000 Subject: [PATCH 0625/2743] [cpan2nix] perlPackages.TermSizePerl: 0.029 -> 0.031 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 85e7059ba1be..d0fc8a5b85ea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13561,10 +13561,10 @@ let self = _self // overrides; _self = with self; { }; TermSizePerl = buildPerlPackage { - name = "Term-Size-Perl-0.029"; + name = "Term-Size-Perl-0.031"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.029.tar.gz; - sha256 = "8c1aaab73646ee1d233e827213ea3b5ab8afcf1d02a8f94be7aed306574875e7"; + url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.031.tar.gz; + sha256 = "ae9a6746cb1b305ddc8f8d8ca46878552b9c1123628971e13a275183822f209e"; }; meta = { description = "Perl extension for retrieving terminal size (Perl version)"; From de8f4481f2aa5d2ebe23edb14e3fc34415bf76c2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:20 +0000 Subject: [PATCH 0626/2743] [cpan2nix] perlPackages.TestCPANMeta: 0.23 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d0fc8a5b85ea..94a833b34057 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13766,10 +13766,10 @@ let self = _self // overrides; _self = with self; { }; TestCPANMeta = buildPerlPackage { - name = "Test-CPAN-Meta-0.23"; + name = "Test-CPAN-Meta-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.23.tar.gz; - sha256 = "dda70c5cb61eddc6d3148cb66b6ff5eb4546a065257f4c104112a8a8a3575116"; + url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz; + sha256 = "f55b4f9cf6bc396d0fe8027267685cb2ac4affce897d0967a317fac6db5a8db5"; }; meta = { description = "Validate your CPAN META.yml files"; From c114fdfacba1965007c8504e7da4384890b3ef6b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:20 +0000 Subject: [PATCH 0627/2743] [cpan2nix] perlPackages.TestCommand: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94a833b34057..1a75b9e9ca81 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13738,7 +13738,7 @@ let self = _self // overrides; _self = with self; { }; }; - TestCommand = buildPerlPackage { + TestCommand = buildPerlModule { name = "Test-Command-0.11"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz; From 6f8406cc819b9f3b341b0f3618db428b4f640ae2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:20 +0000 Subject: [PATCH 0628/2743] [cpan2nix] perlPackages.TestDeep: 0.112 -> 1.127 --- 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 1a75b9e9ca81..f7c2df000163 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13792,12 +13792,11 @@ let self = _self // overrides; _self = with self; { }; TestDeep = buildPerlPackage { - name = "Test-Deep-0.112"; + name = "Test-Deep-1.127"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-0.112.tar.gz; - sha256 = "1vg1bb1lpqpj0pxk738ykip4kw3agbi88g90wxb3pc11l84nlsan"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.127.tar.gz; + sha256 = "0s3jmyvkgk48piw46sxppx11nfsbzhmisb0y513iza8vqiczr35p"; }; - propagatedBuildInputs = [ TestNoWarnings TestTester ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; }; From 4158a3270d0e6834390f9a91b938b611bdec2587 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:21 +0000 Subject: [PATCH 0629/2743] [cpan2nix] perlPackages.TestDir: 1.014 -> 1.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7c2df000163..ff64c3d977f3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13803,10 +13803,10 @@ let self = _self // overrides; _self = with self; { }; TestDir = buildPerlPackage { - name = "Test-Dir-1.014"; + name = "Test-Dir-1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.014.tar.gz; - sha256 = "b36efc286f8127b04fd7bb0dfdf4bd0a090b175872e35b5ce6d4d80c772c28bf"; + url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.16.tar.gz; + sha256 = "7332b323913eb6a2684d094755196304b2f8606f70eaab913654ca91f273eac2"; }; meta = { description = "Test directory attributes"; From 44cca9a32207841b546ca5ebd7e85e7008dfbc26 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:21 +0000 Subject: [PATCH 0630/2743] [cpan2nix] perlPackages.TestEOL: 1.5 -> 2.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff64c3d977f3..55c1a168d274 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13843,10 +13843,10 @@ let self = _self // overrides; _self = with self; { }; TestEOL = buildPerlPackage { - name = "Test-EOL-1.5"; + name = "Test-EOL-2.00"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-EOL-1.5.tar.gz; - sha256 = "0qfdn71562xzmgnhmkkdbpp3vj851ldl1zlmxvharxsr16gjh6s3"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz; + sha256 = "0l3bxpsw0x7j9nclizcp53mnf9wny25dmg2iglfhzgnk0xfpwzwf"; }; meta = { homepage = https://metacpan.org/release/Test-EOL; From 5cee938a6df72ca1c134387e51b9839cda77ab4e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:21 +0000 Subject: [PATCH 0631/2743] [cpan2nix] perlPackages.TestHarness: 3.33 -> 3.42 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55c1a168d274..0968db182095 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13940,10 +13940,10 @@ let self = _self // overrides; _self = with self; { }; TestHarness = buildPerlPackage { - name = "Test-Harness-3.33"; + name = "Test-Harness-3.42"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.33.tar.gz; - sha256 = "c22e36287d5cee3c28fd2006e3c8b6e7cc76c6fc39d79c7ab74f1936d35e8fe2"; + url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.42.tar.gz; + sha256 = "0fd90d4efea82d6e262e6933759e85d27cbcfa4091b14bf4042ae20bab528e53"; }; doCheck = false; # makes assumptions about path to Perl meta = { From c1c96d5372fed7eaa1801fc9054e009ae2aba789 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:22 +0000 Subject: [PATCH 0632/2743] [cpan2nix] perlPackages.TestInter: 1.05 -> 1.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0968db182095..2bd4a3692605 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14896,10 +14896,10 @@ let self = _self // overrides; _self = with self; { }; TestInter = buildPerlPackage { - name = "Test-Inter-1.05"; + name = "Test-Inter-1.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.05.tar.gz; - sha256 = "bda95ef503f1c1b39a5cd1ea686d18a67a63b56a8eb458f0614fc2acc51f7988"; + url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.07.tar.gz; + sha256 = "c3b1e2c753b88a893e08ec2dd3d0f0b3eb513cdce7afa52780cb0e02b6c576ee"; }; meta = { description = "Framework for more readable interactive test scripts"; From 5b82aa5ace71b25ef349943e9229e2469e7ef725 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:22 +0000 Subject: [PATCH 0633/2743] [cpan2nix] perlPackages.TestLeakTrace: 0.14 -> 0.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2bd4a3692605..fad9aa1f4be9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13991,10 +13991,10 @@ let self = _self // overrides; _self = with self; { }; TestLeakTrace = buildPerlPackage rec { - name = "Test-LeakTrace-0.14"; + name = "Test-LeakTrace-0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "06cn4g35l2gi9vbsdi2j49cxsji9fvfi7xp4xgdyxxds9vrxydia"; + url = mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz; + sha256 = "00z4hcjra5nk700f3fgpy8fs036d7ry7glpn8g3wh7jzj7nrw22z"; }; meta = { description = "Traces memory leaks"; From b181c19d2d41177d2958667277f7349e85599fed Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:22 +0000 Subject: [PATCH 0634/2743] [cpan2nix] perlPackages.TestLongString: 0.15 -> 0.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fad9aa1f4be9..46fab4f251df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14003,10 +14003,10 @@ let self = _self // overrides; _self = with self; { }; TestLongString = buildPerlPackage rec { - name = "Test-LongString-0.15"; + name = "Test-LongString-0.17"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "0r2i3a35l116ccwx88jwiii2fq4b8wm16sl1lkxm2kh44s4z7s5s"; + url = mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz; + sha256 = "0kwp7rfr1i2amz4ckigkv13ah7jr30q6l5k4wk0vxl84myg39i5b"; }; }; From 9eca37e4953505380bde4d2bd61ee141b319dc0f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:23 +0000 Subject: [PATCH 0635/2743] [cpan2nix] perlPackages.TestMockTime: 0.12 -> 0.16 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46fab4f251df..1ed95a97cad4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14098,10 +14098,10 @@ let self = _self // overrides; _self = with self; { TestMoose = Moose; TestMockTime = buildPerlPackage rec { - name = "Test-MockTime-0.12"; + name = "Test-MockTime-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz"; - sha256 = "104p9qsqcchfbxh6b6w7q9jhkwb4hc424js0cyivyanjm6bcqvj9"; + sha256 = "1vxv7y7jn71m8v8ag0z0dd0zadhxp264dppb40islcjl4g7r6x08"; }; }; From f29437897f687dc24d1d125ffa99be0fbe2d40f6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:24 +0000 Subject: [PATCH 0636/2743] [cpan2nix] perlPackages.TestMojibake: 0.9 -> 1.3 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1ed95a97cad4..9811379eae63 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14106,10 +14106,10 @@ let self = _self // overrides; _self = with self; { }; TestMojibake = buildPerlPackage { - name = "Test-Mojibake-0.9"; + name = "Test-Mojibake-1.3"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-0.9.tar.gz; - sha256 = "0b7jamkmws6k3cvzwrz3r5vcpjrdhr8wndf82i5nx2z19xsy33ym"; + url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz; + sha256 = "0cqvbwddgh0pfzmh989gkysi9apqj7dp7jkxfa428db9kgzpbzlg"; }; meta = { homepage = https://github.com/creaktive/Test-Mojibake; From c82774e899e18ee36793a0e95fb9e96fe0b93c18 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:24 +0000 Subject: [PATCH 0637/2743] [cpan2nix] perlPackages.TestNoTabs: 1.3 -> 2.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9811379eae63..c3f16bb105bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14146,10 +14146,10 @@ let self = _self // overrides; _self = with self; { }; TestNoTabs = buildPerlPackage { - name = "Test-NoTabs-1.3"; + name = "Test-NoTabs-2.00"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-NoTabs-1.3.tar.gz; - sha256 = "06gvj0pgljc7n9rxhvwb0gq9wk51i3ks41lgh7a5ycqfkh9d0glw"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.00.tar.gz; + sha256 = "127kpl1va267qar2ia4c22xb96jby2jqnda3sj5pjgmxg8si26cg"; }; meta = { description = "Check the presence of tabs in your project"; From eef1c4ce06d23b65ce31c149ec6b2f5c6f09b87d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:25 +0000 Subject: [PATCH 0638/2743] [cpan2nix] perlPackages.TestNoWarnings: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3f16bb105bb..976d494b8f43 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14165,7 +14165,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz; sha256 = "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3"; }; - buildInputs = [ TestTester ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Make sure you didn't emit any warnings while testing"; From 0fbbfeeb2fc3a97908d0aae1b193f139cceac208 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:26 +0000 Subject: [PATCH 0639/2743] [cpan2nix] perlPackages.TestObject: 0.07 -> 0.08 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 976d494b8f43..7d7152c61c7a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14173,10 +14173,10 @@ let self = _self // overrides; _self = with self; { }; TestObject = buildPerlPackage rec { - name = "Test-Object-0.07"; + name = "Test-Object-0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "d142a91b039928dc5d616c7bd9bb62ffb06e58991f00c54e26ef7e62ed61032a"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz; + sha256 = "65278964147837313f4108e55b59676e8a364d6edf01b3dc198aee894ab1d0bb"; }; }; From bc4bf651cb036ef66478611cc3d89fab838847cd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:26 +0000 Subject: [PATCH 0640/2743] [cpan2nix] perlPackages.TestPortabilityFiles: 0.06 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7d7152c61c7a..05df8674a7dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14263,10 +14263,10 @@ let self = _self // overrides; _self = with self; { }; TestPortabilityFiles = buildPerlPackage { - name = "Test-Portability-Files-0.06"; + name = "Test-Portability-Files-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.06.tar.gz; - sha256 = "3e0fd033387ab82df8aedd42a14a8e64200aebd59447ad62a3bc411ff4a808a8"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.09.tar.gz; + sha256 = "16d31fa941af1a79faec0192e09880cb19225cde649c03d2e3ceda9b455a621c"; }; meta = { description = "Check file names portability"; From 5d8b3b05fc0083ad94fd1cd3a1e0383d627e84e6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:27 +0000 Subject: [PATCH 0641/2743] [cpan2nix] perlPackages.TestSimple13: 1.302125 -> 1.302135 --- 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 05df8674a7dc..d4695f685500 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14466,17 +14466,16 @@ let self = _self // overrides; _self = with self; { TestSimple = null; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302125"; + name = "Test-Simple-1.302135"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302125.tar.gz; - sha256 = "8a3785a4fa60c4c5ae0c5cac2f3312242f2b36ca20e368d8a9ec22b4061aa317"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302135.tar.gz; + sha256 = "889b59d5fb5955b5d15dbef1020aa2e9a3ccafacc8717c16a939d7cfd619ab70"; }; meta = { description = "Basic utilities for writing tests"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; - buildInputs = [ ExtUtilsMakeMaker ]; }; TestSpec = buildPerlPackage rec { From 6b280204ba0ea63f7ffc55bbd6d3d06627d9464a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:28 +0000 Subject: [PATCH 0642/2743] [cpan2nix] perlPackages.TestSynopsis: 0.11 -> 0.15 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d4695f685500..e92a0daa8817 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14501,10 +14501,10 @@ let self = _self // overrides; _self = with self; { }; TestSynopsis = buildPerlPackage rec { - name = "Test-Synopsis-0.11"; + name = "Test-Synopsis-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/${name}.tar.gz"; - sha256 = "1jn3vna5r5fa9nv33n1x0bmgc434sk0ggar3jm78xx0zzy5jnsxv"; + sha256 = "1cxxidhwf8j8n41d423ankvls2wdi7aw755csi3hcv3mj9k67mfi"; }; meta = { description = "Test your SYNOPSIS code"; From 19c644b7efbebe0e1d4a31a052ec47b6a1c3df9d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:28 +0000 Subject: [PATCH 0643/2743] [cpan2nix] perlPackages.TestTime: 0.04 -> 0.05 --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e92a0daa8817..8ce5699f5cca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14548,12 +14548,11 @@ let self = _self // overrides; _self = with self; { }; TestTime = buildPerlPackage rec { - name = "Test-Time-0.04"; + name = "Test-Time-0.05"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SATOH/${name}.tar.gz"; - sha256 = "d8c1bc57f9767ae8122fc4ab873bd991cb9ea8e9422c66399acb66770fa5c2ea"; + sha256 = "abef8885a811440114bfe067edc32f08500fbfd624902f8c3a81fc224ac4b410"; }; - buildInputs = [ FileSlurp ]; meta = { description = "Overrides the time() and sleep() core functions for testing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 786f80cd9ac26bd2a6d19876771af3f0299fcda6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:29 +0000 Subject: [PATCH 0644/2743] [cpan2nix] perlPackages.TestUnitLite: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ce5699f5cca..88ec300ea500 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14573,7 +14573,7 @@ let self = _self // overrides; _self = with self; { }; }; - TestUnitLite = buildPerlPackage { + TestUnitLite = buildPerlModule { name = "Test-Unit-Lite-0.1202"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz; From c8260be5dc98865a66eed525b96edcca2ba1b78c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:29 +0000 Subject: [PATCH 0645/2743] [cpan2nix] perlPackages.TestWithoutModule: 0.17 -> 0.20 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88ec300ea500..1f52f95ace6d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14630,10 +14630,10 @@ let self = _self // overrides; _self = with self; { }; TestWithoutModule = buildPerlPackage { - name = "Test-Without-Module-0.17"; + name = "Test-Without-Module-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.17.tar.gz; - sha256 = "a691b0bf6d92dedbacfd547551021389ebc79c51937de2b914e792457da56ff7"; + url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz; + sha256 = "8e9aeb7c32a6c6d0b8a93114db2a8c072721273a9d9a2dd4f9ca86cfd28aa524"; }; meta = { description = "Test fallback behaviour in absence of modules"; From d1278513edb268287c68571af35e3794c62a3fa6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:30 +0000 Subject: [PATCH 0646/2743] [cpan2nix] perlPackages.TextAligner: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f52f95ace6d..a48151e7d8c4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14734,11 +14734,11 @@ let self = _self // overrides; _self = with self; { }; }; - TextAligner = buildPerlPackage rec { - name = "Text-Aligner-0.12"; + TextAligner = buildPerlModule rec { + name = "Text-Aligner-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0a6zkchc0apvzkch6z18cx6h97xfiv50r7n4xhg90x8dvk75qzcs"; + sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776"; }; meta = { description = "Align text in columns"; From 7be38e66a9ce801e7393c31d26c16175dc904629 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:32 +0000 Subject: [PATCH 0647/2743] [cpan2nix] perlPackages.TextCSV: 1.33 -> UniqueColumns_0.4 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a48151e7d8c4..192b922bd64b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14824,10 +14824,10 @@ let self = _self // overrides; _self = with self; { }; TextCSV = buildPerlPackage rec { - name = "Text-CSV-1.33"; + name = "Text-CSV-UniqueColumns_0.4"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz"; - sha256 = "9c5b8fb9baffd58f02ed2b3f0b6d9a6454198f18a80e7f3a049680ddbdb24115"; + url = mirror://cpan/authors/id/T/TU/TUSHAR/Text-CSV-UniqueColumns_0.4.tar.gz; + sha256 = "30ebe22d5ad56bccb1c3976bfca09045882cce792fe460219feaf45eb676b114"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; From 69552ed6dad1358ab12748e12032c0bd8604fefc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:33 +0000 Subject: [PATCH 0648/2743] [cpan2nix] perlPackages.TextCSV_XS: 1.23 -> 1.35 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 192b922bd64b..94b4b3fd91e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14851,10 +14851,10 @@ let self = _self // overrides; _self = with self; { }; TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.23"; + name = "Text-CSV_XS-1.35"; src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; - sha256 = "5714e1c275e7715aee44f820f8ca26c976fbb563668de7eba42a4419a05a4b5a"; + sha256 = "2b4f111e9486b230b02bfabbbf50c453f959d18ec17351a930e41f0959b358b7"; }; meta = { homepage = https://metacpan.org/pod/Text::CSV_XS; From b8fdcf0329ee4dcb28ddf20317259b0ff9bffabb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:34 +0000 Subject: [PATCH 0649/2743] [cpan2nix] perlPackages.TextGlob: 0.09 -> 0.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94b4b3fd91e8..b2dd422b2375 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14877,10 +14877,10 @@ let self = _self // overrides; _self = with self; { }; TextGlob = buildPerlPackage rec { - name = "Text-Glob-0.09"; + name = "Text-Glob-0.11"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz"; - sha256 = "0lr76wrsj8wcxrq4wi8z1640w4dmdbkznp06q744rg3g0bd238d5"; + url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz; + sha256 = "11sj62fynfgwrlgkv5a051cq6yn0pagxqjsz27dxx8phsd4wv706"; }; }; From 26a5285817b9c2ba969960e986c2f54bedb92028 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:34 +0000 Subject: [PATCH 0650/2743] [cpan2nix] perlPackages.TextMicroTemplate: 0.20 -> 0.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b2dd422b2375..b9163962d715 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14957,10 +14957,10 @@ let self = _self // overrides; _self = with self; { }; TextMicroTemplate = buildPerlPackage { - name = "Text-MicroTemplate-0.20"; + name = "Text-MicroTemplate-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.20.tar.gz; - sha256 = "0da44kd3z4n23wivy99583cscmiay2xv0wq9dzx6mg8vq874kx74"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.24.tar.gz; + sha256 = "1j5ljx7hs4k29732nr5f2m4kssz4rqjw3kknsnhams2yydqix01j"; }; meta = { description = "Micro template engine with Perl5 language"; From 68a81af7561699a0b7121f2adf18bebf6f62fbab Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:35 +0000 Subject: [PATCH 0651/2743] [cpan2nix] perlPackages.TextPDF: 0.29a -> 0.31 --- 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 b9163962d715..afe41d13baf0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14995,12 +14995,11 @@ let self = _self // overrides; _self = with self; { }; TextPDF = buildPerlPackage rec { - name = "Text-PDF-0.29a"; + name = "Text-PDF-0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MH/MHOSKEN/${name}.tar.gz"; - sha256 = "11jig38vps957zyc9372q2g0jcabxgkql3b5vazc1if1ajhlvc4s"; + url = mirror://cpan/authors/id/B/BH/BHALLISSY/Text-PDF-0.31.tar.gz; + sha256 = "0s5cimfr4wwzgv15k30x83ncg1257jwsvmbmb86lp02rw5g537yz"; }; - propagatedBuildInputs = [ CompressZlib ]; }; TextQuoted = buildPerlPackage { From a377474130d4a82be1a5e0ceccd171f023554731 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:35 +0000 Subject: [PATCH 0652/2743] [cpan2nix] perlPackages.TextReform: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index afe41d13baf0..578f334b94ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15031,7 +15031,7 @@ let self = _self // overrides; _self = with self; { TextTabularDisplay]; }; - TextReform = buildPerlPackage { + TextReform = buildPerlModule { name = "Text-Reform-1.20"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz; From c3bfbb4ec752e4b1031ee1d2bc5197709950ebd9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:36 +0000 Subject: [PATCH 0653/2743] [cpan2nix] perlPackages.TextRoman: 3.3 -> 3.5 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 578f334b94ae..0c22c0a9d8bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15044,10 +15044,10 @@ let self = _self // overrides; _self = with self; { }; TextRoman = buildPerlPackage rec { - name = "Text-Roman-3.3"; + name = "Text-Roman-3.5"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EC/ECALDER/${name}.tar.gz"; - sha256 = "1ris38kdj15l8l7cl5whdpyyvb0rz8dh9p0w36wgydi3b2pxsa25"; + url = mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz; + sha256 = "0sh47svzz0wm993ywfgpn0fvhajl2sj5hcnf5zxjz02in6ihhjnb"; }; meta = { description = "Allows conversion between Roman and Arabic algarisms"; From 9d19954e9ea9286e0574d9ef9142eb0a07cb57e6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:36 +0000 Subject: [PATCH 0654/2743] [cpan2nix] perlPackages.TextSimpleTable: 2.03 -> 2.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c22c0a9d8bb..7d89563d9128 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15056,10 +15056,10 @@ let self = _self // overrides; _self = with self; { }; TextSimpleTable = buildPerlPackage { - name = "Text-SimpleTable-2.03"; + name = "Text-SimpleTable-2.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.03.tar.gz; - sha256 = "15hpry9jwrf1vbjyk21s65rllxrdvp2fdzzv9gsvczggby2yyzfs"; + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.04.tar.gz; + sha256 = "14sjmdcy7s73sk740g3ccmzmwhwd52x5ay3bjmibjlql1cag70ld"; }; meta = { description = "Simple eyecandy ASCII tables"; From 6a58557134543e25c09120a1ab347d78211752d7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:36 +0000 Subject: [PATCH 0655/2743] [cpan2nix] perlPackages.TextSoundex: 3.04 -> 3.05 --- 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 7d89563d9128..6120c16fba63 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15068,12 +15068,11 @@ let self = _self // overrides; _self = with self; { }; TextSoundex = buildPerlPackage { - name = "Text-Soundex-3.04"; + name = "Text-Soundex-3.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.04.tar.gz; - sha256 = "2e56bb4324ee0186b908b3bd78463643affe7295624af0628e81491e910283d9"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz; + sha256 = "f6dd55b4280b25dea978221839864382560074e1d6933395faee2510c2db60ed"; }; - propagatedBuildInputs = [ if_ ]; }; TextSprintfNamed = buildPerlPackage rec { From 731542d4771a51df092a83cc479ad7391296d151 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:37 +0000 Subject: [PATCH 0656/2743] [cpan2nix] perlPackages.TextTabularDisplay: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6120c16fba63..1d71cec3976b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15121,7 +15121,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; sha256 = "1s46s4pg5mpfllx3icf4vnqz9iadbbdbsr5p7pr6gdjnzbx902gb"; }; - propagatedBuildInputs = [ TextAligner ]; }; TextTemplate = buildPerlPackage { From 5eefa0693fb909ea63dddfc975aa384e7a91e66b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:37 +0000 Subject: [PATCH 0657/2743] [cpan2nix] perlPackages.TextTrim: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1d71cec3976b..1d42fe1ce2c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15180,13 +15180,12 @@ let self = _self // overrides; _self = with self; { }; }; - TextTrim = buildPerlPackage { + TextTrim = buildPerlModule { name = "Text-Trim-1.02"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MATTLAW/Text-Trim-1.02.tar.gz; sha256 = "1bnwjl5n04w8nnrzrm75ljn4pijqbijr9csfkjcs79h4gwn9lwqw"; }; - propagatedBuildInputs = [ CGI ModuleBuild ]; meta = { description = "Remove leading and/or trailing whitespace from strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 816c7835d04fa149ad327db43ad36779e30b4146 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:38 +0000 Subject: [PATCH 0658/2743] [cpan2nix] perlPackages.TextUnidecode: 1.24 -> 1.30 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1d42fe1ce2c2..bd3bae3c2290 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15207,10 +15207,10 @@ let self = _self // overrides; _self = with self; { }; TextUnidecode = buildPerlPackage rec { - name = "Text-Unidecode-1.24"; + name = "Text-Unidecode-1.30"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz"; - sha256 = "124q1zfiyj70zz691nrfjfmv4i8dyalddhqisp8y28kzfnba9vrh"; + url = mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz; + sha256 = "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c"; }; }; From 595108ea1473c89be717e709a76e363227f5c7e4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:38 +0000 Subject: [PATCH 0659/2743] [cpan2nix] perlPackages.ThreadQueue: 3.09 -> 3.12 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd3bae3c2290..fcdfdac861cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15308,10 +15308,10 @@ let self = _self // overrides; _self = with self; { }; ThreadQueue = buildPerlPackage rec { - name = "Thread-Queue-3.09"; + name = "Thread-Queue-3.12"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0f03v10rsasi2j4lh8xw44jac8nfbw66274qgsz5lsmfd6wqvj12"; + sha256 = "0wpqdbdfa4mw8lpcaw1lp2d553gl65cl8mli1srj8wrg0kaxshhx"; }; meta = { description = "Thread-safe queues"; From 91a963d688827bc0917e9721e4c84752fcbf08ca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:39 +0000 Subject: [PATCH 0660/2743] [cpan2nix] perlPackages.ThreadSemaphore: 2.12 -> 2.13 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fcdfdac861cc..bb0ebdea9177 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15320,10 +15320,10 @@ let self = _self // overrides; _self = with self; { }; ThreadSemaphore = buildPerlPackage { - name = "Thread-Semaphore-2.12"; + name = "Thread-Semaphore-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.12.tar.gz; - sha256 = "e0f8e7057b073003e5a96a55b778abb8ee1cc1b279febedce0166526f2988965"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.13.tar.gz; + sha256 = "e3fe2cc047575529c8ea4c168cef8fab2ec931729a1826ffca1ef63e7e45bc81"; }; meta = { description = "Thread-safe semaphores"; From b30d3d410c09d4e1ef496b71d493ca8c8c4628f2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:39 +0000 Subject: [PATCH 0661/2743] [cpan2nix] perlPackages.TieCycle: 1.21 -> 1.225 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bb0ebdea9177..88353e7c2ea7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15373,10 +15373,10 @@ let self = _self // overrides; _self = with self; { }; TieCycle = buildPerlPackage rec { - name = "Tie-Cycle-1.21"; + name = "Tie-Cycle-1.225"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "0r1mdmd01s42vwlwr2mvr1ywjvvfkc79vz6ysdii5fvcgs6wk50y"; + sha256 = "0i9xq2qm50p2ih24265jndp2x8hfq7ap0d88nrlv5yaad4hxhc7k"; }; meta = { description = "Cycle through a list of values via a scalar"; From 333c65ceb749f3ee897cee3c0576c1d60157453d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:40 +0000 Subject: [PATCH 0662/2743] [cpan2nix] perlPackages.TieIxHash: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88353e7c2ea7..7217b9b4e5b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15395,7 +15395,7 @@ let self = _self // overrides; _self = with self; { }; }; - TieIxHash = buildPerlPackage { + TieIxHash = buildPerlModule { name = "Tie-IxHash-1.23"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz; From b17e873928540772fff94ca7d4e264861cc77b99 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:41 +0000 Subject: [PATCH 0663/2743] [cpan2nix] perlPackages.TieToObject: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7217b9b4e5b2..8d24142cf280 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15444,7 +15444,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz; sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3"; }; - propagatedBuildInputs = [Testuseok]; }; TimeDate = buildPerlPackage { From 998e6cec480801659c760b86b7ffaf91e19924e5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:42 +0000 Subject: [PATCH 0664/2743] [cpan2nix] perlPackages.TimeDuration: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d24142cf280..f5775c3c6463 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15460,7 +15460,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; sha256 = "1f5vkid4pl5iq3hal01hk1zjbbzrqpx4m1djawbp93l152shb0j5"; }; - buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Rounded or exact English expression of durations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 237ac751592b55ea85974f726a6e3ca682f55465 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:42 +0000 Subject: [PATCH 0665/2743] [cpan2nix] perlPackages.TimeHiRes: 1.9726 -> 1.9753 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f5775c3c6463..f53316734761 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15481,10 +15481,10 @@ let self = _self // overrides; _self = with self; { }; TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9726"; + name = "Time-HiRes-1.9753"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "17hhd53p72z08l1riwz5f6rch6hngby1pympkla5miznn7cjlrpz"; + url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9753.tar.gz; + sha256 = "05a9xhn8y0f679kg8n0n3ng4mk6sd7isihqbbhfh29nxkkwxbgqg"; }; }; From 4468795cb66133dc7c371b51ad2a007805b94b85 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:42 +0000 Subject: [PATCH 0666/2743] [cpan2nix] perlPackages.TimeLocal: 1.2300 -> 1.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f53316734761..3601d0c0c2ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15489,10 +15489,10 @@ let self = _self // overrides; _self = with self; { }; TimeLocal = buildPerlPackage { - name = "Time-Local-1.2300"; + name = "Time-Local-1.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.2300.tar.gz; - sha256 = "b2acca03700a09f8ae737d3084f3f6287e983da9ab7b537c6599c291b669fb49"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.25.tar.gz; + sha256 = "1ae9c51d777ac44a3ebc154dc625ba24d7c0cde6a8b6dba87b46d0777889fef2"; }; meta = { description = "Efficiently compute time from local and GMT time"; From 682a2d36fc8fbf85f71eb594f913f4a9bcb2fe02 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:43 +0000 Subject: [PATCH 0667/2743] [cpan2nix] perlPackages.Tk: 804.033 -> 804.034 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3601d0c0c2ad..5ab9c732d762 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15514,10 +15514,10 @@ let self = _self // overrides; _self = with self; { }; Tk = buildPerlPackage rec { - name = "Tk-804.033"; + name = "Tk-804.034"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; - sha256 = "84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad"; + sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ]; From b9410430f4e07734da6392df0e22eafd0e64df5a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:44 +0000 Subject: [PATCH 0668/2743] [cpan2nix] perlPackages.UNIVERSALisa: 1.20120726 -> 1.20171012 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ab9c732d762..e727d259a5e2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15607,10 +15607,10 @@ let self = _self // overrides; _self = with self; { }; UNIVERSALisa = buildPerlPackage { - name = "UNIVERSAL-isa-1.20120726"; + name = "UNIVERSAL-isa-1.20171012"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-isa-1.20120726.tar.gz; - sha256 = "1qal99sp888b50kwank9ffyprv7kqx42p4vyfahdabf915lyzc61"; + url = mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz; + sha256 = "0avzv9j32aab6l0rd63n92v0pgliz1p4yabxxjfq275hdh1mcsfi"; }; meta = { homepage = https://github.com/chromatic/UNIVERSAL-isa; From d626556f48b35679c7ae66086e501fe83c317055 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:45 +0000 Subject: [PATCH 0669/2743] [cpan2nix] perlPackages.UnicodeCaseFold: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e727d259a5e2..0d6beb1c71cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15637,7 +15637,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; - buildInputs = [ ModuleBuild ]; meta = { homepage = https://metacpan.org/release/Unicode-CaseFold; description = "Unicode case-folding for case-insensitive lookups"; From ae347a31539940c246e199d5ec74c6c69d402513 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:48 +0000 Subject: [PATCH 0670/2743] [cpan2nix] perlPackages.VariableMagic: 0.61 -> 0.62 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d6beb1c71cc..0682078e681e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15844,10 +15844,10 @@ let self = _self // overrides; _self = with self; { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.61"; + name = "Variable-Magic-0.62"; src = fetchurl { url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "b8afe92e54c72a2ed2ca1b08ce90518b855734f7d33c454d0f66f2c1ccf8a6d7"; + sha256 = "3f9a18517e33f006a9c2fc4f43f01b54abfe6ff2eae7322424f31069296b615c"; }; meta = { homepage = http://search.cpan.org/dist/Variable-Magic/; From 4603d65851b3d32fa6055061ed4139cc8188993b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:49 +0000 Subject: [PATCH 0671/2743] [cpan2nix] perlPackages.X11GUITest: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0682078e681e..b3b84ec48cf8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16096,7 +16096,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz"; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; - buildInputs = [pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi]; + buildInputs = [ pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi ]; NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst"; doCheck = false; # requires an X server }; From 3a37c802baae0856e8f5e57b42059a887dec680e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:49 +0000 Subject: [PATCH 0672/2743] [cpan2nix] perlPackages.X11Protocol: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3b84ec48cf8..28da9cc29ec0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16085,7 +16085,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz"; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; - buildInputs = [pkgs.xlibsWrapper]; + buildInputs = [ pkgs.xlibsWrapper ]; NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server }; From 36f7961427b540c832e00bd1866cd93204350293 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:52 +0000 Subject: [PATCH 0673/2743] [cpan2nix] perlPackages.XSLoader: 0.20 -> 0.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 28da9cc29ec0..5086a6bf1cb3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16419,10 +16419,10 @@ let self = _self // overrides; _self = with self; { }; XSLoader = buildPerlPackage { - name = "XSLoader-0.20"; + name = "XSLoader-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.20.tar.gz; - sha256 = "020fyjhfp385nlkp217fm511sbjz768vqk1lmxz99k4bah740y7i"; + url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.24.tar.gz; + sha256 = "0pyqr12jsqagna75fm2gijfzw06wy1hrh5chn9hwnmcfddda66g8"; }; meta = { homepage = https://metacpan.org/module/Math::BigInt; From 1f7e126c6479d1d3c64b974dc6e20d7f49c78d32 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:53 +0000 Subject: [PATCH 0674/2743] [cpan2nix] perlPackages.YAMLLibYAML: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5086a6bf1cb3..769df1291b31 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16487,6 +16487,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; sha256 = "06msvj3vmjszl5zj1k7g47ll0kkds9gdb5sky0q27lh4zw1vlj33"; }; + doCheck = false; }; WebServiceLinode = buildPerlModule rec { From c44baee9e10003bb8a5b71f6f98addf2fea58fc1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:53 +0000 Subject: [PATCH 0675/2743] [cpan2nix] perlPackages.YAMLSyck: 1.29 -> 1.30 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 769df1291b31..8d617c5dcca5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16461,10 +16461,10 @@ let self = _self // overrides; _self = with self; { }; YAMLSyck = buildPerlPackage rec { - name = "YAML-Syck-1.29"; + name = "YAML-Syck-1.30"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; - sha256 = "0ff9rzb1gg12iiizjqv6bsxdxk39g3f6sa18znha4476acv7nmnk"; + sha256 = "1iwd4pbwg7m1vwc74s3f3hk9yyqmhn1ssrbh9466lmbnc4hl9cv2"; }; meta = { homepage = http://search.cpan.org/dist/YAML-Syck; From b8863c67992f424cbd9e680ad0e45823f49e41f5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:54 +0000 Subject: [PATCH 0676/2743] [cpan2nix] perlPackages.YAMLTiny: 1.69 -> 1.73 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d617c5dcca5..40c4505fbb9c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16474,10 +16474,10 @@ let self = _self // overrides; _self = with self; { }; YAMLTiny = buildPerlPackage rec { - name = "YAML-Tiny-1.69"; + name = "YAML-Tiny-1.73"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "14pmhksj68ii3rf4dza8im1i6jw3zafxkvxww5xlz7ib95cv135w"; + sha256 = "0i3p4nz8ysrsrs6vlzc6gkjcfpcaf05xjc7lwbjkw7lg5shmycdw"; }; }; From 41689f79dc66ccf8469700b0d3651f927ebe3693 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:54 +0000 Subject: [PATCH 0677/2743] [cpan2nix] perlPackages.autovivification: 0.16 -> 0.18 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40c4505fbb9c..c46f0afb4fb8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -636,10 +636,10 @@ let self = _self // overrides; _self = with self; { }; autovivification = buildPerlPackage rec { - name = "autovivification-0.16"; + name = "autovivification-0.18"; src = fetchurl { url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "1422kw9fknv7rbjkgdfflg1q3mb69d3yryszp38dn0bgzkqhwkc1"; + sha256 = "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d"; }; meta = { homepage = http://search.cpan.org/dist/autovivification/; From f5bca64df9f0b5b652be751426721acffc8a8c18 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:54 +0000 Subject: [PATCH 0678/2743] [cpan2nix] perlPackages.base: 2.18 -> 2.23 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c46f0afb4fb8..09c9174dae04 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -649,10 +649,10 @@ let self = _self // overrides; _self = with self; { }; base = buildPerlPackage { - name = "base-2.18"; + name = "base-2.23"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/base-2.18.tar.gz; - sha256 = "55b0d21f8edb5ef6dddcb1fd2457acb19c7584f2dfdea614685cd8ea62a1c306"; + url = mirror://cpan/authors/id/R/RJ/RJBS/base-2.23.tar.gz; + sha256 = "40f55841299a9fe6fab03cd098f94e9221fb516978e9ef40fd8ff2cbd6625dde"; }; }; From 86156de2e34a092fb7ab48d451559ad622993c56 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:55 +0000 Subject: [PATCH 0679/2743] [cpan2nix] perlPackages.constant: cleanup --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 09c9174dae04..69fba9d681ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2487,8 +2487,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/constant-1.33.tar.gz; sha256 = "015my616h5l2fswh52x4dp3n007gk5lax83ww9q6cmzb610mv5kr"; }; - propagatedBuildInputs = [ TestSimple13 ]; - buildInputs = [ ExtUtilsMakeMaker ]; }; constantboolean = buildPerlPackage { From 1762cd074cdc3baf1cf55c7874293033eb7d3a60 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:57 +0000 Subject: [PATCH 0680/2743] [cpan2nix] perlPackages.libintl_perl: 1.23 -> 1.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 69fba9d681ef..c928d351f79f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7803,10 +7803,10 @@ let self = _self // overrides; _self = with self; { libintlperl = pkgs.perlPackages.libintl_perl; libintl_perl = buildPerlPackage rec { - name = "libintl-perl-1.23"; + name = "libintl-perl-1.29"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz; - sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0"; + url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.29.tar.gz; + sha256 = "1cgvrgh4axd8jlr6497ndgphgvgnqc1axd306460hskdvc85z4vq"; }; meta = { maintainers = with maintainers; [ ]; From bb90761c646a43733364b2772c7d8672da503684 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:57 +0000 Subject: [PATCH 0681/2743] [cpan2nix] perlPackages.mod_perl2: 2.0.9 -> 2.0.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c928d351f79f..fed93ccb16fb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9247,10 +9247,10 @@ let self = _self // overrides; _self = with self; { }; mod_perl2 = buildPerlPackage { - name = "mod_perl-2.0.9"; + name = "mod_perl-2.0.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.9.tar.gz; - sha256 = "0azmir4hbb825mfmcxwa1frhnhhf82rl8xf6mmgwkhbinxmg4q02"; + url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.10.tar.gz; + sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi"; }; makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; From 56ba3dc565f0fa2e3d3613575bcb3550858b9215 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:58 +0000 Subject: [PATCH 0682/2743] [cpan2nix] perlPackages.podlators: 4.06 -> 4.10 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fed93ccb16fb..f6ce95b96fad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11813,10 +11813,10 @@ let self = _self // overrides; _self = with self; { }; podlators = buildPerlPackage rec { - name = "podlators-4.06"; + name = "podlators-4.10"; src = fetchurl { url = "mirror://cpan/authors/id/R/RR/RRA/${name}.tar.gz"; - sha256 = "0fsb1k88fsqwgmk5fkcz57jf27g6ip4ncikawslm596d1si2h48a"; + sha256 = "008b4j41ijrfyyq5nd3y7pqyww6rg49fjg2c6kmpnqrmgs347qqp"; }; meta = { description = "Convert POD data to various other formats"; From 4cbebb1f9b12db2b8dff87cf83b5f5038348d9f6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:58 +0000 Subject: [PATCH 0683/2743] [cpan2nix] perlPackages.strictures: 2.000002 -> 2.000003 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f6ce95b96fad..aaef52ab3c62 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12672,10 +12672,10 @@ let self = _self // overrides; _self = with self; { }; strictures = buildPerlPackage rec { - name = "strictures-2.000002"; + name = "strictures-2.000003"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "0021m9k1f6dfqn88znlp24g7xsqxwwjbj91w474c7n5gngf5a0qk"; + sha256 = "08mgvf1d2651gsg3jgjfs13878ndqa4ji8vfsda9f7jjd84ymy17"; }; meta = { homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; From 9da71b527c4693dd73b47fd41d1cc014fb39cfc9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:58 +0000 Subject: [PATCH 0684/2743] [cpan2nix] perlPackages.threads: 2.07 -> 2.21 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aaef52ab3c62..3b6207738bcc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15282,10 +15282,10 @@ let self = _self // overrides; _self = with self; { }; threads = buildPerlPackage rec { - name = "threads-2.07"; + name = "threads-2.21"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0fgprp2ghrh1ryxmr0y9bpsjl1ifbf4lqml8k017cbl4zbn21lim"; + sha256 = "047i22mdnf7fa0h9w5jhqrjbg561l5jxk8xqzwh6zbmwlac4qf98"; }; meta = { description = "Perl interpreter-based threads"; From a421d4d02b8b8d29d0de7a20b3d805c321df718e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:53:59 +0000 Subject: [PATCH 0685/2743] [cpan2nix] perlPackages.threadsshared: 1.51 -> 1.58 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b6207738bcc..a0a39c3de9d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15294,10 +15294,10 @@ let self = _self // overrides; _self = with self; { }; threadsshared = buildPerlPackage rec { - name = "threads-shared-1.51"; + name = "threads-shared-1.58"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "0qsbl8rx8p09cb5vj1yhwf1h2awvimfyckw1qwrqbk7dxjldrimn"; + sha256 = "04qbypzgp49sq1wq5kip0m95lffv0pc8xj2wplrdpyqz87y105xd"; }; meta = { description = "Perl extension for sharing data structures between threads"; From a358e5bb5ec126ad3d6813f081ced11a7cb1df6f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:00 +0000 Subject: [PATCH 0686/2743] [cpan2nix] perlPackages.AlgorithmAnnotate: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a0a39c3de9d1..2394867ff269 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -51,7 +51,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9"; }; - propagatedBuildInputs = [AlgorithmDiff]; + propagatedBuildInputs = [ AlgorithmDiff ]; }; AlgorithmC3 = buildPerlPackage rec { From 97cc81692e631adde5050d5c4374cfcb5f00d030 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:01 +0000 Subject: [PATCH 0687/2743] [cpan2nix] perlPackages.AppConfig: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2394867ff269..184c87edd1c5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -269,6 +269,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "A bundle of Perl5 modules for reading configuration files and parsing command line arguments"; }; + buildInputs = [ TestPod ]; }; Appcpanminus = buildPerlPackage rec { From cc3355fd5e19d88ec2e89b2f0a844c2aa50eab23 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:01 +0000 Subject: [PATCH 0688/2743] [cpan2nix] perlPackages.ArchiveExtract: 0.76 -> 0.80 dependencies: perlPackages.ModuleLoadConditional: init at 0.68 --- pkgs/top-level/perl-packages.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 184c87edd1c5..ef7cc89675ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -434,12 +434,12 @@ let self = _self // overrides; _self = with self; { }; ArchiveExtract = buildPerlPackage rec { - name = "Archive-Extract-0.76"; + name = "Archive-Extract-0.80"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "9ae7080ca70346dd7d9845c581d2e112f4513ec0f7d79c2011c0e0a2ce874cfc"; + sha256 = "25cbc2d5626c14d39a0b5e4fe8383941e085c9a7e0aa873d86e81b6e709025f4"; }; - propagatedBuildInputs = [ self."if" ]; + propagatedBuildInputs = [ ModuleLoadConditional ]; meta = { description = "Generic archive extracting mechanism"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -9081,6 +9081,18 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleLoadConditional = buildPerlPackage rec { + name = "Module-Load-Conditional-0.68"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-Load-Conditional-0.68.tar.gz; + sha256 = "1zcq0s7q9bvk9wdv9ijfyddh3b8ck4n3w87rcx31lbsav5fba9vn"; + }; + meta = { + description = "Looking up module information / loading at runtime"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleManifest = buildPerlPackage { name = "Module-Manifest-1.08"; src = fetchurl { From 07fec5dd1ef807555b05c738152945ecaa7a7148 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:02 +0000 Subject: [PATCH 0689/2743] [cpan2nix] perlPackages.autobox: 2.84 -> 2.85 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef7cc89675ce..8be6a4a6009e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -577,10 +577,10 @@ let self = _self // overrides; _self = with self; { }; autobox = buildPerlPackage rec { - name = "autobox-2.84"; + name = "autobox-2.85"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz"; - sha256 = "98dd2754f226684a72ccba3a95956b7eaff2871568e4dd9746e6fb6daae0b96b"; + sha256 = "d0b8d0f27f3d1c1e8ef47f806fa06b9c229c3ca84057004fedc35dbbc0341140"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { From 9f1cf5636528e9ece24e0b39ff92d7addad230fd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:02 +0000 Subject: [PATCH 0690/2743] [cpan2nix] perlPackages.BHooksOPCheck: 0.19 -> 0.22 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8be6a4a6009e..658f75978d04 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -702,10 +702,10 @@ let self = _self // overrides; _self = with self; { }; BHooksOPCheck = buildPerlPackage { - name = "B-Hooks-OP-Check-0.19"; + name = "B-Hooks-OP-Check-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/B-Hooks-OP-Check-0.19.tar.gz; - sha256 = "0pp1piv74pv9irqlvl5xcs2dvzbb74niwjhnj6dsckxf1j34mzrg"; + url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz; + sha256 = "1kfdv25gn6yik8jrwik4ajp99gi44s6idcvyyrzhiycyynzd3df7"; }; buildInputs = [ ExtUtilsDepends ]; meta = { From 79ef56f941bd018acad9a048a3679c1f4788691b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:03 +0000 Subject: [PATCH 0691/2743] [cpan2nix] perlPackages.BusinessHours: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 658f75978d04..b5f804abd4a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -797,11 +797,10 @@ let self = _self // overrides; _self = with self; { BusinessHours = buildPerlPackage rec { name = "Business-Hours-0.12"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz; sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv"; }; - buildInputs = [ TestPod TestPodCoverage ]; - propagatedBuildInputs = [ SetIntSpan TimeLocal ]; + propagatedBuildInputs = [ SetIntSpan ]; meta = { description = "Calculate business hours in a time period"; }; From 28e26ec84cffb3811abc331bab7d67169a6b26ab Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:03 +0000 Subject: [PATCH 0692/2743] [cpan2nix] perlPackages.BusinessISBN: 2.09 -> 3.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b5f804abd4a8..df3c5863dfa6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -807,12 +807,12 @@ let self = _self // overrides; _self = with self; { }; BusinessISBN = buildPerlPackage rec { - name = "Business-ISBN-2.09"; + name = "Business-ISBN-3.004"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "0fhjzgwjxypai16vv0bws6pnxgcglcbgza81avkck6w6d3jkki4r"; + sha256 = "07l3zfv8hagv37i3clvj5a1zc2jarr5phg80c93ks35zaz6llx9i"; }; - propagatedBuildInputs = [ BusinessISBNData URI ]; + propagatedBuildInputs = [ BusinessISBNData ]; meta = { description = "Parse and validate ISBNs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 5338995694f2f40b05d7657496266b055f4f7e2e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:03 +0000 Subject: [PATCH 0693/2743] [cpan2nix] perlPackages.BusinessISMN: 1.13 -> 1.131 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df3c5863dfa6..a3e4e149b0ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -832,10 +832,10 @@ let self = _self // overrides; _self = with self; { }; BusinessISMN = buildPerlPackage rec { - name = "Business-ISMN-1.13"; + name = "Business-ISMN-1.131"; src = fetchurl { url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; - sha256 = "0cm1v75axg4gp6cnbyavmnqqjscsxh7nc60vcbw34rqivvf9idc9"; + sha256 = "1xyc7x4c4xl930rz7grs1l52f1vg4rbiv0c6xlxdsim8qsh7k94g"; }; propagatedBuildInputs = [ TieCycle ]; meta = { From c7bb4c854b807fe13d247115fde6e10b91fb1f1d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:04 +0000 Subject: [PATCH 0694/2743] [cpan2nix] perlPackages.CPANMetaCheck: 0.012 -> 0.014 --- 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 a3e4e149b0ce..9b28c9d96655 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2598,13 +2598,12 @@ let self = _self // overrides; _self = with self; { }; CPANMetaCheck = buildPerlPackage rec { - name = "CPAN-Meta-Check-0.012"; + name = "CPAN-Meta-Check-0.014"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "1rymh4l6sdh8l1q2q25lncmi4afbh2il0bpk8gxmd13qmjidjk2b"; + sha256 = "07rmdbz1rbnb7w33vswn1wixlyh947sqr93xrvcph1hwzhmmg818"; }; - buildInputs = [ TestDeep ModuleMetadata ]; - propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; + buildInputs = [ TestDeep ]; meta = { description = "Verify requirements in a CPAN::Meta object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From da413ddeb5034b60e9afa67b5e95c529addbcdaf Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:05 +0000 Subject: [PATCH 0695/2743] [cpan2nix] perlPackages.CSSDOM: 0.16 -> 0.17 --- 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 9b28c9d96655..92637eb514e3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2891,13 +2891,12 @@ let self = _self // overrides; _self = with self; { }; CSSDOM = buildPerlPackage rec { - name = "CSS-DOM-0.16"; + name = "CSS-DOM-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/S/SP/SPROUT/${name}.tar.gz"; - sha256 = "0s1gg6jvcxlj87sbbbcn9riw7rrh2n85hkbaim9civki8vj8vg9z"; + sha256 = "09phb6c9czpcp9imq06khm54kspsx6hnvfrjxramx663ygmpifb5"; }; - - buildInputs = [ Clone ]; + propagatedBuildInputs = [ Clone ]; }; CSSMinifierXP = buildPerlModule rec { From 845e54e712ed79529cea13422099674ba04c28e9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:05 +0000 Subject: [PATCH 0696/2743] [cpan2nix] perlPackages.Chart: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 92637eb514e3..d18bb3956920 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1801,7 +1801,7 @@ let self = _self // overrides; _self = with self; { Chart = buildPerlPackage rec { name = "Chart-2.4.10"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/C/CH/CHARTGRP/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz; sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf"; }; propagatedBuildInputs = [ GD ]; From ed2a37dc217652aef87f97208fe63929baddc115 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:06 +0000 Subject: [PATCH 0697/2743] [cpan2nix] perlPackages.ClassAccessorChained: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d18bb3956920..b1941f07b58d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1822,13 +1822,13 @@ let self = _self // overrides; _self = with self; { }; }; - ClassAccessorChained = buildPerlPackage { + ClassAccessorChained = buildPerlModule { name = "Class-Accessor-Chained-0.01"; src = fetchurl { url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz; sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5"; }; - propagatedBuildInputs = [ClassAccessor]; + propagatedBuildInputs = [ ClassAccessor ]; }; ClassAccessorFast = ClassAccessor; From cf299f3ca686a30a99f490997f275d05bc75f3e2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:06 +0000 Subject: [PATCH 0698/2743] [cpan2nix] perlPackages.ClassBase: 0.06 -> 0.09 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1941f07b58d..0030f81a4a9b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1872,11 +1872,12 @@ let self = _self // overrides; _self = with self; { }; ClassBase = buildPerlPackage rec { - name = "Class-Base-0.06"; + name = "Class-Base-0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SZ/SZABGAB/${name}.tar.gz"; - sha256 = "15mvg1ba0iphjjb90a2fq73hyzcgp8pv0c44pjfcn7vdlzp098z3"; + url = mirror://cpan/authors/id/Y/YA/YANICK/Class-Base-0.09.tar.gz; + sha256 = "117dmsrb30a09zlrv919fb5h5rg8r4asa24i99k04n2habgbv9g1"; }; + propagatedBuildInputs = [ Clone ]; }; ClassC3 = buildPerlPackage rec { From 3fa5ca66a2a1d86a332261eb180556af97fa5f49 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:06 +0000 Subject: [PATCH 0699/2743] [cpan2nix] perlPackages.ClassC3: 0.30 -> 0.33 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0030f81a4a9b..3b54a018e5b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1881,10 +1881,10 @@ let self = _self // overrides; _self = with self; { }; ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.30"; + name = "Class-C3-0.33"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "0lmgiqv46x9lx8ip23qr8qprips21wiwaks17yb6pk7igvbgdjnc"; + sha256 = "1c319k0j9knba2k0xjr8fml54kfvs71wcnc0hxp7s3lqc49mvzxf"; }; propagatedBuildInputs = [ AlgorithmC3 ]; meta = { From 8951f22248cdd6bb8943defb85aa1ee9c55afef5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:07 +0000 Subject: [PATCH 0700/2743] [cpan2nix] perlPackages.ClassMix: 0.005 -> 0.006 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b54a018e5b8..9a8e5d574e82 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2044,14 +2044,13 @@ let self = _self // overrides; _self = with self; { }; }; - ClassMix = buildPerlPackage rec { - name = "Class-Mix-0.005"; + ClassMix = buildPerlModule rec { + name = "Class-Mix-0.006"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b"; + sha256 = "8747f643893914f8c44979f1716d0c1ec8a41394796555447944e860f1ff7c0b"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ ParamsClassify self."if" ]; + propagatedBuildInputs = [ ParamsClassify ]; meta = { description = "Dynamic class mixing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 74faa1fd3789476193c78c6ba5c750c451812654 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:08 +0000 Subject: [PATCH 0701/2743] [cpan2nix] perlPackages.ConfigAutoConf: 0.311 -> 0.315 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a8e5d574e82..774110430346 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2282,10 +2282,10 @@ let self = _self // overrides; _self = with self; { }; ConfigAutoConf = buildPerlPackage rec { - name = "Config-AutoConf-0.311"; + name = "Config-AutoConf-0.315"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "1zk2xfvxd3yn3299i13vn5wm1c7jxgr7z3h0yh603xs2h9cg79wc"; + url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.315.tar.gz; + sha256 = "0h39x9rzrhhilpg8yxlzpka269qrzsjg0iy0c1b9xflqlvhx2g2b"; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { From a1f47c374050d7a00794aa4f3ee210ead449125a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:08 +0000 Subject: [PATCH 0702/2743] [cpan2nix] perlPackages.ConfigIniFiles: 2.94 -> 2.95 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 774110430346..32da2d9cb8ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2347,14 +2347,13 @@ let self = _self // overrides; _self = with self; { }; }; - ConfigIniFiles = buildPerlPackage rec { - name = "Config-IniFiles-2.94"; + ConfigIniFiles = buildPerlModule rec { + name = "Config-IniFiles-2.95"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "d6d38a416da79de874c5f1825221f22e972ad500b6527d190cc6e9ebc45194b4"; + sha256 = "414a19f98cc745769ce762aefce01fa52d031bc244403cd32fd1f6257f2dedc2"; }; - buildInputs = [ ModuleBuild perl ]; - propagatedBuildInputs = [ IOstringy ]; + propagatedBuildInputs = [ IOStringy ]; meta = { description = "A module for reading .ini-style configuration files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 244b75e56bc3a8b44cad528a9082fe6bb3477941 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:09 +0000 Subject: [PATCH 0703/2743] [cpan2nix] perlPackages.ConfigStd: 0.901 -> 0.903 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 32da2d9cb8ca..fe7b6e9b1906 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2405,11 +2405,11 @@ let self = _self // overrides; _self = with self; { }; }; - ConfigStd = buildPerlPackage { - name = "Config-Std-0.901"; + ConfigStd = buildPerlModule { + name = "Config-Std-0.903"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.901.tar.gz; - sha256 = "c5c57eb82a37cc41ea152098fc8e5548acfea8861140fbac8fc3beccbb09c243"; + url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.903.tar.gz; + sha256 = "b7709ff663bd279d264ab9c2f51e9e9588479a3367a8c4cfc18659c2a11480fe"; }; propagatedBuildInputs = [ ClassStd ]; meta = { From 9a33c5f8ed552bfcbe0777c118e1e9a6a825dec0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:09 +0000 Subject: [PATCH 0704/2743] [cpan2nix] perlPackages.CookieXS: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fe7b6e9b1906..07075108acc1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2541,7 +2541,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz"; sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3"; }; - buildInputs = [ TestMore ]; propagatedBuildInputs = [ CGICookieXS ]; }; From cccdb0907d25957761d99d626f380f186e282f7d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:09 +0000 Subject: [PATCH 0705/2743] [cpan2nix] perlPackages.CryptMySQL: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07075108acc1..4e8b58f9568a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2797,13 +2797,13 @@ let self = _self // overrides; _self = with self; { }; }; - CryptMySQL = buildPerlPackage rec { + CryptMySQL = buildPerlModule rec { name = "Crypt-MySQL-0.04"; src = fetchurl { url = "mirror://cpan/authors/id/I/IK/IKEBE/${name}.tar.gz"; sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; - propagatedBuildInputs = [DigestSHA1]; + propagatedBuildInputs = [ DigestSHA1 ]; }; CryptRijndael = buildPerlPackage rec { From ba6f0ade701111d7c4860ce7c54b0b070c54e86e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:10 +0000 Subject: [PATCH 0706/2743] [cpan2nix] perlPackages.CwdGuard: 0.04 -> 0.05 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4e8b58f9568a..554a2fcf9325 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2951,15 +2951,16 @@ let self = _self // overrides; _self = with self; { }; CwdGuard = buildPerlModule rec { - name = "Cwd-Guard-0.04"; + name = "Cwd-Guard-0.05"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "071k50n1yr48122jjjg50i1s2kwp06dmrisv35f3wjry8m6cqchm"; + sha256 = "0xwf4rmii55k3lp19mpbh00mbgby7rxdk2lk84148bjhp6i7rz3s"; }; meta = { description = "Temporary changing working directory (chdir)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestRequires ]; }; DataClone = buildPerlPackage { From 82162f8d30faba3e50ce94a46260bc26d875f679 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:11 +0000 Subject: [PATCH 0707/2743] [cpan2nix] perlPackages.DBIxSimple: 1.35 -> 1.37 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 554a2fcf9325..b7cb78f8a4b7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4027,10 +4027,10 @@ let self = _self // overrides; _self = with self; { }; DBIxSimple = buildPerlPackage { - name = "DBIx-Simple-1.35"; + name = "DBIx-Simple-1.37"; src = fetchurl { - url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.35.tar.gz; - sha256 = "445535b3dfab88140c7a0d2776b1e78f254dc7e9c81072d5a01afc95a5db499a"; + url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz; + sha256 = "46d311aa2ce08907401c56119658426dbb044c5a40de73d9a7b79bf50390cae3"; }; propagatedBuildInputs = [ DBI ]; meta = { From b56d59697975f8d7cdd5524cbf380fa39731fa56 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:11 +0000 Subject: [PATCH 0708/2743] [cpan2nix] perlPackages.DataClone: 0.003 -> 0.004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b7cb78f8a4b7..4889860a6510 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2964,10 +2964,10 @@ let self = _self // overrides; _self = with self; { }; DataClone = buildPerlPackage { - name = "Data-Clone-0.003"; + name = "Data-Clone-0.004"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.003.tar.gz; - sha256 = "16ldkjfag4dc3gssj051j212rzr2mawy7d001jflcab9g8hg3f1g"; + url = mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.004.tar.gz; + sha256 = "0g1qhi5qyk4fp0pwyaw90vxiyyn8las0i8ghzrnr4srai1wy3r9g"; }; buildInputs = [ TestRequires ]; meta = { From 7654f54cccc7733b73cab9c65e1f225d3b225e64 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:12 +0000 Subject: [PATCH 0709/2743] [cpan2nix] perlPackages.DateManip: 6.51 -> 6.70 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4889860a6510..881978faf938 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3372,19 +3372,19 @@ let self = _self // overrides; _self = with self; { }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.51"; + name = "Date-Manip-6.70"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0afvr2q2hspd807d6wd7kmrr7ypxdlh8bcnqsqbfwcwd74qadg13"; + sha256 = "0r4k4ypb09xwhvq6das0vpx2c0xbhhhx83knq6jfpf8m55h8qi9r"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' sed -i "s#/bin/date#${pkgs.coreutils}/bin/date#" lib/Date/Manip/TZ.pm ''; - propagatedBuildInputs = [ TestInter ]; meta = { description = "Date manipulation routines"; }; + buildInputs = [ TestInter ]; }; DateSimple = buildPerlPackage { From 0fd47ba09b3bde3982d9ccd39c7c7965cc3a551b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:13 +0000 Subject: [PATCH 0710/2743] [cpan2nix] perlPackages.DevelGlobalDestruction: 0.13 -> 0.14 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 881978faf938..57909a2c0f93 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4091,10 +4091,10 @@ let self = _self // overrides; _self = with self; { }; DevelGlobalDestruction = buildPerlPackage rec { - name = "Devel-GlobalDestruction-0.13"; + name = "Devel-GlobalDestruction-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "0qn4iszgylnxjdkb6430f6a3ci7bcx9ih1az6bd5cbij1pf2965j"; + sha256 = "1aslj6myylsvzr0vpqry1cmmvzbmpbdcl4v9zrl18ccik7rabf1l"; }; propagatedBuildInputs = [ SubExporterProgressive ]; meta = { From e6132a07e1f2fcf5bcd507033db5a65fbde27dcb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:13 +0000 Subject: [PATCH 0711/2743] [cpan2nix] perlPackages.DevelStackTraceAsHTML: 0.14 -> 0.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57909a2c0f93..a480c84a217a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4152,10 +4152,10 @@ let self = _self // overrides; _self = with self; { }; DevelStackTraceAsHTML = buildPerlPackage { - name = "Devel-StackTrace-AsHTML-0.14"; + name = "Devel-StackTrace-AsHTML-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.14.tar.gz; - sha256 = "0yl296y0qfwybwjgqjzd4j2w2bj5a2nz342qqgxchnf5bqynl1c9"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz; + sha256 = "0iri5nb2lb76qv5l9z0vjpfrq5j2fyclkd64kh020bvy37idp0v2"; }; propagatedBuildInputs = [ DevelStackTrace ]; meta = { From 9f42d39d7596f12ba34c162a2c88d9d8740fe46f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:14 +0000 Subject: [PATCH 0712/2743] [cpan2nix] perlPackages.EmailMIMEContentType: 1.018 -> 1.022 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a480c84a217a..43c1750d8a42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4742,10 +4742,10 @@ let self = _self // overrides; _self = with self; { }; EmailMIMEContentType = buildPerlPackage rec { - name = "Email-MIME-ContentType-1.018"; + name = "Email-MIME-ContentType-1.022"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "7508cd1227b8f150a403ca49658cb4a0892836dd8f01ff95f049957b2abf10f9"; + sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310"; }; meta = { homepage = https://github.com/rjbs/Email-MIME-ContentType; @@ -4753,6 +4753,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ rycee ]; }; + propagatedBuildInputs = [ Encode ]; }; EmailMIMEEncodings = buildPerlPackage rec { From 2973192015ad897868b46766ef53e1db6fed10e8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:14 +0000 Subject: [PATCH 0713/2743] [cpan2nix] perlPackages.EmailSimple: 2.210 -> 2.214 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 43c1750d8a42..30e3995a8cfb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4838,10 +4838,10 @@ let self = _self // overrides; _self = with self; { }; EmailSimple = buildPerlPackage rec { - name = "Email-Simple-2.210"; + name = "Email-Simple-2.214"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "c8633fa462538967c036e3077617de9e5e8f6acc68d25546ba1d5bb1e12bd319"; + sha256 = "b2f02b37441ea60efbddebbd675017d26bb767e9a4de3e0fc30b5410a1416b92"; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { From 6c8e74ce6c9aad1b12b0f90bb7484efd7672b421 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:15 +0000 Subject: [PATCH 0714/2743] [cpan2nix] perlPackages.ExceptionBase: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30e3995a8cfb..c30a7d81314a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5027,7 +5027,7 @@ let self = _self // overrides; _self = with self; { }; }; - ExceptionBase = buildPerlPackage rec { + ExceptionBase = buildPerlModule rec { name = "Exception-Base-0.2501"; src = fetchurl { url = "mirror://cpan/authors/id/D/DE/DEXTER/${name}.tar.gz"; From 103f7da901cf24b5a2163181be1f1bd271ed2c30 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:15 +0000 Subject: [PATCH 0715/2743] [cpan2nix] perlPackages.Expect: 1.32 -> 1.35 --- 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 c30a7d81314a..441c88bdab30 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5133,12 +5133,11 @@ let self = _self // overrides; _self = with self; { }; Expect = buildPerlPackage { - name = "Expect-1.32"; + name = "Expect-1.35"; src = fetchurl { - url = mirror://cpan/authors/id/S/SZ/SZABGAB/Expect-1.32.tar.gz; - sha256 = "d1f96842a5c7dd8516b202b530d87a70b65e7054d3bf975c34f6a42084e54e25"; + url = mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz; + sha256 = "09d92761421decd495853103379165a99efbf452c720f30277602cf23679fd06"; }; - buildInputs = [ TestException ]; propagatedBuildInputs = [ IOTty ]; meta = { description = "Automate interactions with command line programs that expose a text terminal interface"; From 16e47c9fb2c9f66d4a9cfe4d4c56ecf1e1cbaab5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:15 +0000 Subject: [PATCH 0716/2743] [cpan2nix] perlPackages.ExtUtilsInstallPaths: 0.010 -> 0.011 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 441c88bdab30..bbb53be863ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5247,10 +5247,10 @@ let self = _self // overrides; _self = with self; { }; ExtUtilsInstallPaths = buildPerlPackage { - name = "ExtUtils-InstallPaths-0.010"; + name = "ExtUtils-InstallPaths-0.011"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz; - sha256 = "0mi1px42in7i442jqncg3gmxd5zn7sw5b2s85h690rz433qvyk6i"; + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.011.tar.gz; + sha256 = "0z06y0fhx9hy9x01abb7s2xdbqrh9x4ps7avmlf4bwfwih2gl2bn"; }; propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { From c60d895f7bf7c3985384ae7eee9a1a19aaa1aab9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:16 +0000 Subject: [PATCH 0717/2743] [cpan2nix] perlPackages.FileFindObject: cleanup --- 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 bbb53be863ef..ada5bd64430f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5507,13 +5507,12 @@ let self = _self // overrides; _self = with self; { }; }; - FileFindObject = buildPerlPackage rec { - name = "File-Find-Object-v0.3.2"; + FileFindObject = buildPerlModule rec { + name = "File-Find-Object-0.3.2"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-v0.3.2.tar.gz; sha256 = "7c467b6b7752bff46b7b8b84c9aabeac45bbfdab1e2224108a2e2170adb9f2b7"; }; - buildInputs = [ ModuleBuild perl ]; propagatedBuildInputs = [ ClassXSAccessor ]; meta = { description = "An object oriented File::Find replacement"; From 52e576178c149b0eb7d91e1a9a3583d40a79660d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:17 +0000 Subject: [PATCH 0718/2743] [cpan2nix] perlPackages.FileHomeDir: 1.00 -> 1.002 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ada5bd64430f..8b0191c2ba5e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5598,10 +5598,10 @@ let self = _self // overrides; _self = with self; { }; FileHomeDir = buildPerlPackage { - name = "File-HomeDir-1.00"; + name = "File-HomeDir-1.002"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/File-HomeDir-1.00.tar.gz; - sha256 = "85b94f3513093ec0a25b91f9f2571918519ae6f2b7a1e8546f8f78d09a877143"; + url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.002.tar.gz; + sha256 = "eb4c0c85775138460cd4013d8117232f08e88381c95c6a93b3d11e969185c274"; }; propagatedBuildInputs = [ FileWhich ]; meta = { From f9e0ac80134c0c7ac40490bc4fb7db078d0357c3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:17 +0000 Subject: [PATCH 0719/2743] [cpan2nix] perlPackages.FileListing: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b0191c2ba5e..8b335f0cdde7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5657,7 +5657,7 @@ let self = _self // overrides; _self = with self; { FileListing = buildPerlPackage rec { name = "File-Listing-6.04"; src = fetchurl { - url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz; sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y"; }; propagatedBuildInputs = [ HTTPDate ]; From af5ec73a4b4e3497b4a5212cd8cdbae185b51e7e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:18 +0000 Subject: [PATCH 0720/2743] [cpan2nix] perlPackages.FileShareDir: 1.03 -> 1.104 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b335f0cdde7..0331e0fdec2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5783,10 +5783,10 @@ let self = _self // overrides; _self = with self; { }; FileShareDir = buildPerlPackage { - name = "File-ShareDir-1.03"; + name = "File-ShareDir-1.104"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/File-ShareDir-1.03.tar.gz; - sha256 = "0fczaqjxyzmzgrmn3ib84cj6pd2085wsvni3wf5b018i21j2wi2r"; + url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.104.tar.gz; + sha256 = "1bqwhk3qfg60bkpi5b83bh93sng8jx20i3ka5sixc0prrppjidh7"; }; propagatedBuildInputs = [ ClassInspector ]; meta = { From 0c09b54c46e9f34f5135abebf37ea5abb4358eca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:18 +0000 Subject: [PATCH 0721/2743] [cpan2nix] perlPackages.FileUtil: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0331e0fdec2e..66f2b0edb3e4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5876,13 +5876,13 @@ let self = _self // overrides; _self = with self; { }; }; - FileUtil = buildPerlPackage rec { + FileUtil = buildPerlModule rec { name = "File-Util-4.161950"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TOMMY/${name}.tar.gz"; sha256 = "88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee"; }; - buildInputs = [ ModuleBuild TestNoWarnings ]; + buildInputs = [ TestNoWarnings ]; meta = { homepage = https://github.com/tommybutler/file-util/wiki; description = "Easy, versatile, portable file handling"; From 814a94e533cb468002c2c98c8f3089cea8563669 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:18 +0000 Subject: [PATCH 0722/2743] [cpan2nix] perlPackages.FontTTF: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66f2b0edb3e4..aa625fb46097 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5958,11 +5958,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BH/BHALLISSY/${name}.tar.gz"; sha256 = "4b697d444259759ea02d2c442c9bffe5ffe14c9214084a01f743693a944cc293"; }; - propagatedBuildInputs = [ IOString ]; meta = { description = "TTF font support for Perl"; license = stdenv.lib.licenses.artistic2; }; + buildInputs = [ IOString ]; }; ForksSuper = buildPerlPackage { From 6815aa75bce2b96a65d87363f1551defd39ddd4e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:19 +0000 Subject: [PATCH 0723/2743] [cpan2nix] perlPackages.GDSecurityImage: 1.72 -> 1.73 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa625fb46097..406dc7c7e471 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6050,11 +6050,11 @@ let self = _self // overrides; _self = with self; { }; }; - GDSecurityImage = buildPerlPackage { - name = "GD-SecurityImage-1.72"; + GDSecurityImage = buildPerlModule { + name = "GD-SecurityImage-1.73"; src = fetchurl { - url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.72.tar.gz; - sha256 = "07a025krdaml5ls7gyssfdcsif6cnsnksrxkqk48n9dmv7rz7q1r"; + url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.73.tar.gz; + sha256 = "1kaxs67rfd4w46lxgcg3pa05a596l0h1k8n4zk2gwrrar4022wpx"; }; propagatedBuildInputs = [ GD ]; meta = { From 760f24828146f3614af72cd8c057e7b948f8116c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:19 +0000 Subject: [PATCH 0724/2743] [cpan2nix] perlPackages.GDText: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 406dc7c7e471..0f04e47828d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6066,7 +6066,7 @@ let self = _self // overrides; _self = with self; { GDText = buildPerlPackage rec { name = "GDTextUtil-0.86"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz"; + url = mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz; sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8"; }; propagatedBuildInputs = [ GD ]; From 405a6d9f624c45276845eba7630165f726952fe2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:20 +0000 Subject: [PATCH 0725/2743] [cpan2nix] perlPackages.IODigest: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f04e47828d5..fa1edcfc0c30 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7256,7 +7256,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz; sha256 = "14kz7z4xw179aya3116wxac29l4y2wmwrba087lya4v2gxdgiz4g"; }; - propagatedBuildInputs = [PerlIOviadynamic]; + propagatedBuildInputs = [ PerlIOviadynamic ]; }; IOHTML = buildPerlPackage { From 07f3cbd9398594ed1c411090a78e721953be9c67 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:20 +0000 Subject: [PATCH 0726/2743] [cpan2nix] perlPackages.IOPager: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fa1edcfc0c30..ecbf32723c6c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7307,7 +7307,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-${version}.tgz"; sha256 = "0ksldcw0hydfy9k70i6q6fm1wgbc54kx0lbwlkrszsbd7q72dlfg"; }; - propagatedBuildInputs = [pkgs.more]; # `more` used in tests + propagatedBuildInputs = [ pkgs.more FileWhich ]; # `more` used in tests }; IOPrompt = buildPerlPackage { From 103dca72348324a6abe223cb66e0f9fdd8aced0a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:21 +0000 Subject: [PATCH 0727/2743] [cpan2nix] perlPackages.IOSocketSSL: 2.050 -> 2.056 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ecbf32723c6c..25505bdd1dc4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7346,12 +7346,12 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.050"; + name = "IO-Socket-SSL-2.056"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "54e6716e40df8b1c168d8f54a0b8f215313739bd99dda17adb7c00fe94656692"; + sha256 = "91451ecc28b243a78b438f0a42db24c4b60a86f088879b38e40bdbd697818259"; }; - propagatedBuildInputs = [ NetSSLeay URI ]; + propagatedBuildInputs = [ NetSSLeay ]; # Fix path to default certificate store. postPatch = '' substituteInPlace lib/IO/Socket/SSL.pm \ From 166f0389d09be6bf545436c5b6690ef1eef12616 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:21 +0000 Subject: [PATCH 0728/2743] [cpan2nix] perlPackages.ImageInfo: 1.39 -> 1.41 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25505bdd1dc4..0f42120037f4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7105,12 +7105,12 @@ let self = _self // overrides; _self = with self; { if_ = self."if"; ImageInfo = buildPerlPackage rec { - name = "Image-Info-1.39"; + name = "Image-Info-1.41"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; - sha256 = "af155264667a2c22e3e2225195b8f6589329f9567e1789b7ce439ee21178713d"; + sha256 = "c546d27414686660dbc3cd8501537128c5285a8db0faf742c2dc12b9a29ba3db"; }; - propagatedBuildInputs = [ IOstringy ]; + propagatedBuildInputs = [ IOStringy ]; meta = { description = "Extract meta information from image files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 6165dcb46959b7a887fc759c6cde9b134369bc1b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:22 +0000 Subject: [PATCH 0729/2743] [cpan2nix] perlPackages.ImageScale: 0.13 -> 0.14 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f42120037f4..f5975460dc57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7118,13 +7118,13 @@ let self = _self // overrides; _self = with self; { }; ImageScale = buildPerlPackage rec { - name = "Image-Scale-0.13"; + name = "Image-Scale-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "5b2c92dc2dd635b488879461760cd251aa2b1feef41b64f17914a6e4bbe3e442"; + sha256 = "f09c5f0663b87738365ac2819e186b909abeb9ed85d83bc15ee76872c947cdf8"; }; - buildInputs = [ pkgs.libpng pkgs.libjpeg ]; - propagatedBuildInputs = [ TestNoWarnings pkgs.zlib ]; + buildInputs = [ pkgs.libpng pkgs.libjpeg TestNoWarnings ]; + propagatedBuildInputs = [ pkgs.zlib ]; makeMakerFlags = "--with-jpeg-includes=${pkgs.libjpeg.dev}/include --with-jpeg-libs=${pkgs.libjpeg.out}/lib --with-png-includes=${pkgs.libpng.dev}/include --with-png-libs=${pkgs.libpng.out}/lib"; meta = { description = "Fast, high-quality fixed-point image resizing"; From fbf01f13c1af91cddea5a214fc97ed5401e764ab Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:22 +0000 Subject: [PATCH 0730/2743] [cpan2nix] perlPackages.ImageSize: 3.232 -> 3.300 --- 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 f5975460dc57..e8fecbe4cb3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7133,13 +7133,12 @@ let self = _self // overrides; _self = with self; { }; ImageSize = buildPerlPackage rec { - name = "Image-Size-3.232"; + name = "Image-Size-3.300"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJRAY/${name}.tar.gz"; - sha256 = "1mx065134gy75pgdldh65118bpcs6yfbqmr7bf9clwq44zslxhxc"; + sha256 = "0sq2kwdph55h4adx50fmy86brjkkv8grsw33xrhf1k9icpwb3jak"; }; - buildInputs = [ TestMore ]; - propagatedBuildInputs = [ ModuleRuntime ]; + buildInputs = [ ModuleBuild ]; meta = { description = "Read the dimensions of an image in several popular formats"; license = with stdenv.lib.licenses; [ artistic1 lgpl21Plus ]; From 714efdab05d8efec00945d4ae96059c0e4356078 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:22 +0000 Subject: [PATCH 0731/2743] [cpan2nix] perlPackages.ImportInto: 1.002004 -> 1.002005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8fecbe4cb3c..64e69152348f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7168,10 +7168,10 @@ let self = _self // overrides; _self = with self; { }; ImportInto = buildPerlPackage { - name = "Import-Into-1.002004"; + name = "Import-Into-1.002005"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Import-Into-1.002004.tar.gz; - sha256 = "110hifk3cj14lxgjq2vaa2qfja21gll4lpn8vbimy0gzqadjbjyy"; + url = mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz; + sha256 = "0rq5kz7c270q33jq6hnrv3xgkvajsc62ilqq7fs40av6zfipg7mx"; }; propagatedBuildInputs = [ ModuleRuntime ]; meta = { From be7d134f8cb59a70cd23dbbb8cc8b29562eb193f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:23 +0000 Subject: [PATCH 0732/2743] [cpan2nix] perlPackages.LinguaENFindNumber: 1.31 -> 1.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64e69152348f..e63e5f0c4204 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7831,10 +7831,10 @@ let self = _self // overrides; _self = with self; { }; LinguaENFindNumber = buildPerlPackage { - name = "Lingua-EN-FindNumber-1.31"; + name = "Lingua-EN-FindNumber-1.32"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.31.tar.gz; - sha256 = "f67f4d4983bd29da5cbbff3cb18dd70788692b35e2dabcd4c65bef1cd2bf658f"; + url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.32.tar.gz; + sha256 = "1d176d1c863fb9844bd19d2c2a4e68a0ed73da158f724a89405b90db7e8dbd04"; }; propagatedBuildInputs = [ LinguaENWords2Nums ]; meta = { From ff471daf2d8b67cbeb41c31a03cb4fcee9aff182 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:23 +0000 Subject: [PATCH 0733/2743] [cpan2nix] perlPackages.LinuxInotify2: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e63e5f0c4204..265ddc4978d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7961,7 +7961,7 @@ let self = _self // overrides; _self = with self; { LinuxInotify2 = buildPerlPackage rec { name = "Linux-Inotify2-1.22"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Linux/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-1.22.tar.gz; sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw"; }; propagatedBuildInputs = [ commonsense ]; From 5d290247308e2471d94bf77e0d3b06a5988302b3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:24 +0000 Subject: [PATCH 0734/2743] [cpan2nix] perlPackages.LocalePO: 0.23 -> 0.27 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 265ddc4978d5..e0884ac25192 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8108,10 +8108,10 @@ let self = _self // overrides; _self = with self; { }; LocalePO = buildPerlPackage { - name = "Locale-PO-0.23"; + name = "Locale-PO-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.23.tar.gz; - sha256 = "52e5fdc88ec4eb00512418a938dc5089476ea66c9e744fee3c6bbfdf17a0d302"; + url = mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz; + sha256 = "3c994a4b63e6e4e836c6f79a93f51921cab77c90c9753fe0f8b5429220d516b9"; }; propagatedBuildInputs = [ FileSlurp ]; meta = { From 0bb2875eaac5cea1780b0e20f016ef07faaa3389 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:25 +0000 Subject: [PATCH 0735/2743] [cpan2nix] perlPackages.MIMELite: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e0884ac25192..2269a4aa4757 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8815,7 +8815,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "8f39901bc580bc3dce69e10415305e4435ff90264c63d29f707b4566460be962"; }; - propagatedBuildInputs = [ EmailDateFormat MailTools MIMETypes ]; + propagatedBuildInputs = [ EmailDateFormat ]; meta = { description = "Low-calorie MIME generator (DEPRECATED)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From ac1e5e4f8b476b5942f6533859d9d0939bd86f17 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:25 +0000 Subject: [PATCH 0736/2743] [cpan2nix] perlPackages.MailIMAPClient: 3.35 -> 3.39 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2269a4aa4757..b43683495791 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8473,12 +8473,12 @@ let self = _self // overrides; _self = with self; { }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.35"; + name = "Mail-IMAPClient-3.39"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.35.tar.gz; - sha256 = "0qzn8370cr91jnq1kawy6v16bcz49pch6inmw85rhzg87j1h6ica"; + url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.39.tar.gz; + sha256 = "18sf8fd093qxvflscysm6pv6mj9cmm19zrnfic297jjvgnsgshdm"; }; - buildInputs = [ParseRecDescent]; + propagatedBuildInputs = [ ParseRecDescent ]; }; MailPOP3Client = buildPerlPackage rec { From aee7ea9254aa6064bb22e42c4d89173e52779193 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:26 +0000 Subject: [PATCH 0737/2743] [cpan2nix] perlPackages.MailTools: 2.14 -> 2.20 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b43683495791..e30eaf4dddc6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8544,10 +8544,10 @@ let self = _self // overrides; _self = with self; { MailTools = buildPerlPackage rec { - name = "MailTools-2.14"; + name = "MailTools-2.20"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "1y6zndb4rsn8i65g1bg3b0zb7966cz83q19zg7m7bvxjfkv7wz2b"; + sha256 = "15iizg2x1w7ca0r8rn3wwhp7w160ljvf55prspljwd6cm7vhcmpm"; }; propagatedBuildInputs = [ TimeDate ]; meta = { From 26332b8ad2a65f7b0a1fee717f54dcfbe49207f4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:26 +0000 Subject: [PATCH 0738/2743] [cpan2nix] perlPackages.MathBigIntGMP: 1.38 -> 1.6004 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e30eaf4dddc6..cf200a7ac6e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8590,15 +8590,16 @@ let self = _self // overrides; _self = with self; { }; MathBigIntGMP = buildPerlPackage rec { - name = "Math-BigInt-GMP-1.38"; + name = "Math-BigInt-GMP-1.6004"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "05bg10gg3ksn4h08yyyj7f31rqhdqap8d0jsbq61b3x0274wml0s"; + sha256 = "1wiklyxxpf02c01flymyjqh46lhi0qhkvf14icni8grjgpfjjqi3"; }; buildInputs = [ pkgs.gmp ]; doCheck = false; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; + propagatedBuildInputs = [ MathBigInt ]; }; MathBigRat = buildPerlPackage rec { From 594535f8303c115775c12f72cb346d76307acd22 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:26 +0000 Subject: [PATCH 0739/2743] [cpan2nix] perlPackages.MathBigRat: 0.2611 -> 0.2613 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cf200a7ac6e0..3e539ec29964 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8603,10 +8603,10 @@ let self = _self // overrides; _self = with self; { }; MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.2611"; + name = "Math-BigRat-0.2613"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "a8a033d0ccac9ac641c73867d71f2455ecb2339984cd964b1e3cfb2859e9fd81"; + sha256 = "b893dfe2caf27b233a3678abc39176e706a9b518e8937bc496e46e125e960e22"; }; propagatedBuildInputs = [ MathBigInt ]; meta = { From efcf92003841e61ea998b0cf97263c60661dbe8c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:27 +0000 Subject: [PATCH 0740/2743] [cpan2nix] perlPackages.ModulePluggable: cleanup dependencies: perlPackages.AppFatPacker: init at 0.010007 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3e539ec29964..cdfbf62b8313 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -272,6 +272,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestPod ]; }; + AppFatPacker = buildPerlPackage rec { + name = "App-FatPacker-0.010007"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010007.tar.gz; + sha256 = "1g9nff9fdg7dvja0ix2yv32w5xcj963ybcf7x22j61g6r81845fi"; + }; + meta = { + description = "pack your dependencies onto your script file"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Appcpanminus = buildPerlPackage rec { name = "App-cpanminus-1.7043"; src = fetchurl { @@ -9138,6 +9150,7 @@ let self = _self // overrides; _self = with self; { description = "Automatically give your module the ability to have plugins"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ AppFatPacker ]; }; ModulePluggableFast = buildPerlPackage { From 76918bc22d4d4ab29a46325618c72eef2c880441 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:28 +0000 Subject: [PATCH 0741/2743] [cpan2nix] perlPackages.ModulePluggableFast: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cdfbf62b8313..d88ad5784dd7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9159,7 +9159,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz; sha256 = "0pq758wlasmh77xyd2xh75m5b2x14s8pnsv63g5356gib1q5gj08"; }; - propagatedBuildInputs = [UNIVERSALrequire]; + propagatedBuildInputs = [ UNIVERSALrequire ]; }; ModuleRefresh = buildPerlPackage { From 6c1e6a92b829b2872e162709fdca4a314cf0b808 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:29 +0000 Subject: [PATCH 0742/2743] [cpan2nix] perlPackages.ModuleScanDeps: 1.20 -> 1.24 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d88ad5784dd7..845bc2af276b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9203,11 +9203,11 @@ let self = _self // overrides; _self = with self; { }; }; - ModuleScanDeps = let version = "1.20"; in buildPerlPackage { + ModuleScanDeps = let version = "1.24"; in buildPerlPackage { name = "Module-ScanDeps-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; - sha256 = "14a623b3gzr0mq5n93lrxm6wjmdp8dwj91gb43wk7f3dwd3ka03j"; + sha256 = "0s6cj90ckhy351gql52ksh4ms1x8piv26iadl09fcpzkx7j0srw9"; }; buildInputs = [ TestRequires ]; meta = { From 066f29ba94f171b50b33941384f716ab0029079f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:29 +0000 Subject: [PATCH 0743/2743] [cpan2nix] perlPackages.MusicBrainz: 0.93 -> 1.0.4 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 845bc2af276b..8ad83da17983 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10187,13 +10187,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pkgs.libdiscid ]; }; - MusicBrainz = buildPerlPackage rec { - name = "WebService-MusicBrainz-0.93"; + MusicBrainz = buildPerlModule rec { + name = "WebService-MusicBrainz-1.0.4"; src = fetchurl { url = "mirror://cpan/authors/id/B/BF/BFAIST/${name}.tar.gz"; - sha256 = "1gg62x6qv4jj73jsqh0sb237k96i22blj29afpbp1scp3m7i5g61"; + sha256 = "182z3xjajk6s7k5xm3kssjy3hqx2qbnq4f8864hma098ryy2ph3a"; }; - propagatedBuildInputs = [ XMLLibXML LWP ClassAccessor URI ]; + propagatedBuildInputs = [ Mojolicious ]; doCheck = false; # Test performs network access. }; From 25c85664cfdb73bbb374dc12532134c552295b5c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:30 +0000 Subject: [PATCH 0744/2743] [cpan2nix] perlPackages.NetAmazonS3Policy: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ad83da17983..3847b8875380 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10323,7 +10323,7 @@ let self = _self // overrides; _self = with self; { }; }; - NetAmazonS3Policy = buildPerlPackage { + NetAmazonS3Policy = buildPerlModule { name = "Net-Amazon-S3-Policy-0.1.6"; src = fetchurl { url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz; From 9dd1efc97a1c8aaa1f956660857cfbb6e84aeb95 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:30 +0000 Subject: [PATCH 0745/2743] [cpan2nix] perlPackages.NetDNS: 1.05 -> 1.15 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3847b8875380..da33ac543ef2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10414,10 +10414,10 @@ let self = _self // overrides; _self = with self; { }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.05"; + name = "Net-DNS-1.15"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "900198014110af96ebac34af019612dd2ddd6af30178600028c3c940d089d5c8"; + sha256 = "1ad46ba6438b846a94b4f50d53ecfda55f504a17e11b94effb087ff9329e61d0"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; From 33a6b407da8b03b4d5be23e5549982c05a87a36a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:30 +0000 Subject: [PATCH 0746/2743] [cpan2nix] perlPackages.NetIDNEncode: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index da33ac543ef2..9d2778c2eced 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10455,7 +10455,7 @@ let self = _self // overrides; _self = with self; { }; }; - NetIDNEncode = buildPerlPackage { + NetIDNEncode = buildPerlModule { name = "Net-IDN-Encode-2.400"; src = fetchurl { url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz; From 53b6895dc184ac5b50cf849d1e8c0e6e36338f8f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:32 +0000 Subject: [PATCH 0747/2743] [cpan2nix] perlPackages.PodCoverage: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9d2778c2eced..e5169cb9f2a2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11709,7 +11709,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh"; }; - propagatedBuildInputs = [DevelSymdump]; + propagatedBuildInputs = [ DevelSymdump ]; }; PodCoverageTrustPod = buildPerlPackage { From 0e8ef94999afd0a9e3e1e9222d0ba1ba8a95d7aa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:32 +0000 Subject: [PATCH 0748/2743] [cpan2nix] perlPackages.PodSimple: 3.05 -> 3.35 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e5169cb9f2a2..74aefd66ef36 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11898,12 +11898,12 @@ let self = _self // overrides; _self = with self; { }; PodSimple = buildPerlPackage { - name = "Pod-Simple-3.05"; + name = "Pod-Simple-3.35"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARANDAL/Pod-Simple-3.05.tar.gz; - sha256 = "1j0kqcvr9ykcqlkr797j1npkbggykb3p4w5ri73s8mi163lzxkqb"; + url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.35.tar.gz; + sha256 = "0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr"; }; - propagatedBuildInputs = [constant PodEscapes]; + propagatedBuildInputs = [ TextTabsWrap ]; }; PodSpell = buildPerlPackage rec { From 8f1ee1431c79c0f90b80eceff95091678269bd8f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:32 +0000 Subject: [PATCH 0749/2743] [cpan2nix] perlPackages.PodUsage: 1.67 -> 1.69 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74aefd66ef36..c2fc0fd026b7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11915,12 +11915,12 @@ let self = _self // overrides; _self = with self; { }; PodUsage = buildPerlPackage { - name = "Pod-Usage-1.67"; + name = "Pod-Usage-1.69"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.67.tar.gz; - sha256 = "c8be6d29b0dfe304c4ddfcc140f93d4c4de7a8362ea6e2651611c288b53cc68a"; + url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.69.tar.gz; + sha256 = "1a920c067b3c905b72291a76efcdf1935ba5423ab0187b9a5a63cfc930965132"; }; - propagatedBuildInputs = [ perl ]; + propagatedBuildInputs = [ podlators ]; meta = { description = "Pod::Usage extracts POD documentation and shows usage information"; }; From b8e4d30734fe81266f0c92258bc977fa300b9f26 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:33 +0000 Subject: [PATCH 0750/2743] [cpan2nix] perlPackages.ProcWaitStat: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c2fc0fd026b7..832b42c1a1b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11602,7 +11602,7 @@ let self = _self // overrides; _self = with self; { ProcWaitStat = buildPerlPackage rec { name = "Proc-WaitStat-1.00"; src = fetchurl { - url = "mirror://cpan//authors/id/R/RO/ROSCH/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz; sha256 = "1g3l8jzx06x4l4p0x7fyn4wvg6plfzl420irwwb9v447wzsn6xfh"; }; propagatedBuildInputs = [ IPCSignal ]; From c19395bf898c7e8d976fdee3699361d3bb9dd604 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:34 +0000 Subject: [PATCH 0751/2743] [cpan2nix] perlPackages.SUPER: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 832b42c1a1b2..c802be654ed3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14086,7 +14086,7 @@ let self = _self // overrides; _self = with self; { }; }; - SUPER = buildPerlPackage rec { + SUPER = buildPerlModule rec { name = "SUPER-1.20141117"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; From 151045a2ddc4e1e4cef68873a467fc2c2ad58424 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:34 +0000 Subject: [PATCH 0752/2743] [cpan2nix] perlPackages.StatisticsBasic: 1.6607 -> 1.6611 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c802be654ed3..5ac1a934e8de 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12625,10 +12625,10 @@ let self = _self // overrides; _self = with self; { }; StatisticsBasic = buildPerlPackage { - name = "Statistics-Basic-1.6607"; + name = "Statistics-Basic-1.6611"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6607.tar.gz; - sha256 = "105agxl2581iqmwj1crgz33l5r19snf47h91hnjgm1nf555z79r7"; + url = mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6611.tar.gz; + sha256 = "1ywl398z42hz9w1k0waf1caa6agz8jzsjlf4rzs1lgpx2mbcwmb8"; }; propagatedBuildInputs = [ NumberFormat ]; meta = { From f077b2c123491edd8c3d2c67e86fb81fa04382cb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:35 +0000 Subject: [PATCH 0753/2743] [cpan2nix] perlPackages.TermVT102Boundless: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ac1a934e8de..a53ce85dcda5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13622,7 +13622,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/N/NU/NUFFIN/Term-VT102-Boundless-0.04.tar.gz; sha256 = "5bb88b5aecb44ebf56d3ac7240be80cd26def9dcf1ebeb4e77d9983dfc7a8f19"; }; - propagatedBuildInputs = [ TermVT102 Testuseok ]; + propagatedBuildInputs = [ TermVT102 ]; meta = { license = "unknown"; }; From eae26a690792226d96d80486a856664652b195b2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:35 +0000 Subject: [PATCH 0754/2743] [cpan2nix] perlPackages.TestAssertions: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a53ce85dcda5..41aaec24b60b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13683,10 +13683,10 @@ let self = _self // overrides; _self = with self; { TestAssertions = buildPerlPackage rec { name = "Test-Assertions-1.054"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BB/BBC/Test-Assertions-1.054.tar.gz; sha256 = "10026w4r3yv6k3vc6cby7d61mxddlqh0ls6z39c82f17awfy9p7w"; }; - buildInputs = [ LogTrace ]; + propagatedBuildInputs = [ LogTrace ]; }; TestAggregate = buildPerlPackage rec { From 06f01bd43d31a96973781191334757660d2a6b6d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:36 +0000 Subject: [PATCH 0755/2743] [cpan2nix] perlPackages.TestCompile: cleanup --- 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 41aaec24b60b..f4afd116b2d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13770,13 +13770,12 @@ let self = _self // overrides; _self = with self; { }; }; - TestCompile = buildPerlPackage rec { - name = "Test-Compile-v1.3.0"; + TestCompile = buildPerlModule rec { + name = "Test-Compile-1.3.0"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EG/EGILES/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v1.3.0.tar.gz; sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { description = "Check whether Perl files compile correctly"; From 12a787b093ef401643b030b1636b0fc2c63d2c21 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:36 +0000 Subject: [PATCH 0756/2743] [cpan2nix] perlPackages.TestException: 0.32 -> 0.43 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f4afd116b2d3..c3383f57c1c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13876,10 +13876,10 @@ let self = _self // overrides; _self = with self; { }; TestException = buildPerlPackage rec { - name = "Test-Exception-0.32"; + name = "Test-Exception-0.43"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADIE/${name}.tar.gz"; - sha256 = "0issbjh5yl62lpaff5zhn28zhbf8sv8n2g79vklfr5s703k2fi5s"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz; + sha256 = "0cxm7s4bg0xpxa6l6996a6iq3brr4j7p4hssnkc6dxv4fzq16sqm"; }; propagatedBuildInputs = [ SubUplevel ]; }; From f20f9c5feb2fe98c3a846a88a2d67e92e162a787 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:37 +0000 Subject: [PATCH 0757/2743] [cpan2nix] perlPackages.TestFile: 1.41 -> 1.443 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3383f57c1c3..5811ed1bad3b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13916,10 +13916,10 @@ let self = _self // overrides; _self = with self; { }; TestFile = buildPerlPackage { - name = "Test-File-1.41"; + name = "Test-File-1.443"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.41.tar.gz; - sha256 = "45ec1b714f64d05e34205c40b08c49549f257910e4966fa28e2ac170d5516316"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz; + sha256 = "61b4a6ab8f617c8c7b5975164cf619468dc304b6baaaea3527829286fa58bcd5"; }; buildInputs = [ Testutf8 ]; meta = { From b587307a88f7ba431ace94fa50ce45e5af2955f6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:37 +0000 Subject: [PATCH 0758/2743] [cpan2nix] perlPackages.TestOutput: 1.01 -> 1.031 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5811ed1bad3b..ccf47a73bd1f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14199,13 +14199,12 @@ let self = _self // overrides; _self = with self; { }; TestOutput = buildPerlPackage rec { - name = "Test-Output-1.01"; + name = "Test-Output-1.031"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "0hg2hv6sify6qcx4865m4gyfdfbi96aw7fx39zpvnrivk3i2jdcd"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz; + sha256 = "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q"; }; - buildInputs = [ TestTester ]; - propagatedBuildInputs = [ SubExporter ]; + propagatedBuildInputs = [ CaptureTiny ]; }; TestPerlCritic = buildPerlPackage rec { From 16c55f323900a3a187554725c7dff2b9efbc741d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:37 +0000 Subject: [PATCH 0759/2743] [cpan2nix] perlPackages.TestSharedFork: 0.34 -> 0.35 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ccf47a73bd1f..ed803767e464 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14467,10 +14467,10 @@ let self = _self // overrides; _self = with self; { }; TestSharedFork = buildPerlPackage rec { - name = "Test-SharedFork-0.34"; + name = "Test-SharedFork-0.35"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "1yq4xzify3wqdc07zq33lwgh9gywp3qd8w6wzwrllbjw0hhkm4s8"; + sha256 = "17y52j20k1bs9dgf4n6rhh9dn4cfxxbnfn2cfs7pb00fc5jyhci9"; }; buildInputs = [ TestRequires ]; meta = { From 391a9bdc6e3fb6fb82d307b769852fb97a669eb3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:38 +0000 Subject: [PATCH 0760/2743] [cpan2nix] perlPackages.TestSubCalls: 1.09 -> 1.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed803767e464..fda941d97a4b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14509,10 +14509,10 @@ let self = _self // overrides; _self = with self; { }; TestSubCalls = buildPerlPackage rec { - name = "Test-SubCalls-1.09"; + name = "Test-SubCalls-1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "a334b0457da338d79be2dbb62d403701fc90f7607df840115ff45ee1e2bd6e70"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz; + sha256 = "cbc1e9b35a05e71febc13e5ef547a31c8249899bb6011dbdc9d9ff366ddab6c2"; }; propagatedBuildInputs = [ HookLexWrap ]; }; From 0e5996b40e3be09aab8260a0205487bc3682afa9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:38 +0000 Subject: [PATCH 0761/2743] [cpan2nix] perlPackages.TestTrap: 0.3.2 -> v0.3.3 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fda941d97a4b..bd9159ab84d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15152,13 +15152,12 @@ let self = _self // overrides; _self = with self; { }; }; - TestTrap = buildPerlPackage rec { - name = "Test-Trap-0.3.2"; + TestTrap = buildPerlModule rec { + name = "Test-Trap-0.3.3"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/${name}.tar.gz"; - sha256 = "1ci5ag9pm850ww55n2929skvw3avy6xcrwmmi2yyn0hifxx9dybs"; + url = mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.3.tar.gz; + sha256 = "1676gqjyk0zig3yyqv053y5j1pajp2af08ffmgx94n414whbhm5c"; }; - buildInputs = [ TestTester ]; propagatedBuildInputs = [ DataDump ]; meta = { description = "Trap exit codes, exceptions, output, etc"; From 4e5e1b477d19cce29a9f4039af4d4a86f46cce0e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:39 +0000 Subject: [PATCH 0762/2743] [cpan2nix] perlPackages.TestWarn: 0.30 -> 0.32 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd9159ab84d0..74b6a9e3da03 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14618,12 +14618,12 @@ let self = _self // overrides; _self = with self; { }; TestWarn = buildPerlPackage { - name = "Test-Warn-0.30"; + name = "Test-Warn-0.32"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.30.tar.gz; - sha256 = "0haf2ii7br5z0psmkvlvmx2z2q9qz1c70gx0969r378qjidmb5w1"; + url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.32.tar.gz; + sha256 = "1lkkpx8gyfsxfkys1psp990xyy1zxf8rsqd44az57x4y3zkidi9g"; }; - propagatedBuildInputs = [ SubUplevel TreeDAGNode ]; + propagatedBuildInputs = [ SubUplevel ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Perl extension to test methods for warnings"; From 3c8cc506b9086e45c450867d7a6c35d0fd76bd50 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:39 +0000 Subject: [PATCH 0763/2743] [cpan2nix] perlPackages.TextAutoformat: 1.72 -> 1.74 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74b6a9e3da03..324bdf71d1c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14775,10 +14775,10 @@ let self = _self // overrides; _self = with self; { }; TextAutoformat = buildPerlPackage { - name = "Text-Autoformat-1.72"; + name = "Text-Autoformat-1.74"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.72.tar.gz; - sha256 = "b541152699fcd0f026322f283b7d9184839742aee0edb317a014c195ea26ae51"; + url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.74.tar.gz; + sha256 = "07eb3c2b3515897340ca6e9377495bbe2e05ec80d7f3f146adab8e534a818d5e"; }; propagatedBuildInputs = [ TextReform ]; meta = { From 71def7a12115934bddc44b858c30f18707d04e52 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:39 +0000 Subject: [PATCH 0764/2743] [cpan2nix] perlPackages.TextCSVEncoded: cleanup dependencies: perlPackages.TextCSV: UniqueColumns_0.4 -> 1.95 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 324bdf71d1c0..62a6fcecfbfc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14841,10 +14841,10 @@ let self = _self // overrides; _self = with self; { }; TextCSV = buildPerlPackage rec { - name = "Text-CSV-UniqueColumns_0.4"; + name = "Text-CSV-1.95"; src = fetchurl { - url = mirror://cpan/authors/id/T/TU/TUSHAR/Text-CSV-UniqueColumns_0.4.tar.gz; - sha256 = "30ebe22d5ad56bccb1c3976bfca09045882cce792fe460219feaf45eb676b114"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.95.tar.gz; + sha256 = "7e0a11d9c1129a55b68a26aa4b37c894279df255aa63ec8341d514ab848dbf61"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; From 241d1751a40e32264632c5ed04305b461fb6874d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:40 +0000 Subject: [PATCH 0765/2743] [cpan2nix] perlPackages.TextDiff: 1.43 -> 1.45 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62a6fcecfbfc..73f900e2c584 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14881,10 +14881,10 @@ let self = _self // overrides; _self = with self; { }; TextDiff = buildPerlPackage rec { - name = "Text-Diff-1.43"; + name = "Text-Diff-1.45"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; - sha256 = "1ampmj1k5cabgcaw2iqwqbmnq6hrnl96f7rk8hh22gsw6my86bac"; + sha256 = "013g13prdghxvrp5754gyc7rmv1syyxrhs33yc5f0lrz3dxs1fp8"; }; propagatedBuildInputs = [ AlgorithmDiff ]; meta = { From bfdd4fec6234ec64c7956068ef34d98c2c71f825 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:40 +0000 Subject: [PATCH 0766/2743] [cpan2nix] perlPackages.TextTable: 1.130 -> 1.133 --- 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 73f900e2c584..9ff44d53765b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15105,13 +15105,12 @@ let self = _self // overrides; _self = with self; { }; }; - TextTable = buildPerlPackage rec { - name = "Text-Table-1.130"; + TextTable = buildPerlModule rec { + name = "Text-Table-1.133"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "02c8v38k639r23dgxwgvsy4myjjzvgdb238kpiffsiz25ab3xp5j"; + sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd"; }; - buildInputs = [ TestPod TestPodCoverage ]; propagatedBuildInputs = [ TextAligner ]; meta = { homepage = http://www.shlomifish.org/open-source/projects/docmake/; From e717f7055ef035ae68b2fa8adb1b5bd6f2f240b3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:40 +0000 Subject: [PATCH 0767/2743] [cpan2nix] perlPackages.TextWrapI18N: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9ff44d53765b..7660b8515eba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15271,7 +15271,7 @@ let self = _self // overrides; _self = with self; { TextWrapI18N = buildPerlPackage { name = "Text-WrapI18N-0.06"; src = fetchurl { - url = http://search.cpan.org/CPAN/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz; + url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz; sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"; }; propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; From c39c40239f7911a2f7a93eca0c0fd36230a5aafb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:41 +0000 Subject: [PATCH 0768/2743] [cpan2nix] perlPackages.TreeDAGNode: 1.27 -> 1.31 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7660b8515eba..7807cce942ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15544,17 +15544,17 @@ let self = _self // overrides; _self = with self; { }; TreeDAGNode = buildPerlPackage rec { - name = "Tree-DAG_Node-1.27"; + name = "Tree-DAG_Node-1.31"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; - sha256 = "1i2i445gh7720bvv06dz67szk2z6q1pi30kb5p2shsa806sj4vr2"; + sha256 = "016kr76azxzfcpxjkhqp2piyyl6529shjis20mc3g2snfabsd2qw"; }; - buildInputs = [ TestPod FileSlurpTiny ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "An N-ary tree"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ FileSlurpTiny ]; }; TreeSimple = buildPerlPackage rec { From 68949156edbe5bbed46ed8977bedcd71b835d8d3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:41 +0000 Subject: [PATCH 0769/2743] [cpan2nix] perlPackages.TypeTiny: 1.000005 -> 1.002001 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7807cce942ca..c744f3e8e0d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15595,10 +15595,10 @@ let self = _self // overrides; _self = with self; { }; TypeTiny = buildPerlPackage { - name = "Type-Tiny-1.000005"; + name = "Type-Tiny-1.002001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.000005.tar.gz; - sha256 = "42ed36c011825aa1e6995a4e8638621a1b2103a0970b15764ca3919368042365"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002001.tar.gz; + sha256 = "93c9eeaaf23016625126794af483bc626a149f7226f9a6ec1081ef896acc13dd"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { From 27473bdfafe3f74f7e48624702881b28c42c3341 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:42 +0000 Subject: [PATCH 0770/2743] [cpan2nix] perlPackages.UnicodeLineBreak: 2017.004 -> 2018.003 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c744f3e8e0d7..1f4cacaa9c62 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15699,10 +15699,10 @@ let self = _self // overrides; _self = with self; { }; UnicodeLineBreak = buildPerlPackage rec { - name = "Unicode-LineBreak-2017.004"; + name = "Unicode-LineBreak-2018.003"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz"; - sha256 = "0xnb80na1ps1b5gmj3n70bk28brjzrn725kqv5q0gbb0rg2c6nv5"; + sha256 = "1cbilpy7ypr26rjr6cmrbkxhsm1l6yx7s1p7lcf0l3vi7vzr4346"; }; propagatedBuildInputs = [ MIMECharset ]; meta = { From af294646eafbc501df739663c5fdec85613d0043 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:43 +0000 Subject: [PATCH 0771/2743] [cpan2nix] perlPackages.bignum: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f4cacaa9c62..13f08af3b93b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -734,11 +734,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; sha256 = "28685b271251927d327851e5951e38649524a4e50cb0d1d35d649e2b814f212d"; }; - buildInputs = [ MathBigInt MathBigRat ]; meta = { description = "Transparent BigNumber support for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ MathBigInt ]; }; BitVector = buildPerlPackage { From d6e33db3f30c37e040ebe51c1387b14bd218a820 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:43 +0000 Subject: [PATCH 0772/2743] [cpan2nix] perlPackages.constantboolean: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 13f08af3b93b..a8a98d4ff9f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2500,7 +2500,7 @@ let self = _self // overrides; _self = with self; { }; }; - constantboolean = buildPerlPackage { + constantboolean = buildPerlModule { name = "constant-boolean-0.02"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz; From 63dc769f67c1ada1fa8f9492097321833d2fab32 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:43 +0000 Subject: [PATCH 0773/2743] [cpan2nix] perlPackages.locallib: 2.000019 -> 2.000024 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a8a98d4ff9f0..6ed86ff19adf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8135,15 +8135,16 @@ let self = _self // overrides; _self = with self; { }; locallib = buildPerlPackage rec { - name = "local-lib-2.000019"; + name = "local-lib-2.000024"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "008b9kgvcs9vjvj7ifg0f1s7i7446ff2441c575vhrwn15x35b9n"; + sha256 = "01cav7m6qc1x96wna1viiw6n212f94ks7cik4vj1a1lasixr36rf"; }; meta = { description = "Create and use a local lib/ for perl modules with PERL5LIB"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ ModuleBuild ]; }; LockFileSimple = buildPerlPackage rec { From ed42cbb6518acab559644e1105b78efe24d46ad0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:44 +0000 Subject: [PATCH 0774/2743] [cpan2nix] perlPackages.AnyEventCacheDNS: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ed86ff19adf..b67950e36ffe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -136,7 +136,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PO/POTYL/${name}.tar.gz"; sha256 = "41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ AnyEvent ]; doCheck = false; # does an DNS lookup meta = { From b70999d01e94d9aae06c7f5d5742a586444d953c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:44 +0000 Subject: [PATCH 0775/2743] [cpan2nix] perlPackages.AudioScan: 0.93 -> 0.99 --- 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 b67950e36ffe..3cc292c56310 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -490,13 +490,12 @@ let self = _self // overrides; _self = with self; { }; AudioScan = buildPerlPackage rec { - name = "Audio-Scan-0.93"; + name = "Audio-Scan-0.99"; src = fetchurl { url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; - sha256 = "03nwcm234y76jb1p20rlcky6vzv68i46s9mjfr7kzp65w3yg94js"; + sha256 = "00092cjj89sp019b35fm3qiz4iczqznwa3yhx5jdkazlwjhlmmma"; }; - buildInputs = [ pkgs.zlib ModuleBuild ModuleBuildPluggablePPPort ]; - propagatedBuildInputs = [ TestWarn ]; + buildInputs = [ pkgs.zlib TestWarn ]; NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; meta = { From e81867b2a2331c7457e08950d15d61160761a6bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:45 +0000 Subject: [PATCH 0776/2743] [cpan2nix] perlPackages.CGIExpand: 2.04 -> 2.05 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3cc292c56310..8cb433d0e2f6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1707,17 +1707,17 @@ let self = _self // overrides; _self = with self; { }; CGIExpand = buildPerlPackage { - name = "CGI-Expand-2.04"; + name = "CGI-Expand-2.05"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.04.tar.gz; - sha256 = "0jk2vvk4mlz7phq3h3wpryix46adi7fkkzvkv0ssn5xkqy3pqlny"; + url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.05.tar.gz; + sha256 = "1ad48nd067j5irjampxpw3zvzpg8wpnpan6szkdc5h64wccd30kf"; }; - propagatedBuildInputs = [ TestException ]; meta = { description = "Convert flat hash to nested data using TT2's dot convention"; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestException ]; }; CGIFast = buildPerlPackage { From 702b21812ae5d68466654df1bc55ee6bead41b6d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:45 +0000 Subject: [PATCH 0777/2743] [cpan2nix] perlPackages.Cairo: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8cb433d0e2f6..6f35bea36ef5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -944,12 +944,13 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.cairo ]; + buildInputs = [ pkgs.cairo ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the cairo 2D vector graphics library"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; cam_pdf = buildPerlPackage rec { From 1b313a872c5b5af05e93e4bc91523083a68e2b32 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:45 +0000 Subject: [PATCH 0778/2743] [cpan2nix] perlPackages.CarpClan: 6.04 -> 6.06 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6f35bea36ef5..d8c441ff3a65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1049,16 +1049,16 @@ let self = _self // overrides; _self = with self; { }; CarpClan = buildPerlPackage { - name = "Carp-Clan-6.04"; + name = "Carp-Clan-6.06"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Carp-Clan-6.04.tar.gz; - sha256 = "1v71k8s1pi16l5y579gnrg372c6pdvy6qqm6iddm8h1dx7n16bjl"; + url = mirror://cpan/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz; + sha256 = "1m6902n6s627nsvyn2vyrk29q7lh6808hsdk7ka5cirm27vchjpa"; }; - propagatedBuildInputs = [ TestException ]; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException ]; }; CatalystActionRenderView = buildPerlPackage rec { From 390e6fefc58c8a77b40c8c0e2ca5bc144e49a7c3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:45 +0000 Subject: [PATCH 0779/2743] [cpan2nix] perlPackages.ClassUnload: 0.09 -> 0.11 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d8c441ff3a65..127be4c49c8a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2151,12 +2151,13 @@ let self = _self // overrides; _self = with self; { }; ClassUnload = buildPerlPackage rec { - name = "Class-Unload-0.09"; + name = "Class-Unload-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "1q50hw217kll1vaxp7vz4x84f478ymd4lgz7mhmz8p94l8lxgi5g"; + sha256 = "0pqa98z3ij6a3v9wkmvc8b410kv30y0xxqf0i6if3lp4lx3rgqjj"; }; propagatedBuildInputs = [ ClassInspector ]; + buildInputs = [ TestRequires ]; }; ClassVirtual = buildPerlPackage rec { From 40ed164a4f73c699ff5f6e7e2bb44d8eed51f992 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:46 +0000 Subject: [PATCH 0780/2743] [cpan2nix] perlPackages.IOCompress: 2.070 -> 2.074 dependencies: perlPackages.CompressRawZlib: init at 2.076 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 127be4c49c8a..fc2079879fd8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7245,10 +7245,10 @@ let self = _self // overrides; _self = with self; { }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.070"; + name = "IO-Compress-2.074"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "3e761b833c8e55eb811a5eeab07831bb380dcdce256cc45cfe8816602a3574ff"; + sha256 = "b4bd68ce895a6578e5be96ade36449461becc328cc7ab900ae4e362380f097f2"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { From db6dc7f69a3dfce0550dd3efb72952a90f284f71 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:46 +0000 Subject: [PATCH 0781/2743] [cpan2nix] perlPackages.ConfigAny: 0.26 -> 0.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fc2079879fd8..cbfb56f7cb65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2281,10 +2281,10 @@ let self = _self // overrides; _self = with self; { }; ConfigAny = buildPerlPackage rec { - name = "Config-Any-0.26"; + name = "Config-Any-0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRICAS/${name}.tar.gz"; - sha256 = "155521bxiim3dv8d8f69fqd9zxm615fd4pfmv5fki17hq7ai5bpr"; + url = mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz; + sha256 = "0l31sg7dwh4dwwnql42hp7arkhcm15bhsgfg4i6xvbjzy9f2mnk8"; }; propagatedBuildInputs = [ ModulePluggable ]; meta = { From 812262f21e0781821d01c65574cde8071abde310 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:47 +0000 Subject: [PATCH 0782/2743] [cpan2nix] perlPackages.CryptDH: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cbfb56f7cb65..16ecaae2c690 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2718,7 +2718,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MITHALDU/${name}.tar.gz"; sha256 = "0pvzlgwpx8fzdy64ki15155vhsj30i9zxmw6i4p7irh17d1g7368"; }; - buildInputs = [ MathBigInt MathBigIntGMP ]; + propagatedBuildInputs = [ MathBigIntGMP ]; }; CryptDHGMP = buildPerlPackage rec { From d6941a94db8ba8cfc4291a3e78283ec94d17846a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:47 +0000 Subject: [PATCH 0783/2743] [cpan2nix] perlPackages.CryptEksblowfish: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 16ecaae2c690..3b99e7ab6f37 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2732,14 +2732,13 @@ let self = _self // overrides; _self = with self; { NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; - CryptEksblowfish = buildPerlPackage rec { + CryptEksblowfish = buildPerlModule rec { name = "Crypt-Eksblowfish-0.009"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ClassMix]; + propagatedBuildInputs = [ ClassMix ]; }; CryptJWT = buildPerlPackage rec { From e1479b9d3238b2cec8d178fd0c496d471a6466b1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:47 +0000 Subject: [PATCH 0784/2743] [cpan2nix] perlPackages.CryptJWT: 0.020 -> 0.021 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b99e7ab6f37..a4eb29bde452 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2742,10 +2742,10 @@ let self = _self // overrides; _self = with self; { }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.020"; + name = "Crypt-JWT-0.021"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "0587fc11435aecbbdc19b33f774d05ff31f19750b26a3588af93f33e8000d464"; + sha256 = "7227a10d185d6550fea855ef44bb8fb927d8c8644cfb16e0b674959bf103df5f"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { From 687551a05d2b877648ce2cd487d6904304eb1a98 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:48 +0000 Subject: [PATCH 0785/2743] [cpan2nix] perlPackages.DataHierarchy: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a4eb29bde452..b1d83bb834c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3097,7 +3097,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz; sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k"; }; - propagatedBuildInputs = [TestException]; + buildInputs = [ TestException ]; }; DataICal = buildPerlPackage { From 69877d820da4983b641e35677f4297d718bab99c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:48 +0000 Subject: [PATCH 0786/2743] [cpan2nix] perlPackages.DataOptList: 0.109 -> 0.110 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1d83bb834c2..190dee72b521 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3123,10 +3123,10 @@ let self = _self // overrides; _self = with self; { }; DataOptList = buildPerlPackage { - name = "Data-OptList-0.109"; + name = "Data-OptList-0.110"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.109.tar.gz; - sha256 = "1j44rm2spprlq3bc80cxni3dzs3gfjiqv1qc9q7820n1qj0wgmqw"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz; + sha256 = "1hzmgr2imdg1fc3hmwx0d56fhsdfyrgmgx7jb4jkyiv6575ifq9n"; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { From 046351db0b6b7286f0e634a8cd47e314174eef8c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:49 +0000 Subject: [PATCH 0787/2743] [cpan2nix] perlPackages.DevelChecklib: 1.05 -> 1.11 dependencies: perlPackages.MockConfig: init at 0.03 --- pkgs/top-level/perl-packages.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 190dee72b521..18c39eaca326 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3723,12 +3723,12 @@ let self = _self // overrides; _self = with self; { }; DevelChecklib = buildPerlPackage rec { - name = "Devel-CheckLib-1.05"; + name = "Devel-CheckLib-1.11"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; - sha256 = "0qs7c8jffar2rpvscrd8rcds75zsc46cizp5fi5369821jl4fw3a"; + sha256 = "1h9jna2d83kpckkm87xwqx84kwd83d2dsynky3hnvgl0gqc1qvdx"; }; - propagatedBuildInputs = [ IOCaptureOutput ]; + buildInputs = [ IOCaptureOutput MockConfig ]; }; DevelCheckOS = buildPerlPackage rec { @@ -8888,6 +8888,18 @@ let self = _self // overrides; _self = with self; { }; }; + MockConfig = buildPerlPackage rec { + name = "Mock-Config-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz; + sha256 = "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55"; + }; + meta = { + description = "temporarily set Config or XSConfig values"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus artistic2 ]; + }; + }; + ModernPerl = buildPerlModule { name = "Modern-Perl-1.20170117"; src = fetchurl { From f6264073023c8c531200fe9977db9816f5f49554 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:50 +0000 Subject: [PATCH 0788/2743] [cpan2nix] perlPackages.ExceptionClass: 1.37 -> 1.44 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18c39eaca326..5a43a7e8ab6c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5053,10 +5053,10 @@ let self = _self // overrides; _self = with self; { }; ExceptionClass = buildPerlPackage rec { - name = "Exception-Class-1.37"; + name = "Exception-Class-1.44"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1p6f20fi82mr5bz7d2c7nqh0322r8n2kszfw37c77g8b1b4r72w3"; + sha256 = "03gf4cdgrjnljgrlxkvbh2cahsyzn0zsh2zcli7b1lrqn7wgpwrk"; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; }; From 76dbe23bcf75d5586786e2940eb5e7d44212689a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:51 +0000 Subject: [PATCH 0789/2743] [cpan2nix] perlPackages.ExtUtilsCppGuess: 0.07 -> 0.12 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5a43a7e8ab6c..7fc3df0874ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5209,14 +5209,15 @@ let self = _self // overrides; _self = with self; { }; }; - ExtUtilsCppGuess = buildPerlModule rec { - name = "ExtUtils-CppGuess-0.07"; + ExtUtilsCppGuess = buildPerlPackage rec { + name = "ExtUtils-CppGuess-0.12"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "1a77hxf2pa8ia9na72rijv1yhpn2bjrdsybwk2dj2l938pl3xn0w"; + url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.12.tar.gz; + sha256 = "0sqq8vadch633cx7w7i47fca49pxzyh82n5kwxdgvsg32mdppi1i"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; propagatedBuildInputs = [ CaptureTiny ]; + buildInputs = [ ModuleBuild ]; }; ExtUtilsDepends = buildPerlPackage { From 596fbb08dfaf6ef2256e5a1146dd0c874a42ddac Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:51 +0000 Subject: [PATCH 0790/2743] [cpan2nix] perlPackages.FileBaseDir: 0.03 -> 0.08 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7fc3df0874ee..28fcb96fcfcb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5445,18 +5445,19 @@ let self = _self // overrides; _self = with self; { }; }; - FileBaseDir = buildPerlPackage rec { - version = "0.03"; + FileBaseDir = buildPerlModule rec { + version = "0.08"; name = "File-BaseDir-${version}"; src = fetchurl { - url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; - sha256 = "0029cba7a3b5d8aa5f7d03cb1b7ba2bcf2829382f7f26aa3bee06fce8611a886"; + url = mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz; + sha256 = "c065fcd3e2f22ae769937bcc971b91f80294d5009fac140bfba83bf7d35305e3"; }; configurePhase = '' preConfigure || true perl Build.PL PREFIX="$out" prefix="$out" ''; - propagatedBuildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ IPCSystemSimple ]; + buildInputs = [ FileWhich ]; }; FileBOM = buildPerlPackage rec { From 62d0ac4f94581253e5f859a3c5c6e41d219d972a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:52 +0000 Subject: [PATCH 0791/2743] [cpan2nix] perlPackages.FileFindRule: 0.33 -> 0.34 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 28fcb96fcfcb..c1f336e82400 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5549,10 +5549,10 @@ let self = _self // overrides; _self = with self; { }; FileFindRule = buildPerlPackage rec { - name = "File-Find-Rule-0.33"; + name = "File-Find-Rule-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; - sha256 = "0w73b4jr2fcrd74a1w3b2jryq3mqzc8z5mk7ia9p85xn3qmpa5r4"; + sha256 = "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy"; }; propagatedBuildInputs = [ NumberCompare TextGlob ]; }; From e01e6ac7453ec2e12e45cd8397d17f834be9e111 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:52 +0000 Subject: [PATCH 0792/2743] [cpan2nix] perlPackages.FileShare: 0.03 -> 0.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c1f336e82400..6d71c7fcf3a2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5780,10 +5780,10 @@ let self = _self // overrides; _self = with self; { }; FileShare = buildPerlPackage { - name = "File-Share-0.03"; + name = "File-Share-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JOENIO/File-Share-0.03.tar.gz; - sha256 = "0siy9p6b7zbln5yq6g8z1nwm76ia23kkdj1k5pywsh3n6dn2lxa2"; + url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz; + sha256 = "0w3h800qqcf1sn79h84zngnn788rg2jx4jjb70l44f6419p2b7cf"; }; propagatedBuildInputs = [ FileShareDir ]; meta = { From c79d7c9bd98d15e2579ef9fe8b1e904804c6c2cf Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:52 +0000 Subject: [PATCH 0793/2743] [cpan2nix] perlPackages.FilesysNotifySimple: 0.08 -> 0.13 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d71c7fcf3a2..43bd359ea51c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5823,15 +5823,16 @@ let self = _self // overrides; _self = with self; { }; FilesysNotifySimple = buildPerlPackage { - name = "Filesys-Notify-Simple-0.08"; + name = "Filesys-Notify-Simple-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.08.tar.gz; - sha256 = "042klyvi8fbkhmyg1h7883bbjdhiclmky9w2wfga7piq5il6nxgi"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.13.tar.gz; + sha256 = "18jv96k1pf8wqf4vn2ahs7dv44lc9cyqj0bja9z17qici3dx7qxd"; }; meta = { description = "Simple and dumb file system watcher"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestSharedFork ]; }; FileTemp = null; From 8077094ebf65b6b825e86114ba605be116feaa5a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:53 +0000 Subject: [PATCH 0794/2743] [cpan2nix] perlPackages.ForksSuper: 0.72 -> 0.93 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 43bd359ea51c..1e6e015afd79 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5980,10 +5980,10 @@ let self = _self // overrides; _self = with self; { }; ForksSuper = buildPerlPackage { - name = "Forks-Super-0.72"; + name = "Forks-Super-0.93"; src = fetchurl { - url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.72.tar.gz; - sha256 = "0zyqwyndb3gnbsh43b6xyl3wmlnyi18vz3yrbsvp3lccz4d0v7qp"; + url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.93.tar.gz; + sha256 = "1blkhi3kpkqv6dlnbxz5r9j9lbr58vag3aa2c9yqpkqk59hivbgg"; }; doCheck = false; meta = { @@ -5991,6 +5991,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; + propagatedBuildInputs = [ URI ]; }; FormValidatorSimple = buildPerlPackage rec { From 264c3aa14a0aba448224460ae6fbc50ebb5abad7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:53 +0000 Subject: [PATCH 0795/2743] [cpan2nix] perlPackages.Glib: 1.321 -> 1.326 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e6e015afd79..6f3be03b1d76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6147,17 +6147,18 @@ let self = _self // overrides; _self = with self; { }; Glib = buildPerlPackage rec { - name = "Glib-1.321"; + name = "Glib-1.326"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "0h4cfxrxcf1mrdab5n5kk0smsi8vcrfnmcw1k6xw87r4vbifnxdr"; + sha256 = "0prn9kkdpwjq9qmzqashbhk3pq4gvlrmvm3b10xf1dhc48406382"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ]; + buildInputs = [ pkgs.glib ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; Gnome2 = buildPerlPackage rec { From 1296c7278d609f4f651aad0133fad44927aea55a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:54 +0000 Subject: [PATCH 0796/2743] [cpan2nix] perlPackages.GoogleProtocolBuffers: 0.11 -> 0.12 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6f3be03b1d76..0e583e3ed273 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6270,10 +6270,10 @@ let self = _self // overrides; _self = with self; { }; GoogleProtocolBuffers = buildPerlPackage rec { - name = "Google-ProtocolBuffers-0.11"; + name = "Google-ProtocolBuffers-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/${name}.tar.gz"; - sha256 = "0k2skcbfzn2aw1f218l47h4kgq5rj9qsam3sd6zw4qq3zyp0amb1"; + sha256 = "0wad56n12h9yhnrq1m1z3jna1ch3mg3mqj41wkfi49ws1g34k15k"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; patches = From 08a5993bfaa530a95ddaf8751f21be515d128211 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:54 +0000 Subject: [PATCH 0797/2743] [cpan2nix] perlPackages.HTMLTidy: 1.56 -> 1.60 --- 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 0e583e3ed273..b27cb866c0b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6816,18 +6816,17 @@ let self = _self // overrides; _self = with self; { }; HTMLTidy = buildPerlPackage rec { - name = "HTML-Tidy-1.56"; + name = "HTML-Tidy-1.60"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "1zp4wndvr9vadbqjmd8d8ck6hlmr0dqg20vpa8cqfdflqkzqf208"; + sha256 = "1iyp2fd6j75cn1xvcwl2lxr8qpjxssy2360cyqn6g3kzd1fzdyxw"; }; - propagatedBuildInputs = [ TextDiff ]; - patchPhase = '' sed -i "s#/usr/include/tidyp#${pkgs.tidyp}/include/tidyp#" Makefile.PL sed -i "s#/usr/lib#${pkgs.tidyp}/lib#" Makefile.PL ''; + buildInputs = [ TestException ]; }; HTMLTiny = buildPerlPackage rec { From f8fbed6b40f308b831c4bea6d96b78b5fb8cea80 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:55 +0000 Subject: [PATCH 0798/2743] [cpan2nix] perlPackages.HashFlatten: cleanup --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b27cb866c0b6..38b6b8ec6ae4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6455,10 +6455,11 @@ let self = _self // overrides; _self = with self; { HashFlatten = buildPerlPackage rec { name = "Hash-Flatten-1.19"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BB/BBC/Hash-Flatten-1.19.tar.gz; sha256 = "162b9qgkr19f97w4pic6igyk3zd0sbnrhl3s8530fikciffw9ikh"; }; - buildInputs = [ TestAssertions LogTrace ]; + buildInputs = [ TestAssertions ]; + propagatedBuildInputs = [ LogTrace ]; }; HashMerge = buildPerlPackage rec { From 9c134c6d6c265af087110b62b236c479398d6dec Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:55 +0000 Subject: [PATCH 0799/2743] [cpan2nix] perlPackages.IOPrompt: 0.997002 -> 0.997004 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38b6b8ec6ae4..285a3b6ea2d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7325,11 +7325,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pkgs.more FileWhich ]; # `more` used in tests }; - IOPrompt = buildPerlPackage { - name = "IO-Prompt-0.997002"; + IOPrompt = buildPerlModule { + name = "IO-Prompt-0.997004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997002.tar.gz; - sha256 = "08ad24f58335ce9696666e4411b2f3cd9c2e1fb72b306b6018c1a13971361ced"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz; + sha256 = "f17bb305ee6ac8b5b203e6d826eb940c4f3f6d6f4bfe719c3b3a225f46f58615"; }; propagatedBuildInputs = [ TermReadKey Want ]; doCheck = false; # needs access to /dev/tty From a642dc1565d829a9762789881df8300ae4f88359 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:56 +0000 Subject: [PATCH 0800/2743] [cpan2nix] perlPackages.Inline: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 285a3b6ea2d7..2843e89589a2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7564,7 +7564,6 @@ let self = _self // overrides; _self = with self; { sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6"; }; buildInputs = [ TestWarn ]; - propagatedBuildInputs = [ ParseRecDescent ]; meta = { homepage = https://github.com/ingydotnet/inline-pm; description = "Write Perl Subroutines in Other Programming Languages"; From 4cb0325ec4b3a6cb81a5e4b31a19980ae58a8090 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:56 +0000 Subject: [PATCH 0801/2743] [cpan2nix] perlPackages.MojoIOLoopForkCall: 0.17 -> 0.19 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2843e89589a2..a0268818f666 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9311,10 +9311,10 @@ let self = _self // overrides; _self = with self; { }; MojoIOLoopForkCall = buildPerlModule rec { - name = "Mojo-IOLoop-ForkCall-0.17"; + name = "Mojo-IOLoop-ForkCall-0.19"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; - sha256 = "886de5c3b44194a86228471075fac4036073bda19093e776c702aa65c3ef1824"; + sha256 = "a436b71c7d1450f79b9810f4f46e24f5ffe1e1428da473d4315673e08e4dec62"; }; propagatedBuildInputs = [ IOPipely Mojolicious ]; meta = { From 01b3d7fae0f03aa0ec2bee78c0a0bbdde67a1094 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:57 +0000 Subject: [PATCH 0802/2743] [cpan2nix] perlPackages.NetDNSResolverProgrammable: v0.003 -> 0.009 --- 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 a0268818f666..3ccde0a816cd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10547,12 +10547,11 @@ let self = _self // overrides; _self = with self; { }; NetDNSResolverProgrammable = buildPerlPackage rec { - name = "Net-DNS-Resolver-Programmable-v0.003"; + name = "Net-DNS-Resolver-Programmable-0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMEHNLE/net-dns-resolver-programmable/${name}.tar.gz"; - sha256 = "8d402260941f259c83bf1b2564408e75288df028f604136c29da11a9a6a076ec"; + url = mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz; + sha256 = "8080a2ab776629585911af1179bdb7c4dc2bebfd4b5efd77b11d1dac62454bf8"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ NetDNS ]; meta = { description = "Programmable DNS resolver class for offline emulation of DNS"; From dd6ee86798031e69bdb21103851c3cd799b842de Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:57 +0000 Subject: [PATCH 0803/2743] [cpan2nix] perlPackages.NetHTTP: 6.12 -> 6.17 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3ccde0a816cd..b6780aea8634 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10457,10 +10457,10 @@ let self = _self // overrides; _self = with self; { }; NetHTTP = buildPerlPackage rec { - name = "Net-HTTP-6.12"; + name = "Net-HTTP-6.17"; src = fetchurl { url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; - sha256 = "8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6"; + sha256 = "1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611"; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; @@ -10469,6 +10469,7 @@ let self = _self // overrides; _self = with self; { description = "Low-level HTTP connection (client)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; NetIDNEncode = buildPerlModule { From c4fa3b0c7524c41607ad0d314d7e305aa125191b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:58 +0000 Subject: [PATCH 0804/2743] [cpan2nix] perlPackages.NetSMTPSSL: 1.03 -> 1.04 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b6780aea8634..9030525bdc54 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10576,12 +10576,12 @@ let self = _self // overrides; _self = with self; { NetSMTP = libnet; NetSMTPSSL = buildPerlPackage { - name = "Net-SMTP-SSL-1.03"; + name = "Net-SMTP-SSL-1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz; - sha256 = "05y94mb1vdw32mvwb0cp2h4ggh32f8j8nwwfjb8kjwxvfkfhyp9h"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz; + sha256 = "001a6dcfahf7kkyirqkc8jd4fh4fkal7n7vm9c4dblqrvmdc8abv"; }; - propagatedBuildInputs = [IOSocketSSL]; + propagatedBuildInputs = [ IOSocketSSL ]; }; NetSMTPTLS = buildPerlPackage { From 07d31929b3562be2c87c2902cc3a6d04c2026a72 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:58 +0000 Subject: [PATCH 0805/2743] [cpan2nix] perlPackages.PerlIOutf8_strict: 0.006 -> 0.007 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9030525bdc54..9a84be07f5d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11178,10 +11178,10 @@ let self = _self // overrides; _self = with self; { }; PerlIOutf8_strict = buildPerlPackage rec { - name = "PerlIO-utf8_strict-0.006"; + name = "PerlIO-utf8_strict-0.007"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "980010e624c43be0a2aac8e1fe5db3fe43035940def75ca70401bb1ca98bd562"; + sha256 = "83a33f2fe046cb3ad6afc80790635a423e2c7c6854afacc6998cd46951cc81cb"; }; buildInputs = [ TestException ]; meta = { From 86e7925a50037c4acf6c525b2ce1aacbfa951567 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:54:59 +0000 Subject: [PATCH 0806/2743] [cpan2nix] perlPackages.RSSParserLite: 0.10 -> 0.12 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a84be07f5d3..8a7820dad170 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12201,16 +12201,17 @@ let self = _self // overrides; _self = with self; { }; RSSParserLite = buildPerlPackage { - name = "RSS-Parser-Lite-0.10"; + name = "RSS-Parser-Lite-0.12"; src = fetchurl { - url = mirror://cpan/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz; - sha256 = "1spvi0z62saz2cam8kwk2k561aavw2w42g3ykj38w1kmydvsk8z6"; + url = mirror://cpan/authors/id/T/TF/TFPBL/RSS-Parser-Lite-0.12.tar.gz; + sha256 = "1fcmp4qp7q3xr2mw7clqqwph45icbvgfs2n41gp9zamim2y39p49"; }; - propagatedBuildInputs = [ SOAPLite ]; + propagatedBuildInputs = [ locallib ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + doCheck = false; }; RTClientREST = buildPerlPackage { From 6809ce6049fa9789cf3bf7282610832ccf4de18c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:00 +0000 Subject: [PATCH 0807/2743] [cpan2nix] perlPackages.StringUtil: 1.24 -> 1.26 dependencies: perlPackages.NumberMisc: init at 1.2 perlPackages.TestToolbox: init at 0.4 --- pkgs/top-level/perl-packages.nix | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8a7820dad170..429900319a87 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10692,6 +10692,18 @@ let self = _self // overrides; _self = with self; { }; }; + NumberMisc = buildPerlModule rec { + name = "Number-Misc-1.2"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz; + sha256 = "1n4ivj4ydplanwbxn3jbsfyfcl91ngn2d0addzqrq1hac26bdfbp"; + }; + meta = { + description = "Number::Misc - handy utilities for numbers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NTLM = buildPerlPackage rec { name = "NTLM-1.09"; src = fetchurl { @@ -12895,17 +12907,19 @@ let self = _self // overrides; _self = with self; { }; }; - StringUtil = let version = "1.24"; in buildPerlPackage { + StringUtil = let version = "1.26"; in buildPerlModule { name = "String-Util-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKO/String-Util-${version}.tar.gz"; - sha256 = "16c7dbpz87ywq49lnsaml0k28jbkraf1p2njh72jc5xcxys7vykv"; + sha256 = "0bgs6fsc0gcj9qa1k98nwjp4xbkl3ckz71rz3qhmav0lgkrr96pl"; }; meta = { inherit version; description = "String::Util -- String processing utilities"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ NumberMisc ]; + buildInputs = [ TestToolbox ]; }; libfile-stripnondeterminism = buildPerlPackage rec { @@ -14593,6 +14607,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestToolbox = buildPerlModule rec { + name = "Test-Toolbox-0.4"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz; + sha256 = "1hxx9rhvncvn7wvzhzx4sk00w0xq2scgspfhhyqwjnm1yg3va820"; + }; + meta = { + description = "Test::Toolbox - tools for testing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestTrailingSpace = buildPerlPackage rec { name = "Test-TrailingSpace-0.0301"; src = fetchurl { From fac56514fc7e86718d5df4a02529df44e6b85b17 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:02 +0000 Subject: [PATCH 0808/2743] [cpan2nix] perlPackages.TestCheckDeps: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 429900319a87..df55301f1cd9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13750,7 +13750,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; sha256 = "1vjinlixxdx6gfcw8y1dw2rla8bfhi8nmgcqr3nffc7kqskcrz36"; }; - buildInputs = [ ModuleBuildTiny ModuleMetadata ]; propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; From a93149d5957d2f078fd98e6db7349e5cd5489faa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:02 +0000 Subject: [PATCH 0809/2743] [cpan2nix] perlPackages.TestFileContents: 0.21 -> 0.23 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df55301f1cd9..328d2f5ce1eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13959,10 +13959,10 @@ let self = _self // overrides; _self = with self; { }; TestFileContents = buildPerlModule { - name = "Test-File-Contents-0.21"; + name = "Test-File-Contents-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.21.tar.gz; - sha256 = "1b5a13f86f5df625ffd30361f628d34b0ceda80b9f39ca74bf0a4c1105828317"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz; + sha256 = "cd6fadfb910b34b4b53991ff231dad99929ca8850abec3ad0e2810c4bd7b1f3d"; }; propagatedBuildInputs = [ TextDiff ]; meta = { From 309cc78577105a0b8c38988e46436e597d14d39e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:03 +0000 Subject: [PATCH 0810/2743] [cpan2nix] perlPackages.TestMockModule: 0.11 -> 0.13 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 328d2f5ce1eb..9595bffe27d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14103,10 +14103,10 @@ let self = _self // overrides; _self = with self; { }; TestMockModule = buildPerlModule { - name = "Test-MockModule-0.11"; + name = "Test-MockModule-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.11.tar.gz; - sha256 = "1f8l5y9dzik7a19mdbydqa0yxc4x0ilgpf9yaq6ix0bzlsilnn05"; + url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.13.tar.gz; + sha256 = "0lwh6fvnc16r6d74vvh5h4b5a1spcslpjb3mcqbv23k01lm78wvl"; }; propagatedBuildInputs = [ SUPER ]; meta = { From b23c3b956fa1d15c02f64ea12e6bee288debd3c6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:03 +0000 Subject: [PATCH 0811/2743] [cpan2nix] perlPackages.TestPodCoverage: 1.08 -> 1.10 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9595bffe27d1..579d243ae25a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14272,12 +14272,12 @@ let self = _self // overrides; _self = with self; { }; TestPodCoverage = buildPerlPackage rec { - name = "Test-Pod-Coverage-1.08"; + name = "Test-Pod-Coverage-1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "0y2md932zhbxdjwzskx0vmw2qy7jxkn87f9lb5h3f3vxxg1kcqz0"; + url = mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz; + sha256 = "1m203mhgfilz7iqc8mxaw4lw02fz391mni3n25sfx7nryylwrja8"; }; - propagatedBuildInputs = [PodCoverage]; + propagatedBuildInputs = [ PodCoverage ]; }; TestPodLinkCheck = buildPerlPackage rec { From b946667443a8c6bf842800a41fb97885ebda4650 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:04 +0000 Subject: [PATCH 0812/2743] [cpan2nix] perlPackages.TestTCP: 2.14 -> 2.19 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 579d243ae25a..879bc243a67d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14574,16 +14574,16 @@ let self = _self // overrides; _self = with self; { }; TestTCP = buildPerlPackage rec { - name = "Test-TCP-2.14"; + name = "Test-TCP-2.19"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; - sha256 = "00bxgm7qva4fd25phwl8fvv36h8h5k3jk89hz9302a288wv3ysmr"; + sha256 = "14ahzklq3xgmwj58p9vdcfgpggrmh3nigq5mzqk4wakbb6fjs0fx"; }; - propagatedBuildInputs = [ TestSharedFork ]; meta = { description = "Testing TCP program"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestSharedFork ]; }; TestTester = buildPerlPackage { From 9f657389a4e1d81daf897602b1f0b78a66386909 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:04 +0000 Subject: [PATCH 0813/2743] [cpan2nix] perlPackages.TestWarnings: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 879bc243a67d..9a38e47ef6ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14679,7 +14679,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; }; - buildInputs = [ TestTester CPANMetaCheck ModuleMetadata ]; + buildInputs = [ CPANMetaCheck ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; From 0994e9a7e1e8bf8ae0b90c9b0063535bfb941ea0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:04 +0000 Subject: [PATCH 0814/2743] [cpan2nix] perlPackages.TextSprintfNamed: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9a38e47ef6ee..8c3c9d87e1f9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15134,13 +15134,13 @@ let self = _self // overrides; _self = with self; { }; }; - TextSprintfNamed = buildPerlPackage rec { + TextSprintfNamed = buildPerlModule rec { name = "Text-Sprintf-Named-0.0402"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "951317fce8fa5dd08190ba760182bc71f2b4346fa21df55c76155e6353e2864f"; }; - buildInputs = [ ModuleBuild TestWarn ]; + buildInputs = [ TestWarn ]; meta = { description = "Sprintf-like function with named conversions"; license = stdenv.lib.licenses.mit; From 35940091b354c70ce6a6a81e273640093fadf68a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:05 +0000 Subject: [PATCH 0815/2743] [cpan2nix] perlPackages.TextWikiFormat: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c3c9d87e1f9..8d69a373a18b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15297,7 +15297,7 @@ let self = _self // overrides; _self = with self; { }; }; - TextWikiFormat = buildPerlPackage { + TextWikiFormat = buildPerlModule { name = "Text-WikiFormat-0.81"; src = fetchurl { url = mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz; From a82b6b0d72641d98effcca48e2b1d5fff7c5710e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:06 +0000 Subject: [PATCH 0816/2743] [cpan2nix] perlPackages.TimeDurationParse: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d69a373a18b..6dc733e2438d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15524,10 +15524,10 @@ let self = _self // overrides; _self = with self; { }; TimeDurationParse = buildPerlPackage rec { - name = "Time-Duration-Parse-0.12"; + name = "Time-Duration-Parse-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; - sha256 = "0yxfxw7fxs19nncpv54nqh21ak2cmvpz7ks8d9v4lz3mbq6q0q9s"; + sha256 = "0affdzhsiy7dr6dzj2p6m9lynmjh53k31bprfsfa21pz8551hjj1"; }; buildInputs = [ TimeDuration ]; propagatedBuildInputs = [ ExporterLite ]; From 84f3c7572ed172fd853d9b4a5f037165a17d066c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:06 +0000 Subject: [PATCH 0817/2743] [cpan2nix] perlPackages.TreeSimple: 1.25 -> 1.33 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6dc733e2438d..6f6e747e503b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15600,12 +15600,12 @@ let self = _self // overrides; _self = with self; { }; TreeSimple = buildPerlPackage rec { - name = "Tree-Simple-1.25"; + name = "Tree-Simple-1.33"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; - sha256 = "1xj1n70v4qbx7m9k01bj9aixk77yssliavgvfds3xj755hcan0nr"; + sha256 = "1alnwb6c7n4al91m9cyknvcyvdz521lh22dz1hyk4v7c50adffnv"; }; - buildInputs = [ TestException TestMemoryCycle ]; + buildInputs = [ TestException ]; meta = { description = "A simple tree object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 2032f585e279d231d057cb8291c064f3ebe36655 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:06 +0000 Subject: [PATCH 0818/2743] [cpan2nix] perlPackages.URIFind: 20140709 -> 20160806 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6f6e747e503b..a1054b7279ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15813,10 +15813,10 @@ let self = _self // overrides; _self = with self; { }; URIFind = buildPerlModule rec { - name = "URI-Find-20140709"; + name = "URI-Find-20160806"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; - sha256 = "0czc4h182s7sx3k123m7qlg7yybnwxgh369hap3c3b6xgrglrhy0"; + sha256 = "1mk3jv8x0mcq3ajrn9garnxd0jc7sw4pkwqi88r5apqvlljs84z2"; }; propagatedBuildInputs = [ URI ]; meta = { From b7169388e0e5ccf97f838e623d605fb209672317 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:07 +0000 Subject: [PATCH 0819/2743] [cpan2nix] perlPackages.URIIMAP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a1054b7279ca..e1596f7f0bcc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15856,7 +15856,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz; sha256 = "0bdv6mrdijcq46r3lmz801rscs63f8p9qqliy2safd6fds4rj55v"; }; - propagatedBuildInputs = [URI]; + propagatedBuildInputs = [ URI ]; }; URINested = buildPerlModule { From f47c16b9ec726f7767a9c61e9cd20a51365d865d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:07 +0000 Subject: [PATCH 0820/2743] [cpan2nix] perlPackages.URIws: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e1596f7f0bcc..8968bdec34be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15879,7 +15879,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; sha256 = "6e6b0e4172acb6a53c222639c000608c2dd61d50848647482ac8600d50e541ef"; }; - buildInputs = [ URI ]; propagatedBuildInputs = [ URI ]; meta = { homepage = http://perl.wdlabs.com/URI-ws/; From 811d872a861e2347cf8c3bd27476c1fc09f15037 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:08 +0000 Subject: [PATCH 0821/2743] [cpan2nix] perlPackages.UriGoogleChart: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8968bdec34be..beded9b997ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15847,7 +15847,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; sha256 = "00hq5cpsk7sa04n0wg52qhpqf9i2849yyvw2zk83ayh1qqpc50js"; }; - buildInputs = [URI TestMore]; + propagatedBuildInputs = [ URI ]; }; URIIMAP = buildPerlPackage { From 64794b5970a72842680646e032e6493f5185995b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:09 +0000 Subject: [PATCH 0822/2743] [cpan2nix] perlPackages.cam_pdf: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index beded9b997ec..a5651c1fcb3c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -953,14 +953,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; - cam_pdf = buildPerlPackage rec { + cam_pdf = buildPerlModule rec { name = "CAM-PDF-1.60"; src = fetchurl { url = "mirror://cpan/authors/id/C/CD/CDOLAN/${name}.tar.gz"; sha256 = "12dv5ssf3y7yjz9mrrqnfzx8nf4ydk1qijf5fx59495671zzqsp7"; }; propagatedBuildInputs = [ CryptRC4 TextPDF ]; - buildInputs = [ TestMore ]; }; CanaryStability = buildPerlPackage rec { From 34407de811c8d1f1f764c91ad3a422f258d40b95 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:09 +0000 Subject: [PATCH 0823/2743] [cpan2nix] perlPackages.ApacheSession: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a5651c1fcb3c..8ea03697ec75 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -207,7 +207,7 @@ let self = _self // overrides; _self = with self; { }; }; - ApacheSession = buildPerlPackage { + ApacheSession = buildPerlModule { name = "Apache-Session-1.93"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz; From bfbecd960880da0780c549b3c1e0715e69970844 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:10 +0000 Subject: [PATCH 0824/2743] [cpan2nix] perlPackages.ArchiveZip_1_53: 1.53 -> 1.60 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ea03697ec75..721409b9ce48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -478,15 +478,16 @@ let self = _self // overrides; _self = with self; { }; ArchiveZip_1_53 = buildPerlPackage { - name = "Archive-Zip-1.53"; + name = "Archive-Zip-1.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.53.tar.gz; - sha256 = "c66f3cdfd1965d47d84af1e37b997e17d3f8c5f2cceffc1e90d04d64001424b9"; + url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz; + sha256 = "eac75b05f308e860aa860c3094aa4e7915d3d31080e953e49bc9c38130f5c20b"; }; meta = { description = "Provide an interface to ZIP archive files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestMockModule ]; }; AudioScan = buildPerlPackage rec { From 6bdf322a518fd1a2311e9b6e2b80fd7499663325 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:10 +0000 Subject: [PATCH 0825/2743] [cpan2nix] perlPackages.AuthenDecHpwd: 2.006 -> 2.007 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 721409b9ce48..e33a9337dd6c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -505,14 +505,13 @@ let self = _self // overrides; _self = with self; { }; }; - AuthenDecHpwd = buildPerlPackage rec { - name = "Authen-DecHpwd-2.006"; + AuthenDecHpwd = buildPerlModule rec { + name = "Authen-DecHpwd-2.007"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; - sha256 = "67f45fef6a23b7548f387b675cbf7881bf9da62d7d007cbf90d3a4b851b99eb7"; + sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ ScalarString DataInteger DigestCRC ]; + propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; license = stdenv.lib.licenses.gpl1Plus; From 7f4ca4e3fca502b3b2650bcbfb76e4906896155b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:10 +0000 Subject: [PATCH 0826/2743] [cpan2nix] perlPackages.AuthenRadius: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e33a9337dd6c..96e6f0fc7f11 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -549,7 +549,7 @@ let self = _self // overrides; _self = with self; { AuthenRadius = buildPerlPackage rec { name = "Authen-Radius-0.26"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/P/PO/PORTAONE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.26.tar.gz; sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3"; }; buildInputs = [ TestNoWarnings ]; From a4ee21010b3ac315b0f2a15dfee48975a623af5c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:11 +0000 Subject: [PATCH 0827/2743] [cpan2nix] perlPackages.BitVector: 7.3 -> 7.4 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 96e6f0fc7f11..ff5b283fe7bd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -740,12 +740,12 @@ let self = _self // overrides; _self = with self; { }; BitVector = buildPerlPackage { - name = "Bit-Vector-7.3"; + name = "Bit-Vector-7.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz; - sha256 = "0gcg1173i1bsx2qvyw77kw90xbf03b861jc42hvq744vzc5k6xjs"; + url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz; + sha256 = "09m96p8c0ipgz42li2ywdgy0vxb57mb5nf59j9gw7yzc3xkslv9w"; }; - propagatedBuildInputs = [CarpClan]; + propagatedBuildInputs = [ CarpClan ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; From 7fae2f03b75992248f34bb2f0399c675e2808093 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:11 +0000 Subject: [PATCH 0828/2743] [cpan2nix] perlPackages.CacheCache: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff5b283fe7bd..88e26fee10b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -869,7 +869,7 @@ let self = _self // overrides; _self = with self; { CacheCache = buildPerlPackage rec { name = "Cache-Cache-1.08"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz; sha256 = "1s6i670dc3yb6ngvdk48y6szdk5n1f4icdcjv2vi1l2xp9fzviyj"; }; propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ]; From c8e90fd019aa0e8c217cbc75c0ed162e15cf1d74 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:12 +0000 Subject: [PATCH 0829/2743] [cpan2nix] perlPackages.CarpAssertMore: 1.14 -> 1.16 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88e26fee10b3..49d0aa22e190 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1035,16 +1035,17 @@ let self = _self // overrides; _self = with self; { }; CarpAssertMore = buildPerlPackage { - name = "Carp-Assert-More-1.14"; + name = "Carp-Assert-More-1.16"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.14.tar.gz; - sha256 = "0cq7qk4qbhqppm4raby5k24b5mx5qjgy1884nrddhxillnzlq01z"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz; + sha256 = "1x9jd6s3lq97na6gz7g0zaq62l8z297xsfpdj2v42p3ijpfirl4f"; }; - propagatedBuildInputs = [ CarpAssert TestException ]; + propagatedBuildInputs = [ CarpAssert ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; license = stdenv.lib.licenses.artistic2; }; + buildInputs = [ TestException ]; }; CarpClan = buildPerlPackage { From 37fd1307fae5274f61761adff0f47bc339b67224 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:12 +0000 Subject: [PATCH 0830/2743] [cpan2nix] perlPackages.ClassAccessorGrouped: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 49d0aa22e190..02b7b05a2d23 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1850,7 +1850,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz; sha256 = "c4613ee3307939f47a9afd40e8b173f3a22f501c3b139799aa030f01b627e7fe"; }; - buildInputs = [ ClassXSAccessor DevelHide PackageStash SubName TestException ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Lets you build groups of accessors"; From de535417bced8d4b97fd36a318babddba29e94e7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:13 +0000 Subject: [PATCH 0831/2743] [cpan2nix] perlPackages.ContextPreserve: 0.01 -> 0.03 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 02b7b05a2d23..6fa84f98addf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2524,12 +2524,12 @@ let self = _self // overrides; _self = with self; { }; ContextPreserve = buildPerlPackage rec { - name = "Context-Preserve-0.01"; + name = "Context-Preserve-0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JR/JROCKWAY/${name}.tar.gz"; - sha256 = "0gssillawjknqks81x7fg7w2x94bnyklgd8ry2pr1k6ifkjhwz46"; + url = mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz; + sha256 = "07zxgmb11bn4zj3w9g1zwbb9iv4jyk5q7hc0nv59knvv5i64m489"; }; - buildInputs = [ TestException Testuseok ]; + buildInputs = [ TestException TestSimple13 ]; }; CookieBaker = buildPerlModule rec { From 70bea2e7ac3aaff9b6fa2693d301337a55602290 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:13 +0000 Subject: [PATCH 0832/2743] [cpan2nix] perlPackages.DBDMock: cleanup --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6fa84f98addf..0e319e091dd0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3807,13 +3807,14 @@ let self = _self // overrides; _self = with self; { }; }; - DBDMock = buildPerlPackage { + DBDMock = buildPerlModule { name = "DBD-Mock-1.45"; src = fetchurl { url = mirror://cpan/authors/id/D/DI/DICHI/DBD-Mock/DBD-Mock-1.45.tar.gz; sha256 = "40a80c37b31ef14536b58b4a8b483e65953b00b8fa7397817c7eb76d540bd00f"; }; - propagatedBuildInputs = [ DBI TestException ]; + propagatedBuildInputs = [ DBI ]; + buildInputs = [ TestException ]; }; DBDSQLite = import ../development/perl-modules/DBD-SQLite { From 3206fd47e26ca48e1dd32ea51462b6ada496215a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:13 +0000 Subject: [PATCH 0833/2743] [cpan2nix] perlPackages.DataCompare: 1.2102 -> 1.25 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e319e091dd0..311aa1219bd8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2990,10 +2990,10 @@ let self = _self // overrides; _self = with self; { }; DataCompare = buildPerlPackage rec { - name = "Data-Compare-1.2102"; + name = "Data-Compare-1.25"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; - sha256 = "0v1997gnq3gpcr7f64jmyay2l60s5z6gsiy5hbpn1p2l2hrfnwlj"; + sha256 = "0wzasidg9yjcfsi2gdiaw6726ikqda7n24n0v2ngpaazakdkcjqx"; }; propagatedBuildInputs = [ FileFindRule ]; }; From f1b3d748418728c374a469ea32c423a04e5c4ce1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:14 +0000 Subject: [PATCH 0834/2743] [cpan2nix] perlPackages.DevelPatchPerl: 1.38 -> 1.48 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 311aa1219bd8..90ee10dcc402 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3741,10 +3741,10 @@ let self = _self // overrides; _self = with self; { }; DevelPatchPerl = buildPerlPackage rec { - name = "Devel-PatchPerl-1.38"; + name = "Devel-PatchPerl-1.48"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0997ms4ksvxy0x0bnhrm7mhx3d2rbmgdiv3xdsawb17r2695vrgk"; + sha256 = "1zlh1pmlihzcabj2zyfdnrqj6kfl3n9769yfrs296wxgaa7bra96"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { From de82c0aeb982189aa11c844494510f956a99b8ce Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:15 +0000 Subject: [PATCH 0835/2743] [cpan2nix] perlPackages.FileMimeInfo: 0.27 -> 0.28 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 90ee10dcc402..560b712fbeed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5678,13 +5678,13 @@ let self = _self // overrides; _self = with self; { }; FileMimeInfo = buildPerlPackage rec { - name = "File-MimeInfo-0.27"; + name = "File-MimeInfo-0.28"; src = fetchurl { - url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; - sha256 = "0d3jcs2fgrrfwl3rxk8xg0varjah2llm66jk6rk2gznpzqkgi72p"; + url = mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.28.tar.gz; + sha256 = "1ipbh63bkh1r2gy5g7q4bzhki8j29mm1jkhbv60p9vwsdys5s91a"; }; doCheck = false; # Failed test 'desktop file is the right one' - propagatedBuildInputs = [ FileBaseDir FileDesktopEntry ]; + buildInputs = [ FileBaseDir ]; }; FileMMagic = buildPerlPackage rec { From cfd9203ad81a560be64c31a3a52de1b0f9d5a8ac Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:15 +0000 Subject: [PATCH 0836/2743] [cpan2nix] perlPackages.FileSlurper: 0.011 -> 0.012 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 560b712fbeed..95133592f48b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5867,10 +5867,10 @@ let self = _self // overrides; _self = with self; { }; FileSlurper = buildPerlPackage rec { - name = "File-Slurper-0.011"; + name = "File-Slurper-0.012"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "f6494844b9759b3d1dd8fc4ffa790f8e6e493c4eb58e88831a51e085f2e76010"; + sha256 = "4efb2ea416b110a1bda6f8133549cc6ea3676402e3caf7529fce0313250aa578"; }; buildInputs = [ TestWarnings ]; meta = { From 6b891358e5e6e41e422af4edc3c7d00afc1b4b45 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:15 +0000 Subject: [PATCH 0837/2743] [cpan2nix] perlPackages.Gnome2VFS: 1.082 -> 1.083 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 95133592f48b..629cdcae60e7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6190,12 +6190,12 @@ let self = _self // overrides; _self = with self; { }; Gnome2VFS = buildPerlPackage rec { - name = "Gnome2-VFS-1.082"; + name = "Gnome2-VFS-1.083"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "19dacfedef8770300861cb75f98ca5402e6e56501a888af3c18266a0790911b7"; + sha256 = "eca974669df4e7f21b4fcedb96c8a328422369c68b8c2cd99b9ce9cc5d7a7979"; }; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib pkgs.gnome2.gnome_vfs ]; + propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; meta = { description = "Perl interface to the 2.x series of the GNOME VFS library"; license = stdenv.lib.licenses.lgpl21Plus; From 12842092a388d84b2bf516dc6a82253a7807d835 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:16 +0000 Subject: [PATCH 0838/2743] [cpan2nix] perlPackages.HashMerge: 0.200 -> 0.300 dependencies: perlPackages.CloneChoose: init at 0.008 perlPackages.ClonePP: init at 1.07 --- pkgs/top-level/perl-packages.nix | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 629cdcae60e7..83e779b40bb6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2217,6 +2217,31 @@ let self = _self // overrides; _self = with self; { }; }; + CloneChoose = buildPerlPackage rec { + name = "Clone-Choose-0.008"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.008.tar.gz; + sha256 = "0grf0bg1ldzqakaq7aaigjngwd07zybrlmwjcnb0q986q0jcfank"; + }; + buildInputs = [ Clone ClonePP ]; + meta = { + description = "Choose appropriate clone utility"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/Clone-Choose"; + }; + }; + + ClonePP = buildPerlPackage rec { + name = "Clone-PP-1.07"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz; + sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; + }; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + # For backwards compatibility. CommonSense = self.commonsense; @@ -6464,15 +6489,16 @@ let self = _self // overrides; _self = with self; { }; HashMerge = buildPerlPackage rec { - name = "Hash-Merge-0.200"; + name = "Hash-Merge-0.300"; src = fetchurl { url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; - sha256 = "0r1a2axz85wn6573zrl9rk8mkfl2cvf1gp9vwya5qndp60rz1ya7"; + sha256 = "0h3wfnpv5d4d3f9xzmwkchay6251nhzngdv3f6xia56mj4hxabs0"; }; - propagatedBuildInputs = [ Clone ]; + propagatedBuildInputs = [ CloneChoose ]; meta = { description = "Merges arbitrarily deep hashes into a single hash"; }; + buildInputs = [ Clone ClonePP ]; }; HashMergeSimple = buildPerlPackage { From b657dc6137d1b356f23f351b7cbdacd738d14c49 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:16 +0000 Subject: [PATCH 0839/2743] [cpan2nix] perlPackages.InlineJava: 0.52 -> 0.53 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 83e779b40bb6..20d09fd45e17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7625,11 +7625,11 @@ let self = _self // overrides; _self = with self; { }; InlineJava = buildPerlPackage rec { - name = "Inline-Java-0.52"; + name = "Inline-Java-0.53"; src = fetchurl { url = "mirror://cpan/authors/id/P/PA/PATL/${name}.tar.gz"; - sha256 = "0xdx1nnjvsih2njcncmwxwdi3w2zf74vqb9wpn1va8ii93mlakff"; + sha256 = "1d9hq09nv3l6m015ws08b3gbfp8daxryqr7p0yi0xhqr44j9qcj8"; }; propagatedBuildInputs = [ Inline ]; From 161683e13a5eac06d4629ea652975030ccc4655a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:17 +0000 Subject: [PATCH 0840/2743] [cpan2nix] perlPackages.JSONXS: 2.34 -> 3.04 dependencies: perlPackages.TypesSerialiser: init at 1.0 --- pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 20d09fd45e17..c84ee1dfc2b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7762,16 +7762,17 @@ let self = _self // overrides; _self = with self; { }; JSONXS = buildPerlPackage { - name = "JSON-XS-2.34"; + name = "JSON-XS-3.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.34.tar.gz; - sha256 = "1sh0i73skxp3rvd9w8phxqncw9m1r5ibnb9qxxm21bmrfwkxybx6"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz; + sha256 = "0b3w14zqjxnm93jjfzjqz8pkxp3a2l9242y7zxxhnvzav1mq7n35"; }; - propagatedBuildInputs = [ commonsense ]; + propagatedBuildInputs = [ TypesSerialiser ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; + buildInputs = [ CanaryStability ]; }; JSONXSVersionOneAndTwo = buildPerlPackage rec { @@ -15677,6 +15678,17 @@ let self = _self // overrides; _self = with self; { }; }; + TypesSerialiser = buildPerlPackage rec { + name = "Types-Serialiser-1.0"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz; + sha256 = "03bk0hm5ys8k7265dkap825ybn2zmzb1hl0kf1jdm8yq95w39lvs"; + }; + propagatedBuildInputs = [ commonsense ]; + meta = { + }; + }; + UNIVERSALcan = buildPerlPackage { name = "UNIVERSAL-can-1.20140328"; src = fetchurl { From 4eb348715dac31c28600c94fb30b4c4edcac3f0e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:17 +0000 Subject: [PATCH 0841/2743] [cpan2nix] perlPackages.MIMETools: cleanup --- pkgs/top-level/perl-packages.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c84ee1dfc2b3..5ae73c1c65b9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8873,20 +8873,11 @@ let self = _self // overrides; _self = with self; { MIMETools = buildPerlPackage rec { name = "MIME-tools-5.509"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz"; + url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz; sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; }; - propagatedBuildInputs = [ - MailTools - FilePath - FileTemp - MIMEBase64 - ]; - buildInputs = [ - TestDeep - TestPod - TestPodCoverage - ]; + propagatedBuildInputs = [ MailTools ]; + buildInputs = [ TestDeep ]; meta = { description = "class for parsed-and-decoded MIME message"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 860db7a3c585e6717d9c9ffa71aa914e36199a8e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:18 +0000 Subject: [PATCH 0842/2743] [cpan2nix] perlPackages.NetSMTPTLS: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ae73c1c65b9..c0a4dd01275b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10609,7 +10609,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz; sha256 = "19g48kabj22v66jbf69q78xplhi7r1y2kdbddfwh4xy3g9k75rzg"; }; - propagatedBuildInputs = [IOSocketSSL DigestHMAC]; + propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; }; NetSMTPTLSButMaintained = buildPerlPackage { From 849c6f535d8a42087ba4a897bc11fb9a2a16d69f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:18 +0000 Subject: [PATCH 0843/2743] [cpan2nix] perlPackages.NetSMTPTLSButMaintained: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c0a4dd01275b..2ab53dd085c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10618,7 +10618,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz; sha256 = "0vi5cv7f9i96hgp3q3jpxzn1ysn802kh5xc304f8b7apf67w15bb"; }; - propagatedBuildInputs = [NetSSLeay DigestHMAC IOSocketSSL]; + propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; }; NetSNMP = buildPerlModule rec { From 3337b9255b07f0ece11883eefa1db7ba9be57b61 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:18 +0000 Subject: [PATCH 0844/2743] [cpan2nix] perlPackages.ObjectInsideOut: 3.98 -> 4.04 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ab53dd085c1..96b67881a1ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10748,11 +10748,11 @@ let self = _self // overrides; _self = with self; { }; }; - ObjectInsideOut = buildPerlPackage { - name = "Object-InsideOut-3.98"; + ObjectInsideOut = buildPerlModule { + name = "Object-InsideOut-4.04"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-3.98.tar.gz; - sha256 = "1zxfm2797p8b9dsvnbgd6aa4mgpxqxjqzbpfbla1g7f9alxm9f1z"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.04.tar.gz; + sha256 = "01pncagr3k7yj0rn22xap08s17nw2p2ffcg6j00gs9fg4jv9pfmj"; }; propagatedBuildInputs = [ ExceptionClass ]; meta = { From 94e253a22856f91c02209ac6b3b08c14b7398d49 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:19 +0000 Subject: [PATCH 0845/2743] [cpan2nix] perlPackages.POE: cleanup --- pkgs/top-level/perl-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 96b67881a1ff..360e2574db99 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11490,11 +11490,7 @@ let self = _self // overrides; _self = with self; { # N.B. removing TestPodLinkCheck from buildInputs because tests requiring # this module don't disable themselves when "run_network_tests" is # not present (see below). - buildInputs = [ - Curses EmailMIME HTTPMessage IOTty LWPProtocolHttps POETestLoops - TermReadKey TestPod TestPodCoverage TestPodNo404s YAML - ]; - propagatedBuildInputs = [ pkgs.cacert IOPipely ]; + propagatedBuildInputs = [ pkgs.cacert IOPipely IOTty POETestLoops ]; meta = { maintainers = [ maintainers.limeytexan ]; description = "Portable multitasking and networking framework for any event loop"; From c5f3201d38f1bc363aaaa6dd385a0a7e71762501 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:19 +0000 Subject: [PATCH 0846/2743] [cpan2nix] perlPackages.Razor2ClientAgent: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 360e2574db99..a4bf140d5617 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12020,6 +12020,7 @@ let self = _self // overrides; _self = with self; { description = "Collaborative, content-based spam filtering network agent"; license = stdenv.lib.licenses.mit; }; + doCheck = false; }; From eb9d52a9e163f894c8fa9e64d9af0fe826cfc77a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:20 +0000 Subject: [PATCH 0847/2743] [cpan2nix] perlPackages.ServerStarter: 0.33 -> 0.34 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a4bf140d5617..712057f4df90 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12356,12 +12356,12 @@ let self = _self // overrides; _self = with self; { }; ServerStarter = buildPerlModule rec { - name = "Server-Starter-0.33"; + name = "Server-Starter-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; - sha256 = "109cc1ede244f2edb7e020c507d4a1ff7a8074f22a8f7c30253fb00af1aba6f6"; + sha256 = "96a20d4a1f341655bd1b26df5795d57c5d7498d9bcf8ca9d0d6e2ed743608f78"; }; - buildInputs = [ ModuleBuild TestRequires TestSharedFork TestTCP ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { homepage = https://github.com/kazuho/p5-Server-Starter; description = "A superdaemon for hot-deploying server programs"; From 56ca90204a43e8dd4a57d00f60c89f50b4fcb4ea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:20 +0000 Subject: [PATCH 0848/2743] [cpan2nix] perlPackages.SubExporter: 0.984 -> 0.987 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 712057f4df90..2c61a47b35fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12971,12 +12971,12 @@ let self = _self // overrides; _self = with self; { }; SubExporter = buildPerlPackage { - name = "Sub-Exporter-0.984"; + name = "Sub-Exporter-0.987"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.984.tar.gz; - sha256 = "190qly7nv7zf17c1v0gnqhyf25p6whhh2m132mh4xzs5mqadwq0f"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz; + sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l"; }; - propagatedBuildInputs = [ DataOptList ParamsUtil SubInstall ]; + propagatedBuildInputs = [ DataOptList ]; meta = { homepage = https://github.com/rjbs/sub-exporter; description = "A sophisticated exporter for custom-built routines"; From 2e8c2e164cd29db2e8a0a354bc4b848c0d90943d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:21 +0000 Subject: [PATCH 0849/2743] [cpan2nix] perlPackages.TestBase: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2c61a47b35fa..3dd78ce7332b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13758,6 +13758,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fch1cvivnszbnwhpfmwv1rin04j5xkj1n1ylfmlxg6bm72qqdjj"; }; propagatedBuildInputs = [ Spiffy ]; + buildInputs = [ AlgorithmDiff TextDiff ]; }; TestCheckDeps = buildPerlPackage rec { From 07bde432cb28f5bb0b73e69185e77ed52ca4a38d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:21 +0000 Subject: [PATCH 0850/2743] [cpan2nix] perlPackages.TestDifferences: 0.63 -> 0.64 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3dd78ce7332b..00f347f5847c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13879,11 +13879,11 @@ let self = _self // overrides; _self = with self; { }; }; - TestDifferences = buildPerlPackage { - name = "Test-Differences-0.63"; + TestDifferences = buildPerlModule { + name = "Test-Differences-0.64"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.63.tar.gz; - sha256 = "7c657a178c32f48de3b469f6d4f67b75f018a3a19c1e6d0d8892188b0d261a66"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz; + sha256 = "9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { From dd665c65f221c08b28228f32f0307f4e6ec8eb70 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:21 +0000 Subject: [PATCH 0851/2743] [cpan2nix] perlPackages.TestRunValgrind: 0.0.1 -> 0.2.0 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00f347f5847c..61d07359f918 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14488,12 +14488,12 @@ let self = _self // overrides; _self = with self; { }; TestRunValgrind = buildPerlModule rec { - name = "Test-RunValgrind-0.0.1"; + name = "Test-RunValgrind-0.2.0"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "67bf3cf3e7d5d23ec33e592f8b0dbcccfa01205d5bf0a3d73d8c8358d167e83f"; + sha256 = "70947565ad0be3e5d0cd9aca9e1fd0cb07c873e574310e92e8eca629ec6cd631"; }; - buildInputs = [ ModuleBuild perl ]; + buildInputs = [ TestTrap ]; propagatedBuildInputs = [ PathTiny ]; meta = { description = "Tests that an external program is valgrind-clean"; From 82da98199e6f95040c33160ff7ddd89ffd94eb85 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:22 +0000 Subject: [PATCH 0852/2743] [cpan2nix] perlPackages.TextTemplate: 1.46 -> 1.52 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61d07359f918..43f562fa5881 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15199,15 +15199,16 @@ let self = _self // overrides; _self = with self; { }; TextTemplate = buildPerlPackage { - name = "Text-Template-1.46"; + name = "Text-Template-1.52"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJD/Text-Template-1.46.tar.gz; - sha256 = "77d812cb86e48091bcd59aa8522ef887b33a0ff758f8a269da8c2b733889d580"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.52.tar.gz; + sha256 = "85da7a5e7eecf1871cda8bf3ce7b8ad0b5f75c6c5791f43a7d94373406859b6c"; }; meta = { description = "Unknown"; license = "unknown"; }; + buildInputs = [ TestWarnings ]; }; TestTrap = buildPerlModule rec { From d8a8453cddd024d7326fa8e3298cb2842240eaad Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:22 +0000 Subject: [PATCH 0853/2743] [cpan2nix] perlPackages.TreeSimpleVisitorFactory: 0.12 -> 0.15 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 43f562fa5881..6a3acdb3163b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15631,13 +15631,13 @@ let self = _self // overrides; _self = with self; { }; TreeSimpleVisitorFactory = buildPerlPackage { - name = "Tree-Simple-VisitorFactory-0.12"; + name = "Tree-Simple-VisitorFactory-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.12.tgz; - sha256 = "1g27xl48q1vr7aikhxg4vvcsj1si8allxz59vmnks61wsw4by7vg"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz; + sha256 = "06y2vazkl307k59hnkp9h5bp3p7711kgmp1qdhb2lgnfwzn84zin"; }; - propagatedBuildInputs = [TreeSimple]; - buildInputs = [TestException]; + propagatedBuildInputs = [ TreeSimple ]; + buildInputs = [ TestException ]; }; TryTiny = buildPerlPackage { From 1f64eec12052716cd30f829c87d2b7d56d91a18f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:22 +0000 Subject: [PATCH 0854/2743] [cpan2nix] perlPackages.TryTiny: 0.22 -> 0.30 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a3acdb3163b..1f70e3c45011 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15641,12 +15641,12 @@ let self = _self // overrides; _self = with self; { }; TryTiny = buildPerlPackage { - name = "Try-Tiny-0.22"; + name = "Try-Tiny-0.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.22.tar.gz; - sha256 = "60fba46f4693d33d54539104f9001df008dabb400b6837e9605c39a6ee6a1b19"; + url = mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz; + sha256 = "da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b"; }; - buildInputs = [ if_ ]; + buildInputs = [ CPANMetaCheck CaptureTiny ]; meta = { homepage = https://metacpan.org/release/Try-Tiny; description = "Minimal try/catch with proper preservation of $@"; From ab71051a7746c06207b150cdfc55aeca607c64ae Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:23 +0000 Subject: [PATCH 0855/2743] [cpan2nix] perlPackages.URIdb: 0.15 -> 0.18 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f70e3c45011..849824019aec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15828,12 +15828,12 @@ let self = _self // overrides; _self = with self; { }; URIdb = buildPerlModule { - name = "URI-db-0.15"; + name = "URI-db-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.15.tar.gz; - sha256 = "ac3dc3eeb8ca58dc4f7e1dfed6bca5bb8ebbc5dfacee63161490b09a4bfac982"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.18.tar.gz; + sha256 = "460a1d3b9a45779f56dbbeebc60612370b32771f3158c87da981857163b43e0b"; }; - propagatedBuildInputs = [ URI URINested ]; + propagatedBuildInputs = [ URINested ]; meta = { homepage = https://search.cpan.org/dist/URI-db/; description = "Database URIs"; From a528811eda62ed30b71d5be515cb7ea28bab6631 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:24 +0000 Subject: [PATCH 0856/2743] [cpan2nix] perlPackages.XMLSAXWriter: 0.56 -> 0.57 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 849824019aec..1d6fa9d926ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16411,10 +16411,10 @@ let self = _self // overrides; _self = with self; { }; XMLSAXWriter = buildPerlPackage { - name = "XML-SAX-Writer-0.56"; + name = "XML-SAX-Writer-0.57"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.56.tar.gz; - sha256 = "d073f7a25072c8150317b86b99d07031316a15bffab99e63e5afe591c8217d03"; + url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz; + sha256 = "3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0"; }; propagatedBuildInputs = [ XMLFilterBufferText XMLNamespaceSupport XMLSAXBase ]; meta = { From e57ece9abe1a7344cd2b0e646f85856e755254b0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:24 +0000 Subject: [PATCH 0857/2743] [cpan2nix] perlPackages.AlienTidyp: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1d6fa9d926ef..45d201651f00 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -104,8 +104,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0raapwp4155lqag1kzhsd20z4if10hav9wx4d7mc1xpvf7dcnr5r"; }; - buildInputs = [ FileShareDir ArchiveExtract ]; + buildInputs = [ ArchiveExtract ]; TIDYP_DIR = "${pkgs.tidyp}"; + propagatedBuildInputs = [ FileShareDir ]; }; AlienWxWidgets = buildPerlPackage rec { From a76e6b04b12f2cad36c24faaf1ba792f61700f52 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:24 +0000 Subject: [PATCH 0858/2743] [cpan2nix] perlPackages.AuthenHtpasswd: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 45d201651f00..af66114a694d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -522,7 +522,7 @@ let self = _self // overrides; _self = with self; { AuthenHtpasswd = buildPerlPackage rec { name = "Authen-Htpasswd-0.171"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Authen/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz; sha256 = "0rw06hwpxg388d26l0jvirczx304f768ijvc20l4b2ll7xzg9ymm"; }; propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; From 739f01ad1e7f344d78241e1a0685dad2a6e6d20a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:25 +0000 Subject: [PATCH 0859/2743] [cpan2nix] perlPackages.CGISimple: 1.115 -> 1.15 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index af66114a694d..a86aded3a8df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1769,17 +1769,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGI ]; }; - CGISimple = buildPerlPackage rec { - name = "CGI-Simple-1.115"; + CGISimple = buildPerlModule rec { + name = "CGI-Simple-1.15"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SZ/SZABGAB/${name}.tar.gz"; - sha256 = "1nkyb1m1g5r47xykflf68dplanih5p15njv82frbgbsms34kp1sg"; + url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.15.tar.gz; + sha256 = "013dcy9k4sj9alkksk5aqz65ryxw0rxgg71c7w666y941gd8n46q"; }; propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException TestNoWarnings ]; }; CGIStruct = buildPerlPackage { From 2f11851d33d2253901156bc10ee8cd0d96d2a1a9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:25 +0000 Subject: [PATCH 0860/2743] [cpan2nix] perlPackages.CarpAlways: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a86aded3a8df..e48a8b2b8bae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1023,6 +1023,7 @@ let self = _self // overrides; _self = with self; { description = "Warns and dies noisily with stack backtraces"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestBase ]; }; CarpAssert = buildPerlPackage { From cab9e859cab656720a927990820d71471e2cf63a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:25 +0000 Subject: [PATCH 0861/2743] [cpan2nix] perlPackages.ConvertColor: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e48a8b2b8bae..5efedf0f3005 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2506,7 +2506,7 @@ let self = _self // overrides; _self = with self; { }; }; - ConvertColor = buildPerlPackage { + ConvertColor = buildPerlModule { name = "Convert-Color-0.11"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz; From 2a58cdff3ca30eada46dd6e24cb9a50be45b77b7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:26 +0000 Subject: [PATCH 0862/2743] [cpan2nix] perlPackages.CryptDHGMP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5efedf0f3005..2b06059a54b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2755,7 +2755,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DM/DMAKI/${name}.tar.gz"; sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi"; }; - buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; + buildInputs = [ pkgs.gmp DevelChecklib TestRequires ]; NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; From 83b347ac34c41fae911581beacc6b60c7057c047 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:26 +0000 Subject: [PATCH 0863/2743] [cpan2nix] perlPackages.DataPage: cleanup --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b06059a54b5..df2d29c92b52 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3164,13 +3164,14 @@ let self = _self // overrides; _self = with self; { }; }; - DataPage = buildPerlPackage { + DataPage = buildPerlModule { name = "Data-Page-2.02"; src = fetchurl { url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz; sha256 = "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554"; }; - propagatedBuildInputs = [TestException ClassAccessorChained]; + propagatedBuildInputs = [ ClassAccessorChained ]; + buildInputs = [ TestException ]; }; DataPagePageset = buildPerlPackage rec { From c36c1bc5dc9ab8e0dab104fc3f85596e57680797 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:27 +0000 Subject: [PATCH 0864/2743] [cpan2nix] perlPackages.DateCalc: 6.3 -> 6.4 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index df2d29c92b52..b23ddb674792 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3388,12 +3388,12 @@ let self = _self // overrides; _self = with self; { }; DateCalc = buildPerlPackage { - name = "Date-Calc-6.3"; + name = "Date-Calc-6.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz; - sha256 = "14yvbgy9n8icwlm5zi86lskvxd6nsl42i1g9f5dwdaw9my463diy"; + url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz; + sha256 = "1barz0jgdaan3jm7ciphs5n3ahwkl42imprs3y8c1dwpwyr3gqbw"; }; - propagatedBuildInputs = [CarpClan BitVector]; + propagatedBuildInputs = [ BitVector ]; doCheck = false; # some of the checks rely on the year being <2015 meta = { maintainers = with maintainers; [ ]; From 251828648f13624374ed8b28c01416b7e415e870 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:27 +0000 Subject: [PATCH 0865/2743] [cpan2nix] perlPackages.DevelCheckOS: 1.76 -> 1.81 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b23ddb674792..222ac658f4cd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3761,12 +3761,12 @@ let self = _self // overrides; _self = with self; { }; DevelCheckOS = buildPerlPackage rec { - name = "Devel-CheckOS-1.76"; + name = "Devel-CheckOS-1.81"; src = fetchurl { url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; - sha256 = "f83fb4cb8de060f607214b1e88c98ac6c4e065371e646fe896f16ea887aecb0c"; + sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10"; }; - propagatedBuildInputs = [ DataCompare FileFindRule ]; + propagatedBuildInputs = [ DataCompare ]; }; DevelPatchPerl = buildPerlPackage rec { From d9b69beebd8ec8ad141fc2585ae791ddf7eae302 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:28 +0000 Subject: [PATCH 0866/2743] [cpan2nix] perlPackages.FileFindObjectRule: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 222ac658f4cd..99a14dd2eef6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5569,8 +5569,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "2ce55766b25fb8799d37b95bca61e8a71d8a437e28541e1cd06b7eb89f7739d1"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ ClassXSAccessor FileFindObject NumberCompare TextGlob ]; + propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; meta = { homepage = http://www.shlomifish.org/open-source/projects/File-Find-Object/; description = "Alternative interface to File::Find::Object"; From 11e0f2a5ae886c216dad5a2e7148f59c3c8611bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:28 +0000 Subject: [PATCH 0867/2743] [cpan2nix] perlPackages.FileFindRulePerl: 1.13 -> 1.15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 99a14dd2eef6..833e463029ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5587,10 +5587,10 @@ let self = _self // overrides; _self = with self; { }; FileFindRulePerl = buildPerlPackage { - name = "File-Find-Rule-Perl-1.13"; + name = "File-Find-Rule-Perl-1.15"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/File-Find-Rule-Perl-1.13.tar.gz; - sha256 = "d2ecb270778ddf54c536a78d02fe6ee7a675f7dcb7f3497ba1a76493f1bd2476"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz; + sha256 = "9a48433f86e08ce18e03526e2982de52162eb909d19735460f07eefcaf463ea6"; }; propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { From d2cf8a0e345c648b82c7c786c3b5bebe66a53cf6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:28 +0000 Subject: [PATCH 0868/2743] [cpan2nix] perlPackages.HTMLFromANSI: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 833e463029ed..806653eb0254 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6622,7 +6622,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz; sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359"; }; - propagatedBuildInputs = [ HTMLParser TermVT102Boundless Testuseok ]; + propagatedBuildInputs = [ HTMLParser TermVT102Boundless ]; meta = { }; }; From 3db2eb336f61f366fc11e84e3b4c28c7c92b9ae8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:29 +0000 Subject: [PATCH 0869/2743] [cpan2nix] perlPackages.HTMLRewriteAttributes: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 806653eb0254..22495149b4df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6791,7 +6791,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz; sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c"; }; - propagatedBuildInputs = [ HTMLParser HTMLTagset URI ]; + propagatedBuildInputs = [ HTMLParser URI ]; meta = { description = "Concise attribute rewriting"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From b357de04f540dcfacd806d99335a8084adf6b49b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:29 +0000 Subject: [PATCH 0870/2743] [cpan2nix] perlPackages.HTMLSelectorXPath: 0.16 -> 0.23 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22495149b4df..32ae9899f88d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6799,10 +6799,10 @@ let self = _self // overrides; _self = with self; { }; HTMLSelectorXPath = buildPerlPackage { - name = "HTML-Selector-XPath-0.16"; + name = "HTML-Selector-XPath-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.16.tar.gz; - sha256 = "0v12plal866ifcv7m8x22abrddd6cf12gn55qclk53qqa6c8f8m6"; + url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.23.tar.gz; + sha256 = "0vvvdrccypwv3qpf9hq5h2b6k0p5qrmz60p2swjh009dvr601h7j"; }; buildInputs = [ TestBase ]; meta = { From 7e1dd17fa2a1302bc4343a3e7f71c9a7005b48ed Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:30 +0000 Subject: [PATCH 0871/2743] [cpan2nix] perlPackages.ListMoreUtils: 0.413 -> 0.428 dependencies: perlPackages.ListMoreUtilsXS: init at 0.428 --- pkgs/top-level/perl-packages.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 32ae9899f88d..b9553af3d686 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8038,17 +8038,32 @@ let self = _self // overrides; _self = with self; { }; ListMoreUtils = buildPerlPackage rec { - name = "List-MoreUtils-0.413"; + name = "List-MoreUtils-0.428"; src = fetchurl { url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; - sha256 = "4d6429d5672ce74a59d6490320252cb8b5b8285db8fe9c6551a4162e5375ef37"; + sha256 = "713e0945d5f16e62d81d5f3da2b6a7b14a4ce439f6d3a7de74df1fd166476cc2"; }; - propagatedBuildInputs = [ ExporterTiny ]; + propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ]; meta = { homepage = https://metacpan.org/release/List-MoreUtils; description = "Provide the stuff missing in List::Util"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestLeakTrace ]; + }; + + ListMoreUtilsXS = buildPerlPackage rec { + name = "List-MoreUtils-XS-0.428"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz; + sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; + }; + propagatedBuildInputs = [ XSLoader ]; + meta = { + description = "Provide the stuff missing in List::Util in XS"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "https://metacpan.org/release/List-MoreUtils-XS"; + }; }; ListSomeUtils = buildPerlPackage rec { From 0629240658eff5fc30b255a75add66edd0fdc883 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:30 +0000 Subject: [PATCH 0872/2743] [cpan2nix] perlPackages.MathRandomMTAuto: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b9553af3d686..649d7af8ddc3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8743,7 +8743,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.22.tar.gz; sha256 = "07zha5zjxyvqwnycb1vzk4hk2m46n9yc5lrbvhkc22595dsyjahz"; }; - propagatedBuildInputs = [ ExceptionClass ObjectInsideOut ]; + propagatedBuildInputs = [ ObjectInsideOut ]; meta = { description = "Auto-seeded Mersenne Twister PRNGs"; license = "unrestricted"; From 693325ab7c6402b0aecaf712aad72a8e13b17870 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:31 +0000 Subject: [PATCH 0873/2743] [cpan2nix] perlPackages.ModuleManifest: 1.08 -> 1.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 649d7af8ddc3..e9071f86e548 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9154,10 +9154,10 @@ let self = _self // overrides; _self = with self; { }; ModuleManifest = buildPerlPackage { - name = "Module-Manifest-1.08"; + name = "Module-Manifest-1.09"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Module-Manifest-1.08.tar.gz; - sha256 = "722ed428afcbe5b5b441b0165cbafbd8534fa63d7856d4089e6e25ac21e6445d"; + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz; + sha256 = "a395f80ff15ea0e66fd6c453844b6787ed4a875a3cd8df9f7e29280250bd539b"; }; buildInputs = [ TestException TestWarn ]; propagatedBuildInputs = [ ParamsUtil ]; From 1f39b67c131afb157e84ff370de00640d34c0f7e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:31 +0000 Subject: [PATCH 0874/2743] [cpan2nix] perlPackages.Pango: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9071f86e548..48ead8490744 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10949,7 +10949,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "0wdcidnfnb6nm79fzfs39ivawj3x8m98a147fmcxgv1zvwia9c1l"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.pango ]; + buildInputs = [ pkgs.pango ]; propagatedBuildInputs = [ Cairo Glib ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; From 9036a7e54f2b6725fbe985bf366de5a1906ab69a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:32 +0000 Subject: [PATCH 0875/2743] [cpan2nix] perlPackages.PodMarkdown: 2.000 -> 3.005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 48ead8490744..7749b7d5489e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11945,10 +11945,10 @@ let self = _self // overrides; _self = with self; { }; PodMarkdown = buildPerlPackage { - name = "Pod-Markdown-2.000"; + name = "Pod-Markdown-3.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-2.000.tar.gz; - sha256 = "0qix7gmrc2ypm5dl1w5ajnjy32xlmy73wb3zycc1pxl5lipigsx8"; + url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.005.tar.gz; + sha256 = "00s3745kl4vbxqyi2lx149q5ghyfazc4fd00kcpl84bb87jfgdzq"; }; buildInputs = [ TestDifferences ]; meta = { From a07a5bd147238c6c61bcaf901ec2984af4f5ab96 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:32 +0000 Subject: [PATCH 0876/2743] [cpan2nix] perlPackages.SpreadsheetParseExcel: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7749b7d5489e..ec43baa206b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12552,7 +12552,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz"; sha256 = "6ec4cb429bd58d81640fe12116f435c46f51ff1040c68f09cc8b7681c1675bec"; }; - propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOstringy OLEStorage_Lite ]; + propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; meta = { homepage = https://github.com/runrig/spreadsheet-parseexcel/; description = "Read information from an Excel file"; From 585fcabed2f11ddf407eeac53ca8ffd7be013d97 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:32 +0000 Subject: [PATCH 0877/2743] [cpan2nix] perlPackages.StringFormatter: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec43baa206b2..a70b12ac888c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12850,7 +12850,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz; sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; - propagatedBuildInputs = [ ParamsUtil SubExporter ]; + propagatedBuildInputs = [ SubExporter ]; meta = with stdenv.lib; { description = "Build sprintf-like functions of your own"; license = licenses.gpl2; From cc8b3f392ab2f5e249114c28773070f36c86053b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:33 +0000 Subject: [PATCH 0878/2743] [cpan2nix] perlPackages.StringTruncate: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a70b12ac888c..c639d3f42e17 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12918,7 +12918,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz; sha256 = "0vjz4fd4cvcy12gk5bdha7z73ifmfpmk748khha94dhiq3pd98xa"; }; - propagatedBuildInputs = [ SubExporter SubInstall ]; + propagatedBuildInputs = [ SubExporter ]; meta = { description = "A module for when strings are too long to be displayed in"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 8aa936addf103c563882877b4fcd460cdc077869 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:33 +0000 Subject: [PATCH 0879/2743] [cpan2nix] perlPackages.SubExporterGlobExporter: 0.004 -> 0.005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c639d3f42e17..ae25d3368aef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13019,10 +13019,10 @@ let self = _self // overrides; _self = with self; { }; SubExporterGlobExporter = buildPerlPackage { - name = "Sub-Exporter-GlobExporter-0.004"; + name = "Sub-Exporter-GlobExporter-0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.004.tar.gz; - sha256 = "025wgjavrbzh52jb4v0w2fxqh7r5181k935h9cyy2rm1qk49fg8p"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz; + sha256 = "0qvsvfvfyk69v2ygjnyd5sh3bgbzd6f7k7mgv0zws1yywvpmxi1g"; }; propagatedBuildInputs = [ SubExporter ]; meta = { From d24dad3ede236547fe2942f0dfc97bb59c4a5aeb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:35 +0000 Subject: [PATCH 0880/2743] [cpan2nix] perlPackages.TestYAML: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae25d3368aef..e7675adce91d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14813,6 +14813,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; sha256 = "0hxrfs7p9hqkhvv5nhk2hd3kh32smwng4nz47b8xf4iw2q1n2dr7"; }; + buildInputs = [ TestBase ]; }; TextAbbrev = buildPerlPackage { From 5581beef71c981a15458addb6098948ea16d95f7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:35 +0000 Subject: [PATCH 0881/2743] [cpan2nix] perlPackages.TextBibTeX: 0.81 -> 0.85 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e7675adce91d..f68bc98eda07 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14879,11 +14879,11 @@ let self = _self // overrides; _self = with self; { }; TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.81"; - buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ]; + name = "Text-BibTeX-0.85"; + buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; - sha256 = "0dig1zlglm8rwm8fhnz087lx6gixj9jx10kxn1fx3swdkfblhsmf"; + sha256 = "036kxgbn1jf70pfm2lmjlzjwnhbkd888fp5lyvmkjpdd15gla18h"; }; perlPreHook = "export LD=$CC"; perlPostHook = stdenv.lib.optionalString stdenv.isDarwin '' @@ -14900,6 +14900,7 @@ let self = _self // overrides; _self = with self; { description = "Interface to read and parse BibTeX files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ ScalarListUtils ]; }; TextBrew = buildPerlPackage rec { From 941137081fe06db819f45c3f6897976d87d295f2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:35 +0000 Subject: [PATCH 0882/2743] [cpan2nix] perlPackages.TextWrapper: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f68bc98eda07..cf2b85c3aa7e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15376,6 +15376,7 @@ let self = _self // overrides; _self = with self; { description = "Word wrap text by breaking long lines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDifferences ]; }; threads = buildPerlPackage rec { From 7e16794df81dc40cd131989597e84ccc32f2000e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:36 +0000 Subject: [PATCH 0883/2743] [cpan2nix] perlPackages.XMLLibXMLSimple: 0.93 -> 0.99 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cf2b85c3aa7e..acb2b59c8d8d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16314,12 +16314,12 @@ let self = _self // overrides; _self = with self; { }; XMLLibXMLSimple = buildPerlPackage { - name = "XML-LibXML-Simple-0.93"; + name = "XML-LibXML-Simple-0.99"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.93.tar.gz; - sha256 = "f2eb1c1523d6414cf2a646a289b0325b489954382c862928d165a03a7cce767c"; + url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.99.tar.gz; + sha256 = "14fe45c9fcb36c1cf14ac922da4439f1f83d451a5e70aa7177cb6edb705c9e44"; }; - propagatedBuildInputs = [ FileSlurp XMLLibXML ]; + propagatedBuildInputs = [ XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 836f4cf4db0a693a0b9a6bfb9436e88e4201accb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:36 +0000 Subject: [PATCH 0884/2743] [cpan2nix] perlPackages.XMLLibXSLT: 1.89 -> 1.96 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index acb2b59c8d8d..0d6688c79287 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16327,10 +16327,10 @@ let self = _self // overrides; _self = with self; { }; XMLLibXSLT = buildPerlPackage rec { - name = "XML-LibXSLT-1.89"; + name = "XML-LibXSLT-1.96"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0py7ll5vj2k977l4r2g8bbz0hdy0hhkdq0mzblrwizify0825b12"; + sha256 = "0wyl8klgr65j8y8fzgwz9jlvfjwvxazna8j3dg9gksd2v973fpia"; }; buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; From 4e97dd71b2705333b13ab434acf949966eefa109 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:37 +0000 Subject: [PATCH 0885/2743] [cpan2nix] perlPackages.CacheMemory: 2.04 -> 2.11 dependencies: perlPackages.DBFile: init at 1.831 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d6688c79287..81b40aa63b48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -913,13 +913,13 @@ let self = _self // overrides; _self = with self; { }; }; - CacheMemory = buildPerlPackage { - name = "Cache-Memory-2.04"; + CacheMemory = buildPerlModule { + name = "Cache-2.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLEISHMAN/Cache-2.04.tar.gz; - sha256 = "1zykapgl9lxnlx79xfghzb26qimhry94xfxfyswwfhra1ywd9yyg"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz; + sha256 = "14m513f4g02daklmnvdm7vqh3w3ick65wvmvqnmnc4cqfybdilp1"; }; - propagatedBuildInputs = [ TimeDate DBFile DigestSHA1 FileNFSLock HeapFibonacci IOString ]; + propagatedBuildInputs = [ DBFile FileNFSLock HeapFibonacci IOString TimeDate ]; doCheck = false; # can time out meta = { maintainers = with maintainers; [ ]; From bad0ba959e674c965805ef92f7e547c7656a3b83 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:37 +0000 Subject: [PATCH 0886/2743] [cpan2nix] perlPackages.DataGUID: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 81b40aa63b48..388a07fc0983 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3099,7 +3099,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq"; }; - propagatedBuildInputs = [ DataUUID SubExporter SubInstall ]; + propagatedBuildInputs = [ DataUUID SubExporter ]; meta = { homepage = https://github.com/rjbs/Data-GUID; description = "Globally unique identifiers"; From 18a93b941370fba2062e0a5e85de5911def6c33b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:38 +0000 Subject: [PATCH 0887/2743] [cpan2nix] perlPackages.DataPagePageset: cleanup --- 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 388a07fc0983..4ec7f1d1d833 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3174,14 +3174,13 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestException ]; }; - DataPagePageset = buildPerlPackage rec { + DataPagePageset = buildPerlModule rec { name = "Data-Page-Pageset-1.02"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz; sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f"; }; - buildInputs = [ TestPod TestPodCoverage ]; - propagatedBuildInputs = [ DataPage ]; + buildInputs = [ ClassAccessor DataPage TestException ]; meta = { description = "change long page list to be shorter and well navigate"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3d84d41db004f1db26c77fa697f6833d3ec65d92 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:38 +0000 Subject: [PATCH 0888/2743] [cpan2nix] perlPackages.ExtUtilsCChecker: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ec7f1d1d833..f0816e1366ec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5205,13 +5205,13 @@ let self = _self // overrides; _self = with self; { }; }; - ExtUtilsCChecker = buildPerlPackage rec { + ExtUtilsCChecker = buildPerlModule rec { name = "ExtUtils-CChecker-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz"; sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; }; - buildInputs = [ ModuleBuild TestFatal ]; + buildInputs = [ TestFatal ]; meta = { description = "Configure-time utilities for using C headers,"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 8ab575e2d7d6a61e11d4104e81b27230d0b4ea03 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:39 +0000 Subject: [PATCH 0889/2743] [cpan2nix] perlPackages.FileLibMagic: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f0816e1366ec..d1a7a219f73f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5681,7 +5681,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; }; - buildInputs = [ TestFatal pkgs.file ]; + buildInputs = [ pkgs.file TestFatal ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; preCheck = '' substituteInPlace t/oo-api.t \ From 6688a141085d9c2aada8d33bd1a7899886fdb4cc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:39 +0000 Subject: [PATCH 0890/2743] [cpan2nix] perlPackages.GDGraph: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d1a7a219f73f..49f8311c01ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6082,11 +6082,11 @@ let self = _self // overrides; _self = with self; { GDGraph = buildPerlPackage rec { name = "GDGraph-1.54"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz; sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr"; }; - propagatedBuildInputs = [ GD GDText ]; - buildInputs = [ TestException CaptureTiny ]; + propagatedBuildInputs = [ GDText ]; + buildInputs = [ CaptureTiny TestException ]; meta = { description = "Graph Plotting Module for Perl 5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From a2b9af413ad1e78eed142047199bbd1059caa32a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:39 +0000 Subject: [PATCH 0891/2743] [cpan2nix] perlPackages.Gtk2: 1.2498 -> 1.24992 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 49f8311c01ed..e9eee6e7fd59 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6381,12 +6381,12 @@ let self = _self // overrides; _self = with self; { }; Gtk2 = buildPerlPackage rec { - name = "Gtk2-1.2498"; + name = "Gtk2-1.24992"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "0gs6lr4clz86838s3klrl37lf48j24zv0p37jlsvsnr927whpq3j"; + sha256 = "1044rj3wbfmgaif2jb0k28m2aczli6ai2n5yvn6pr7zjyw16kvd2"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ]; + buildInputs = [ pkgs.gtk2 Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Pango ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; From a2fe45b9f198651f11bbec90d2ee76b821460a45 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:40 +0000 Subject: [PATCH 0892/2743] [cpan2nix] perlPackages.MathPlanePath: 123 -> 126 dependencies: perlPackages.MathBigIntLite: init at 0.17 --- pkgs/top-level/perl-packages.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9eee6e7fd59..06d546a6cb90 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8663,6 +8663,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MathBigInt ]; }; + MathBigIntLite = buildPerlPackage rec { + name = "Math-BigInt-Lite-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.17.tar.gz; + sha256 = "1pii36cykpja9al6bdnsxn2w0la674qagqcff6lhk9yx6xakycpk"; + }; + propagatedBuildInputs = [ MathBigInt ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MathBigRat = buildPerlPackage rec { name = "Math-BigRat-0.2613"; src = fetchurl { @@ -8712,12 +8724,13 @@ let self = _self // overrides; _self = with self; { }; MathPlanePath = buildPerlPackage rec { - name = "Math-PlanePath-123"; + name = "Math-PlanePath-126"; src = fetchurl { url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; - sha256 = "13by23pzwfa2f3rxiws7blqxb8lr3mfczdfq6jsi1kb3ml2wnxyc"; + sha256 = "014gr79gg992paas6v1glciyycqp2hg7pg4y03kgfbxz1slc6zhq"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; + buildInputs = [ DataFloat MathBigIntLite ]; }; MathRandomISAAC = buildPerlPackage { From a5e6c2c8d0cb1de54392b7f93a60984242861225 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:40 +0000 Subject: [PATCH 0893/2743] [cpan2nix] perlPackages.ModuleBuildTiny: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 06d546a6cb90..c8a285196f64 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9025,8 +9025,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz; sha256 = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c"; }; - buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness perl ]; - propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness ]; + buildInputs = [ FileShareDir ]; + propagatedBuildInputs = [ ExtUtilsHelpers ExtUtilsInstallPaths ]; meta = { description = "A tiny replacement for Module::Build"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From b3b4cf748c7b3a9a0b1b81f634a486604723a2bd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:40 +0000 Subject: [PATCH 0894/2743] [cpan2nix] perlPackages.ModuleInstall: 1.16 -> 1.19 --- 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 c8a285196f64..6d890aed73c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9109,14 +9109,13 @@ let self = _self // overrides; _self = with self; { }; }; - ModuleInstall = let version = "1.16"; in buildPerlPackage { + ModuleInstall = let version = "1.19"; in buildPerlPackage { name = "Module-Install-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-${version}.tar.gz"; - sha256 = "0ph242hmz11wv41yh1g8k9zj1bgzkamg2kgq8hnq4kaz4mj15b5g"; + sha256 = "06q12cm97yh4p7qbm0a2p96996ii6ss59qy57z0f7f9svy6sflqs"; }; - buildInputs = [ YAMLTiny ]; - propagatedBuildInputs = [ FileRemove ModuleScanDeps YAMLTiny ]; + propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From fc834903b8626a06af91ac645f7bfe616d597952 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:41 +0000 Subject: [PATCH 0895/2743] [cpan2nix] perlPackages.StatisticsDescriptive: 3.0605 -> 3.0612 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d890aed73c9..4131f0f03b9a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12712,17 +12712,18 @@ let self = _self // overrides; _self = with self; { }; }; - StatisticsDescriptive = buildPerlPackage { - name = "Statistics-Descriptive-3.0605"; + StatisticsDescriptive = buildPerlModule { + name = "Statistics-Descriptive-3.0612"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0605.tar.gz; - sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz; + sha256 = "772413148e5e00efb32f277c4254aa78b9112490a896208dcd0025813afdbf7a"; }; meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ ListMoreUtils ]; }; StatisticsDistributions = buildPerlPackage rec { From 77b9712cb309be1d5d9345e1cb14a75fd80ae94d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:41 +0000 Subject: [PATCH 0896/2743] [cpan2nix] perlPackages.StringFlogger: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4131f0f03b9a..685e8f3f57d6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12840,7 +12840,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b"; }; - propagatedBuildInputs = [ JSONMaybeXS ParamsUtil SubExporter ]; + propagatedBuildInputs = [ JSONMaybeXS SubExporter ]; meta = { homepage = https://github.com/rjbs/String-Flogger; description = "String munging for loggers"; From 6a25deefc089194d6f889223720e37ba5100e379 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:41 +0000 Subject: [PATCH 0897/2743] [cpan2nix] perlPackages.SubOverride: 0.08 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 685e8f3f57d6..7654eca189af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13128,12 +13128,12 @@ let self = _self // overrides; _self = with self; { }; SubOverride = buildPerlPackage rec { - name = "Sub-Override-0.08"; + name = "Sub-Override-0.09"; src = fetchurl { url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; - sha256 = "13s5zi6qz02q50vv4bmwdmhn9gvg0988fydjlrrv500g6hnyzlkj"; + sha256 = "1d955qn44brkcfif3gi0q2vvvqahny6rax0vr068x5i9yz0ng6lk"; }; - propagatedBuildInputs = [SubUplevel TestException]; + buildInputs = [ TestFatal ]; }; SubQuote = buildPerlPackage rec { From 4e10a667cb875cab94b5e6c7f51725de8d72b996 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:42 +0000 Subject: [PATCH 0898/2743] [cpan2nix] perlPackages.TestAssert: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7654eca189af..71ae7077f048 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13743,14 +13743,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestAssert = buildPerlPackage { + TestAssert = buildPerlModule { name = "Test-Assert-0.0504"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz; sha256 = "194bzflmzc0cw5727kznbj1zwzj7gnj7nx1643zk2hshdjlnv8yg"; }; buildInputs = [ ClassInspector TestUnitLite ]; - propagatedBuildInputs = [ constantboolean ExceptionBase SymbolUtil ]; + propagatedBuildInputs = [ ExceptionBase constantboolean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; From 74c4281fa7cea572c532df6bc99ef50eb5750947 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:43 +0000 Subject: [PATCH 0899/2743] [cpan2nix] perlPackages.TestTrailingSpace: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71ae7077f048..6aee442c7636 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14665,13 +14665,12 @@ let self = _self // overrides; _self = with self; { }; }; - TestTrailingSpace = buildPerlPackage rec { + TestTrailingSpace = buildPerlModule rec { name = "Test-TrailingSpace-0.0301"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "a28875747adb7a0e7d1ae8a4ffe71869e7ceb3a85d0cb30172959dada7de5970"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ FileFindObjectRule ]; meta = { description = "Test for trailing space in source files"; From ab81a69d164b2231bdcbb1719fc8698e75b8b5f8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:43 +0000 Subject: [PATCH 0900/2743] [cpan2nix] perlPackages.TieCacheLRU: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6aee442c7636..f6999a2ce769 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15460,7 +15460,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; sha256 = "1bf740450d3a6d7c12b48c25f7da5964e44e7cc38b28572cfb76ff22464f4469"; }; - propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassVirtual enum ]; + propagatedBuildInputs = [ ClassVirtual enum ]; meta = { description = "A Least-Recently Used cache"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 0cb0ffbd50ace3e9cb465a62538161326c1b28a4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:44 +0000 Subject: [PATCH 0901/2743] [cpan2nix] perlPackages.YAML: 1.15 -> 1.24 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f6999a2ce769..fced877846d9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16562,10 +16562,10 @@ let self = _self // overrides; _self = with self; { }; YAML = buildPerlPackage rec { - name = "YAML-1.15"; + name = "YAML-1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "06wx1pzc2sb7vidlp17g1x11rrz57ch8q68gjj8fbgd75wr9bx40"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.24.tar.gz; + sha256 = "1dpzgnjbd8yvf94vf45cmyj5bc6vrm6bchhx9xqwxqd5f9d093dm"; }; buildInputs = [ TestBase TestYAML ]; From bb9ec0fc136f0a173ba8088d410ae238a4a7ae30 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:44 +0000 Subject: [PATCH 0902/2743] [cpan2nix] perlPackages.libapreq2: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fced877846d9..c5fef8b81ae9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7817,7 +7817,7 @@ let self = _self // overrides; _self = with self; { sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; }; outputs = [ "out" ]; - buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ]; + buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; propagatedBuildInputs = [ mod_perl2 ]; makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config"; preConfigure = '' From 1af65b94bca4697f411f4b837a8bce67c984cf4d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:44 +0000 Subject: [PATCH 0903/2743] [cpan2nix] perlPackages.CGI: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c5fef8b81ae9..704be6e3e325 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1677,7 +1677,7 @@ let self = _self // overrides; _self = with self; { sha256 = "8c58f4a529bb92a914b22b7e64c5e31185c9854a4070a6dfad44fe5cc248e7d4"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ HTMLParser self."if" ]; + propagatedBuildInputs = [ HTMLParser ]; meta = { homepage = https://metacpan.org/module/CGI; description = "Handle Common Gateway Interface requests and responses"; From b4ef22f601b83ba6f51c1307e518860e1d961c26 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:45 +0000 Subject: [PATCH 0904/2743] [cpan2nix] perlPackages.ClassC3Componentised: 1.001000 -> 1.001002 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 704be6e3e325..86cdc4e141d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1923,10 +1923,10 @@ let self = _self // overrides; _self = with self; { }; ClassC3Componentised = buildPerlPackage { - name = "Class-C3-Componentised-1.001000"; + name = "Class-C3-Componentised-1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Class-C3-Componentised-1.001000.tar.gz; - sha256 = "1nzav8arxll0rya7r2vp032s3acliihbb9mjlfa13rywhh77bzvl"; + url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-Componentised-1.001002.tar.gz; + sha256 = "14wn1g45z3b5apqq7dcai5drk01hfyqydsd2m6hsxzhyvi3b2l9h"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; From 2ebedaedc9ce85d7b6120411ccf9864af00d9a1b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:45 +0000 Subject: [PATCH 0905/2743] [cpan2nix] perlPackages.ClassMethodModifiers: 2.11 -> 2.12 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 86cdc4e141d8..c960f63b2003 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2045,10 +2045,10 @@ let self = _self // overrides; _self = with self; { }; ClassMethodModifiers = buildPerlPackage rec { - name = "Class-Method-Modifiers-2.11"; + name = "Class-Method-Modifiers-2.12"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "14nk2gin9cjwpysakli7f0gs4q1w220sn73xzv35rhlspngrggyy"; + sha256 = "1j3swa212wh14dq5r6zjarm2lzpx6mrdfplpjy65px8b09ri0k74"; }; buildInputs = [ TestFatal TestRequires ]; meta = { From 62f552329fe9c99ca3f76ad766739cdaa2dd1281 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:46 +0000 Subject: [PATCH 0906/2743] [cpan2nix] perlPackages.DevelNYTProf: 6.04 -> 6.05 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c960f63b2003..2faf61c5e04d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4152,17 +4152,18 @@ let self = _self // overrides; _self = with self; { }; DevelNYTProf = buildPerlPackage rec { - name = "Devel-NYTProf-6.04"; + name = "Devel-NYTProf-6.05"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "c04c9f03663b7e4e9cc159f30bcdc0bab5652889c88c425ec157e831318d4891"; + sha256 = "b2a9f8b49afb9be8d087ddb50ef77a53f3796481b37eb5a965e1d4055445db1c"; }; - propagatedBuildInputs = [ FileWhich JSONMaybeXS TestDifferences ]; + propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; meta = { homepage = https://github.com/timbunce/devel-nytprof; description = "Powerful fast feature-rich Perl source code profiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDifferences ]; }; DevelPartialDump = buildPerlPackage { From 5583a1879e0c10ca984098185a1ca89fa366c4ef Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:46 +0000 Subject: [PATCH 0907/2743] [cpan2nix] perlPackages.DistCheckConflicts: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2faf61c5e04d..f5c4cdbec322 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4346,8 +4346,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; sha256 = "1i7dr9jpdiy2nijl2p4q5zg2q2s9ckbj2hs4kmnnckf9hsb4p17a"; }; - buildInputs = [ TestFatal ModuleRuntime ]; - propagatedBuildInputs = [ SubExporter ListMoreUtils ]; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ModuleRuntime ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Declare version conflicts for your dist"; From a39220c17faeed0f214738082e06861a0b7b49f4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:47 +0000 Subject: [PATCH 0908/2743] [cpan2nix] perlPackages.EmailValid: 1.200 -> 1.202 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f5c4cdbec322..c7b108c2b0d5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4894,12 +4894,12 @@ let self = _self // overrides; _self = with self; { }; EmailValid = buildPerlPackage rec { - name = "Email-Valid-1.200"; + name = "Email-Valid-1.202"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0nnvbqz0ls451b5p0w6lgqm6kklm115db2p2xf89lw0r5pvmkw54"; + sha256 = "18hkmhddzbd23s6ak64d4j6q8ijykjyp5nxbr2hfcq1acsdhh8fh"; }; - propagatedBuildInputs = [MailTools NetDNS]; + propagatedBuildInputs = [ IOCaptureOutput MailTools NetDNS NetDomainTLD ]; doCheck = false; }; From 7b2ff13d7daca0ed7448271db6cd47f27317530e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:47 +0000 Subject: [PATCH 0909/2743] [cpan2nix] perlPackages.EvalClosure: 0.11 -> 0.14 --- 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 c7b108c2b0d5..bd775bbbe526 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5054,13 +5054,12 @@ let self = _self // overrides; _self = with self; { }; EvalClosure = buildPerlPackage { - name = "Eval-Closure-0.11"; + name = "Eval-Closure-0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.11.tar.gz; - sha256 = "1b3rc9smdyyi0janckfiyg1kwph893sqwx7dr5n4mky0x8x3v4m1"; + url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz; + sha256 = "1bcc47r6zm3hfr6ccsrs72kgwxm3wkk07mgnpsaxi67cypr482ga"; }; buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ SubExporter TryTiny ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Safely and cleanly create closures via string eval"; From 9a93764a2c55ea10c7016e10da02615cac78402f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:47 +0000 Subject: [PATCH 0910/2743] [cpan2nix] perlPackages.ExceptionDied: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd775bbbe526..252b0430ebb4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5090,14 +5090,14 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; }; - ExceptionDied = buildPerlPackage { + ExceptionDied = buildPerlModule { name = "Exception-Died-0.06"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz; sha256 = "1dcajw2m3x5m76fpi3fvy9fjkmfrd171pnx087i5fkgx5ay41i1m"; }; buildInputs = [ TestAssert TestUnitLite ]; - propagatedBuildInputs = [ constantboolean ExceptionBase ]; + propagatedBuildInputs = [ ExceptionBase constantboolean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; From 3aed3ce93470606ec6313f25bc6a93ef2e9329c8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:48 +0000 Subject: [PATCH 0911/2743] [cpan2nix] perlPackages.ExceptionWarning: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 252b0430ebb4..367a0cfab797 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5104,7 +5104,7 @@ let self = _self // overrides; _self = with self; { }; }; - ExceptionWarning = buildPerlPackage { + ExceptionWarning = buildPerlModule { name = "Exception-Warning-0.0401"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz; From 01d63bab9e79be20e30925323768bf871f0f0b0b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:48 +0000 Subject: [PATCH 0912/2743] [cpan2nix] perlPackages.ExtUtilsXSpp: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 367a0cfab797..46b959ac0e0f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5395,10 +5395,10 @@ let self = _self // overrides; _self = with self; { ExtUtilsXSpp = buildPerlModule rec { name = "ExtUtils-XSpp-0.18"; src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz; sha256 = "1zx84f93lkymqz7qa4d63gzlnhnkxm5i3gvsrwkvvqr9cxjasxli"; }; - buildInputs = [ Spiffy TestBase TestDifferences ]; + buildInputs = [ TestBase TestDifferences ]; }; FatalException = buildPerlPackage { From 84f8a2f0ca39b361244971b17424c9230512951a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:48 +0000 Subject: [PATCH 0913/2743] [cpan2nix] perlPackages.FileShareDirInstall: 0.08 -> 0.11 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46b959ac0e0f..23b47cff97bc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5836,11 +5836,11 @@ let self = _self // overrides; _self = with self; { }; }; - FileShareDirInstall = buildPerlPackage { - name = "File-ShareDir-Install-0.08"; + FileShareDirInstall = buildPerlModule { + name = "File-ShareDir-Install-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWYN/File-ShareDir-Install-0.08.tar.gz; - sha256 = "188pgn43wa6hgpcrv997lp3bad50030p4wmrcdzvfrqxj0bx2amf"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz; + sha256 = "1j0cw1aq9fdv9kl1a6fnfa4zihsvmcqzy9sb0xk0i9pyx5r8ggrj"; }; meta = { description = "Install shared files"; @@ -5848,6 +5848,7 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ ModuleBuildTiny ]; }; FilesysNotifySimple = buildPerlPackage { From c979ba07184bd1a1f21cd48b0dc7a0a738e81c59 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:49 +0000 Subject: [PATCH 0914/2743] [cpan2nix] perlPackages.Filelchown: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23b47cff97bc..bd8316a31c2d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5662,13 +5662,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CryptRijndael ]; }; - Filelchown = buildPerlPackage rec { + Filelchown = buildPerlModule rec { name = "File-lchown-0.02"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz"; sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; - buildInputs = [ ExtUtilsCChecker ModuleBuild ]; + buildInputs = [ ExtUtilsCChecker ]; meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3fb37457e1356e01c8cf699b94cb79871e9fb5c7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:49 +0000 Subject: [PATCH 0915/2743] [cpan2nix] perlPackages.Gnome2Canvas: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd8316a31c2d..f78d8de9578e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6211,10 +6211,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; sha256 = "47a34204cd5f3a0ef5c8b9e1c9c96f41740edab7e9abf1d0560fa8666ba1916e"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gnome2.libgnomecanvas ]; + buildInputs = [ pkgs.gnome2.libgnomecanvas ]; meta = { license = stdenv.lib.licenses.lgpl2Plus; }; + propagatedBuildInputs = [ Gtk2 Pango ]; }; Gnome2VFS = buildPerlPackage rec { From 224c9be71b244bb55a9760a00e4f8bbda9ebab0c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:49 +0000 Subject: [PATCH 0916/2743] [cpan2nix] perlPackages.Gnome2Wnck: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f78d8de9578e..30bc8837b303 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6237,8 +6237,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.libwnck pkgs.glib pkgs.gtk2 ]; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 ]; + buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; + propagatedBuildInputs = [ Gtk2 Pango ]; meta = { description = "Perl interface to the Window Navigator Construction Kit"; license = stdenv.lib.licenses.lgpl21Plus; From 87b6896e0c62fc063eb7ffd0457db69712212b9a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:50 +0000 Subject: [PATCH 0917/2743] [cpan2nix] perlPackages.GooCanvas: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30bc8837b303..20c7569bb442 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6292,7 +6292,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/Y/YE/YEWENBIN/${name}.tar.gz"; sha256 = "0c588c507eed5e62d12ed1cc1e491c6ff3a1f59c4fb3d435e14214b37ab39251"; }; - propagatedBuildInputs = [ Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.goocanvas pkgs.gtk2 ]; + propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 Pango ]; meta = { description = "Perl interface to the GooCanvas"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 0a5de94fc2fed3bebd63c15b8103d8f06659f326 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:50 +0000 Subject: [PATCH 0918/2743] [cpan2nix] perlPackages.Gtk2AppIndicator: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 20c7569bb442..43f59dcdb65e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6429,7 +6429,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/O/OE/OESTERHOL/${name}.tar.gz"; sha256 = "a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a"; }; - propagatedBuildInputs = [ Gtk2 pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Glib Pango ]; + propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Gtk2 ]; # Tests fail due to no display: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. doCheck = false; From d80e2dcca97d6c39968bd31f83815209ae61e4e1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:51 +0000 Subject: [PATCH 0919/2743] [cpan2nix] perlPackages.Gtk2GladeXML: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 43f59dcdb65e..9d0219102334 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6403,7 +6403,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; }; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gnome2.libglade pkgs.gtk2 ]; + propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 Pango ]; meta = { homepage = https://metacpan.org/pod/Gtk2::GladeXML; description = "Create user interfaces directly from Glade XML files"; From 4dc5db64b91159d41896bc6e9e639eaf217ee047 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:51 +0000 Subject: [PATCH 0920/2743] [cpan2nix] perlPackages.Gtk2ImageView: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9d0219102334..3ff1af41b275 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6445,8 +6445,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/${name}.tar.gz"; sha256 = "087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80"; }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gtkimageview pkgs.gtk2 ]; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 ]; + buildInputs = [ pkgs.gtkimageview pkgs.gtk2 ]; + propagatedBuildInputs = [ Gtk2 Pango ]; # Tests fail due to no display server: # Gtk-WARNING **: cannot open display: at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126. # t/animview.t ........... From 83898571d586448d7060c0044b0a3d4323876fea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:51 +0000 Subject: [PATCH 0921/2743] [cpan2nix] perlPackages.Gtk2TrayIcon: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3ff1af41b275..06981619f4d4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6417,7 +6417,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BORUP/${name}.tar.gz"; sha256 = "cbb7632b75d7f41554dfe8ee9063dbfd1d8522291077c65d0d82e9ceb5e94ae2"; }; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gtk2 ]; + propagatedBuildInputs = [ pkgs.gtk2 Gtk2 Pango ]; meta = { license = stdenv.lib.licenses.gpl2; }; From 4de6a35ef3b33d3a89ef9abf6fce419cebb3ddd5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:52 +0000 Subject: [PATCH 0922/2743] [cpan2nix] perlPackages.Gtk2Unique: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 06981619f4d4..b2fe7954022d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6463,7 +6463,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PO/POTYL/${name}.tar.gz"; sha256 = "ae8dfb0f6844ddaa2ce7b5b44553419490c8e83c24fd35c431406a58f6be0f4f"; }; - propagatedBuildInputs = [ Gtk2 Glib ExtUtilsDepends ExtUtilsPkgConfig pkgs.libunique pkgs.gtk2 Cairo Pango ]; + propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 Pango ]; meta = { description = "Use single instance applications"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 76a90b19b8362690b563d2916f4b49ee5ff15eea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:54 +0000 Subject: [PATCH 0923/2743] [cpan2nix] perlPackages.PackageStashXS: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b2fe7954022d..087770c285b7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10948,7 +10948,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz; sha256 = "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13"; }; - buildInputs = [ TestRequires TestFatal ]; + buildInputs = [ TestFatal TestRequires ]; meta = { homepage = https://metacpan.org/release/Package-Stash-XS; description = "Faster and more correct implementation of the Package::Stash API"; From d4e11ae715adc6e068ac1175bc61b3105061f0c5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:54 +0000 Subject: [PATCH 0924/2743] [cpan2nix] perlPackages.ProtocolWebSocket: 0.20 -> 0.24 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 087770c285b7..3634b28bab2b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11683,10 +11683,10 @@ let self = _self // overrides; _self = with self; { }; ProtocolWebSocket = buildPerlModule rec { - name = "Protocol-WebSocket-0.20"; + name = "Protocol-WebSocket-0.24"; src = fetchurl { url = "mirror://cpan/authors/id/V/VT/VTI/${name}.tar.gz"; - sha256 = "00ga7sjrqcbr46kwfbaa37lxqqbp9z5gymjckzps6ll2jf7k58mx"; + sha256 = "1w0l9j1bnmw82jfhrx5yfw4hbl0bpcwmrl5laa1gz06mkzkdpa6z"; }; buildInputs = [ ModuleBuildTiny ]; }; From c12764896a34f6bef17a9c8245937ca449140794 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:55 +0000 Subject: [PATCH 0925/2743] [cpan2nix] perlPackages.TestVars: 0.008 -> 0.014 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3634b28bab2b..70a2759e5f75 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15258,13 +15258,13 @@ let self = _self // overrides; _self = with self; { }; TestVars = buildPerlModule rec { - name = "Test-Vars-0.008"; + name = "Test-Vars-0.014"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1h0kifiia78s3425hvpjs5di5539vsz15mmkkk0cwshwizhcwp7h"; + sha256 = "0qr8q0ksr925ycwbsyxjwgz4p9r7a8vkxpn33vy23zbijwpa3xx7"; }; - buildInputs = [ TestTester ]; + buildInputs = [ ModuleBuildTiny ]; meta = { homepage = https://github.com/gfx/p5-Test-Vars; From 72e9c4708240bd44a1a4778acc6e660530a931af Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:56 +0000 Subject: [PATCH 0926/2743] [cpan2nix] perlPackages.XMLValidatorSchema: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70a2759e5f75..ebc381bd7cb3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16522,7 +16522,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz; sha256 = "6142679580150a891f7d32232b5e31e2b4e5e53e8a6fa9cbeecb5c23814f1422"; }; - buildInputs = [ FileSlurpTiny ]; propagatedBuildInputs = [ TreeDAGNode XMLFilterBufferText XMLSAX ]; meta = { description = "Validate XML against a subset of W3C XML Schema"; From 5e92a7bfe8d7c015f70f70362e0430d5a5c3f86c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:57 +0000 Subject: [PATCH 0927/2743] [cpan2nix] perlPackages.XSObjectMagic: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ebc381bd7cb3..63d4bc30ce94 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16555,7 +16555,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; }; - buildInputs = [ ExtUtilsDepends TestFatal Testuseok ]; + buildInputs = [ ExtUtilsDepends TestFatal ]; meta = { description = "XS pointer backed objects using sv_magic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 7321efc3486679bac6f0b2bb17622532ed549110 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:57 +0000 Subject: [PATCH 0928/2743] [cpan2nix] perlPackages.aliased: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 63d4bc30ce94..d1df1de6bddd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -88,12 +88,13 @@ let self = _self // overrides; _self = with self; { }; }; - aliased = buildPerlPackage rec { + aliased = buildPerlModule rec { name = "aliased-0.34"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "1syyqzy462501kn5ma9gl6xbmcahqcn4qpafhsmpz0nd0x2m4l63"; }; + buildInputs = [ ModuleBuildTiny ]; }; AlienTidyp = buildPerlModule rec { From e4d638be993f7f01735b4548dcd98fb0401da6be Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:57 +0000 Subject: [PATCH 0929/2743] [cpan2nix] perlPackages.CGIFormBuilder: 3.09 -> 3.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d1df1de6bddd..201884fd3c66 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1739,10 +1739,10 @@ let self = _self // overrides; _self = with self; { }; CGIFormBuilder = buildPerlPackage rec { - name = "CGI-FormBuilder-3.09"; + name = "CGI-FormBuilder-3.10"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NW/NWIGER/${name}.tgz"; - sha256 = "0qx8kxj0iy55ss9kraqr8q2m4igi2ylajff7d6qvphqpfx90fjb5"; + url = mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz; + sha256 = "163ixq9kninqq094z2rnkg9pv3bcmvjphlww4vksfrzhq3h9pjdf"; }; propagatedBuildInputs = [ CGI ]; From fce61846092ec70943b134551a43321364ce2a8f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:58 +0000 Subject: [PATCH 0930/2743] [cpan2nix] perlPackages.CGISession: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 201884fd3c66..3eb388a3cd26 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1761,13 +1761,12 @@ let self = _self // overrides; _self = with self; { }; }; - CGISession = buildPerlPackage rec { + CGISession = buildPerlModule rec { name = "CGI-Session-4.48"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; - buildInputs = [ DBFile ]; propagatedBuildInputs = [ CGI ]; }; From 1c9f16d44b39cdd0cde5b582e09c3e58bdbea6e3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:59 +0000 Subject: [PATCH 0931/2743] [cpan2nix] perlPackages.CryptPKCS10: 1.0 -> 1.9 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3eb388a3cd26..86a8f1ffb85e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2790,13 +2790,13 @@ let self = _self // overrides; _self = with self; { }; }; - CryptPKCS10 = buildPerlPackage { - name = "Crypt-PKCS10-1.0"; + CryptPKCS10 = buildPerlModule { + name = "Crypt-PKCS10-1.9"; src = fetchurl { - url = mirror://cpan/authors/id/G/GK/GKNOCKE/Crypt-PKCS10-1.0.zip; - sha256 = "08de199411056df1a1e6374b503574d21089913daa3823ebb21aa399dc59bdb6"; + url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-1.9.tar.gz; + sha256 = "ee0ce58cc17e9a8d7a6f33f3f26aca5be7edfc054204f7946370b3a8d291f0fd"; }; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ pkgs.unzip ModuleBuildTiny ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c0cfead76c2bdaeb9613f279160e8a5afeb3eba6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:55:59 +0000 Subject: [PATCH 0932/2743] [cpan2nix] perlPackages.DataSection: 0.200006 -> 0.200007 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 86a8f1ffb85e..de9245159985 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3211,17 +3211,18 @@ let self = _self // overrides; _self = with self; { }; DataSection = buildPerlPackage rec { - name = "Data-Section-0.200006"; + name = "Data-Section-0.200007"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0psvsfn5q9y1qkzkq62dr1c6bfrckkkz8hr1sgkdn2mbkpwh319l"; + sha256 = "1pmlxca0a8sv2jjwvhwgqavq6iwys6kf457lby4anjp3f1dpx4yd"; }; - propagatedBuildInputs = [ MROCompat SubExporter TestFailWarnings ]; + propagatedBuildInputs = [ MROCompat SubExporter ]; meta = { homepage = https://github.com/rjbs/data-section; description = "Read multiple hunks of data out of your DATA section"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestFailWarnings ]; }; DataSerializer = buildPerlModule { From 4d1752a4941efd15aa70d6172ae0e774218a54ae Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:00 +0000 Subject: [PATCH 0933/2743] [cpan2nix] perlPackages.FileCopyRecursive: 0.38 -> 0.40 --- pkgs/top-level/perl-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de9245159985..000085efea9a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5518,11 +5518,13 @@ let self = _self // overrides; _self = with self; { }; FileCopyRecursive = buildPerlPackage rec { - name = "File-Copy-Recursive-0.38"; + name = "File-Copy-Recursive-0.40"; src = fetchurl { url = "mirror://cpan/authors/id/D/DM/DMUEY/${name}.tar.gz"; - sha256 = "1syyyvylr51iicialdmv0dw06q49xzv8zrkb5cn8ma4l73gvvk44"; + sha256 = "18amrqvdjlb4hc7mblbwb63q96ql1rnlb5saknsvrxqfjcxr5f78"; }; + propagatedBuildInputs = [ PathTiny ]; + buildInputs = [ TestDeep TestException TestFile TestWarn ]; }; FileDesktopEntry = buildPerlPackage rec { From 290b0759d033000a646a101a8557ac7794ccfea2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:00 +0000 Subject: [PATCH 0934/2743] [cpan2nix] perlPackages.HTMLTree: 5.03 -> 5.07 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 000085efea9a..4bf14a533f38 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6887,13 +6887,13 @@ let self = _self // overrides; _self = with self; { }; HTMLTree = buildPerlModule { - name = "HTML-Tree-5.03"; + name = "HTML-Tree-5.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CJ/CJM/HTML-Tree-5.03.tar.gz; - sha256 = "13qlqbpixw470gnck0xgny8hyjj576m8y24bba2p9ai2lvy76vbx"; + url = mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz; + sha256 = "1gyvm4qlwm9y6hczkpnrdfl303ggbybr0nqxdjw09hii8yw4sdzh"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ HTMLParser HTMLTagset ]; + propagatedBuildInputs = [ HTMLParser ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Work with HTML in a DOM-like tree structure"; From df074361915235ecb7910a2d2453dc05f568370b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:00 +0000 Subject: [PATCH 0935/2743] [cpan2nix] perlPackages.HTTPLite: 2.43 -> 2.44 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4bf14a533f38..c86974e0f3a0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7018,12 +7018,12 @@ let self = _self // overrides; _self = with self; { }; HTTPLite = buildPerlPackage rec { - name = "HTTP-Lite-2.43"; + name = "HTTP-Lite-2.44"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; - sha256 = "10svyy8r5ca86spz21r0k2mdy8g2slzssin4qbg101zc9kr5r65a"; + sha256 = "0z77nflj8zdcfg70kc93glq5kmd6qxn2nf7h70x4xhfg25wkvr1q"; }; - buildInputs = [ ModuleBuild ]; + buildInputs = [ CGI ]; }; HTTPMessage = buildPerlPackage rec { From a9f9afe1197cd8170083d430b19d81ab9d4a738b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:01 +0000 Subject: [PATCH 0936/2743] [cpan2nix] perlPackages.HTTPServerSimple: 0.44 -> 0.52 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c86974e0f3a0..200fb49fbdae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7100,15 +7100,16 @@ let self = _self // overrides; _self = with self; { }; HTTPServerSimple = buildPerlPackage { - name = "HTTP-Server-Simple-0.44"; + name = "HTTP-Server-Simple-0.52"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-0.44.tar.gz; - sha256 = "05klpfkss2a6i5ihmvcm27fyar0f2v4ispg2f49agab3va1gix6g"; + url = mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz; + sha256 = "0k6bg7k6mjixfzxdkkdrhqvaqmdhjszx0zsk8g0bimiby6j9z4yq"; }; doCheck = false; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ CGI ]; }; HTTPServerSimpleAuthen = buildPerlPackage rec { From 4fe253b3c35ae947a24683863886c2cc63743776 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:02 +0000 Subject: [PATCH 0937/2743] [cpan2nix] perlPackages.ModuleInfo: 0.35 -> 0.37 dependencies: perlPackages.BUtils: init at 0.27 --- pkgs/top-level/perl-packages.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 200fb49fbdae..0ef0301953a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -806,6 +806,21 @@ let self = _self // overrides; _self = with self; { }; }; + BUtils = buildPerlPackage rec { + name = "B-Utils-0.27"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz; + sha256 = "1spzhmk3z6c4blmra3kn84nq20fira2b3vjg86m0j085lgv56zzr"; + }; + propagatedBuildInputs = [ TaskWeaken ]; + buildInputs = [ ExtUtilsDepends ]; + meta = { + description = "Helper functions for op tree manipulation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://search.cpan.org/dist/B-Utils"; + }; + }; + BusinessHours = buildPerlPackage rec { name = "Business-Hours-0.12"; src = fetchurl { @@ -9103,16 +9118,17 @@ let self = _self // overrides; _self = with self; { }; ModuleInfo = buildPerlPackage rec { - name = "Module-Info-0.35"; + name = "Module-Info-0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBARBON/Module-Info-0.35.tar.gz"; - sha256 = "0r7vxg1iy3lam0jgb2sk8ghgpmp3x5fskvzqlgkb09bssq83s1xb"; + url = mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz; + sha256 = "0j143hqxgdkdpj5qssppq72gjr0n73c4f7is6wgrrcchjx905a4f"; }; buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ BUtils ]; }; ModuleInstall = let version = "1.19"; in buildPerlPackage { From 07b4f8b23201278686b34fa1c1ee3747010d98a6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:03 +0000 Subject: [PATCH 0938/2743] [cpan2nix] perlPackages.ModuleRuntimeConflicts: 0.001 -> 0.003 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ef0301953a3..2823e7d11831 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9275,13 +9275,12 @@ let self = _self // overrides; _self = with self; { }; ModuleRuntimeConflicts = buildPerlPackage { - name = "Module-Runtime-Conflicts-0.001"; + name = "Module-Runtime-Conflicts-0.003"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.001.tar.gz; - sha256 = "0f73d03846575dd1492d3760deeb9627afaa1f8b04d4d526b1775174201be25f"; + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz; + sha256 = "707cdc75038c70fe91779b888ac050f128565d3967ba96680e1b1c7cc9733875"; }; - buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ DistCheckConflicts ModuleRuntime ]; + propagatedBuildInputs = [ DistCheckConflicts ]; meta = { homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts; description = "Provide information on conflicts for Module::Runtime"; From 91f5c804571727cf4c6d5c16172fc9e84c5d224a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:03 +0000 Subject: [PATCH 0939/2743] [cpan2nix] perlPackages.NetIMAPClient: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2823e7d11831..c45a3da5cfa6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10559,7 +10559,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GA/GANGLION/${name}.tar.gz"; sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912"; }; - buildInputs = [TestPod TestPodCoverage]; propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; meta = { description = "Not so simple IMAP client library"; From 8e5915b4746cfa00db44a6c00a4fb535378d5d73 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:04 +0000 Subject: [PATCH 0940/2743] [cpan2nix] perlPackages.ReadonlyXS: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c45a3da5cfa6..395b7a2d0bad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12094,6 +12094,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; sha256 = "8ae5c4e85299e5c8bddd1b196f2eea38f00709e0dc0cb60454dc9114ae3fff0d"; }; + propagatedBuildInputs = [ Readonly ]; }; Redis = buildPerlPackage rec { From 708652b102c2aac7da2e2d7931b39816f92da5ef Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:05 +0000 Subject: [PATCH 0941/2743] [cpan2nix] perlPackages.StatisticsTTest: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 395b7a2d0bad..462b2e2ca872 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12758,7 +12758,7 @@ let self = _self // overrides; _self = with self; { StatisticsTTest = buildPerlPackage rec { name = "Statistics-TTest-1.1.0"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; + url = mirror://cpan/authors/id/Y/YU/YUNFANG/Statistics-TTest-1.1.0.tar.gz; sha256 = "0rkifgzm4rappiy669dyi6lyxn2sdqaf0bl6gndlfa67b395kndj"; }; propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; From 5f8143eb7b4d3896f8a6ff756e1f257157f96498 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:05 +0000 Subject: [PATCH 0942/2743] [cpan2nix] perlPackages.StringErrf: 0.007 -> 0.008 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 462b2e2ca872..68a3532782a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12830,13 +12830,13 @@ let self = _self // overrides; _self = with self; { }; StringErrf = buildPerlPackage { - name = "String-Errf-0.007"; + name = "String-Errf-0.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.007.tar.gz; - sha256 = "1apnmxdsqwrvn1kkbba4sw6yh6hdfxxar545p6m9dkid7xsiqjfj"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz; + sha256 = "1nyn9s52jgbffrsv0m7rhcx1awjj43n68bfjlap8frdc7mw6y4xf"; }; - buildInputs = [ JSON TimeDate ]; - propagatedBuildInputs = [ ParamsUtil StringFormatter SubExporter ]; + buildInputs = [ JSONMaybeXS TimeDate ]; + propagatedBuildInputs = [ StringFormatter ]; meta = { description = "A simple sprintf-like dialect"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 457a667e19b6191a7f982f6829892829732f18a2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:05 +0000 Subject: [PATCH 0943/2743] [cpan2nix] perlPackages.Test2Suite: 0.000094 -> 0.000111 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 68a3532782a3..97170f5c98dd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13751,12 +13751,12 @@ let self = _self // overrides; _self = with self; { }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000094"; + name = "Test2-Suite-0.000111"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "7135ccb6af82bac39801234e1ce49eb8693dfe8f8e215c7de577c7ded65b6e5f"; + sha256 = "4ca28df74c7c2f37fe63897c5041aee92fba4530544d0afc371e7d14a9b4d0ad"; }; - propagatedBuildInputs = [ Importer ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; + propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f9710975cb92363aa3d0325566bed8c3b4eae764 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:05 +0000 Subject: [PATCH 0944/2743] [cpan2nix] perlPackages.TestVersion: 2.05 -> 2.07 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 97170f5c98dd..5380a03b03f3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15293,10 +15293,10 @@ let self = _self // overrides; _self = with self; { }; TestVersion = buildPerlPackage rec { - name = "Test-Version-2.05"; + name = "Test-Version-2.07"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "39c0ec02663da0e56962bdafaef6790cf83d12b4d90e8a4cdc971d57d869d63f"; + sha256 = "eae8b758395d6b23d4ce3109b055663379b9970fb8f81e5803d145dbc5ccdbac"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ FileFindRulePerl ]; From ee9cdad6041babc8fd3d50ec3f36da4843f80efd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:06 +0000 Subject: [PATCH 0945/2743] [cpan2nix] perlPackages.CGIFast: 2.10 -> 2.13 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5380a03b03f3..588fbaaf7dd8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1740,12 +1740,12 @@ let self = _self // overrides; _self = with self; { }; CGIFast = buildPerlPackage { - name = "CGI-Fast-2.10"; + name = "CGI-Fast-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.10.tar.gz; - sha256 = "98263afcc9f5d88c7cbbd39651c5431b434c1c815fe284962d887ed7be3a1dd3"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.13.tar.gz; + sha256 = "792f21fc3b94380e37c99faa7901ecedf01d6855191000d1ffb2a7003813b1d4"; }; - propagatedBuildInputs = [ FCGI if_ ]; + propagatedBuildInputs = [ CGI FCGI ]; doCheck = false; meta = { homepage = https://metacpan.org/module/CGI::Fast; From 9a3cfaab5b96b16f2ced45500ce0dc14a21538ae Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:06 +0000 Subject: [PATCH 0946/2743] [cpan2nix] perlPackages.DebugShowStuff: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 588fbaaf7dd8..4a725c0da418 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3740,7 +3740,7 @@ let self = _self // overrides; _self = with self; { }; }; - DebugShowStuff = buildPerlPackage { + DebugShowStuff = buildPerlModule { name = "Debug-ShowStuff-1.16"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz; From ce4391c23f05e5eb90fac54a5cbee56b68377b5f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:07 +0000 Subject: [PATCH 0947/2743] [cpan2nix] perlPackages.FatalException: 0.0204 -> 0.05 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a725c0da418..fc2ae92f446a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5417,14 +5417,14 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestBase TestDifferences ]; }; - FatalException = buildPerlPackage { - name = "Fatal-Exception-0.0204"; + FatalException = buildPerlModule { + name = "Fatal-Exception-0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.0204.tar.gz; - sha256 = "10a9j0fa83s3apv0xgi01l2h6s43my031097hg72wa80n07rgs2c"; + url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz; + sha256 = "0kzfwc44vpxla3j637kfmnwmv57g6x4899ijqb4ljamk7whms298"; }; buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; - propagatedBuildInputs = [ ExceptionBase ExceptionDied ]; + propagatedBuildInputs = [ ExceptionDied ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; From 2542eaa42669f6a8df757e118c7df82995ecc938 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:07 +0000 Subject: [PATCH 0948/2743] [cpan2nix] perlPackages.Gnome2: 1.046 -> 1.047 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fc2ae92f446a..7289c33ae864 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6209,13 +6209,13 @@ let self = _self // overrides; _self = with self; { }; Gnome2 = buildPerlPackage rec { - name = "Gnome2-1.046"; + name = "Gnome2-1.047"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "a6c787232ab7e82a423a9ff5a49cec6bf586c1bb3c04c2052a91cdda5b66ae40"; + sha256 = "ccc85c5dc3c14f915ed1a186d238681d83fef3d17eed1c20001499ff56b6390c"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; - propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 Pango pkgs.gnome2.libgnomeui ]; + propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; meta = { homepage = http://gtk2-perl.sourceforge.net; description = "Perl interface to the 2.x series of the GNOME libraries"; From a8f53ea49e076010f62a8d263ac61626a0c7f2ff Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:08 +0000 Subject: [PATCH 0949/2743] [cpan2nix] perlPackages.GrowlGNTP: 0.20 -> 0.21 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7289c33ae864..521dc7021207 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6376,12 +6376,13 @@ let self = _self // overrides; _self = with self; { }; GrowlGNTP = buildPerlModule rec { - name = "Growl-GNTP-0.20"; + name = "Growl-GNTP-0.21"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Growl/${name}.tar.gz"; - sha256 = "150x65lwf7pfsygcpmvj3679lhlfwx87xylwnrmwll67f9dpkjdi"; + url = mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz; + sha256 = "0gq8ypam6ifp8f3s2mf5d6sw53m7h3ki1zfahh2p41kl8a77yy98"; }; - buildInputs = [ DataUUID CryptCBC ]; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CryptCBC DataUUID ]; }; GSSAPI = buildPerlPackage rec { From d8d1e87c2f5935dcf0a5431ee598b94f4623d3a6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:08 +0000 Subject: [PATCH 0950/2743] [cpan2nix] perlPackages.HTMLTemplate: 2.95 -> 2.97 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 521dc7021207..b14401bd806c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6858,12 +6858,13 @@ let self = _self // overrides; _self = with self; { }; HTMLTemplate = buildPerlPackage rec { - name = "HTML-Template-2.95"; + name = "HTML-Template-2.97"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WONKO/${name}.tar.gz"; - sha256 = "07ahpfgidxsw2yb7y8i7bbr8s64aq6qgq832h9jswmksxbd0l43q"; + url = mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz; + sha256 = "17qjw8swj2q4b1ic285pndgrkmvpsqw0j68nhqzpk1daydhsyiv5"; }; propagatedBuildInputs = [ CGI ]; + buildInputs = [ TestPod ]; }; HTMLTidy = buildPerlPackage rec { From d1882fe5bac81c8a89e9ab5f9af4c30a5d30a0db Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:09 +0000 Subject: [PATCH 0951/2743] [cpan2nix] perlPackages.HTMLTokeParserSimple: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b14401bd806c..c6e3f06444d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6893,14 +6893,13 @@ let self = _self // overrides; _self = with self; { }; }; - HTMLTokeParserSimple = buildPerlPackage rec { + HTMLTokeParserSimple = buildPerlModule rec { name = "HTML-TokeParser-Simple-3.16"; src = fetchurl { url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd"; }; - propagatedBuildInputs = [HTMLParser SubOverride]; - buildInputs = [TestPod]; + propagatedBuildInputs = [ HTMLParser SubOverride ]; }; HTMLTree = buildPerlModule { From da4dcd3a86dd0321bc7244c1349c13905a6663f7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:09 +0000 Subject: [PATCH 0952/2743] [cpan2nix] perlPackages.HTTPHeadersFast: 0.20 -> 0.21 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c6e3f06444d3..2f1162412999 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7019,12 +7019,12 @@ let self = _self // overrides; _self = with self; { }; HTTPHeadersFast = buildPerlModule rec { - name = "HTTP-Headers-Fast-0.20"; + name = "HTTP-Headers-Fast-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; - sha256 = "d2f4c9724618e74f300fc746498fb5849692ef0cfc4af47fe499c4063969e520"; + sha256 = "5e68ed8e3e67531e1d43c6a2cdfd0ee2daddf2e5b94c1a2648f3a6500a6f12d5"; }; - buildInputs = [ ModuleBuild TestRequires ]; + buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ HTTPDate ]; meta = { homepage = https://github.com/tokuhirom/HTTP-Headers-Fast; From 3fc2a233e712e72c0bd269ed7bf824b57dc39862 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:09 +0000 Subject: [PATCH 0953/2743] [cpan2nix] perlPackages.IPCRun: 0.92 -> 0.98 --- pkgs/top-level/perl-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f1162412999..55b690ff796c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7522,10 +7522,10 @@ let self = _self // overrides; _self = with self; { IPCRun = buildPerlPackage { - name = "IPC-Run-0.92"; + name = "IPC-Run-0.98"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.92.tar.gz; - sha256 = "1lj6kmr8rs6na77b3v673vvw6qsr511bmhgf257x4xqmvxnv91p1"; + url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.98.tar.gz; + sha256 = "018r6jb8h0danyd3g8k03ziaf4w2d31qi9x876gn21js8l232spl"; }; doCheck = false; /* attempts a network connection to localhost */ meta = { @@ -7534,6 +7534,8 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; + propagatedBuildInputs = [ IOTty ]; + buildInputs = [ Readonly ]; }; IPCRun3 = buildPerlPackage rec { From 7f81eff7d49d96a49acdd6d8e436c92e3a3837f9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:10 +0000 Subject: [PATCH 0954/2743] [cpan2nix] perlPackages.JSONAny: 1.29 -> 1.39 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55b690ff796c..52d2bca0f72b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7724,16 +7724,16 @@ let self = _self // overrides; _self = with self; { }; JSONAny = buildPerlPackage { - name = "JSON-Any-1.29"; + name = "JSON-Any-1.39"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/JSON-Any-1.29.tar.gz; - sha256 = "15v2j9dh58r7r4s7rnnmgnzzbyz61bhyxwpx1z7r811ixs9bkks2"; + url = mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz; + sha256 = "1hspg6khjb38syn59cysnapc1q77qgavfym3fqr6l2kiydf7ajdf"; }; - propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; JSONMaybeXS = buildPerlPackage rec { From 16e1c9edae0399c4c6c51cb4f2781115423a7091 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:10 +0000 Subject: [PATCH 0955/2743] [cpan2nix] perlPackages.LinguaStem: cleanup dependencies: perlPackages.LinguaPTStemmer: init at 0.02 perlPackages.LinguaStemFr: init at 0.02 perlPackages.LinguaStemIt: init at 0.02 perlPackages.LinguaStemRu: init at 0.04 perlPackages.LinguaStemSnowballDa: init at 1.01 perlPackages.SnowballNorwegian: init at 1.2 perlPackages.SnowballSwedish: init at 1.2 perlPackages.TextGerman: init at 0.06 --- pkgs/top-level/perl-packages.nix | 95 +++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 52d2bca0f72b..3aa4ad31e384 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7994,13 +7994,70 @@ let self = _self // overrides; _self = with self; { }; }; - LinguaStem = buildPerlPackage rec { + LinguaPTStemmer = buildPerlPackage rec { + name = "Lingua-PT-Stemmer-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz; + sha256 = "17c48sfbgwd2ivlgf59sr6jdhwa3aim8750f8pyzz7xpi8gz0var"; + }; + meta = { + description = "Portuguese language stemming"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Lingua-PT-Stemmer"; + }; + }; + + LinguaStem = buildPerlModule rec { name = "Lingua-Stem-0.84"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz; sha256 = "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"; }; doCheck = false; + propagatedBuildInputs = [ LinguaPTStemmer LinguaStemFr LinguaStemIt LinguaStemRu LinguaStemSnowballDa SnowballNorwegian SnowballSwedish TextGerman ]; + }; + + LinguaStemFr = buildPerlPackage rec { + name = "Lingua-Stem-Fr-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz; + sha256 = "0vyrspwzaqjxm5mqshf4wvwa3938mkajd1918d9ii2l9m2rn8kwx"; + }; + meta = { + }; + }; + + LinguaStemIt = buildPerlPackage rec { + name = "Lingua-Stem-It-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz; + sha256 = "1207r183s5hlh4mfwa6p46vzm0dhvrs2dnss5s41a0gyfkxp7riq"; + }; + meta = { + }; + }; + + LinguaStemRu = buildPerlPackage rec { + name = "Lingua-Stem-Ru-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz; + sha256 = "0a2jmdz7jn32qj5hyiw5kbv8fvlpmws8i00a6xcbkzb48yvwww0j"; + }; + meta = { + description = "Porter's stemming algorithm for Russian (KOI8-R only)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Lingua-Stem-Ru"; + }; + }; + + LinguaStemSnowballDa = buildPerlPackage rec { + name = "Lingua-Stem-Snowball-Da-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz; + sha256 = "0mm0m7glm1s6i9f6a78jslw6wh573208arxhq93yriqmw17bwf9f"; + }; + meta = { + }; }; LinguaTranslit = buildPerlPackage rec { @@ -12491,6 +12548,30 @@ let self = _self // overrides; _self = with self; { }; }; + SnowballNorwegian = buildPerlModule rec { + name = "Snowball-Norwegian-1.2"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz; + sha256 = "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"; + }; + meta = { + description = "Porters stemming algorithm for norwegian."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + SnowballSwedish = buildPerlModule rec { + name = "Snowball-Swedish-1.2"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz; + sha256 = "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"; + }; + meta = { + description = "Porters stemming algorithm for swedish."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SOAPLite = buildPerlPackage { name = "SOAP-Lite-1.11"; src = fetchurl { @@ -15007,6 +15088,16 @@ let self = _self // overrides; _self = with self; { }; }; + TextGerman = buildPerlPackage rec { + name = "Text-German-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz; + sha256 = "1p87pgap99lw0nv62i3ghvsi7yg90lhn8vsa3yqp75rd04clybcj"; + }; + meta = { + }; + }; + TextGlob = buildPerlPackage rec { name = "Text-Glob-0.11"; src = fetchurl { From a313c84da76e7ed0ccca9407f7b098967570847f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:11 +0000 Subject: [PATCH 0956/2743] [cpan2nix] perlPackages.PackageVariant: 1.002002 -> 1.003002 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3aa4ad31e384..cd7405983bf5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12751,13 +12751,13 @@ let self = _self // overrides; _self = with self; { }; PackageVariant = buildPerlPackage { - name = "Package-Variant-1.002002"; + name = "Package-Variant-1.003002"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Package-Variant-1.002002.tar.gz; - sha256 = "826780f19522f42c6b3d9f717ab6b5400f198cec08f4aa15b71aef9aa17e9b13"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz; + sha256 = "b2ed849d2f4cdd66467512daa3f143266d6df810c5fae9175b252c57bc1536dc"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ImportInto ModuleRuntime strictures ]; + propagatedBuildInputs = [ ImportInto strictures ]; meta = { description = "Parameterizable packages"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 211e145765e7c27d4f85fd3c7c3f390ca100d07d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:11 +0000 Subject: [PATCH 0957/2743] [cpan2nix] perlPackages.ParamsValidate: 1.24 -> 1.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cd7405983bf5..5fa92266cfd4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11100,12 +11100,12 @@ let self = _self // overrides; _self = with self; { }; ParamsValidate = buildPerlModule rec { - name = "Params-Validate-1.24"; + name = "Params-Validate-1.29"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1e1576f16e6e01ba63aa73775da563b410b49f26ee44169a45280feb958a5f0d"; + sha256 = "49a68dfb430bea028042479111d19068e08095e5a467e320b7ab7bde3d729733"; }; - buildInputs = [ ModuleBuild TestFatal TestRequires ]; + buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; perlPreHook = "export LD=$CC"; meta = { From ebe63501601269f5699b9785f8c4725b7ec6d8e0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:11 +0000 Subject: [PATCH 0958/2743] [cpan2nix] perlPackages.Pegex: 0.60 -> 0.64 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5fa92266cfd4..39390c3c4c1b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11260,10 +11260,10 @@ let self = _self // overrides; _self = with self; { }; Pegex = buildPerlPackage rec { - name = "Pegex-0.60"; + name = "Pegex-0.64"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "317347f8c6355e886d87aef4c30fb4cb6cfa3e46adf62f59e6141ec05a97f2cf"; + sha256 = "27e00264bdafb9c2109212b9654542032617fecf7b7814915d2bdac198f067cd"; }; buildInputs = [ FileShareDirInstall YAMLLibYAML ]; meta = { From 0d891474f625bee47315fb0cd5f93bd09171b5cc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:13 +0000 Subject: [PATCH 0959/2743] [cpan2nix] perlPackages.grepmail: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39390c3c4c1b..382d9b5ab735 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6365,7 +6365,7 @@ let self = _self // overrides; _self = with self; { sha256 = "7969e569ec54b2f569a5af56ac4d884c630ad850974658219b0b6953e97b5d3d"; }; buildInputs = [ FileSlurp URI ]; - propagatedBuildInputs = [ DateManip DigestMD5 MailMboxMessageParser TimeDate ]; + propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; outputs = [ "out" ]; meta = { homepage = https://github.com/coppit/grepmail; From 1d84dcb8dfc2705b1ca13cf9970530ec3764d223 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:14 +0000 Subject: [PATCH 0960/2743] [cpan2nix] perlPackages.BHooksEndOfScope: 0.15 -> 0.21 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 382d9b5ab735..49a9a28f5b51 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -700,12 +700,12 @@ let self = _self // overrides; _self = with self; { }; BHooksEndOfScope = buildPerlPackage rec { - name = "B-Hooks-EndOfScope-0.15"; + name = "B-Hooks-EndOfScope-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "0bllq4077hxbdsh31r3cwpm6mzmc0247rrg1lr7rk7flscif8bhj"; + sha256 = "0b70vbpabsy9ia366k330cz1zbdyb1pwhb0l7j28pmpih045iwwh"; }; - propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ]; + propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; meta = { homepage = https://metacpan.org/release/B-Hooks-EndOfScope; description = "Execute code after a scope finished compilation"; From ab944294932b9ea61e35f86f97607c2198f519d9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:14 +0000 Subject: [PATCH 0961/2743] [cpan2nix] perlPackages.ClassC3AdoptNEXT: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 49a9a28f5b51..8b80cd6f8727 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1922,14 +1922,14 @@ let self = _self // overrides; _self = with self; { }; }; - ClassC3AdoptNEXT = buildPerlPackage rec { + ClassC3AdoptNEXT = buildPerlModule rec { name = "Class-C3-Adopt-NEXT-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "1xsbydmiskpa1qbmnf6n39cb83nlb432xgkad9kfhxnvm8jn4rw5"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ ListMoreUtils MROCompat ]; + buildInputs = [ ModuleBuildTiny TestException ]; + propagatedBuildInputs = [ MROCompat ]; meta = { homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT; description = "Make NEXT suck less"; From 41767e9582ae4c61768adc272bfee27a723825ea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:15 +0000 Subject: [PATCH 0962/2743] [cpan2nix] perlPackages.ClassContainer: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b80cd6f8727..77a62a944338 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1958,11 +1958,11 @@ let self = _self // overrides; _self = with self; { }; }; - ClassContainer = buildPerlPackage { - name = "Class-Container-0.12"; + ClassContainer = buildPerlModule { + name = "Class-Container-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.12.tar.gz; - sha256 = "771206f2b7a916ce0dfb93d82200472beaeb910248482734179bf36808e486b1"; + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.13.tar.gz; + sha256 = "f5d495b1dfb826d5c0c45d03b4d0e6b6047cbb06cdbf6be15fd4dc902aeeb70b"; }; propagatedBuildInputs = [ ParamsValidate ]; meta = { From 21e851198eb5bf0778cdb7badb8b3133b949bcb1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:15 +0000 Subject: [PATCH 0963/2743] [cpan2nix] perlPackages.ConfigMerge: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 77a62a944338..e7fea313abef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2422,7 +2422,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz; sha256 = "a932477b43ae5fb04a16f071a891da7bd2086c10c680592f2888fa9d9972cccf"; }; - buildInputs = [ ConfigAny YAML ]; + buildInputs = [ YAML ]; propagatedBuildInputs = [ ConfigAny ]; meta = { description = "Load a configuration directory tree containing YAML, JSON, XML, Perl, INI or Config::General files"; From a401db5c6d4b4c755c99a0013de5a4271ef852d9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:15 +0000 Subject: [PATCH 0964/2743] [cpan2nix] perlPackages.CookieBaker: 0.06 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e7fea313abef..44f08be47215 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2576,12 +2576,12 @@ let self = _self // overrides; _self = with self; { }; CookieBaker = buildPerlModule rec { - name = "Cookie-Baker-0.06"; + name = "Cookie-Baker-0.09"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "4b1fb173d6977af902fa018242a0b28099e5612a2fa43e0160380781f5d76ea0"; + sha256 = "be020a634162b319cab55b6e2bf10556a33a210a2eee8a2f1aa1b19b5e33aa4f"; }; - buildInputs = [ ModuleBuild TestTime ]; + buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; meta = { homepage = https://github.com/kazeburo/Cookie-Baker; From 34080840fb8bdef8038198a3d29554384cc8ff41 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:16 +0000 Subject: [PATCH 0965/2743] [cpan2nix] perlPackages.DataICal: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 44f08be47215..d19c04ee0992 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3150,7 +3150,7 @@ let self = _self // overrides; _self = with self; { sha256 = "8ae9d20af244e5a6f606c7325e9d145dd0002676a178357af860a5e156925720"; }; buildInputs = [ TestLongString TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ ClassAccessor ClassReturnValue TextvFileasData ]; + propagatedBuildInputs = [ ClassReturnValue TextvFileasData ]; meta = { description = "Generates iCalendar (RFC 2445) calendar files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 44d7244bbdec2284d479021ea077ab5f203f191c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:16 +0000 Subject: [PATCH 0966/2743] [cpan2nix] perlPackages.DataTaxi: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d19c04ee0992..fe6888f920a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3294,11 +3294,11 @@ let self = _self // overrides; _self = with self; { DataTaxi = buildPerlPackage { name = "Data-Taxi-0.96"; - propagatedBuildInputs = [DebugShowStuff]; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz; sha256 = "0y4wls4jlwd6prvd77szymddhq9sfj06kaqnk4frlvd0zh83djxb"; }; + buildInputs = [ DebugShowStuff ]; }; DataUniqid = buildPerlPackage rec { From 75f69a6fd21e31cc66cf4442a2b21f04efba3677 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:16 +0000 Subject: [PATCH 0967/2743] [cpan2nix] perlPackages.DataValidateDomain: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fe6888f920a3..aae4d5d9044c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3351,7 +3351,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421"; }; - buildInputs = [ Test2Suite ]; + buildInputs = [ Test2Suite TestSimple13 ]; propagatedBuildInputs = [ NetDomainTLD ]; meta = { homepage = https://metacpan.org/release/Data-Validate-Domain; From b2b41516f6ba1d31e028569d239b6e16041bb61d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:17 +0000 Subject: [PATCH 0968/2743] [cpan2nix] perlPackages.FileBOM: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aae4d5d9044c..12ff13768a27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5505,13 +5505,13 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FileWhich ]; }; - FileBOM = buildPerlPackage rec { + FileBOM = buildPerlModule rec { name = "File-BOM-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz"; sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1"; }; - buildInputs = [ ModuleBuild TestException ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ Readonly ]; meta = { description = "Utilities for handling Byte Order Marks"; From e683092db452ba9857fd2303304b964979eec5b7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:17 +0000 Subject: [PATCH 0969/2743] [cpan2nix] perlPackages.HTMLTableExtract: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 12ff13768a27..2fce4ab94d0a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6846,7 +6846,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MS/MSISK/${name}.tar.gz"; sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; - propagatedBuildInputs = [ HTMLElementExtended HTMLParser ]; + propagatedBuildInputs = [ HTMLElementExtended ]; }; HTMLTagset = buildPerlPackage rec { From eef2aca206342bbb8abcee092a19e3d81a22cd06 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:18 +0000 Subject: [PATCH 0970/2743] [cpan2nix] perlPackages.ListSomeUtils: 0.52 -> 0.56 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2fce4ab94d0a..21eb124042e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8147,13 +8147,13 @@ let self = _self // overrides; _self = with self; { }; ListSomeUtils = buildPerlPackage rec { - name = "List-SomeUtils-0.52"; + name = "List-SomeUtils-0.56"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1e8c900332ac08c314b78ca1b0d23aba28c146b6133606a817d828d5bd0485ac"; + sha256 = "eaa7d99ce86380c0389876474c8eb84acc0a6bfeef1b0fc23a292592de6f89f7"; }; buildInputs = [ TestLeakTrace ]; - propagatedBuildInputs = [ ExporterTiny ModuleImplementation ]; + propagatedBuildInputs = [ ModuleImplementation ]; meta = { homepage = https://metacpan.org/release/List-SomeUtils; description = "Provide the stuff missing in List::Util"; From abb616cc9560310c9421997a866d8911538b08bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:18 +0000 Subject: [PATCH 0971/2743] [cpan2nix] perlPackages.LogHandler: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 21eb124042e1..3e7481176729 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8330,13 +8330,12 @@ let self = _self // overrides; _self = with self; { }; }; - LogHandler = buildPerlPackage rec { + LogHandler = buildPerlModule rec { name = "Log-Handler-0.88"; src = fetchurl { url = "mirror://cpan/authors/id/B/BL/BLOONIX/${name}.tar.gz"; sha256 = "45bf540ab2138ed3ff93afc205b0516dc75755b86acdcc5e75c41347833c293d"; }; - buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ ParamsValidate ]; meta = { description = "Log messages to several outputs"; From 9f58a45e5ad6b4024190be9f20fe628c4b9d5625 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:19 +0000 Subject: [PATCH 0972/2743] [cpan2nix] perlPackages.MailDKIM: 0.40 -> 0.52 dependencies: perlPackages.NetDNSResolverMock: init at 1.20171219 perlPackages.TestRequiresInternet: init at 0.05 --- pkgs/top-level/perl-packages.nix | 35 ++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3e7481176729..418913c73203 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8604,13 +8604,14 @@ let self = _self // overrides; _self = with self; { }; MailDKIM = buildPerlPackage rec { - name = "Mail-DKIM-0.40"; + name = "Mail-DKIM-0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz"; - sha256 = "1wd6mab4fp47v1nh85jfxsjmysnyv5mwvfv47cn5m2h2lb1s0piw"; + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.52.tar.gz; + sha256 = "1dbczg7vyvvm12d9gbiqd9a24qg4254cz7bh7yf3p27i58hhpbwy"; }; - propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ]; + propagatedBuildInputs = [ CryptOpenSSLRSA MailTools NetDNSResolverMock YAMLLibYAML ]; doCheck = false; # tries to access the domain name system + buildInputs = [ TestRequiresInternet ]; }; MailIMAPClient = buildPerlPackage { @@ -10571,6 +10572,19 @@ let self = _self // overrides; _self = with self; { }; }; + NetDNSResolverMock = buildPerlPackage rec { + name = "Net-DNS-Resolver-Mock-1.20171219"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz; + sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9"; + }; + propagatedBuildInputs = [ NetDNS ]; + meta = { + description = "Mock a DNS Resolver object for testing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetDomainTLD = buildPerlPackage rec { name = "Net-Domain-TLD-1.75"; src = fetchurl { @@ -14484,6 +14498,19 @@ let self = _self // overrides; _self = with self; { }; }; + TestRequiresInternet = buildPerlPackage rec { + name = "Test-RequiresInternet-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz; + sha256 = "0gl33vpj9bb78pzyijp884b66sbw6jkh1ci0xki8rmf03hmb79xv"; + }; + meta = { + description = "Easily test network connectivity"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/dist/Test-RequiresInternet"; + }; + }; + TestRoo = buildPerlPackage rec { name = "Test-Roo-1.004"; src = fetchurl { From 4c621bf7e0e865a558b2b30afd4b06c3630b147d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:19 +0000 Subject: [PATCH 0973/2743] [cpan2nix] perlPackages.ModuleBuildWithXSpp: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 418913c73203..9df7a21dd21e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9120,7 +9120,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; sha256 = "0d39fjg9c0n820bk3fb50vvlwhdny4hdl69xmlyzql5xzp4cicsk"; }; - propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ]; + propagatedBuildInputs = [ ExtUtilsCppGuess ExtUtilsXSpp ]; }; ModuleBuildXSUtil = buildPerlModule rec { From c842e727a60b091fe5d0c026564749eca59a186b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:20 +0000 Subject: [PATCH 0974/2743] [cpan2nix] perlPackages.ModuleSignature: 0.79 -> 0.81 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9df7a21dd21e..dc3e46c1cada 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9363,10 +9363,10 @@ let self = _self // overrides; _self = with self; { }; ModuleSignature = buildPerlPackage { - name = "Module-Signature-0.79"; + name = "Module-Signature-0.81"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.79.tar.gz; - sha256 = "22df2ce097fb5d176efa951c782633d8debe594924a25ca66666252512ce462c"; + url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.81.tar.gz; + sha256 = "7df547ceb8e45d40f75e481a868f389aaed5641c2cf4e133146ccea4b8facec6"; }; buildInputs = [ IPCRun ]; meta = { From 9dc8d5f708d8a63a6e6a2204874467086cc2c315 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:20 +0000 Subject: [PATCH 0975/2743] [cpan2nix] perlPackages.PackageStash: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dc3e46c1cada..c0ed3bc96aa8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11024,7 +11024,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz; sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c"; }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; + buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; meta = { homepage = https://metacpan.org/release/Package-Stash; From 7e11982a720b9df1e861a42e4cbeeaf33aecc537 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:20 +0000 Subject: [PATCH 0976/2743] [cpan2nix] perlPackages.PerlIOviaTimeout: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c0ed3bc96aa8..b05866627237 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11378,13 +11378,13 @@ let self = _self // overrides; _self = with self; { ''; }; - PerlIOviaTimeout = buildPerlPackage rec { + PerlIOviaTimeout = buildPerlModule rec { name = "PerlIO-via-Timeout-0.32"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; sha256 = "9278f9ef668850d913d98fa4c0d7e7d667cff3503391f4a4eae73a246f2e7916"; }; - buildInputs = [ ModuleBuildTiny TestTCP ]; + buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; meta = { description = "A PerlIO layer that adds read & write timeout to a handle"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 1e6fe8f5bbf7c0c60a7abac64f0fd64f4b5772da Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:21 +0000 Subject: [PATCH 0977/2743] [cpan2nix] perlPackages.PodEventual: 0.093330 -> 0.094001 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b05866627237..4c4f8c413541 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11931,16 +11931,17 @@ let self = _self // overrides; _self = with self; { }; PodEventual = buildPerlPackage { - name = "Pod-Eventual-0.093330"; + name = "Pod-Eventual-0.094001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.093330.tar.gz; - sha256 = "29de14a69df8a26f7e8ff73daca5afa7acc84cc9b7ae28093a5b1af09a4830b6"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz; + sha256 = "be9fb8910b108e5d1a66f002b659ad22576e88d779b703dff9d15122c3f80834"; }; - propagatedBuildInputs = [ MixinLinewise TestDeep ]; + propagatedBuildInputs = [ MixinLinewise ]; meta = { description = "Read a POD document as a series of trivial events"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDeep ]; }; PodParser = buildPerlPackage { From e098059c589025d094c75757a8ad5bbdc16caddc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:21 +0000 Subject: [PATCH 0978/2743] [cpan2nix] perlPackages.PodPOMViewTOC: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4c4f8c413541..fda558434997 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11977,7 +11977,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; sha256 = "ccb42272c7503379cb1131394620ee50276d72844e0e80eb4b007a9d58f87623"; }; - buildInputs = [ TestMore ]; propagatedBuildInputs = [ PodPOM ]; meta = { description = "Generate the TOC of a POD with Pod::POM"; From d3b6ec6cf27444a9ad32a49c9625db956266a3ba Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:21 +0000 Subject: [PATCH 0979/2743] [cpan2nix] perlPackages.EmailMIME: 1.936 -> 1.946 dependencies: perlPackages.EmailAddressXS: init at 1.03 --- pkgs/top-level/perl-packages.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fda558434997..8cd0e9e34c63 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4725,6 +4725,18 @@ let self = _self // overrides; _self = with self; { }; }; + EmailAddressXS = buildPerlPackage rec { + name = "Email-Address-XS-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.03.tar.gz; + sha256 = "1knf1i9rr20bpzscbvaqsqjgw51pnnga4zlnkgsvw7jpqh4cyj6i"; + }; + meta = { + description = "Parse and format RFC 2822 email addresses and groups"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailDateFormat = buildPerlPackage rec { name = "Email-Date-Format-1.005"; src = fetchurl { @@ -4768,12 +4780,12 @@ let self = _self // overrides; _self = with self; { }; EmailMIME = buildPerlPackage rec { - name = "Email-MIME-1.936"; + name = "Email-MIME-1.946"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "4c0934284da84b8e9ed48ff1060c9719273fac18e776f4c8e888a47c863ee661"; + sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c"; }; - propagatedBuildInputs = [ EmailAddress EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ]; + propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { homepage = https://github.com/rjbs/Email-MIME; description = "Easy MIME message handling"; From 75dead16f367ed075dc270e0714a8b678cd9be84 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:22 +0000 Subject: [PATCH 0980/2743] [cpan2nix] perlPackages.HTTPMessage: 6.14 -> 6.16 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8cd0e9e34c63..6c96756c7f22 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7055,10 +7055,10 @@ let self = _self // overrides; _self = with self; { }; HTTPMessage = buildPerlPackage rec { - name = "HTTP-Message-6.14"; + name = "HTTP-Message-6.16"; src = fetchurl { url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; - sha256 = "71aab9f10eb4b8ec6e8e3a85fc5acb46ba04db1c93eb99613b184078c5cf2ac9"; + sha256 = "46790ae127946d5cfea5a1e05c1b9f4a045a7c5094fe81f086bbf3341290ebd0"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; From 4aa6691fad3d2eeb5c823793269d7b92cb50a89f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:22 +0000 Subject: [PATCH 0981/2743] [cpan2nix] perlPackages.IOSocketTimeout: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c96756c7f22..3990a6ef4d9f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7443,13 +7443,13 @@ let self = _self // overrides; _self = with self; { doCheck = false; # tries to connect to facebook.com etc. }; - IOSocketTimeout = buildPerlPackage rec { + IOSocketTimeout = buildPerlModule rec { name = "IO-Socket-Timeout-0.32"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; sha256 = "edf915d6cc66bee43503aa6dc2b373366f38eaff701582183dad10cb8adf2972"; }; - buildInputs = [ ModuleBuildTiny TestTCP ]; + buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; propagatedBuildInputs = [ PerlIOviaTimeout ]; meta = { description = "IO::Socket with read/write timeout"; From 9e2a5a9fcc6ea509726261f0b4526018c7cb4f6a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:22 +0000 Subject: [PATCH 0982/2743] [cpan2nix] perlPackages.MathGeometryVoronoi: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3990a6ef4d9f..5c04128f468d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8810,7 +8810,7 @@ let self = _self // overrides; _self = with self; { MathGeometryVoronoi = buildPerlPackage rec { name = "Math-Geometry-Voronoi-1.3"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SAMTREGAR/Math-Geometry-Voronoi-1.3.tar.gz; sha256 = "0b206k2q5cznld45cjhgm0as0clc9hk135ds8qafbkl3k175w1vj"; }; propagatedBuildInputs = [ ClassAccessor ParamsValidate ]; From 7d211dfbbc039e175f6438c2d1ce1edbd831c6d4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:23 +0000 Subject: [PATCH 0983/2743] [cpan2nix] perlPackages.SQLSplitStatement: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5c04128f468d..239f890f8b8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12742,7 +12742,7 @@ let self = _self // overrides; _self = with self; { SQLSplitStatement = buildPerlPackage rec { name = "SQL-SplitStatement-1.00020"; src = fetchurl { - url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz; sha256 = "0bqg45k4c9qkb2ypynlwhpvzsl4ssfagmsalys18s5c79ps30z7p"; }; buildInputs = [ TestException ]; From b72e49f28c33c0c9a6b59b727a5b4ac3b0220b06 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:23 +0000 Subject: [PATCH 0984/2743] [cpan2nix] perlPackages.TemplateToolkit: 2.25 -> 2.27 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 239f890f8b8b..94ffd0f27d7a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13613,16 +13613,17 @@ let self = _self // overrides; _self = with self; { }; TemplateToolkit = buildPerlPackage rec { - name = "Template-Toolkit-2.25"; + name = "Template-Toolkit-2.27"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.25.tar.gz; - sha256 = "048yg07j48rix3cly13j5wzms7kd5argviicj0kwykb004xpc8zl"; + url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.27.tar.gz; + sha256 = "1p66y9mwj7nkc1bcwgp2xjw78l4x5bzhj0xghp2k80ad4q1s848k"; }; propagatedBuildInputs = [ AppConfig ]; meta = { description = "Comprehensive template processing system"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CGI TestLeakTrace ]; }; TemplateGD = buildPerlPackage rec { From a5c7702bba5cc1d8fee28760ce3a3e249f82c3d3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:24 +0000 Subject: [PATCH 0985/2743] [cpan2nix] perlPackages.TestMockObject: 1.20150527 -> 1.20161202 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94ffd0f27d7a..481875ef4a63 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14308,12 +14308,12 @@ let self = _self // overrides; _self = with self; { TestMockObject = buildPerlPackage rec { - name = "Test-MockObject-1.20150527"; + name = "Test-MockObject-1.20161202"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; - sha256 = "adf1357a9014b3a397ff7ecbf1835dec376a67a37bb2e788734a627e17dc1d98"; + sha256 = "14b225fff3645338697976dbbe2c39e44c1c93536855b78b3bbc6e9bfe94a0a2"; }; - buildInputs = [ TestException TestWarn CGI ]; + buildInputs = [ CGI TestException TestWarn ]; propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; meta = { description = "Perl extension for emulating troublesome interfaces"; From a29a85e608324d166906c03ca9c6168fb6a2c3b6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:24 +0000 Subject: [PATCH 0986/2743] [cpan2nix] perlPackages.TestScript: 1.10 -> 1.23 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 481875ef4a63..b6c55f189213 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14676,15 +14676,15 @@ let self = _self // overrides; _self = with self; { }; TestScript = buildPerlPackage rec { - name = "Test-Script-1.10"; + name = "Test-Script-1.23"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "0wxbia5mmn73n5rkv857fv547kihpg3amizqllyh5flap6kbc7fn"; + sha256 = "1ca4mwcghgpdrpcg6xc0iwp3ga9c94qni9zf4hhqq8lpjwdyg89k"; }; - buildInputs = [ TestTester ]; + buildInputs = [ Test2Suite ]; - propagatedBuildInputs = [ ProbePerl IPCRun3 ]; + propagatedBuildInputs = [ CaptureTiny ProbePerl TestSimple13 ]; }; TestSharedFork = buildPerlPackage rec { From c943b7366c67d767f291839c0f74dda738c759a9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:24 +0000 Subject: [PATCH 0987/2743] [cpan2nix] perlPackages.BC: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b6c55f189213..6506a17da971 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -681,6 +681,7 @@ let self = _self // overrides; _self = with self; { description = "Perl compiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; BFlags = buildPerlPackage rec { From 431421346817f4b344fceddf906e3a295befc551 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:25 +0000 Subject: [PATCH 0988/2743] [cpan2nix] perlPackages.BoostGeometryUtils: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6506a17da971..4e74b13a200c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -786,12 +786,12 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz"; sha256 = "1jnihz3029x51a455nxa0jx2z125x38q3vkkggsgdlrvawzxsm00"; }; - propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; patches = [ # Fix out of memory error on Perl 5.19.4 and later. ../development/perl-modules/boost-geometry-utils-fix-oom.patch ]; perlPreHook = "export LD=$CC"; + buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp ]; }; BSDResource = buildPerlPackage rec { From cc100f3c851471adc0a34931685498f3762d0945 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:25 +0000 Subject: [PATCH 0989/2743] [cpan2nix] perlPackages.DBIxSearchBuilder: 1.66 -> 1.67 dependencies: perlPackages.DBDSQLite: init at 1.56 perlPackages.capitalization: init at 0.03 --- pkgs/top-level/perl-packages.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4e74b13a200c..7164355322e2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -980,6 +980,17 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CryptRC4 TextPDF ]; }; + capitalization = buildPerlPackage rec { + name = "capitalization-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz; + sha256 = "0g7fpckydzxsf8mjkfbyj0pv42dzym4hwbizqahnh7wlfbaicdgi"; + }; + propagatedBuildInputs = [ DevelSymdump ]; + meta = { + }; + }; + CanaryStability = buildPerlPackage rec { name = "Canary-Stability-2012"; src = fetchurl { @@ -4070,13 +4081,13 @@ let self = _self // overrides; _self = with self; { }; DBIxSearchBuilder = buildPerlPackage { - name = "DBIx-SearchBuilder-1.66"; + name = "DBIx-SearchBuilder-1.67"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/DBIx-SearchBuilder-1.66.tar.gz; - sha256 = "e2703c3f4b38cf232dec48be98aeab6d2dbee077dcf059369b825629c4be702e"; + url = mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz; + sha256 = "453179c22a61af573e502c8396f3f28daea03dfdc162094b90f9b3c331d563da"; }; buildInputs = [ DBDSQLite ]; - propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBI DBIxDBSchema Want ]; + propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBIxDBSchema Want capitalization ]; meta = { description = "Encapsulate SQL queries and rows in simple perl objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 24ae793f7505eca58a1b6822c696c9d0d48ad98b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:26 +0000 Subject: [PATCH 0990/2743] [cpan2nix] perlPackages.DataEntropy: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7164355322e2..f09c4b74e544 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3089,14 +3089,13 @@ let self = _self // overrides; _self = with self; { }; }; - DataEntropy = buildPerlPackage rec { + DataEntropy = buildPerlModule rec { name = "Data-Entropy-0.007"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ParamsClassify DataFloat CryptRijndael HTTPLite]; + propagatedBuildInputs = [ CryptRijndael DataFloat HTTPLite ParamsClassify ]; }; DataFloat = buildPerlModule rec { From 25a2e49a6ccd81a34ae2904e655551b5217587f4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:26 +0000 Subject: [PATCH 0991/2743] [cpan2nix] perlPackages.ExporterDeclare: 0.113 -> 0.114 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f09c4b74e544..2f0809e1841e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5158,10 +5158,10 @@ let self = _self // overrides; _self = with self; { }; ExporterDeclare = buildPerlModule { - name = "Exporter-Declare-0.113"; + name = "Exporter-Declare-0.114"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.113.tar.gz; - sha256 = "724de5e982c8477df14a360c82233f9e0c26b4af9191647f750f5e465ea42dce"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.114.tar.gz; + sha256 = "4bd70d6ca76f6f6ba7e4c618d4ac93b8593a58f1233ccbe18b10f5f204f1d4e4"; }; buildInputs = [ FennecLite TestException ]; propagatedBuildInputs = [ MetaBuilder aliased ]; From 6bd13d631a3f4f57998d5dd985f0f4ae268c4b35 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:27 +0000 Subject: [PATCH 0992/2743] [cpan2nix] perlPackages.HTMLFormatter: 2.14 -> 2.16 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f0809e1841e..690cfa9a22eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6683,13 +6683,13 @@ let self = _self // overrides; _self = with self; { }; }; - HTMLFormatter = buildPerlModule { - name = "HTML-Formatter-2.14"; + HTMLFormatter = buildPerlPackage { + name = "HTML-Formatter-2.16"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.14.tar.gz; - sha256 = "d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e"; + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz; + sha256 = "cb0a0dd8aa5e8ba9ca214ce451bf4df33aa09c13e907e8d3082ddafeb30151cc"; }; - buildInputs = [ FileSlurper TestCPANMeta TestEOL TestNoTabs perl ]; + buildInputs = [ FileSlurper TestWarnings ]; propagatedBuildInputs = [ FontAFM HTMLTree ]; meta = { homepage = https://metacpan.org/release/HTML-Formatter; From e39869481a32bd509e6296a006a3a5fc228c023e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:27 +0000 Subject: [PATCH 0993/2743] [cpan2nix] perlPackages.HTTPBody: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 690cfa9a22eb..b4e22720c2fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6975,7 +6975,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz"; sha256 = "fc0d2c585b3bd1532d92609965d589e0c87cd380e7cca42fb9ad0a1311227297"; }; - buildInputs = [ HTTPMessage TestDeep ]; + buildInputs = [ TestDeep ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; From 3b3933936ec620a9a01d3fb879c70370355f526f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:27 +0000 Subject: [PATCH 0994/2743] [cpan2nix] perlPackages.HTTPCookies: 6.01 -> 6.04 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b4e22720c2fc..d17ab665d090 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6984,12 +6984,12 @@ let self = _self // overrides; _self = with self; { }; HTTPCookies = buildPerlPackage { - name = "HTTP-Cookies-6.01"; + name = "HTTP-Cookies-6.04"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Cookies-6.01.tar.gz; - sha256 = "087bqmg22dg3vj7gssh3pcsh9y1scimkbl5h1kc8jqyfhgisvlzm"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz; + sha256 = "1m0kxcirbvbkrm2c59p1bkbvzlcdymg8fdpa7wlxijlx0xwz1iqc"; }; - propagatedBuildInputs = [ HTTPDate HTTPMessage ]; + propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP cookie jars"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 1781eafcb14dd13a1838959ef40fb3a934d652bc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:27 +0000 Subject: [PATCH 0995/2743] [cpan2nix] perlPackages.HTTPDaemon: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d17ab665d090..f83277527165 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7002,7 +7002,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz; sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; }; - propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; + propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 962a8c5a6492cfbab237a76c60f4213c5a7f5360 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:28 +0000 Subject: [PATCH 0996/2743] [cpan2nix] perlPackages.PodSpell: 1.01 -> 1.20 dependencies: perlPackages.ClassTiny: init at 1.006 --- pkgs/top-level/perl-packages.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f83277527165..b80a72088add 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2129,6 +2129,19 @@ let self = _self // overrides; _self = with self; { }; }; + ClassTiny = buildPerlPackage rec { + name = "Class-Tiny-1.006"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz; + sha256 = "0knbi1agcfc9d7fca0szvxr6335pb22pc5n648q1vrcba8qvvz1f"; + }; + meta = { + description = "Minimalist class construction"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "https://github.com/dagolden/Class-Tiny"; + }; + }; + ClassLoad = buildPerlPackage rec { name = "Class-Load-0.24"; src = fetchurl { @@ -12095,11 +12108,13 @@ let self = _self // overrides; _self = with self; { }; PodSpell = buildPerlPackage rec { - name = "Pod-Spell-1.01"; + name = "Pod-Spell-1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBURKE/${name}.tar.gz"; - sha256 = "938648dca5b62e591783347f9d4d4e2a5239f9629c6adfed9a581b9457ef7d2e"; + url = mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz; + sha256 = "6383f7bfe22bc0d839a08057a0ce780698b046184aea935be4833d94986dd03c"; }; + propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny ]; + buildInputs = [ FileShareDirInstall TestDeep ]; }; PodUsage = buildPerlPackage { From f99f07b7b0f5fed2b372392522e21f8429ac9fe0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:30 +0000 Subject: [PATCH 0997/2743] [cpan2nix] perlPackages.TestDistManifest: 1.012 -> 1.014 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b80a72088add..65d7ca57af83 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14079,13 +14079,13 @@ let self = _self // overrides; _self = with self; { }; }; - TestDistManifest = buildPerlPackage { - name = "Test-DistManifest-1.012"; + TestDistManifest = buildPerlModule { + name = "Test-DistManifest-1.014"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.012.tar.gz; - sha256 = "4b128bef9beea2f03bdca037ceb722de43b4a2c516c3f50c2a26421548a72208"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz; + sha256 = "3d26c20df42628981cbfcfa5b1ca028c6ceadb344c1dcf97a25ad6a88b73d7c5"; }; - buildInputs = [ TestNoWarnings ]; + buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ ModuleManifest ]; meta = { homepage = http://search.cpan.org/dist/Test-DistManifest; From b173d26d0f1bf9b496a1bd346223ebc1e965da17 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:30 +0000 Subject: [PATCH 0998/2743] [cpan2nix] perlPackages.TextMarkdown: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 65d7ca57af83..98467045b841 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15209,8 +15209,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1"; }; - buildInputs = [ FileSlurp ListMoreUtils Encode ExtUtilsMakeMaker - TestException HTMLTidy TestDifferences ]; + buildInputs = [ ListMoreUtils TestDifferences TestException ]; }; TestMagpie = buildPerlPackage { From da1a9db769e38fe92a82e211dba2d8d28ce04ffa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:31 +0000 Subject: [PATCH 0999/2743] [cpan2nix] perlPackages.URIFromHash: 0.04 -> 0.05 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 98467045b841..f80281c4e866 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16067,10 +16067,10 @@ let self = _self // overrides; _self = with self; { }; URIFromHash = buildPerlPackage { - name = "URI-FromHash-0.04"; + name = "URI-FromHash-0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.04.tar.gz; - sha256 = "03yckli4fj8cgsyh1l1lmyxj56q9qc04a3r8kv0whbnb37zz1j23"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.05.tar.gz; + sha256 = "1l3g5ygv83vn9y1zpwjdqq5cs4ip2q058q0gmpcf5wp9rsycbjm7"; }; propagatedBuildInputs = [ ParamsValidate URI ]; meta = { @@ -16079,6 +16079,7 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestFatal ]; }; UriGoogleChart = buildPerlPackage rec { From 90cf466a952106736815921bd4e2f6be5a6962e9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:31 +0000 Subject: [PATCH 1000/2743] [cpan2nix] perlPackages.CatalystPluginLogHandler: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f80281c4e866..9099cf5211c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1461,7 +1461,7 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginLogHandler = buildPerlPackage rec { + CatalystPluginLogHandler = buildPerlModule rec { name = "Catalyst-Plugin-Log-Handler-0.08"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEPE/${name}.tar.gz"; From d052306ea341c09efb1e97e902782d3ae7b20967 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:32 +0000 Subject: [PATCH 1001/2743] [cpan2nix] perlPackages.EmailSend: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9099cf5211c6..1316cac5ad27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4885,13 +4885,14 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "4bbec933558d7cc9b8152bad86dd313de277a21a89b4ea83d84e61587e95dbc6"; }; - propagatedBuildInputs = [ EmailAbstract EmailAddress EmailSimple ModulePluggable ReturnValue ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress ReturnValue ]; meta = { homepage = https://github.com/rjbs/Email-Send; description = "Simply Sending Email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; + buildInputs = [ MIMETools MailTools ]; }; EmailOutlookMessage = buildPerlPackage rec { From 1286f6e9bfe3d7a9f4dba31fe026de3743d26821 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:32 +0000 Subject: [PATCH 1002/2743] [cpan2nix] perlPackages.HTTPRequestAsCGI: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1316cac5ad27..8df7cd2009ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7134,10 +7134,10 @@ let self = _self // overrides; _self = with self; { HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FL/FLORA/HTTP-Request-AsCGI-1.2.tar.gz; sha256 = "1smwmiarwcgq7vjdblnb6ldi2x1s5sk5p15p7xvm5byiqq3znnwl"; }; - propagatedBuildInputs = [ ClassAccessor LWP ]; + propagatedBuildInputs = [ ClassAccessor HTTPMessage ]; }; HTTPResponseEncoding = buildPerlPackage { From 3fadc7cf63759e4c3065b5a05a7722f1b79988a5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:33 +0000 Subject: [PATCH 1003/2743] [cpan2nix] perlPackages.LinguaENTagger: 0.24 -> 0.28 dependencies: perlPackages.MemoizeExpireLRU: init at 0.56 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8df7cd2009ed..3892f56ad614 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8007,12 +8007,12 @@ let self = _self // overrides; _self = with self; { }; LinguaENTagger = buildPerlPackage { - name = "Lingua-EN-Tagger-0.24"; + name = "Lingua-EN-Tagger-0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.24.tar.gz; - sha256 = "0qksqh1zi8fz76a29s2ll4g6yr8y6agmzgq7ngccvgj3gza5q241"; + url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.28.tar.gz; + sha256 = "1rm223d871s150dgnhbar71w56bim950cp45f0904w6px5fifcqa"; }; - propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ]; + propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; meta = { description = "Part-of-speech tagger for English natural language processing"; license = stdenv.lib.licenses.gpl3; @@ -8922,6 +8922,19 @@ let self = _self // overrides; _self = with self; { }; }; + MemoizeExpireLRU = buildPerlPackage rec { + name = "Memoize-ExpireLRU-0.56"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz; + sha256 = "1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"; + }; + meta = { + description = "Expiry plug-in for Memoize that adds LRU cache expiration"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Memoize-ExpireLRU"; + }; + }; + MetaBuilder = buildPerlModule { name = "Meta-Builder-0.003"; src = fetchurl { From e0731a67f09b8ab80228fc2530fe71eb461b2dd1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:33 +0000 Subject: [PATCH 1004/2743] [cpan2nix] perlPackages.ListAllUtils: 0.09 -> 0.14 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3892f56ad614..b7cc5db05827 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8131,13 +8131,12 @@ let self = _self // overrides; _self = with self; { }; ListAllUtils = buildPerlPackage { - name = "List-AllUtils-0.09"; + name = "List-AllUtils-0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.09.tar.gz; - sha256 = "4cfe6359cc6c9f4ba0d178e223f4b468d3cf7768d645334962f05de069bdaee2"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz; + sha256 = "e45aa65927ae1975a000cc2fed14274627fa5e2bd09bab826a5f2c41d17ef6cd"; }; - buildInputs = [ TestWarnings ]; - propagatedBuildInputs = [ ListMoreUtils ]; + propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ScalarListUtils ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From ffe86fe949199ebe0e5610c74230edf60a05ae8d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:33 +0000 Subject: [PATCH 1005/2743] [cpan2nix] perlPackages.MathClipper: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b7cc5db05827..66e9f340dfa6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8808,11 +8808,11 @@ let self = _self // overrides; _self = with self; { MathClipper = buildPerlModule rec { name = "Math-Clipper-1.23"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-Clipper-1.23.tar.gz; sha256 = "0i9wzvig7ayijc9nvh5x5rryk1jrcj1hcvfmlcj449rnnxx24dav"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; - propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ]; + buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ]; }; MathComplex = buildPerlPackage { From 090788a4ff663ff94d35f21ca254d77b0e6610a9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:34 +0000 Subject: [PATCH 1006/2743] [cpan2nix] perlPackages.ModuleBuildPluggable: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66e9f340dfa6..aff0a6c637ba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9127,12 +9127,13 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; sha256 = "e5bb2acb117792c984628812acb0fec376cb970caee8ede57535e04d762b0e40"; }; - propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ModuleBuild TestSharedFork ]; + propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ]; meta = { homepage = https://github.com/tokuhirom/Module-Build-Pluggable; description = "Module::Build meets plugins"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestSharedFork ]; }; ModuleBuildPluggablePPPort = buildPerlModule rec { From aa94d330320f7f871de77d9f09b4118c39769d7f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:34 +0000 Subject: [PATCH 1007/2743] [cpan2nix] perlPackages.MonitoringPlugin: cleanup --- pkgs/top-level/perl-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aff0a6c637ba..86f8f1503e31 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9508,10 +9508,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NI/NIERLEIN/${name}.tar.gz"; sha256 = "030cw86j8712z8rn66k935gbilb5rcj3lnk4n53vh1b2phrszvjw"; }; - buildInputs = [ TestMore ]; - propagatedBuildInputs = [ - Carp ClassAccessor ConfigTiny - MathCalcUnits ParamsValidate ]; + propagatedBuildInputs = [ ClassAccessor ConfigTiny MathCalcUnits ParamsValidate ]; meta = { description = '' A family of perl modules to streamline writing Naemon, From b72992d82a80f272e48b3ce85312708929eafb7b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:35 +0000 Subject: [PATCH 1008/2743] [cpan2nix] perlPackages.namespaceclean: 0.26 -> 0.27 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 86f8f1503e31..cfb2c6a59f1a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10405,10 +10405,10 @@ let self = _self // overrides; _self = with self; { }; namespaceclean = buildPerlPackage rec { - name = "namespace-clean-0.26"; + name = "namespace-clean-0.27"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "73986e19c4ad0e634e35f4f26e81437f152d8026eb1d91fe795725746ce13eca"; + sha256 = "8a10a83c3e183dc78f9e7b7aa4d09b47c11fb4e7d3a33b9a12912fd22e31af9d"; }; propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; meta = { From 7d53a9c041f4864ca3f6b5496aebf23ed392664d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:35 +0000 Subject: [PATCH 1009/2743] [cpan2nix] perlPackages.ParallelPrefork: 0.17 -> 0.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cfb2c6a59f1a..7eed7da327ba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11125,10 +11125,10 @@ let self = _self // overrides; _self = with self; { }; ParallelPrefork = buildPerlPackage { - name = "Parallel-Prefork-0.17"; + name = "Parallel-Prefork-0.18"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.17.tar.gz; - sha256 = "0d81de2632281091bd31297de1906e14cae4e845cf32200953b50406859e763b"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz; + sha256 = "f1c1f48f1ae147a58bc88f9cb2f570d6bb15ea4c0d589abd4c3084ddc961596e"; }; buildInputs = [ TestRequires TestSharedFork ]; propagatedBuildInputs = [ ClassAccessorLite ListMoreUtils ProcWait3 ScopeGuard SignalMask ]; From 25adca9131eab541bf8f4caf815e1f52529b867c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:35 +0000 Subject: [PATCH 1010/2743] [cpan2nix] perlPackages.PodCoverageTrustPod: 0.100003 -> 0.100005 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7eed7da327ba..43dfa399bfdf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11925,10 +11925,10 @@ let self = _self // overrides; _self = with self; { }; PodCoverageTrustPod = buildPerlPackage { - name = "Pod-Coverage-TrustPod-0.100003"; + name = "Pod-Coverage-TrustPod-0.100005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100003.tar.gz; - sha256 = "19lyc5a5hg3pqhw0k5fnd0q4l2mrdq0ck4kw1smjvwkccp24431z"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz; + sha256 = "08bk6lfimr2pwi6c92xg5cw1cxmi5fqhls3yasqzpjnd4if86s3c"; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { From b90385e89949c571156ac1fdaf0e7bed0b3d9a34 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:36 +0000 Subject: [PATCH 1011/2743] [cpan2nix] perlPackages.TemplateGD: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 43dfa399bfdf..eeb1c83f4363 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13666,7 +13666,7 @@ let self = _self // overrides; _self = with self; { TemplateGD = buildPerlPackage rec { name = "Template-GD-2.66"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz; sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b"; }; propagatedBuildInputs = [ GD TemplateToolkit ]; From 3b45b084c37b8aedf251b4012e37171c77226b18 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:37 +0000 Subject: [PATCH 1012/2743] [cpan2nix] perlPackages.TestJSON: cleanup --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eeb1c83f4363..997fe93af5da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14240,17 +14240,18 @@ let self = _self // overrides; _self = with self; { }; }; - TestJSON = buildPerlPackage { + TestJSON = buildPerlModule { name = "Test-JSON-0.11"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Test-JSON-0.11.tar.gz; sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; }; - propagatedBuildInputs = [ JSONAny TestDifferences TestTester ]; + propagatedBuildInputs = [ JSONAny ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestDifferences ]; }; TestLeakTrace = buildPerlPackage rec { From 6a19bcee23c1733f55faf9f963e86162d5fedbc1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:37 +0000 Subject: [PATCH 1013/2743] [cpan2nix] perlPackages.TestMost: 0.33 -> 0.35 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 997fe93af5da..08ff65448542 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14385,16 +14385,17 @@ let self = _self // overrides; _self = with self; { TestMore = TestSimple; TestMost = buildPerlPackage { - name = "Test-Most-0.33"; + name = "Test-Most-0.35"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.33.tar.gz; - sha256 = "0jp4jcwk97bgf85wwyjpxfsx4165s6w1v4ymn9gnv03yn77inyij"; + url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz; + sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq"; }; - propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ]; + propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Most commonly needed test functions and features"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDeep TestDifferences TestException TestSimple13 TestWarn ]; }; TestNeeds = buildPerlPackage rec { From d80c6414546f89d78205c1a040d1d50eea3a3d19 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:38 +0000 Subject: [PATCH 1014/2743] [cpan2nix] perlPackages.GamesSolitaireVerify: 0.1400 -> 0.1701 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 08ff65448542..1652471eb2ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6102,13 +6102,13 @@ let self = _self // overrides; _self = with self; { }; GamesSolitaireVerify = buildPerlModule { - name = "Games-Solitaire-Verify-0.1400"; + name = "Games-Solitaire-Verify-0.1701"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1400.tar.gz; - sha256 = "0c897c17f23ed6710d0e3ddfb54cce0f00f5b68c55277181adc94a03b7d8c659"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1701.tar.gz; + sha256 = "71383f9c44a344aa92eca6ad999103b05809f19b3e078cf01651f2298bc435c1"; }; buildInputs = [ TestDifferences ]; - propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils MooXlate ]; + propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ]; meta = { description = "Verify solutions for solitaire games"; license = stdenv.lib.licenses.mit; From fd3913b7914218761b50cdac28242629cc84d88f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:38 +0000 Subject: [PATCH 1015/2743] [cpan2nix] perlPackages.HTMLForm: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1652471eb2ed..5188a09c58e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6690,7 +6690,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz; sha256 = "0dpwr7yz6hjc3bcqgcbdzjjk9l58ycdjmbam9nfcmm85y2a1vh38"; }; - propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; + propagatedBuildInputs = [ HTMLParser HTTPMessage ]; meta = { description = "Class that represents an HTML form element"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c33a3c6309b15891f2ad6f8bdbffcb5e3901dc75 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:39 +0000 Subject: [PATCH 1016/2743] [cpan2nix] perlPackages.MailBox: 2.118 -> 3.005 dependencies: perlPackages.MailMessage: init at 3.006 perlPackages.MailTransport: init at 3.002 perlPackages.UserIdentity: init at 0.99 --- pkgs/top-level/perl-packages.nix | 52 +++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5188a09c58e0..4eaee80b0550 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8603,24 +8603,16 @@ let self = _self // overrides; _self = with self; { }; MailBox = buildPerlPackage rec { - version = "2.118"; + version = "3.005"; name = "Mail-Box-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "1ixi7xpvj8kn2y0l8rxkvdnnl7x5wqg7mi2av0viwdh5l828dcfc"; + sha256 = "103v5jiv5mlckss1yardjvil506sx60f3g2ph2kgx9x6sy1sd93m"; }; doCheck = false; - propagatedBuildInputs = [ - Later - - DevelGlobalDestruction - FileRemove - IOStringy - MailTools - MIMETypes - ]; + propagatedBuildInputs = [ DevelGlobalDestruction FileRemove Later MailTransport ]; }; MailMboxMessageParser = buildPerlPackage rec { @@ -8639,6 +8631,19 @@ let self = _self // overrides; _self = with self; { }; }; + MailMessage = buildPerlPackage rec { + name = "Mail-Message-3.006"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.006.tar.gz; + sha256 = "08bdf06bmxdqbslk3k9av542pjhyw9wx10j79fxz0dwpalimc6zi"; + }; + propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; + meta = { + description = "Processing MIME messages"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MailDKIM = buildPerlPackage rec { name = "Mail-DKIM-0.52"; src = fetchurl { @@ -8735,6 +8740,19 @@ let self = _self // overrides; _self = with self; { }; }; + MailTransport = buildPerlPackage rec { + name = "Mail-Transport-3.002"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.002.tar.gz; + sha256 = "0wm4j9w15nsvjxi9x22fn2rnljbffd88v27p0z0305bfg35gh4kg"; + }; + propagatedBuildInputs = [ MailMessage ]; + meta = { + description = "Email message exchange"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MathLibm = buildPerlPackage rec { name = "Math-Libm-1.00"; src = fetchurl { @@ -16104,6 +16122,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ URI ]; }; + UserIdentity = buildPerlPackage rec { + name = "User-Identity-0.99"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz; + sha256 = "0c2qwxgpqncm4ya3rb5zz2hgiwwf559j1b1a6llyarf9jy43hfzm"; + }; + meta = { + description = "Collect information about a user"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + URIIMAP = buildPerlPackage { name = "URI-imap-1.01"; src = fetchurl { From 9938dd313f850991cc80db6468f9e68e5a04990d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:39 +0000 Subject: [PATCH 1017/2743] [cpan2nix] perlPackages.ModuleBuildPluggablePPPort: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4eaee80b0550..fcc71a107704 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9160,8 +9160,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; sha256 = "44084ba3d8815f343bd391585ac5d8339a4807ce5c0dd84c98db8f310b64c0ea"; }; - buildInputs = [ ModuleBuild TestRequires ]; - propagatedBuildInputs = [ ClassAccessorLite ModuleBuildPluggable ]; + buildInputs = [ TestRequires TestSharedFork ]; + propagatedBuildInputs = [ ModuleBuildPluggable ]; meta = { description = "Generate ppport.h"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 0ed9ab8a512603fd3bdf4fdeff97de55174cf43c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:39 +0000 Subject: [PATCH 1018/2743] [cpan2nix] perlPackages.MooXTypesMooseLike: 0.27 -> 0.29 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fcc71a107704..7de9f1ec9d5c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9599,12 +9599,13 @@ let self = _self // overrides; _self = with self; { }; MooXTypesMooseLike = buildPerlPackage rec { - name = "MooX-Types-MooseLike-0.27"; + name = "MooX-Types-MooseLike-0.29"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz"; - sha256 = "1489almsam2zcrs5039sh0y88gjicwna8kws8j2jgfs8bpcf4dgf"; + sha256 = "1d6jg9x3p7gm2r0xmbcag374a44gf5pcga2swvxhlhzakfm80dqx"; }; - propagatedBuildInputs = [ Moo TestFatal ]; + propagatedBuildInputs = [ ModuleRuntime ]; + buildInputs = [ Moo TestFatal ]; }; MooXTypesMooseLikeNumeric = buildPerlPackage rec { From b7433d47e556b96b5f8753844094e8e97d8ae739 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:40 +0000 Subject: [PATCH 1019/2743] [cpan2nix] perlPackages.MooseXHasSugar: 0.05070421 -> 1.000006 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7de9f1ec9d5c..d54855e335d4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9912,14 +9912,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXHasSugar = buildPerlModule { - name = "MooseX-Has-Sugar-0.05070421"; + MooseXHasSugar = buildPerlPackage { + name = "MooseX-Has-Sugar-1.000006"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-0.05070421.tar.gz; - sha256 = "5acf92a6dcac50a6edfcbdb2c38802f8c1f9dc7194a79d0b85a3d4105ebba7df"; + url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz; + sha256 = "efeed3ddb3a8ea18f416d485f3c2b0427145d267e63368c651d488eaa8c28d09"; }; - buildInputs = [ Moose MooseXTypes TestFatal namespaceautoclean ]; - propagatedBuildInputs = [ SubExporter ]; + buildInputs = [ TestFatal namespaceclean ]; + propagatedBuildInputs = [ SubExporterProgressive ]; meta = { homepage = https://github.com/kentfredric/MooseX-Has-Sugar; description = "Sugar Syntax for moose 'has' fields"; From 9eb7a5405859369cea04ec668bbd2bcded70394d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:40 +0000 Subject: [PATCH 1020/2743] [cpan2nix] perlPackages.ProtocolHTTP2: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d54855e335d4..1a7a45adf585 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11855,8 +11855,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CR/CRUX/${name}.tar.gz"; sha256 = "06y1djgzbn340hixav85728dvp8mj2mx2qf5fzkqxh145g5q860g"; }; - buildInputs = [ ModuleBuildTiny TestLeakTrace TestTCP ]; - propagatedBuildInputs = [ AnyEvent NetSSLeay ]; + buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ]; }; PSGI = buildPerlPackage rec { From 8dd5d3d89b66581780401581d0c31c17539a8051 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:41 +0000 Subject: [PATCH 1021/2743] [cpan2nix] perlPackages.SubName: 0.19 -> 0.21 dependencies: perlPackages.DevelCheckBin: init at 0.04 --- pkgs/top-level/perl-packages.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a7a45adf585..753a539f6f8d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3790,6 +3790,19 @@ let self = _self // overrides; _self = with self; { }; }; + DevelCheckBin = buildPerlPackage rec { + name = "Devel-CheckBin-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz; + sha256 = "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm"; + }; + meta = { + description = "check that a command is available"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tokuhirom/Devel-CheckBin"; + }; + }; + DevelChecklib = buildPerlPackage rec { name = "Devel-CheckLib-1.11"; src = fetchurl { @@ -13298,12 +13311,12 @@ let self = _self // overrides; _self = with self; { }; SubName = buildPerlPackage rec { - name = "Sub-Name-0.19"; + name = "Sub-Name-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "b06ba8252ce3b1bb88fa0ea0fe9ec8b572e5ed36c69f55e9e3d9db8a73efe22b"; + sha256 = "bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117"; }; - buildInputs = [ self."if" ]; + buildInputs = [ BC DevelCheckBin ]; meta = { homepage = https://github.com/p5sagit/Sub-Name; description = "(Re)name a sub"; From 67e21a39e39b8ba1df43e4328ca6f42f58eef8c6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:42 +0000 Subject: [PATCH 1022/2743] [cpan2nix] perlPackages.ClassLoad: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 753a539f6f8d..712e4fbcf301 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2149,7 +2149,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0bb983da46c146534fc77a556d6e40d925142f2eb43103534025ee545265ca36"; }; buildInputs = [ TestFatal TestNeeds ]; - propagatedBuildInputs = [ DataOptList ModuleImplementation ModuleRuntime PackageStash TryTiny ]; + propagatedBuildInputs = [ DataOptList PackageStash ]; meta = { homepage = https://github.com/moose/Class-Load; description = "A working (require \"Class::Name\") and more"; From 6904fa26f9ed4c9d15cf0603abf2e1e7e8ee83b5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:42 +0000 Subject: [PATCH 1023/2743] [cpan2nix] perlPackages.GetoptLongDescriptive: 0.101 -> 0.102 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 712e4fbcf301..f6bd6ba5b609 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6206,10 +6206,10 @@ let self = _self // overrides; _self = with self; { }; GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.101"; + name = "Getopt-Long-Descriptive-0.102"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "752e898ea6eb8706ceb836668ca645704f5dcbc3124b6d1b21d04007dbc46948"; + sha256 = "9ad4b98f294aa0515cc3150a1ae878d39e470762b78d8bd9df055eba9dea2846"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; From 40158690b3021d62d6970c6d4e6e79a5badaca5d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:43 +0000 Subject: [PATCH 1024/2743] [cpan2nix] perlPackages.HTMLEscape: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f6bd6ba5b609..4d80e3141bd1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6678,7 +6678,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; }; - buildInputs = [ ModuleBuild ModuleBuildPluggablePPPort TestRequires ]; + buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; meta = { homepage = https://github.com/tokuhirom/HTML-Escape; description = "Extremely fast HTML escaping"; From 0c32146bdfa6978838b9dfa8d74b8d4d76998ae5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:43 +0000 Subject: [PATCH 1025/2743] [cpan2nix] perlPackages.HTMLFormatTextWithLinks: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d80e3141bd1..5283b038e2a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6725,13 +6725,13 @@ let self = _self // overrides; _self = with self; { }; }; - HTMLFormatTextWithLinks = buildPerlPackage { + HTMLFormatTextWithLinks = buildPerlModule { name = "HTML-FormatText-WithLinks-0.15"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz; sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1"; }; - propagatedBuildInputs = [ HTMLFormatter HTMLTree URI ]; + propagatedBuildInputs = [ HTMLFormatter URI ]; meta = { description = "HTML to text conversion with links as footnotes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 9346137fae17eb2f10977673c8d080aff01ec1c2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:43 +0000 Subject: [PATCH 1026/2743] [cpan2nix] perlPackages.HashMergeSimple: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5283b038e2a8..7d6b5c292628 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6580,7 +6580,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz; sha256 = "1c56327873d2f04d5722777f044863d968910466997740d55a754071c6287b73"; }; - buildInputs = [ TestMost ]; + buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; From 3cf47c4bdeca5c22b13bb8893426975b9b1841e3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:44 +0000 Subject: [PATCH 1027/2743] [cpan2nix] perlPackages.namespaceautoclean: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7d6b5c292628..8b4eec289640 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10428,7 +10428,7 @@ let self = _self // overrides; _self = with self; { sha256 = "cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ BHooksEndOfScope SubIdentify namespaceclean ]; + propagatedBuildInputs = [ SubIdentify namespaceclean ]; meta = { homepage = https://github.com/moose/namespace-autoclean; description = "Keep imports out of your namespace"; From 30073e175d9cb734ef7f9ba66e3ebff452214569 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:45 +0000 Subject: [PATCH 1028/2743] [cpan2nix] perlPackages.TestSpec: 0.51 -> 0.54 dependencies: perlPackages.DevelGlobalPhase: init at 0.003003 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b4eec289640..deb1e1c41c1e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4196,6 +4196,18 @@ let self = _self // overrides; _self = with self; { }; }; + DevelGlobalPhase = buildPerlPackage rec { + name = "Devel-GlobalPhase-0.003003"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz; + sha256 = "1x9jzy3l7gwikj57swzl94qsq03j9na9h1m69azzs7d7ghph58wd"; + }; + meta = { + description = "Detect perl's global phase on older perls."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelHide = buildPerlPackage rec { name = "Devel-Hide-0.0009"; src = fetchurl { @@ -14787,16 +14799,17 @@ let self = _self // overrides; _self = with self; { }; TestSpec = buildPerlPackage rec { - name = "Test-Spec-0.51"; + name = "Test-Spec-0.54"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYJONES/${name}.tar.gz"; - sha256 = "0n2pzc32q4fr1b9w292ld9gh3yn3saxib3hxrjx6jvcmy3k9jkbi"; + url = mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz; + sha256 = "1lk5l69bm6yl1zxzz5v6mizzqfinpdhasmi4qjxr1vnwcl9cyc8a"; }; - propagatedBuildInputs = [ PackageStash TestDeep TestTrap TieIxHash ]; + propagatedBuildInputs = [ DevelGlobalPhase PackageStash TieIxHash ]; meta = { description = "Write tests in a declarative specification style"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestDeep TestTrap ]; }; TestSubCalls = buildPerlPackage rec { From 9a6142fc2f68ae135c12952368fbf76604f82bf0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:45 +0000 Subject: [PATCH 1029/2743] [cpan2nix] perlPackages.Throwable: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index deb1e1c41c1e..aeef89660985 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15680,8 +15680,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "184gdcwxqwnkrx5md968v1ny70pq6blzpkihccm3bpdxnpgd11wr"; }; - buildInputs = [ DevelStackTrace ]; - propagatedBuildInputs = [ DevelStackTrace ModuleRuntime Moo ]; + propagatedBuildInputs = [ DevelStackTrace Moo ]; meta = { homepage = https://github.com/rjbs/Throwable; description = "A role for classes that can be thrown"; From 34ce19da77a735a68ddf4c2e5224fee3e0fd0e38 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:45 +0000 Subject: [PATCH 1030/2743] [cpan2nix] perlPackages.ClassLoadXS: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aeef89660985..1898c4295d6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2163,7 +2163,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1"; }; - buildInputs = [ ModuleImplementation TestFatal TestNeeds ]; + buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ ClassLoad ]; meta = { homepage = https://github.com/moose/Class-Load-XS; From 23949a34c27f6163407a312533753596423a7371 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:46 +0000 Subject: [PATCH 1031/2743] [cpan2nix] perlPackages.EmailMIMEAttachmentStripper: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1898c4295d6b..1dd21c29154e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4845,11 +4845,11 @@ let self = _self // overrides; _self = with self; { EmailMIMEAttachmentStripper = buildPerlPackage rec { name = "Email-MIME-Attachment-Stripper-1.317"; - buildInputs = [ CaptureTiny TestPod ]; + buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailMIME ]; src = fetchurl { - url = "http://www.cpan.org/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz; sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789"; }; meta = { From 4af15e19501510215d4ff69387c8f4bd91d9ec86 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:46 +0000 Subject: [PATCH 1032/2743] [cpan2nix] perlPackages.HTMLFormatTextWithLinksAndTables: 0.06 -> 0.07 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1dd21c29154e..122ed1a16d39 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6751,12 +6751,12 @@ let self = _self // overrides; _self = with self; { }; HTMLFormatTextWithLinksAndTables = buildPerlPackage { - name = "HTML-FormatText-WithLinks-AndTables-0.06"; + name = "HTML-FormatText-WithLinks-AndTables-0.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz; - sha256 = "e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa"; + url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz; + sha256 = "809ee2f11705706b33c54312b5c7bee674838f2beaaedaf8cb945e702aae39b6"; }; - propagatedBuildInputs = [ HTMLFormatTextWithLinks HTMLFormatter HTMLTree ]; + propagatedBuildInputs = [ HTMLFormatTextWithLinks ]; meta = { description = "Converts HTML to Text with tables intact"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 47f35227706f95fe2f63bbc7436e5515a12ece2c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:47 +0000 Subject: [PATCH 1033/2743] [cpan2nix] perlPackages.podlinkcheck: 14 -> 15 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 122ed1a16d39..9907b5cbcd31 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12101,12 +12101,12 @@ let self = _self // overrides; _self = with self; { }; podlinkcheck = buildPerlPackage rec { - name = "podlinkcheck-14"; + name = "podlinkcheck-15"; src = fetchurl { url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; - sha256 = "8ad152bdffbb7f5080616c0c0ae142f75b4c1255ed82b9cd80a5f4e3172fed3d"; + sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db"; }; - propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constantdefer libintlperl ]; + propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constant-defer libintl_perl ]; meta = { homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; description = "Check POD L<> link references"; From dbb3c72429914b174e2a848c9a6d245985309c26 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:48 +0000 Subject: [PATCH 1034/2743] [cpan2nix] perlPackages.ArrayCompare: 2.11 -> v3.0.1 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9907b5cbcd31..ee7152d056e7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -393,14 +393,15 @@ let self = _self // overrides; _self = with self; { }; }; - ArrayCompare = buildPerlPackage rec { - name = "Array-Compare-2.11"; + ArrayCompare = buildPerlModule rec { + name = "Array-Compare-3.0.1"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/${name}.tar.gz"; - sha256 = "0f1mg2lpr5jzxy1hciww7vlp4r602vfwpzsqmhkgv1i107pmiwcs"; + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.1.tar.gz; + sha256 = "0fyj6jdfshga4kj4567529a1aiqy49awxg62lslx54166j4mhkzb"; }; - buildInputs = [ TestNoWarnings Moo TypeTiny ]; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ Moo TypeTiny ]; }; ArrayFIFO = buildPerlPackage rec { From 31616531079faf5cfde63e0e2666bbd282970b9d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:48 +0000 Subject: [PATCH 1035/2743] [cpan2nix] perlPackages.ConfigGitLike: 1.16 -> 1.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee7152d056e7..6acbde88b28b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2387,10 +2387,10 @@ let self = _self // overrides; _self = with self; { }; ConfigGitLike = buildPerlPackage { - name = "Config-GitLike-1.16"; + name = "Config-GitLike-1.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.16.tar.gz; - sha256 = "48c7f7e71405219582a96e5266cbec51c0ff3ec4bf0bb6db1fd12725ee23fe8f"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz; + sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; From c26a16aa19763e570d61a57130a712f66fa62987 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:49 +0000 Subject: [PATCH 1036/2743] [cpan2nix] perlPackages.EmailReply: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6acbde88b28b..9ce9ed527bbf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4804,7 +4804,7 @@ let self = _self // overrides; _self = with self; { EmailReply = buildPerlPackage rec { name = "Email-Reply-1.204"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz; sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0"; }; propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ]; From b0e16f172587f8d8d77ab65a665ba47857b962d6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:49 +0000 Subject: [PATCH 1037/2743] [cpan2nix] perlPackages.PPIxRegexp: 0.050 -> 0.056 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9ce9ed527bbf..357234482d2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11761,13 +11761,13 @@ let self = _self // overrides; _self = with self; { }; }; - PPIxRegexp = buildPerlPackage rec { - name = "PPIx-Regexp-0.050"; + PPIxRegexp = buildPerlModule rec { + name = "PPIx-Regexp-0.056"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "fd095fb90826efa3f9b28bf018a099dc51f1d7c7d34ed2f193a28f1087635125"; + sha256 = "37992de526a368d120506e8c6c0498266e4de81942658cf0af1db89b12302f15"; }; - propagatedBuildInputs = [ ListMoreUtils PPI TaskWeaken ]; + propagatedBuildInputs = [ PPI ]; meta = { description = "Parse regular expressions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 5e38d70a59bd7111ed549f90d2064ba6d63874e4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:50 +0000 Subject: [PATCH 1038/2743] [cpan2nix] perlPackages.TermProgressBarQuiet: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 357234482d2e..4b47918e033e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13777,11 +13777,12 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz; sha256 = "25675292f588bc29d32e710cf3667da9a2a1751e139801770a9fdb18cd2184a6"; }; - propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; + propagatedBuildInputs = [ IOInteractive TermProgressBar ]; meta = { description = ""; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestMockObject ]; }; TermProgressBarSimple = buildPerlPackage { From 4eb33f1e2b20ef37ff4cf02029f26456a583f6ca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:50 +0000 Subject: [PATCH 1039/2743] [cpan2nix] perlPackages.TestAggregate: 0.373 -> 0.375 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b47918e033e..808ba7516ea4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13979,14 +13979,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ LogTrace ]; }; - TestAggregate = buildPerlPackage rec { - name = "Test-Aggregate-0.373"; + TestAggregate = buildPerlModule rec { + name = "Test-Aggregate-0.375"; src = fetchurl { url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz"; - sha256 = "00d218daa7ba29d82bcf364b61d391d3a14356cf3bcb4b12144270108a14fd14"; + sha256 = "c6cc0abfd0d4fce85371acca93ec245381841d32b4caa2d6475e4bc8130427d1"; }; - buildInputs = [ TestMost TestTrap ]; - propagatedBuildInputs = [ TestNoWarnings ]; + buildInputs = [ TestMost TestNoWarnings TestTrap ]; meta = { description = "Aggregate C<*.t> tests to make them run faster"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 7ca64f14277ebdaff6ccf99ea57f44fcf999a38f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:50 +0000 Subject: [PATCH 1040/2743] [cpan2nix] perlPackages.TestFileShareDir: 0.3.3 -> 1.001002 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 808ba7516ea4..8e79d1a8516b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14231,14 +14231,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestFileShareDir = buildPerlModule { - name = "Test-File-ShareDir-0.3.3"; + TestFileShareDir = buildPerlPackage { + name = "Test-File-ShareDir-1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-0.3.3.tar.gz; - sha256 = "877e14afb6f432bd888ef730c0afd776dd149b14bc520bc2ce842d114e5886a2"; + url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz; + sha256 = "b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ FileCopyRecursive FileShareDir PathTiny ]; + propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir ScopeGuard ]; meta = { homepage = https://github.com/kentfredric/Test-File-ShareDir; description = "Create a Fake ShareDir for your modules for testing"; From 9719ce65697bfe8dd2068e78d6e17095825e0063 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:51 +0000 Subject: [PATCH 1041/2743] [cpan2nix] perlPackages.TestRoo: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e79d1a8516b..dff41289a834 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14614,8 +14614,8 @@ let self = _self // overrides; _self = with self; { sha256 = "1mnym49j1lj7gzylma5b6nr4vp75rmgz2v71904v01xmxhy9l4i1"; }; - propagatedBuildInputs = [ strictures Moo MooXTypesMooseLike SubInstall - CaptureTiny ]; + propagatedBuildInputs = [ Moo MooXTypesMooseLike SubInstall strictures ]; + buildInputs = [ CaptureTiny ]; }; TestRoutine = buildPerlPackage { From 4977435811193c389c59b7febac2509585e36c72 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:51 +0000 Subject: [PATCH 1042/2743] [cpan2nix] perlPackages.MooX: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dff41289a834..bf4d7ec21086 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9712,7 +9712,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz"; sha256 = "2ff91a656e78aae0aca42293829d7a7e5acb9bf22b0401635b2ab6c870de32d5"; }; - propagatedBuildInputs = [ DataOptList ImportInto ModuleRuntime Moo ]; + propagatedBuildInputs = [ DataOptList ImportInto Moo ]; meta = { homepage = https://github.com/Getty/p5-moox; description = "Using Moo and MooX:: packages the most lazy way"; From ca3153be6e7bd43ff128b3534f279268cf162dea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:52 +0000 Subject: [PATCH 1043/2743] [cpan2nix] perlPackages.SyntaxKeywordJunction: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bf4d7ec21086..074ca296a31e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13451,7 +13451,7 @@ let self = _self // overrides; _self = with self; { sha256 = "8b4975f21b1992a7e6c2df5dcc92b254c61925595eddcdfaf0b1498717aa95ef"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ SubExporterProgressive syntax ]; + propagatedBuildInputs = [ syntax ]; meta = { homepage = https://github.com/frioux/Syntax-Keyword-Junction; description = "Perl6 style Junction operators in Perl5"; From e5997ede4948faec9b61c6fb1afaf5ae95aa59f5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:52 +0000 Subject: [PATCH 1044/2743] [cpan2nix] perlPackages.TermProgressBarSimple: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 074ca296a31e..1e055783bee0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13792,6 +13792,7 @@ let self = _self // overrides; _self = with self; { sha256 = "a20db3c67d5bdfd0c1fab392c6d1c26880a7ee843af602af4f9b53a7043579a6"; }; propagatedBuildInputs = [ TermProgressBarQuiet ]; + buildInputs = [ TestMockObject ]; }; TermReadKey = buildPerlPackage rec { From d64081fad326d63e1488b50c0e133b8e79418d46 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:53 +0000 Subject: [PATCH 1045/2743] [cpan2nix] perlPackages.CGIEmulatePSGI: 0.21 -> 0.23 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e055783bee0..2869ef7cc5c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1724,10 +1724,10 @@ let self = _self // overrides; _self = with self; { }; CGIEmulatePSGI = buildPerlPackage { - name = "CGI-Emulate-PSGI-0.21"; + name = "CGI-Emulate-PSGI-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Emulate-PSGI-0.21.tar.gz; - sha256 = "06b8f1864101de69b2264ad3c3a2b15333e428cf9f5d17a777cfc61f8c64093f"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz; + sha256 = "dd5b6c353f08fba100dae09904284f7f73f8328d31f6a67b2c136fad728d158b"; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ CGI HTTPMessage ]; From ce6b5ac8ee155b1446a978152cbd926905cd50df Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:53 +0000 Subject: [PATCH 1046/2743] [cpan2nix] perlPackages.ModuleBuildXSUtil: 0.10 -> 0.18 dependencies: perlPackages.DevelCheckCompiler: init at 0.07 --- pkgs/top-level/perl-packages.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2869ef7cc5c9..648e1b2167b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3804,6 +3804,20 @@ let self = _self // overrides; _self = with self; { }; }; + DevelCheckCompiler = buildPerlModule rec { + name = "Devel-CheckCompiler-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz; + sha256 = "1db973a4dbyknjxq608hywil5ai6vplnayshqxrd7m5qnjbpd2vn"; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + description = "Check the compiler's availability"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tokuhirom/Devel-CheckCompiler"; + }; + }; + DevelChecklib = buildPerlPackage rec { name = "Devel-CheckLib-1.11"; src = fetchurl { @@ -9218,16 +9232,17 @@ let self = _self // overrides; _self = with self; { }; ModuleBuildXSUtil = buildPerlModule rec { - name = "Module-Build-XSUtil-0.10"; + name = "Module-Build-XSUtil-0.18"; src = fetchurl { url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz"; - sha256 = "1323vxp8vf5xdz66lbc1wfciaks93mrbqfsjgb9nz1w9bb21xj36"; + sha256 = "1vjl77iwbwr2xhdlyqva3hhma9r1fgr2rappwsimwqjmybdrfd6b"; }; - buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ]; + buildInputs = [ CaptureTiny CwdGuard FileCopyRecursive ]; meta = { description = "A Module::Build class for building XS modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = [ DevelCheckCompiler ]; }; ModuleCoreList = buildPerlPackage { From 9ca56799df9c073b2c6accd8cf4a61d8d78eaa0a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:54 +0000 Subject: [PATCH 1047/2743] [cpan2nix] perlPackages.TextRecordParser: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 648e1b2167b6..b1d25d57430e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15386,9 +15386,8 @@ let self = _self // overrides; _self = with self; { # at /etc/fonts/font.conf is not available. doCheck = false; - propagatedBuildInputs = [ TestException IOStringy ClassAccessor Readonly - ListMoreUtils TestPod TestPodCoverage GraphViz ReadonlyXS - TextTabularDisplay]; + propagatedBuildInputs = [ ClassAccessor IOStringy ListMoreUtils Readonly TextAutoformat ]; + buildInputs = [ TestException ]; }; TextReform = buildPerlModule { From 941fd56a880918e032253e4cd06b5b26b3c86872 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:54 +0000 Subject: [PATCH 1048/2743] [cpan2nix] perlPackages.DBIxIntrospector: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1d25d57430e..1d9969df8034 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4155,7 +4155,8 @@ let self = _self // overrides; _self = with self; { sha256 = "0fp6h71xv4pgb8l815rs6ad4camzhjqf64s1sf7zmhchqqn4vacn"; }; - propagatedBuildInputs = [ TestFatal TestRoo Moo DBI DBDSQLite ]; + propagatedBuildInputs = [ DBI Moo ]; + buildInputs = [ DBDSQLite TestFatal TestRoo ]; }; DevelCycle = buildPerlPackage { From 05492fa8b715d0f748ac39932d17801bb211b2c5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:55 +0000 Subject: [PATCH 1049/2743] [cpan2nix] perlPackages.StringTT: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1d9969df8034..970e63d599ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13170,7 +13170,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz; sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p"; }; - buildInputs = [ Testuseok TestException TestTableDriven ]; + buildInputs = [ TestException TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; From cf13a7c8c6f46b99ac5eb1df99f29df4202ebfc8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:55 +0000 Subject: [PATCH 1050/2743] [cpan2nix] perlPackages.ApacheLogFormatCompiler: 0.33 -> 0.35 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 970e63d599ef..c8b1371a2576 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -193,12 +193,12 @@ let self = _self // overrides; _self = with self; { }; ApacheLogFormatCompiler = buildPerlModule rec { - name = "Apache-LogFormat-Compiler-0.33"; + name = "Apache-LogFormat-Compiler-0.35"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "17blk3zhp05azgypn25ydxf3d7fyfgr9bxyiv7xkchhqma96vwqv"; + sha256 = "06i70ydxk2wa2rcqn16842kra2qz3jwk0vk1abq8lah4180c0m0n"; }; - buildInputs = [ HTTPMessage ModuleBuild TestMockTime TestRequires TryTiny URI ]; + buildInputs = [ HTTPMessage ModuleBuildTiny TestMockTime TestRequires TryTiny URI ]; propagatedBuildInputs = [ POSIXstrftimeCompiler ]; # We cannot change the timezone on the fly. prePatch = "rm t/04_tz.t"; From d5c93aec8fb0263b329b331775f184b76a4903e5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:55 +0000 Subject: [PATCH 1051/2743] [cpan2nix] perlPackages.DevelPartialDump: 0.15 -> 0.20 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c8b1371a2576..2adf1ed01c55 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4248,16 +4248,17 @@ let self = _self // overrides; _self = with self; { }; DevelPartialDump = buildPerlPackage { - name = "Devel-PartialDump-0.15"; + name = "Devel-PartialDump-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Devel-PartialDump-0.15.tar.gz; - sha256 = "0xm42030qlbimay5x72sjj0na43ciniai2xdcdx8zf191jw5dz7n"; + url = mirror://cpan/authors/id/E/ET/ETHER/Devel-PartialDump-0.20.tar.gz; + sha256 = "01yrsdpn9ns9iwwc92bhjn2605b7ys7i3198gjb935lsllzgzw5f"; }; - propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ]; + propagatedBuildInputs = [ ClassTiny SubExporter namespaceclean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestSimple13 TestWarnings ]; }; DevelStackTrace = buildPerlPackage { From 968854ffc52db398abea4aea4f886db8ebe9a861 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:57 +0000 Subject: [PATCH 1052/2743] [cpan2nix] perlPackages.LWP: 6.15 -> 6.33 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2adf1ed01c55..a1dcbbe821b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8503,17 +8503,18 @@ let self = _self // overrides; _self = with self; { }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.15"; + name = "libwww-perl-6.33"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322"; + url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.33.tar.gz; + sha256 = "97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99"; }; - propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ]; + propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; meta = with stdenv.lib; { description = "The World-Wide Web library for Perl"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; }; + buildInputs = [ TestFatal TestRequiresInternet ]; }; LWPAuthenOAuth = buildPerlPackage rec { From afb14126a46b5ca277c8010ba04a6aa31fbc0cd9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:57 +0000 Subject: [PATCH 1053/2743] [cpan2nix] perlPackages.SQLAbstract: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a1dcbbe821b8..5b52778fba57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12820,7 +12820,7 @@ let self = _self // overrides; _self = with self; { sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; }; buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ HashMerge MROCompat Moo SubQuote ]; + propagatedBuildInputs = [ HashMerge MROCompat Moo ]; meta = { description = "Generate SQL from Perl data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From aa425d9ce1abac3611fda379ce15abca240841c6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:58 +0000 Subject: [PATCH 1054/2743] [cpan2nix] perlPackages.HTTPProxy: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b52778fba57..e280def8d968 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7163,8 +7163,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d"; }; - buildInputs = [ HTMLParser ]; - propagatedBuildInputs = [ HTTPDaemon HTTPDate HTTPMessage LWP ]; + propagatedBuildInputs = [ LWP ]; meta = { description = "A pure Perl HTTP proxy"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 433925c69690758310884884a4a991dfa196845f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:58 +0000 Subject: [PATCH 1055/2743] [cpan2nix] perlPackages.HTTPResponseEncoding: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e280def8d968..b8861143b883 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7187,10 +7187,11 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz; sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh"; }; - propagatedBuildInputs = [ LWPUserAgent HTTPMessage ]; + propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Adds encoding() to HTTP::Response"; }; + buildInputs = [ LWP ]; }; HTTPServerSimple = buildPerlPackage { From ad17549de38d7de9a40a998eac3380fc51ef9658 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:59 +0000 Subject: [PATCH 1056/2743] [cpan2nix] perlPackages.LWPAuthenOAuth: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b8861143b883..221461048143 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8523,7 +8523,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TI/TIMBRODY/${name}.tar.gz"; sha256 = "e78e0bd7de8002cfb4760073258d555ef55b2c27c07a94b3d8a2166a17fd96bc"; }; - propagatedBuildInputs = [ LWP URI ]; + propagatedBuildInputs = [ LWP ]; meta = { description = "Generate signed OAuth requests"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From a824a5710503b3ff83200d164ea77550babfa501 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:56:59 +0000 Subject: [PATCH 1057/2743] [cpan2nix] perlPackages.LWPUserAgentDetermined: 1.06 -> 1.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 221461048143..25b0f5214879 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8579,10 +8579,10 @@ let self = _self // overrides; _self = with self; { LWPUserAgent = LWP; LWPUserAgentDetermined = buildPerlPackage { - name = "LWP-UserAgent-Determined-1.06"; + name = "LWP-UserAgent-Determined-1.07"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/LWP-UserAgent-Determined-1.06.tar.gz; - sha256 = "c31d8e16dc92e2113c81cdbfb11149cfd19039e789f77cd34333ac9184346fc5"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz; + sha256 = "06d8d50e8cd3692a11cb4fb44a2f84e5476a98f0e2e6a4a0dfce9f67e55ddb53"; }; propagatedBuildInputs = [ LWP ]; meta = { From caf9dd5a723f74f493d7a94a9349319e91aa13bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:00 +0000 Subject: [PATCH 1058/2743] [cpan2nix] perlPackages.XMLParser: 2.41 -> 2.44 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25b0f5214879..7e8468dff362 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16623,15 +16623,16 @@ let self = _self // overrides; _self = with self; { }; XMLParser = buildPerlPackage { - name = "XML-Parser-2.41"; + name = "XML-Parser-2.44"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz; - sha256 = "1sadi505g5qmxr36lgcbrcrqh3a5gcdg32b405gnr8k54b6rg0dl"; + url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; + sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; }; patchPhase = if stdenv.isCygwin then '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm '' else null; makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include"; + propagatedBuildInputs = [ LWP ]; }; XMLXPath = buildPerlPackage rec { From 73f7557a90c40e8af299d9ca8cf4aa275664ab8d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:00 +0000 Subject: [PATCH 1059/2743] [cpan2nix] perlPackages.AppCmd: 0.330 -> 0.331 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7e8468dff362..41581ce318ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -245,13 +245,13 @@ let self = _self // overrides; _self = with self; { }; AppCmd = buildPerlPackage rec { - name = "App-Cmd-0.330"; + name = "App-Cmd-0.331"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "7a7bfd7196f7551a07509b03ea7abddc1fa9aee19a84e3dd5ba939c619cb6011"; + sha256 = "4a5d3df0006bd278880d01f4957aaa652a8f91fe8f66e93adf70fba0c3ecb680"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix SubExporter SubInstall ]; + propagatedBuildInputs = [ CaptureTiny ClassLoad GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix ]; meta = { homepage = https://github.com/rjbs/App-Cmd; description = "Write command line apps with less suffering"; From 4e7345dc05dc95c4f5b1fb7100362032365a9e1c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:01 +0000 Subject: [PATCH 1060/2743] [cpan2nix] perlPackages.CaptchaReCAPTCHA: 0.97 -> 0.99 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 41581ce318ff..0891a19303d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1004,13 +1004,12 @@ let self = _self // overrides; _self = with self; { }; CaptchaReCAPTCHA = buildPerlPackage rec { - name = "Captcha-reCAPTCHA-0.97"; + name = "Captcha-reCaptcha-0.99"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz; - sha256 = "12f2yh89aji6mnkrqxjcllws5dlg545wvz0j7wamy149xyqi12wq"; + url = mirror://cpan/authors/id/S/SU/SUNNYP/Captcha-reCaptcha-0.99.tar.gz; + sha256 = "14j3lk6fhfzda5d3d7z6f373ng3fzxazzwpjyziysrhic1v3b4mq"; }; - propagatedBuildInputs = [HTMLTiny LWP]; - buildInputs = [TestPod]; + propagatedBuildInputs = [ HTMLTiny LWP ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; From c1487299d9637b3c1f2c8b5eab0bd798afbc28fb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:01 +0000 Subject: [PATCH 1061/2743] [cpan2nix] perlPackages.DataFormValidator: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0891a19303d7..3eb0f7e8fcd2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3130,6 +3130,7 @@ let self = _self // overrides; _self = with self; { description = "Validates user input (usually from an HTML form) based on input profile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CGI ]; }; DataGUID = buildPerlPackage rec { From 61da5708b88da5679c11cb80f4e919947cc16e64 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:01 +0000 Subject: [PATCH 1062/2743] [cpan2nix] perlPackages.ParseDebControl: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3eb0f7e8fcd2..20f4f2da8170 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11277,8 +11277,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/J/JA/JAYBONCI/${name}.tar.gz"; sha256 = "0ad78qri4sg9agghqdm83xsjgks94yvffs23kppy7mqjy8gwwjxn"; }; - buildInputs = [ TestPod LWPUserAgent ]; - propagatedBuildInputs = [ IOStringy ]; + propagatedBuildInputs = [ IOStringy LWP ]; meta = with stdenv.lib; { homepage = http://search.cpan.org/~jaybonci/Parse-DebControl; license = with licenses; [ artistic1 gpl1Plus ]; From b51aa0a39193b64bff9a1127b89162b147bc1a23 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:02 +0000 Subject: [PATCH 1063/2743] [cpan2nix] perlPackages.RpcXML: 0.78 -> 0.80 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 20f4f2da8170..458a1a36f75f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12391,12 +12391,12 @@ let self = _self // overrides; _self = with self; { }; RpcXML = buildPerlPackage { - name = "RPC-XML-0.78"; + name = "RPC-XML-0.80"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.78.tar.gz; - sha256 = "0spci3sj2hq9k916sk9k2gchqrbnz9lwmlcnwf1k33wzl8j2gh52"; + url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz; + sha256 = "1xvy9hs7bqsjnk0663kf7zk2qjg0pzv96n6z2wlc2w5bgal7q3ga"; }; - propagatedBuildInputs = [LWP XMLLibXML XMLParser]; + propagatedBuildInputs = [ XMLParser ]; doCheck = false; }; From 5f4c535b4050fd7b0693582bd36d6f5f0e40dea9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:02 +0000 Subject: [PATCH 1064/2743] [cpan2nix] perlPackages.SQLAbstractLimit: cleanup --- 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 458a1a36f75f..0e58bb2de4da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12826,15 +12826,14 @@ let self = _self // overrides; _self = with self; { }; }; - SQLAbstractLimit = buildPerlPackage rec { + SQLAbstractLimit = buildPerlModule rec { name = "SQL-Abstract-Limit-0.141"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/${name}.tar.gz"; sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg"; }; - propagatedBuildInputs = - [ SQLAbstract TestException DBI TestDeep ]; - buildInputs = [ TestPod TestPodCoverage ]; + propagatedBuildInputs = [ DBI SQLAbstract ]; + buildInputs = [ TestDeep TestException ]; }; SQLSplitStatement = buildPerlPackage rec { From 7093793c466de8322f04c59f8a2a3606055da678 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:03 +0000 Subject: [PATCH 1065/2743] [cpan2nix] perlPackages.XMLSemanticDiff: 1.0000 -> 1.0006 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e58bb2de4da..50e1499ea8ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16722,11 +16722,11 @@ let self = _self // overrides; _self = with self; { }; }; - XMLSemanticDiff = buildPerlPackage { - name = "XML-SemanticDiff-1.0000"; + XMLSemanticDiff = buildPerlModule { + name = "XML-SemanticDiff-1.0006"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-SemanticDiff-1.0000.tar.gz; - sha256 = "05rzm433vvndh49k8p4gqnyw4x4lxa4zr6qdlrlgplqkxvhvk6jk"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-SemanticDiff-1.0006.tar.gz; + sha256 = "1z0lkb7xzhw9calz4pbwzry2lqqpy6pw6pvfn2gv70ry1xqycr0k"; }; propagatedBuildInputs = [ XMLParser ]; meta = { From 28a37c783251d30d50cca28ce23e1f604f16303a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:04 +0000 Subject: [PATCH 1066/2743] [cpan2nix] perlPackages.XMLTwig: 3.49 -> 3.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 50e1499ea8ce..1105dbe64396 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16771,12 +16771,12 @@ let self = _self // overrides; _self = with self; { }; XMLTwig = buildPerlPackage rec { - name = "XML-Twig-3.49"; + name = "XML-Twig-3.52"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIROD/${name}.tar.gz"; - sha256 = "00af6plljrx2dc0js60975wqp725ka4i3gzs4y6gmzkpfj5fy39y"; + sha256 = "1bc0hrz4jp6199hi29sdxmb9gyy45whla9hd19yqfasgq8k5ixzy"; }; - propagatedBuildInputs = [XMLParser]; + propagatedBuildInputs = [ XMLParser ]; doCheck = false; # requires lots of extra packages }; From 66d24e142de97643ede612bf5967bba089cef4f0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:04 +0000 Subject: [PATCH 1067/2743] [cpan2nix] perlPackages.libxml_perl: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1105dbe64396..8a35dcd9a4cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7975,7 +7975,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/K/KM/KMACLEOD/${name}.tar.gz"; sha256 = "1jy9af0ljyzj7wakqli0437zb2vrbplqj4xhab7bfj2xgfdhawa5"; }; - propagatedBuildInputs = [XMLParser]; + propagatedBuildInputs = [ XMLParser ]; }; LinguaENFindNumber = buildPerlPackage { From 5597758ad25cb21b221a38bfa4bc5aafc8f19780 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:04 +0000 Subject: [PATCH 1068/2743] [cpan2nix] perlPackages.HTMLMason: 1.56 -> 1.58 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8a35dcd9a4cc..9c0432352d50 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6817,13 +6817,13 @@ let self = _self // overrides; _self = with self; { }; HTMLMason = buildPerlPackage { - name = "HTML-Mason-1.56"; + name = "HTML-Mason-1.58"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz; - sha256 = "84ac24fb1d551f998145435265e5b6fd4a52ec61e4fadd3d7755eb648be2c4b2"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz; + sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ CacheCache CGI ClassContainer ExceptionClass HTMLParser LogAny ParamsValidate ]; + propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ]; meta = { homepage = https://metacpan.org/release/HTML-Mason; description = "High-performance, dynamic web site authoring system"; From 38157d726170c8a06694489f54e0a095f9533574 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:05 +0000 Subject: [PATCH 1069/2743] [cpan2nix] perlPackages.LWPxParanoidAgent: 1.10 -> 1.12 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9c0432352d50..fd30cbc54170 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8609,10 +8609,10 @@ let self = _self // overrides; _self = with self; { }; LWPxParanoidAgent = buildPerlPackage rec { - name = "LWPx-ParanoidAgent-1.10"; + name = "LWPx-ParanoidAgent-1.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/${name}.tar.gz"; - sha256 = "0i306p7mdqx09qfsf6b3rnn5xw9v9r3md4swlbk9z0mskjl0l4w4"; + sha256 = "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c"; }; doCheck = false; # 3 tests fail, probably because they try to connect to the network propagatedBuildInputs = [ LWP NetDNS ]; From f67f47a593d9d1ec716d41cfcca8ddf55ce6fdff Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:05 +0000 Subject: [PATCH 1070/2743] [cpan2nix] perlPackages.LinguaENInflectPhrase: 0.18 -> 0.20 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fd30cbc54170..853215a3b9ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8019,13 +8019,13 @@ let self = _self // overrides; _self = with self; { }; LinguaENInflectPhrase = buildPerlPackage rec { - name = "Lingua-EN-Inflect-Phrase-0.18"; + name = "Lingua-EN-Inflect-Phrase-0.20"; src = fetchurl { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "290a5b8fc2be28d6d479517655027a90e944476cb3552f10cbf6db37af79f9a6"; + sha256 = "55058911a99f1755de3eb449a99ffbeb92d88c01ff5dc60511a24679050ddea8"; }; buildInputs = [ TestNoWarnings ]; - propagatedBuildInputs = [ LinguaENFindNumber LinguaENInflect LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ]; + propagatedBuildInputs = [ LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ]; meta = { homepage = https://metacpan.org/release/Lingua-EN-Inflect-Phrase; description = "Inflect short English Phrases"; From bc902a06051feff78b53f1950c14a494d3e0ae47 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:06 +0000 Subject: [PATCH 1071/2743] [cpan2nix] perlPackages.MooXHandlesVia: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 853215a3b9ee..88104a60d945 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9635,7 +9635,7 @@ let self = _self // overrides; _self = with self; { sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c"; }; buildInputs = [ MooXTypesMooseLike TestException TestFatal ]; - propagatedBuildInputs = [ ClassMethodModifiers DataPerl ModuleRuntime Moo RoleTiny ]; + propagatedBuildInputs = [ DataPerl Moo ]; meta = { description = "NativeTrait-like behavior for Moo"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 14d596016b3b238d8a9a0075fcab6c76ba331416 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:07 +0000 Subject: [PATCH 1072/2743] [cpan2nix] perlPackages.AuthenPassphrase: cleanup --- pkgs/top-level/perl-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88104a60d945..435d815c36f8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -534,15 +534,13 @@ let self = _self // overrides; _self = with self; { }; }; - AuthenPassphrase = buildPerlPackage rec { + AuthenPassphrase = buildPerlModule rec { name = "Authen-Passphrase-0.008"; src = fetchurl { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ModuleRuntime ParamsClassify CryptPasswdMD5 CryptDES - DataEntropy CryptUnixCryptXS CryptEksblowfish CryptMySQL DigestMD4 AuthenDecHpwd]; + propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ]; meta = { description = "Hashed passwords/passphrases as objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d4e4124252059908876bf1cf560e4a8fa20c4e3a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:07 +0000 Subject: [PATCH 1073/2743] [cpan2nix] perlPackages.LWPProtocolHttps: 6.04 -> 6.07 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 435d815c36f8..c46418cce57b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8559,19 +8559,20 @@ let self = _self // overrides; _self = with self; { LWPProtocolhttps = pkgs.perlPackages.LWPProtocolHttps; LWPProtocolHttps = buildPerlPackage rec { - name = "LWP-Protocol-https-6.04"; + name = "LWP-Protocol-https-6.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz; - sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy"; + url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz; + sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; - propagatedBuildInputs = [ LWP IOSocketSSL ]; + propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ]; doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; + buildInputs = [ TestRequiresInternet ]; }; LWPUserAgent = LWP; From 7fbb6823e4f5f83937fb17ea23c5e822e209c0f0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:08 +0000 Subject: [PATCH 1074/2743] [cpan2nix] perlPackages.PPIxUtilities: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c46418cce57b..c002674bd844 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11790,14 +11790,14 @@ let self = _self // overrides; _self = with self; { }; }; - PPIxUtilities = buildPerlPackage { + PPIxUtilities = buildPerlModule { name = "PPIx-Utilities-1.001000"; src = fetchurl { url = mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz; sha256 = "03a483386fd6a2c808f09778d44db06b02c3140fb24ba4bf12f851f46d3bcb9b"; }; - buildInputs = [ PPI TestDeep ]; - propagatedBuildInputs = [ ExceptionClass PPI Readonly TaskWeaken ]; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ ExceptionClass PPI Readonly ]; meta = { description = "Extensions to L"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3cf0459fbd713b992782f0f3a9cd7a20a2cbbefb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:08 +0000 Subject: [PATCH 1075/2743] [cpan2nix] perlPackages.XMLDOM: 1.45 -> 1.46 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c002674bd844..e6e3160f79cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16518,12 +16518,12 @@ let self = _self // overrides; _self = with self; { }; XMLDOM = buildPerlPackage rec { - name = "XML-DOM-1.45"; + name = "XML-DOM-1.46"; src = fetchurl { url = "mirror://cpan/authors/id/T/TJ/TJMATHER/${name}.tar.gz"; - sha256 = "1jvqfi0jm8wh80rd5h9c3k72car8l7x1jywj8rck8w6rm1mlxldy"; + sha256 = "0phpkc4li43m2g44hdcvyxzy9pymqwlqhh5hwp2xc0cv8l5lp8lb"; }; - propagatedBuildInputs = [XMLRegExp XMLParser LWP libxml_perl]; + propagatedBuildInputs = [ XMLRegExp libxml_perl ]; }; XMLFilterBufferText = buildPerlPackage { From e986d465bedfaccca9e4f351eabf97ba8aed0f6c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:08 +0000 Subject: [PATCH 1076/2743] [cpan2nix] perlPackages.XMLXPath: 1.37 -> 1.42 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e6e3160f79cb..f716e7ca5fcd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16633,13 +16633,13 @@ let self = _self // overrides; _self = with self; { }; XMLXPath = buildPerlPackage rec { - name = "XML-XPath-1.37"; + name = "XML-XPath-1.42"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; - sha256 = "b8ae1196184f794528a9727988dce944ecec7155e6ee1c433b17e12737a22725"; + sha256 = "9e6ac67c2cead5f918a060b8b9ccdbdcaa6d610be8517bba42a96cd56748b512"; }; buildInputs = [ PathTiny ]; - propagatedBuildInputs = [ XMLParser ]; + propagatedBuildInputs = [ ScalarListUtils XMLParser ]; meta = { description = "Modules for parsing and evaluating XPath statements"; license = stdenv.lib.licenses.artistic2; From 01aa3487d6d565f308df4788888070df722776ca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:09 +0000 Subject: [PATCH 1077/2743] [cpan2nix] perlPackages.DevelDeclare: 0.006018 -> 0.006019 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f716e7ca5fcd..16308df86aa2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4171,12 +4171,12 @@ let self = _self // overrides; _self = with self; { }; DevelDeclare = buildPerlPackage rec { - name = "Devel-Declare-0.006018"; + name = "Devel-Declare-0.006019"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "bb3607bc7546bcf8d9ac57acd8de4e4ca5567ace836ab823d5f5b450216f466a"; + sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808"; }; - buildInputs = [ BHooksOPCheck ExtUtilsDepends TestRequires ]; + buildInputs = [ ExtUtilsDepends TestRequires ]; propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; From 7641bb122e92e3227a8b7e297e7196321cb462ae Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:09 +0000 Subject: [PATCH 1078/2743] [cpan2nix] perlPackages.HTTPDAV: 0.44 -> 0.48 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 16308df86aa2..452b96ec8cbd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7076,15 +7076,15 @@ let self = _self // overrides; _self = with self; { }; HTTPDAV = buildPerlPackage rec { - name = "HTTP-DAV-0.44"; + name = "HTTP-DAV-0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OP/OPERA/${name}.tar.gz"; - sha256 = "1pp7xbfn6yr87cqy2m2kl2v5zgvmmikhl7wmaw6c5nksj4wi9xq1"; + url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz; + sha256 = "1fnw3wd9zrkxq54jqgi4iw48ndysgy73glva4129s8243pn05a86"; }; - buildInputs = [ LWP XMLDOM ]; meta = { description = "WebDAV client library."; }; + propagatedBuildInputs = [ XMLDOM ]; }; HTTPHeaderParserXS = buildPerlPackage rec { From 64ac4a17165e8a624e77c654943ac6160d3adaf9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:10 +0000 Subject: [PATCH 1079/2743] [cpan2nix] perlPackages.Mouse: v2.4.10 -> v2.5.2 --- pkgs/top-level/perl-packages.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 452b96ec8cbd..c19995f09ce6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10360,15 +10360,12 @@ let self = _self // overrides; _self = with self; { }; Mouse = buildPerlModule rec { - name = "Mouse-v2.4.10"; + name = "Mouse-2.5.2"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "053d28c4v8kj7llwfwj5hjkvc1kcs6mvcn24yg7vxklgj6hxv5dr"; + url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.2.tar.gz; + sha256 = "17nr2432cfw7q2qxiz8pv7lw91dszgvn4ln77gpv2m77kjh5ilbs"; }; - buildInputs = [ - ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput - TestFatal - ]; + buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; }; From eb4b41b12e825b3214433a1f50557d426ae30d48 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:10 +0000 Subject: [PATCH 1080/2743] [cpan2nix] perlPackages.CryptSSLeay: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c19995f09ce6..69b16ab0f528 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2962,7 +2962,8 @@ let self = _self // overrides; _self = with self; { sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; - buildInputs = [ PathClass TryTiny ]; + buildInputs = [ PathClass ]; + propagatedBuildInputs = [ LWPProtocolHttps ]; }; CSSDOM = buildPerlPackage rec { From 751a084bdd47e85f3d17abcaccb66cb6aa4157f4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:11 +0000 Subject: [PATCH 1081/2743] [cpan2nix] perlPackages.GnuPGInterface: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 69b16ab0f528..4742b2f71501 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6361,7 +6361,7 @@ let self = _self // overrides; _self = with self; { sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; - propagatedBuildInputs = [ Moo MooXHandlesVia MooXlate ]; + propagatedBuildInputs = [ MooXHandlesVia MooXlate ]; doCheck = false; meta = { description = "Supply object methods for interacting with GnuPG"; From a07fcdee65243e41cf56d8471a2a7aade0a8b897 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:12 +0000 Subject: [PATCH 1082/2743] [cpan2nix] perlPackages.PackageDeprecationManager: 0.16 -> 0.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4742b2f71501..c448e1dbbe84 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11098,13 +11098,13 @@ let self = _self // overrides; _self = with self; { }; PackageDeprecationManager = buildPerlPackage rec { - name = "Package-DeprecationManager-0.16"; + name = "Package-DeprecationManager-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "4018a06f7a3ba252c9eccc3fdcad9490cd003dfa6baf261545e96b5a82e784a7"; + sha256 = "1d743ada482b5c9871d894966e87d4c20edc96931bb949fb2638b000ddd6684b"; }; buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName namespaceautoclean ]; + propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName ]; meta = { homepage = https://metacpan.org/release/Package-DeprecationManager; description = "Manage deprecation warnings for your distribution"; From e821540e108c2634698dbb8a4ce8f3516a64a838 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:13 +0000 Subject: [PATCH 1083/2743] [cpan2nix] perlPackages.XMLDescent: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c448e1dbbe84..50dba46b73d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16501,7 +16501,7 @@ let self = _self // overrides; _self = with self; { }; }; - XMLDescent = buildPerlPackage rec { + XMLDescent = buildPerlModule rec { name = "XML-Descent-1.04"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; From 5c8e1853545cabda37bb9a25275dff8d1af6eaa7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:13 +0000 Subject: [PATCH 1084/2743] [cpan2nix] perlPackages.XMLSimple: 2.20 -> 2.25 dependencies: perlPackages.XMLSAXExpat: init at 0.51 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 50dba46b73d0..861624b43d86 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16705,6 +16705,19 @@ let self = _self // overrides; _self = with self; { }; }; + XMLSAXExpat = buildPerlPackage rec { + name = "XML-SAX-Expat-0.51"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz; + sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac"; + }; + propagatedBuildInputs = [ XMLParser XMLSAX ]; + meta = { + description = "SAX Driver for Expat"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLSAXWriter = buildPerlPackage { name = "XML-SAX-Writer-0.57"; src = fetchurl { @@ -16733,12 +16746,12 @@ let self = _self // overrides; _self = with self; { }; XMLSimple = buildPerlPackage { - name = "XML-Simple-2.20"; + name = "XML-Simple-2.25"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz; - sha256 = "0jj3jiray1l4pi9wkjcpxjc3v431whdwx5aqnhgdm4i7h3817zsw"; + url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz; + sha256 = "1y6vh328zrh085d40852v4ij2l4g0amxykswxd1nfhd2pspds7sk"; }; - propagatedBuildInputs = [XMLParser]; + propagatedBuildInputs = [ XMLSAXExpat ]; }; XMLTokeParser = buildPerlPackage rec { From 6746fbe2e0a4afe4eff689fc8af055f9e896302e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:13 +0000 Subject: [PATCH 1085/2743] [cpan2nix] perlPackages.AlienWxWidgets: 0.67 -> 0.69 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 861624b43d86..fafd4b9b7474 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -110,14 +110,14 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ FileShareDir ]; }; - AlienWxWidgets = buildPerlPackage rec { - name = "Alien-wxWidgets-0.67"; + AlienWxWidgets = buildPerlModule rec { + name = "Alien-wxWidgets-0.69"; src = fetchurl { url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; - sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; + sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK - ModulePluggable ModuleBuild ]; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ]; + buildInputs = [ LWPProtocolHttps ]; }; AnyEvent = buildPerlPackage rec { From 4f1a3c2095fd14637b2f2f40dc2609a31ed0edb6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:14 +0000 Subject: [PATCH 1086/2743] [cpan2nix] perlPackages.LWPProtocolConnect: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fafd4b9b7474..c14303b34839 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8550,7 +8550,7 @@ let self = _self // overrides; _self = with self; { sha256 = "9f252394775e23aa42c3176611e5930638ab528d5190110b4731aa5b0bf35a15"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ HTTPMessage IOSocketSSL LWP LWPProtocolhttps URI ]; + propagatedBuildInputs = [ LWPProtocolHttps ]; meta = { description = "Provides HTTP/CONNECT proxy support for LWP::UserAgent"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 7d4dab4275c41f94cdf1c96309f68f9d3e3b1840 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:14 +0000 Subject: [PATCH 1087/2743] [cpan2nix] perlPackages.NetAmazonMechanicalTurk: 1.01 -> 1.02 --- pkgs/top-level/perl-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c14303b34839..78e56423dcab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10547,17 +10547,16 @@ let self = _self // overrides; _self = with self; { doCheck = false; # wants to create actual EC2 instances (for $$$) }; - NetAmazonMechanicalTurk = buildPerlPackage rec { - name = "Net-Amazon-MechanicalTurk-1.01"; + NetAmazonMechanicalTurk = buildPerlModule rec { + name = "Net-Amazon-MechanicalTurk-1.02"; src = fetchurl { url = "mirror://cpan/authors/id/M/MT/MTURK/${name}.tar.gz"; - sha256 = "17xh6qcp2sw721r8cpcal80an49264db497namms4k139fsr1yig"; + sha256 = "13hgggfchhp4m3l2rn3d1v6g6ccwmwf9xiyc9izv5570930mw2cd"; }; patches = [ ../development/perl-modules/net-amazon-mechanicalturk.patch ]; - propagatedBuildInputs = - [ DigestHMAC LWP LWPProtocolHttps URI XMLParser IOString ]; - buildInputs = [ DBI DBDSQLite ]; + propagatedBuildInputs = [ DigestHMAC LWPProtocolHttps XMLParser ]; + doCheck = false; }; NetAmazonS3 = buildPerlPackage rec { From 9cf0ae40807dbf8ba3886c9ee4c745bfea899231 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:15 +0000 Subject: [PATCH 1088/2743] [cpan2nix] perlPackages.NetOAuth: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 78e56423dcab..ff4dde2b003d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10757,14 +10757,14 @@ let self = _self // overrides; _self = with self; { NetLDAP = perlldap; - NetOAuth = buildPerlPackage { + NetOAuth = buildPerlModule { name = "Net-OAuth-0.28"; src = fetchurl { url = mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz; sha256 = "0k4h4a5048h7qgyx25ih64x0l4airx8a6d9gjq08wmxcl2fk3z3v"; }; - buildInputs = [ ModuleBuild TestWarn ]; - propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; + buildInputs = [ TestWarn ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWP ]; meta = { description = "An implementation of the OAuth protocol"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c069a8e3c2eab5a6a4d1eca45c913e05e541d30a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:16 +0000 Subject: [PATCH 1089/2743] [cpan2nix] perlPackages.EmailSender: 1.300028 -> 1.300031 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff4dde2b003d..95de60f59985 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4957,13 +4957,13 @@ let self = _self // overrides; _self = with self; { }; EmailSender = buildPerlPackage rec { - name = "Email-Sender-1.300028"; + name = "Email-Sender-1.300031"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "4a1cb9386a6b58b589b3183c807e533547a28e596fb15aa4cfd614947ad8ad30"; + sha256 = "c412372938510283d8c850127895e09c2b670f892e1c3992fd54c0c1a9064f14"; }; buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ libnet EmailAbstract EmailAddress EmailSimple ListMoreUtils ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike ScalarListUtils SubExporter Throwable TryTiny libnet ]; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; From 316ef75b40820a8321206fc547f85a0d5944c72a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:16 +0000 Subject: [PATCH 1090/2743] [cpan2nix] perlPackages.TestDataSplit: 0.2.0 -> 0.2.1 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 95de60f59985..6f457cbba1af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14098,12 +14098,12 @@ let self = _self // overrides; _self = with self; { }; TestDataSplit = buildPerlModule rec { - name = "Test-Data-Split-0.2.0"; + name = "Test-Data-Split-0.2.1"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "90811c2af56750bf08eeff39e1e30f2ff8f625e809ed838b5ccb56a256c4b595"; + sha256 = "9ba0c27a9e23c5dd8ede7611a049180485acc512a63783e1d1843b6569db5ae7"; }; - buildInputs = [ ModuleBuild TestDifferences perl ]; + buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ IOAll ListMoreUtils MooX MooXlate ]; meta = { description = "Split data-driven tests into several test scripts"; From 932d03ababbe1e635b4248b065da786059eaa7d6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:16 +0000 Subject: [PATCH 1091/2743] [cpan2nix] perlPackages.LWPUserAgentMockable: 1.10 -> 1.18 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6f457cbba1af..a6c2643917ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8591,13 +8591,13 @@ let self = _self // overrides; _self = with self; { }; }; - LWPUserAgentMockable = buildPerlPackage { - name = "LWP-UserAgent-Mockable-1.10"; + LWPUserAgentMockable = buildPerlModule { + name = "LWP-UserAgent-Mockable-1.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MM/MMORGAN/LWP-UserAgent-Mockable-1.10.tgz; - sha256 = "1z89jszgifvjb8irzd8wrzim7l5m4hypdl9mj4dpkb4jm4189kmn"; + url = mirror://cpan/authors/id/M/MJ/MJEMMESON/LWP-UserAgent-Mockable-1.18.tar.gz; + sha256 = "0923ahl22c0gdzrihj7dqnrawia9hmcl462asf4ry8d5wd84z1i5"; }; - propagatedBuildInputs = [ LWP HookLexWrap ]; + propagatedBuildInputs = [ HookLexWrap LWP SafeIsa ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; @@ -8606,6 +8606,7 @@ let self = _self // overrides; _self = with self; { # https://rt.cpan.org/Public/Bug/Display.html?id=63966 is the bug upstream, # which doesn't look like it will get fixed anytime soon. doCheck = false; + buildInputs = [ ModuleBuildTiny TestRequiresInternet ]; }; LWPxParanoidAgent = buildPerlPackage rec { From 6adfd5f0f426732a395e5ce9892f6a39cd3f2c90 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:17 +0000 Subject: [PATCH 1092/2743] [cpan2nix] perlPackages.Redis: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a6c2643917ef..fba1f337d569 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12277,7 +12277,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Readonly ]; }; - Redis = buildPerlPackage rec { + Redis = buildPerlModule rec { name = "Redis-1.991"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; From a6c6dc1ef62b5b229e996d6ddd88dfd88d0032c9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:17 +0000 Subject: [PATCH 1093/2743] [cpan2nix] perlPackages.TestPodNo404s: cleanup --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fba1f337d569..b117ad3c5395 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14570,18 +14570,19 @@ let self = _self // overrides; _self = with self; { }; }; - TestPodNo404s = buildPerlPackage rec { + TestPodNo404s = buildPerlModule rec { name = "Test-Pod-No404s-0.02"; src = fetchurl { url = "mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-No404s-0.02.tar.gz"; sha256 = "0ycfghsyl9f31kxdppjwx2g5iajrqh3fyywz0x7d8ayndw2hdihi"; }; - propagatedBuildInputs = [ LWPUserAgent ModuleBuildTiny URIFind TestPod ]; + propagatedBuildInputs = [ LWP URIFind ]; meta = { homepage = http://search.cpan.org/dist/Test-Pod-No404s/; description = "Checks POD for any http 404 links"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny TestPod ]; }; TestPortabilityFiles = buildPerlPackage { From 60c2a763f5e3cef68c651f37a9459982a9703476 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:17 +0000 Subject: [PATCH 1094/2743] [cpan2nix] perlPackages.W3CLinkChecker: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b117ad3c5395..14c0ed6861c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16302,7 +16302,7 @@ let self = _self // overrides; _self = with self; { sha256 = "6239f61b20d91dce7b21e4d4f626ab93a8f1e2f207da5015590d508cf6c66a65"; }; outputs = [ "out" ]; - propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral CryptSSLeay EncodeLocale HTMLParser HTTPCookies HTTPMessage LWP LWPProtocolHttps NetHTTP NetIP TermReadKey URI ]; + propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP NetIP TermReadKey ]; meta = { homepage = http://validator.w3.org/checklink; description = "A tool to check links and anchors in Web pages or full Web sites"; From f651c3b82968d57fcf4773b87448c2c96580cfb1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:18 +0000 Subject: [PATCH 1095/2743] [cpan2nix] perlPackages.WWWMechanize: 1.73 -> 1.88 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 14c0ed6861c6..2782b0edfe8f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16328,18 +16328,19 @@ let self = _self // overrides; _self = with self; { }; WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.73"; + name = "WWW-Mechanize-1.88"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/WWW-Mechanize-1.73.tar.gz; - sha256 = "1zrw8aadhwy48q51x2z2rqlkwf17bya4j4h3hy89mw783j96rmg9"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.88.tar.gz; + sha256 = "0yd8a1zsfpbv5wr79x3iqmik9gvcd10iam9dfrdan4dri9vpxn9n"; }; - propagatedBuildInputs = [ HTMLForm HTMLParser HTMLTree HTTPDaemon HTTPMessage HTTPServerSimple LWP LWPUserAgent TestWarn URI ]; + propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; meta = { homepage = https://github.com/bestpractical/www-mechanize; description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { From 2890e8bbe2fb4ac47ee3063677276645c4a8ba0b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:18 +0000 Subject: [PATCH 1096/2743] [cpan2nix] perlPackages.FileChangeNotify: 0.24 -> 0.28 --- pkgs/top-level/perl-packages.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2782b0edfe8f..f23ebc1e7eb1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5544,16 +5544,14 @@ let self = _self // overrides; _self = with self; { }; }; - FileChangeNotify = buildPerlModule { - name = "File-ChangeNotify-0.24"; + FileChangeNotify = buildPerlPackage { + name = "File-ChangeNotify-0.28"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.24.tar.gz; - sha256 = "3c8180169de0f97ad852a55942f74e520cbe433aa0889d0b65548ee38a111124"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.28.tar.gz; + sha256 = "e00fe809d481131a08dca26e851cf0ffce8d9e9d03d58c58f15aa62e28aa2f05"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = - [ ClassLoad ListMoreUtils ModulePluggable Moose MooseXParamsValidate MooseXSemiAffordanceAccessor namespaceautoclean ] - ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; + buildInputs = [ TestException TestRequires TestWithoutModule ]; + propagatedBuildInputs = [ ClassLoad ModulePluggable Moo TypeTiny namespaceautoclean ]; meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; license = licenses.artistic2; From 4c8914fdcc67dd09a9f2f7b4efc2d8ed8fa84898 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:18 +0000 Subject: [PATCH 1097/2743] [cpan2nix] perlPackages.SQLTranslator: 0.11021 -> 0.11024 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f23ebc1e7eb1..e17078f4802f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12853,13 +12853,13 @@ let self = _self // overrides; _self = with self; { }; SQLTranslator = buildPerlPackage rec { - name = "SQL-Translator-0.11021"; + name = "SQL-Translator-0.11024"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "64cb38a9f78367bc115359a999003bbeb3c32cc75bba8306ec1a938fc441bfd1"; + sha256 = "5bde9d6f67850089ef35a9296d6f53e5ee8e991438366b71477f3f27c1581bb1"; }; buildInputs = [ JSON TestDifferences TestException XMLWriter YAML ]; - propagatedBuildInputs = [ CarpClan DBI FileShareDir ListMoreUtils Moo PackageVariant ParseRecDescent TryTiny ]; + propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; meta = { description = "SQL DDL transformations and more"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From e9dc18bc367c68bb451e2ff63549b5cd448771c2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:19 +0000 Subject: [PATCH 1098/2743] [cpan2nix] perlPackages.NetOpenIDCommon: 1.18 -> 1.20 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e17078f4802f..a362f045f4c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11054,12 +11054,12 @@ let self = _self // overrides; _self = with self; { }; NetOpenIDCommon = buildPerlPackage rec { - name = "Net-OpenID-Common-1.18"; + name = "Net-OpenID-Common-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; - sha256 = "13hy5j6hcggb4l2r4pnwdh30p20wwja0chpmqm8y6wnnsp1km07f"; + sha256 = "1jdbkp18ka2m4akjp9b0dbw2lqnzgwpq435cnh6hwwa79bbrfkmb"; }; - propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPMessage XMLSimple ]; + propagatedBuildInputs = [ CryptDHGMP XMLSimple ]; }; NetOpenIDConsumer = buildPerlPackage rec { From 626716bee4ab3eb662d87020c26c46d54585bbe4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:19 +0000 Subject: [PATCH 1099/2743] [cpan2nix] perlPackages.NetTwitterLite: 0.11002 -> 0.12008 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a362f045f4c3..9be75e0d6146 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10902,14 +10902,14 @@ let self = _self // overrides; _self = with self; { }; }; - NetTwitterLite = buildPerlPackage { - name = "Net-Twitter-Lite-0.11002"; + NetTwitterLite = buildPerlModule { + name = "Net-Twitter-Lite-0.12008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.11002.tar.gz; - sha256 = "032gyn1h3r5d83wvz7nj3k7g50wcf73lbbmjc18466ml90vigys0"; + url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.12008.tar.gz; + sha256 = "13j69a6nqq8mh5b4qk021db55rkfnk1ppwk0rpg68b1z58gvxsmj"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ CryptSSLeay LWPUserAgent NetOAuth URI ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ JSON LWPProtocolHttps ]; doCheck = false; meta = { homepage = https://github.com/semifor/Net-Twitter-Lite; From a51028122d4563423f23e2823b1953f9abd9bef6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:20 +0000 Subject: [PATCH 1100/2743] [cpan2nix] perlPackages.Swim: 0.1.45 -> 0.1.46 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9be75e0d6146..d39ba809d0a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13394,10 +13394,10 @@ let self = _self // overrides; _self = with self; { }; Swim = buildPerlPackage rec { - name = "Swim-0.1.45"; + name = "Swim-0.1.46"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "3755ba1a02aee933c8e1de3995aca1523d6175291a1fa60c3f7fd477f5bb2469"; + sha256 = "ac747362afec12a0ba30ffdfff8765f80a124dff8ebcb238326fa627e07daae8"; }; buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; From 48dc4d3246d1139f2f81daa35ac846c2fe362ce1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:21 +0000 Subject: [PATCH 1101/2743] [cpan2nix] perlPackages.WebServiceLinode: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d39ba809d0a1..59cc7bfa102c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16889,7 +16889,7 @@ let self = _self // overrides; _self = with self; { sha256 = "66a315016999c0d2043caae86e664dad10c6613708f33a2f56aae8030326c509"; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ JSON LWP LWPProtocolhttps ]; + propagatedBuildInputs = [ JSON LWPProtocolHttps ]; meta = { homepage = https://github.com/mikegrb/WebService-Linode; description = "Perl Interface to the Linode.com API"; From 14c8e79a667c9c0a275b850a476bf54c30af407a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:21 +0000 Subject: [PATCH 1102/2743] [cpan2nix] perlPackages.CryptRandomSource: 0.07 -> 0.12 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59cc7bfa102c..af38198e3d1c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2841,14 +2841,14 @@ let self = _self // overrides; _self = with self; { }; }; - CryptRandomSource = buildPerlPackage { - name = "Crypt-Random-Source-0.07"; + CryptRandomSource = buildPerlModule { + name = "Crypt-Random-Source-0.12"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/Crypt-Random-Source-0.07.tar.gz; - sha256 = "0kxcqcpknh9hhfnpiymxrjg74yj7nfr7k4fgrfmd9s2cw9p9mqdv"; + url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.12.tar.gz; + sha256 = "00mw5m52sbz9nqp3f6axyrgcrihqxn7k8gv0vi1kvm1j1nc9g29h"; }; - buildInputs = [ Testuseok TestException ]; - propagatedBuildInputs = [ AnyMoose CaptureTiny ModuleFind namespaceclean SubExporter ]; + buildInputs = [ ModuleBuildTiny TestException TestSimple13 ]; + propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ]; meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; From e1494a2a62f9d1b94406af26d2ea119edbe8b8f0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:21 +0000 Subject: [PATCH 1103/2743] [cpan2nix] perlPackages.StringToIdentifierEN: 0.11 -> 0.12 --- 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 af38198e3d1c..40b7f6f7e6a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13137,13 +13137,12 @@ let self = _self // overrides; _self = with self; { }; StringToIdentifierEN = buildPerlPackage rec { - name = "String-ToIdentifier-EN-0.11"; + name = "String-ToIdentifier-EN-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; - sha256 = "1bawghkgkkx7j3avnrj5sg3vix1z5564ks6wf9az3jc2knh8s5nh"; + sha256 = "12nw7h2yiybhdw0vnnpc7bif8ylhsn6kqf6s39dsrf9h54iq9yrs"; }; - propagatedBuildInputs = - [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; + propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; }; StringTruncate = buildPerlPackage { From 9d26374f0589270b6f3dcbb6bea03d34b1bdf539 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:22 +0000 Subject: [PATCH 1104/2743] [cpan2nix] perlPackages.Appperlbrew: 0.73 -> 0.82 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40b7f6f7e6a9..a20b1974361e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -300,13 +300,13 @@ let self = _self // overrides; _self = with self; { }; Appperlbrew = buildPerlPackage rec { - name = "App-perlbrew-0.73"; + name = "App-perlbrew-0.82"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0ym7ahjm95igm1hg0qwy29zdcjqdcakcmrn3r8xlbvqkk5xrxg5c"; + sha256 = "0p6l5i85zp89f5sh0gyz7didla672zg169yprbqcf97icmr46g80"; }; - buildInputs = [ pkgs.curl IOAll PathClass TestException TestNoWarnings TestOutput TestSpec ]; - propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; + buildInputs = [ pkgs.curl FileWhich IOAll PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec ]; + propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ]; preConfigure = '' patchShebangs . From bf111e02cf630b7c05cd512cd9b5db9b8b7a3595 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:23 +0000 Subject: [PATCH 1105/2743] [cpan2nix] perlPackages.VMEC2: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a20b1974361e..c2ade6451a52 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16270,8 +16270,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ AnyEvent AnyEventCacheDNS AnyEventHTTP JSON LWP StringApprox URI XMLSimple ]; + propagatedBuildInputs = [ AnyEventCacheDNS AnyEventHTTP JSON StringApprox XMLSimple ]; meta = { description = "Perl interface to Amazon EC2, Virtual Private Cloud, Elastic Load Balancing, Autoscaling, and Relational Database services"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 3832fad9ffec5c2e7da6d5642bcb7c1a03af5be6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:23 +0000 Subject: [PATCH 1106/2743] [cpan2nix] perlPackages.Wx: 0.9927 -> 0.9932 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c2ade6451a52..438bd0f1245d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16421,15 +16421,16 @@ let self = _self // overrides; _self = with self; { }; Wx = buildPerlPackage rec { - name = "Wx-0.9927"; + name = "Wx-0.9932"; src = fetchurl { url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; - sha256 = "1fr23nn5cvzydl8nxfv0iljn10pvwbny0nvpjx31fn2md8dvsx51"; + sha256 = "0w0vcpk8bmklh16c0z1vxgipnmvdw7cckcmay7k7cihgb99vdz8w"; }; - propagatedBuildInputs = [ ExtUtilsXSpp AlienWxWidgets ]; + propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: # Error: Unable to initialize GTK+, is DISPLAY set properly?" doCheck = false; + buildInputs = [ ExtUtilsXSpp ]; }; WxGLCanvas = buildPerlPackage rec { From 21d3bd04f268fa6a7a351dae83300707ec2b6014 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:24 +0000 Subject: [PATCH 1107/2743] [cpan2nix] perlPackages.TestWWWMechanize: 1.44 -> 1.48 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 438bd0f1245d..1106bcf8d799 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14989,13 +14989,13 @@ let self = _self // overrides; _self = with self; { }; TestWWWMechanize = buildPerlPackage { - name = "Test-WWW-Mechanize-1.44"; + name = "Test-WWW-Mechanize-1.48"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz; - sha256 = "062pj242vsc73bw11jqpap92ax9wzc9f2m4xhyp1wzrwkfchpl2q"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.48.tar.gz; + sha256 = "1d11fx9155d5v17d5w7q3kj37b01l8yj2yb0g6b0z1vh938rrlcr"; }; - buildInputs = [ CGI ]; - propagatedBuildInputs = [ CarpAssertMore HTMLTree HTTPServerSimple LWP TestLongString URI WWWMechanize ]; + buildInputs = [ TestLongString ]; + propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; meta = { homepage = https://github.com/petdance/test-www-mechanize; description = "Testing-specific WWW::Mechanize subclass"; From 215e71fdf246a4ed54e17f55c7eab9b0e56c2303 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:24 +0000 Subject: [PATCH 1108/2743] [cpan2nix] perlPackages.WxGLCanvas: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1106bcf8d799..70f104480624 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16439,7 +16439,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; - propagatedBuildInputs = [ Wx OpenGL pkgs.libGLU ]; + propagatedBuildInputs = [ pkgs.libGLU Wx ]; doCheck = false; }; From 671b0a355d17c0f506fe4647d6c908837515e9ff Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:25 +0000 Subject: [PATCH 1109/2743] [cpan2nix] perlPackages.Autodia: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70f104480624..3a512e67973f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -608,8 +608,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/T/TE/TEEJAY/${name}.tar.gz"; sha256 = "08pl5y18nsvy8ihfzdsbd8rz6a8al09wqfna07zdjfdyib42b0dc"; }; - propagatedBuildInputs = [ TemplateToolkit Inline InlineJava GraphViz - XMLSimple DBI ]; + propagatedBuildInputs = [ TemplateToolkit XMLSimple ]; meta = { description = "AutoDia, create UML diagrams from source code"; @@ -631,6 +630,7 @@ let self = _self // overrides; _self = with self; { maintainers = [ ]; }; + buildInputs = [ DBI ]; }; autodie = null; # part of Perl From 2ffe718683ce69a6c714be7826a50879a7f81b3e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:26 +0000 Subject: [PATCH 1110/2743] [cpan2nix] perlPackages.DateTimeTimeZone: 1.97 -> 2.18 dependencies: perlPackages.ParamsValidationCompiler: init at 0.27 perlPackages.Specio: init at 0.42 perlPackages.Test2PluginNoWarnings: init at 0.06 --- pkgs/top-level/perl-packages.nix | 51 ++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3a512e67973f..e628a8158bde 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3735,13 +3735,13 @@ let self = _self // overrides; _self = with self; { }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-1.97"; + name = "DateTime-TimeZone-2.18"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "68a5f4b0a77074f9cc96b2c1d2282e2110db74f55e43fbad72926cee0fd434c8"; + sha256 = "b7f74295650bde3f378017113dcc504cefecc054cf6ef31133dc76940e15453a"; }; buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassSingleton ListAllUtils ModuleRuntime ParamsValidate TryTiny ]; + propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/DateTime-TimeZone; description = "Time zone object base class and factory"; @@ -11233,6 +11233,21 @@ let self = _self // overrides; _self = with self; { }; }; + ParamsValidationCompiler = buildPerlPackage rec { + name = "Params-ValidationCompiler-0.27"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.27.tar.gz; + sha256 = "1cpr188c2xm0kkmdir6slcsgv7v6ibqff4lax8s0whwx6ml9kaah"; + }; + propagatedBuildInputs = [ EvalClosure ExceptionClass ]; + buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestSimple13 TestWithoutModule ]; + meta = { + description = "Build an optimized subroutine parameter validator once, use it forever"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "http://metacpan.org/release/Params-ValidationCompiler"; + }; + }; + PARDist = buildPerlPackage { name = "PAR-Dist-0.49"; src = fetchurl { @@ -12772,6 +12787,21 @@ let self = _self // overrides; _self = with self; { }; }; + Specio = buildPerlPackage rec { + name = "Specio-0.42"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz; + sha256 = "1xjfa9g4vc6x3f0bzzbac8dwgpc4in4za1l1sp0y6ykdla9qna93"; + }; + propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; + buildInputs = [ TestFatal TestNeeds ]; + meta = { + description = "Type constraints and coercions for Perl"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "http://metacpan.org/release/Specio"; + }; + }; + Spiffy = buildPerlPackage rec { name = "Spiffy-0.46"; src = fetchurl { @@ -13953,6 +13983,21 @@ let self = _self // overrides; _self = with self; { }; }; + Test2PluginNoWarnings = buildPerlPackage rec { + name = "Test2-Plugin-NoWarnings-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz; + sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242"; + }; + propagatedBuildInputs = [ TestSimple13 ]; + buildInputs = [ IPCRun3 Test2Suite ]; + meta = { + description = "Fail if tests warn"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "http://metacpan.org/release/Test2-Plugin-NoWarnings"; + }; + }; + Test2Suite = buildPerlPackage rec { name = "Test2-Suite-0.000111"; src = fetchurl { From 843382e2a0dcc8bfd6caac33c8c01601902dc9c8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:26 +0000 Subject: [PATCH 1111/2743] [cpan2nix] perlPackages.LogDispatch: 2.41 -> 2.67 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e628a8158bde..5d0536b38b50 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8391,18 +8391,19 @@ let self = _self // overrides; _self = with self; { }; LogDispatch = buildPerlPackage { - name = "Log-Dispatch-2.41"; + name = "Log-Dispatch-2.67"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.41.tar.gz; - sha256 = "0vsmlkx2g9lc13pl9v96kn575yszfvd79a236b8v0s1di83gm09z"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.67.tar.gz; + sha256 = "017ks3i0k005dqz7fz53w7x35csqqlr4vfb95c0ijdablajs4kd9"; }; - propagatedBuildInputs = [ ClassLoad ParamsValidate ]; + propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Dispatches messages to one or more outputs"; license = stdenv.lib.licenses.artistic2; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ IPCRun3 TestFatal TestNeeds ]; }; LogHandler = buildPerlModule rec { From 854428b23b9d299def200f40aa66153fd856d853 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:27 +0000 Subject: [PATCH 1112/2743] [cpan2nix] perlPackages.CPANUploader: 0.103010 -> 0.103013 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5d0536b38b50..a5514f87d146 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2741,12 +2741,12 @@ let self = _self // overrides; _self = with self; { }; CPANUploader = buildPerlPackage rec { - name = "CPAN-Uploader-0.103010"; + name = "CPAN-Uploader-0.103013"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1n57d61q9g37s0pp7sriq8vvqj2cvp3s9v0grpv277s9idvm37x8"; + sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq"; }; - propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive HTTPMessage LWP LWPProtocolhttps TermReadKey ]; + propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { homepage = https://github.com/rjbs/cpan-uploader; description = "Upload things to the CPAN"; From 9e96a19fcf38edc65060e699d7fa7f7c87b50af7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:27 +0000 Subject: [PATCH 1113/2743] [cpan2nix] perlPackages.GraphViz: 2.18 -> 2.24 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a5514f87d146..8eedf111fdca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6417,15 +6417,15 @@ let self = _self // overrides; _self = with self; { }; GraphViz = buildPerlPackage rec { - name = "GraphViz-2.18"; + name = "GraphViz-2.24"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; - sha256 = "1zdgdd42ywg7bklysd8p8dra66q64vlm4fmnj5gjslp98cm02p9h"; + sha256 = "1bgm4a8kan53r30qiknr4kasvhar1khf7vq064l1inzfrp2glpnr"; }; # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz. - buildInputs = [ pkgs.graphviz ]; - propagatedBuildInputs = [ IPCRun TestMore ]; + buildInputs = [ pkgs.graphviz TestPod ]; + propagatedBuildInputs = [ FileWhich IPCRun ParseRecDescent XMLTwig XMLXPath ]; meta = with stdenv.lib; { description = "Perl interface to the GraphViz graphing tool"; From ec5f307bac2690e5031cd410d4a8aed82afcfeb5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:28 +0000 Subject: [PATCH 1114/2743] [cpan2nix] perlPackages.NetOpenIDConsumer: 1.15 -> 1.18 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8eedf111fdca..6620aaa95ca2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11064,12 +11064,13 @@ let self = _self // overrides; _self = with self; { }; NetOpenIDConsumer = buildPerlPackage rec { - name = "Net-OpenID-Consumer-1.15"; + name = "Net-OpenID-Consumer-1.18"; src = fetchurl { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; - sha256 = "1nh9988436rmmmd6x2zz1fyrqy2005a1gvqzgvnc1pg2ylg61fqf"; + sha256 = "0f2g6sczvbpyjmy14pabmrj0d48hlsndqswrvmqk1161wxpkh70f"; }; - propagatedBuildInputs = [ CGI NetOpenIDCommon JSON LWP ]; + propagatedBuildInputs = [ JSON NetOpenIDCommon ]; + buildInputs = [ CGI ]; }; NetOpenSSH = buildPerlPackage rec { From cb89c463269a17ac66d2d4fede9b20e98b206d3e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:28 +0000 Subject: [PATCH 1115/2743] [cpan2nix] perlPackages.EmailOutlookMessage: 0.918 -> 0.919 --- pkgs/top-level/perl-packages.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6620aaa95ca2..0f48f800573f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4936,18 +4936,14 @@ let self = _self // overrides; _self = with self; { buildInputs = [ MIMETools MailTools ]; }; - EmailOutlookMessage = buildPerlPackage rec { + EmailOutlookMessage = buildPerlModule rec { name = "Email-Outlook-Message-${version}"; - version = "0.918"; + version = "0.919"; src = fetchurl { url = "mirror://cpan/authors/id/M/MV/MVZ/${name}.tar.gz"; - sha256 = "1w1s858xzp3vbi91qa01qnmk4n78fmvl4a7axrx2r15vr3s2k2pv"; + sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; }; - propagatedBuildInputs = [ - Carp Encode EmailMIME EmailMIMEContentType EmailSender - EmailSimple GetoptLong IOString OLEStorage_Lite PodUsage - ]; - buildInputs = [ TestMore IOAll ]; + propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; meta = with stdenv.lib; { homepage = http://www.matijs.net/software/msgconv/; description = "A .MSG to mbox converter"; From da79b95be7752e0d2fe62c8d4270d6653566dec2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:29 +0000 Subject: [PATCH 1116/2743] [cpan2nix] perlPackages.TestWWWMechanizeCGI: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f48f800573f..4c3212866b5d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15067,11 +15067,12 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz; sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; - propagatedBuildInputs = [ CGI TestWWWMechanize WWWMechanizeCGI ]; + propagatedBuildInputs = [ WWWMechanizeCGI ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestLongString TestWWWMechanize ]; }; TestWWWMechanizePSGI = buildPerlPackage { From c807d7586e9265c4a283c691037ca63c82d9aabd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:29 +0000 Subject: [PATCH 1117/2743] [cpan2nix] perlPackages.PerlCritic: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4c3212866b5d..f9a336421386 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11430,8 +11430,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; sha256 = "0662e8f02dd78e39ee9d5b01bdf5376a7cc70ce2b0edc9ca015be35e6cb61df6"; }; - buildInputs = [ ModuleBuild TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ]; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress FileHomeDir ModulePluggable PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; From 9b7f583dd48c53b81e868d355faff64263350e7b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:29 +0000 Subject: [PATCH 1118/2743] [cpan2nix] perlPackages.RESTUtils: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f9a336421386..4b1b99362c6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12382,13 +12382,13 @@ let self = _self // overrides; _self = with self; { }; }; - RESTUtils = buildPerlPackage { + RESTUtils = buildPerlModule { name = "REST-Utils-0.6"; src = fetchurl { url = mirror://cpan/authors/id/J/JA/JALDHAR/REST-Utils-0.6.tar.gz; sha256 = "1zdrf3315rp2b8r9dwwj5h93xky7i33iawf4hzszwcddhzflmsfl"; }; - buildInputs = [ TestWWWMechanizeCGI ]; + buildInputs = [ TestLongString TestWWWMechanize TestWWWMechanizeCGI ]; meta = { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; From d79df4478e978a1b965a451284085a375e4229b3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:30 +0000 Subject: [PATCH 1119/2743] [cpan2nix] perlPackages.MathRandomSecure: 0.06 -> 0.080001 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b1b99362c6b..4d311329e3a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8939,13 +8939,13 @@ let self = _self // overrides; _self = with self; { }; MathRandomSecure = buildPerlPackage { - name = "Math-Random-Secure-0.06"; + name = "Math-Random-Secure-0.080001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MK/MKANAT/Math-Random-Secure-0.06.tar.gz; - sha256 = "0392h78l3shkba9l2c43rgz6sm5qv7pzdylgb7gp9milprn77crc"; + url = mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz; + sha256 = "0dgbf4ncll4kmgkyb9fsaxn0vf2smc9dmwqzgh3259zc2zla995z"; }; - buildInputs = [ ListMoreUtils TestWarn ]; - propagatedBuildInputs = [ AnyMoose CryptRandomSource MathRandomISAAC ]; + buildInputs = [ ListMoreUtils TestSharedFork TestWarn ]; + propagatedBuildInputs = [ CryptRandomSource MathRandomISAAC ]; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; license = stdenv.lib.licenses.artistic2; From e00430f6717397823428b0ada9bc3837ec0ea03a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:30 +0000 Subject: [PATCH 1120/2743] [cpan2nix] perlPackages.TestPerlCritic: 1.02 -> 1.04 dependencies: perlPackages.MCE: init at 1.835 --- pkgs/top-level/perl-packages.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4d311329e3a8..5ff391b6e5eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8436,6 +8436,19 @@ let self = _self // overrides; _self = with self; { }; }; + MCE = buildPerlPackage rec { + name = "MCE-1.835"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.835.tar.gz; + sha256 = "1dxs7gvj97vr1ns74k3inix1i80d8b2j942crnapdx9j90j6cqvi"; + }; + meta = { + description = "Many-Core Engine for Perl providing parallel processing capabilities"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/marioroy/mce-perl"; + }; + }; + LogLog4perl = buildPerlPackage rec { name = "Log-Log4perl-1.49"; src = fetchurl { @@ -14552,13 +14565,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CaptureTiny ]; }; - TestPerlCritic = buildPerlPackage rec { - name = "Test-Perl-Critic-1.02"; + TestPerlCritic = buildPerlModule rec { + name = "Test-Perl-Critic-1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz"; - sha256 = "89b242ff539034336ed87c11ef3e5ecac47c333a6ab8b46aab4cc449e3739a89"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Perl-Critic-1.04.tar.gz; + sha256 = "28f806b5412c7908b56cf1673084b8b44ce1cb54c9417d784d91428e1a04096e"; }; - propagatedBuildInputs = [ PerlCritic ]; + propagatedBuildInputs = [ MCE PerlCritic ]; }; TestPerlTidy = buildPerlPackage rec { From b6703587b3cefe8c30859fc2ebe7e9f61e116d8e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:31 +0000 Subject: [PATCH 1121/2743] [cpan2nix] perlPackages.CHI: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ff391b6e5eb..26d299063051 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1829,7 +1829,7 @@ let self = _self // overrides; _self = with self; { sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; }; buildInputs = [ TestClass TestDeep TestException TestWarn TimeDate ]; - propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLike MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse TryTiny ]; + propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse ]; meta = { description = "Unified cache handling interface"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 93302fe6e51270403a1f13b81d34439a92cbe7f3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:31 +0000 Subject: [PATCH 1122/2743] [cpan2nix] perlPackages.LogDispatchouli: 2.012 -> 2.016 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 26d299063051..7a7567348e7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8482,13 +8482,13 @@ let self = _self // overrides; _self = with self; { }; LogDispatchouli = buildPerlPackage rec { - name = "Log-Dispatchouli-2.012"; + name = "Log-Dispatchouli-2.016"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "214eca0fe77f2dc74675f9aa542778d5d4618c5bf12283540ca1062fcb967fa0"; + sha256 = "7f2a1a1854fd1e4ed02883bc21f5395f4244a266b661276b438d1bdd50bdacf7"; }; buildInputs = [ TestDeep TestFatal ]; - propagatedBuildInputs = [ LogDispatch LogDispatchArray ParamsUtil StringFlogger SubExporter SubExporterGlobExporter TryTiny ]; + propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; meta = { homepage = https://github.com/rjbs/Log-Dispatchouli; description = "A simple wrapper around Log::Dispatch"; From 81f34b1ccfbeb22d2e865eb8139cda470f20864a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:31 +0000 Subject: [PATCH 1123/2743] [cpan2nix] perlPackages.CPAN: 2.10 -> 2.16 dependencies: perlPackages.ArchiveZip: 1.16 -> 1.60 --- pkgs/top-level/perl-packages.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7a7567348e7f..53b2bbf92d48 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -473,11 +473,12 @@ let self = _self // overrides; _self = with self; { }; ArchiveZip = buildPerlPackage { - name = "Archive-Zip-1.16"; + name = "Archive-Zip-1.60"; src = fetchurl { - url = http://tarballs.nixos.org/Archive-Zip-1.16.tar.gz; - sha256 = "1ghgs64by3ybjlb0bj65kxysb03k72i7iwmw63g41bj175l44ima"; + url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz; + sha256 = "02y2ylq83hy9kgj57sc0239x65br9sm98c0chsm61s08yc2mpiza"; }; + buildInputs = [ TestMockModule ]; }; ArchiveZip_1_53 = buildPerlPackage { @@ -2623,16 +2624,17 @@ let self = _self // overrides; _self = with self; { }; CPAN = buildPerlPackage rec { - name = "CPAN-2.10"; + name = "CPAN-2.16"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "090e9e3d9fca83b89341a75c514c7411b743c887743723dbfe80f30d4ee5f3ad"; + sha256 = "7dbd61c172b99b05c16a2fce790140489494c744190f6c4f80c162d5ae3ccc2c"; }; - propagatedBuildInputs = [ ArchiveZip CompressBzip2 Expect FileHomeDir FileWhich JSONPP LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ Expect FileWhich LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ArchiveZip ]; }; CpanelJSONXS = buildPerlPackage rec { From 1df32cd94ef65c1b589be99819abba82a8ddb814 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:32 +0000 Subject: [PATCH 1124/2743] [cpan2nix] perlPackages.TestCleanNamespaces: 0.16 -> 0.22 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 53b2bbf92d48..d02f807a869e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14101,13 +14101,13 @@ let self = _self // overrides; _self = with self; { }; TestCleanNamespaces = buildPerlPackage { - name = "Test-CleanNamespaces-0.16"; + name = "Test-CleanNamespaces-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.16.tar.gz; - sha256 = "9779378394b9be32cf04129fafe2d40d74f6f200f593f1494998bd128a6ed9fa"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.22.tar.gz; + sha256 = "862a221994dd413b2f350450f22c96f57cac78784b1aca1a8fc763fc5449aaca"; }; - buildInputs = [ ModuleRuntime TestDeep TestRequires TestTester TestWarnings if_ ]; - propagatedBuildInputs = [ FileFindRule FileFindRulePerl ModuleRuntime PackageStash SubExporter SubIdentify namespaceclean ]; + buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ]; + propagatedBuildInputs = [ PackageStash SubIdentify ]; meta = { homepage = https://github.com/karenetheridge/Test-CleanNamespaces; description = "Check for uncleaned imports"; From d27aae093df3b7e62d386ccf05d1a6321ed10ce3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:33 +0000 Subject: [PATCH 1125/2743] [cpan2nix] perlPackages.AppCLI: 0.313 -> 0.49 dependencies: perlPackages.ArchiveAnyLite: init at 0.11 perlPackages.ArrayDiff: init at 0.07 perlPackages.CPANDistnameInfo: init at 0.12 perlPackages.ExtUtilsMakeMakerCPANfile: init at 0.08 perlPackages.ModuleCPANTSAnalyse: init at 0.96 perlPackages.ModuleCPANfile: init at 1.1002 perlPackages.ModuleExtractUse: init at 0.342 perlPackages.PodStrip: init at 1.02 perlPackages.SoftwareLicenseCCpack: init at 1.11 perlPackages.TestKwalitee: init at 1.27 --- pkgs/top-level/perl-packages.nix | 145 ++++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d02f807a869e..70ed8c1702be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -236,12 +236,13 @@ let self = _self // overrides; _self = with self; { }; AppCLI = buildPerlPackage { - name = "App-CLI-0.313"; + name = "App-CLI-0.49"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORNELIUS/App-CLI-0.313.tar.gz; - sha256 = "0ni1z14xis1b634qjc3zra9c9pl2icfr6sp5qxs0xy8nvib65037"; + url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.49.tar.gz; + sha256 = "0gv4dcscxiacdrb9aqxc9mdl1w8wszicmg2q86zlz31ya5spjvv3"; }; - propagatedBuildInputs = [LocaleMaketextSimple]; + propagatedBuildInputs = [ CaptureTiny ClassLoad ]; + buildInputs = [ TestKwalitee TestPod ]; }; AppCmd = buildPerlPackage rec { @@ -320,6 +321,20 @@ let self = _self // overrides; _self = with self; { }; }; + ArchiveAnyLite = buildPerlPackage rec { + name = "Archive-Any-Lite-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz; + sha256 = "0w2i50fd81ip674zmnrb15nadw162fdpiw4rampbd94k74jqih8m"; + }; + propagatedBuildInputs = [ ArchiveZip ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "simple CPAN package extractor"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AppSqitch = buildPerlModule rec { version = "0.9996"; name = "App-Sqitch-${version}"; @@ -404,6 +419,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moo TypeTiny ]; }; + ArrayDiff = buildPerlPackage rec { + name = "Array-Diff-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TY/TYPESTER/Array-Diff-0.07.tar.gz; + sha256 = "0il3izx45wkh71fli2hvaq32jyin95k8x3qrnwby2x2c6yix7rvq"; + }; + propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; + meta = { + description = "Find the differences between two arrays"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ArrayFIFO = buildPerlPackage rec { name = "Array-FIFO-0.10"; src = fetchurl { @@ -2662,6 +2690,18 @@ let self = _self // overrides; _self = with self; { }; }; + CPANDistnameInfo = buildPerlPackage rec { + name = "CPAN-DistnameInfo-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz; + sha256 = "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"; + }; + meta = { + description = "Extract distribution name and version from a distribution filename"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CPANMeta = buildPerlPackage rec { name = "CPAN-Meta-2.150010"; src = fetchurl { @@ -5418,6 +5458,19 @@ let self = _self // overrides; _self = with self; { }; }; + ExtUtilsMakeMakerCPANfile = buildPerlPackage rec { + name = "ExtUtils-MakeMaker-CPANfile-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.08.tar.gz; + sha256 = "0yg2z4six807lraqh8ncsq6l62vj7zi0a38ha9nvmhd6lbipmsql"; + }; + propagatedBuildInputs = [ ModuleCPANfile ]; + meta = { + description = "cpanfile support for EUMM"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ExtUtilsManifest = buildPerlPackage rec { name = "ExtUtils-Manifest-1.70"; src = fetchurl { @@ -9259,6 +9312,34 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DevelCheckCompiler ]; }; + ModuleCPANTSAnalyse = buildPerlPackage rec { + name = "Module-CPANTS-Analyse-0.96"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-0.96.tar.gz; + sha256 = "1c38fnbx9w1s841am1i5h33lcqr9bwc9bni21n907nmyp41wr297"; + }; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo FileFindObject IOCapture JSONMaybeXS ModuleExtractUse ModulePluggable SetScalar SoftwareLicenseCCpack ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; + meta = { + description = "Generate Kwalitee ratings for a distribution"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://cpants.cpanauthors.org"; + }; + }; + + ModuleCPANfile = buildPerlPackage rec { + name = "Module-CPANfile-1.1002"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1002.tar.gz; + sha256 = "1z9wsps70h7ypaxmwq8l8wp0dg4kqrxmaqgzbh2fq8jw9idw55dz"; + }; + meta = { + description = "Parse cpanfile"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/cpanfile"; + }; + }; + ModuleCoreList = buildPerlPackage { name = "Module-CoreList-5.20180221"; src = fetchurl { @@ -9272,6 +9353,20 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleExtractUse = buildPerlModule rec { + name = "Module-ExtractUse-0.342"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.342.tar.gz; + sha256 = "06z6iz4zc1rdm3w3zkddgv832rghlpvb4r494vdz65pphr65saax"; + }; + propagatedBuildInputs = [ ParseRecDescent PodStrip ]; + buildInputs = [ TestDeep TestNoWarnings ]; + meta = { + description = "Find out what modules are used"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleFind = buildPerlPackage { name = "Module-Find-0.13"; src = fetchurl { @@ -12212,6 +12307,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ FileShareDirInstall TestDeep ]; }; + PodStrip = buildPerlModule rec { + name = "Pod-Strip-1.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz; + sha256 = "1zsjfw2cjq1bd3ppl67fdvrx46vj9lina0c3cv9qgk5clzvaq3fq"; + }; + meta = { + description = "Remove POD from Perl code"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodUsage = buildPerlPackage { name = "Pod-Usage-1.69"; src = fetchurl { @@ -12780,6 +12887,21 @@ let self = _self // overrides; _self = with self; { }; }; + SoftwareLicenseCCpack = buildPerlPackage rec { + name = "Software-License-CCpack-1.11"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz; + sha256 = "1cakbn7am8mhalwas5h33l7c6avdqpg42z478p6rav11pim5qksr"; + }; + propagatedBuildInputs = [ SoftwareLicense ]; + buildInputs = [ TestCheckDeps ]; + meta = { + description = "Software::License pack for Creative Commons' licenses"; + license = with stdenv.lib.licenses; [ lgpl3Plus ]; + homepage = "https://github.com/SineSwiper/Software-License-CCpack"; + }; + }; + SortKey = buildPerlPackage rec { name = "Sort-Key-1.33"; src = fetchurl { @@ -14367,6 +14489,21 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestDifferences ]; }; + TestKwalitee = buildPerlPackage rec { + name = "Test-Kwalitee-1.27"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.27.tar.gz; + sha256 = "095kpj2011jk1mpnb07fs7yi190hmqh85mj662gx0dkpl9ic7a5w"; + }; + propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; + buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; + meta = { + description = "Test the Kwalitee of a distribution before you release it"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Test-Kwalitee"; + }; + }; + TestLeakTrace = buildPerlPackage rec { name = "Test-LeakTrace-0.16"; src = fetchurl { From effb3310793882caad8efa66bdad6127a752adb6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:33 +0000 Subject: [PATCH 1126/2743] [cpan2nix] perlPackages.DateTimeLocale: 1.03 -> 1.17 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70ed8c1702be..c0114cc6c80f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3749,13 +3749,13 @@ let self = _self // overrides; _self = with self; { }; DateTimeLocale = buildPerlPackage rec { - name = "DateTime-Locale-1.03"; + name = "DateTime-Locale-1.17"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "3100568a62a91ca1c09c0aac8e1e4ba34e6f82047ec64f714733a647c040f511"; + sha256 = "0ca6598b3f89e92e3d1140e5685c69f6f795f6eed158fa482f33ce2122b35cc9"; }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires TestWarnings ]; - propagatedBuildInputs = [ DistCheckConflicts ListMoreUtils ParamsValidate ]; + buildInputs = [ CPANMetaCheck FileShareDirInstall TestFatal TestFileShareDir TestRequires TestWarnings ]; + propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/DateTime-Locale; description = "Localization support for DateTime.pm"; From 6b46b0b0dba122c9646ae971bbf7205231571579 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:34 +0000 Subject: [PATCH 1127/2743] [cpan2nix] perlPackages.PerlMinimumVersion: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c0114cc6c80f..a90ccf877db5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12050,7 +12050,7 @@ let self = _self // overrides; _self = with self; { sha256 = "478b5824791b87fc74c94a892180682bd06ad2cdf34034b1a4b859273927802a"; }; buildInputs = [ TestScript ]; - propagatedBuildInputs = [ FileFindRule FileFindRulePerl PPI PPIxRegexp ParamsUtil PerlCritic ]; + propagatedBuildInputs = [ FileFindRulePerl PerlCritic ]; meta = { homepage = https://github.com/neilbowers/Perl-MinimumVersion; description = "Find a minimum required version of perl for Perl code"; From f3491f0f197b01b3a4a1002652a3ef0e0de2d584 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:34 +0000 Subject: [PATCH 1128/2743] [cpan2nix] perlPackages.TestMinimumVersion: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a90ccf877db5..4e3a72c09f65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15499,8 +15499,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "3fba4e8fcf74806259aa639be7d90e70346ad0e0e4b8b619593490e378241970"; }; - buildInputs = [ TestTester ]; - propagatedBuildInputs = [ FileFindRule FileFindRulePerl PerlMinimumVersion ]; + propagatedBuildInputs = [ PerlMinimumVersion ]; meta = { homepage = https://github.com/rjbs/Test-MinimumVersion; description = "Does your code require newer perl than you think?"; From 59def127df8a21ba25b69235e2e8d2d26ae7f9ed Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:34 +0000 Subject: [PATCH 1129/2743] [cpan2nix] perlPackages.DateTime: 1.21 -> 1.48 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4e3a72c09f65..627d2c8e21b0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3519,14 +3519,14 @@ let self = _self // overrides; _self = with self; { }; }; - DateTime = buildPerlModule rec { - name = "DateTime-1.21"; + DateTime = buildPerlPackage rec { + name = "DateTime-1.48"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1cgnscbh40f783znpq15rkvbfflfm8azdl0v6yqr7minmq6899d3"; + sha256 = "0glcsvgldrmbwbaps6hssjzipzghhx4jh3g4jdncjspdmdp481ah"; }; - buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; + buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; + propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; meta = { description = "A date and time object"; license = stdenv.lib.licenses.artistic2; From 65d19e3664f363225879ec976a840ba7c1ea23dc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:35 +0000 Subject: [PATCH 1130/2743] [cpan2nix] perlPackages.DateTimeCalendarJulian: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 627d2c8e21b0..afe98084869d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3539,11 +3539,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/P/PI/PIJLL/${name}.tar.gz"; sha256 = "03h0llkwsiw2d2ci1ah5x9sp8xrvnbgd471i5hnpgl5w32nnhndv"; }; - propagatedBuildInputs = [ DateTime ]; meta = { description = "Dates in the Julian calendar"; license = stdenv.lib.licenses.artistic2; }; + buildInputs = [ DateTime ]; }; DateTimeEventICal = buildPerlPackage rec { From c7d2870cff087412190d9360b0dc45685b0b5cb0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:36 +0000 Subject: [PATCH 1131/2743] [cpan2nix] perlPackages.DateTimeFormatW3CDTF: 0.06 -> 0.07 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index afe98084869d..a83973a06cff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3735,10 +3735,10 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatW3CDTF = buildPerlPackage { - name = "DateTime-Format-W3CDTF-0.06"; + name = "DateTime-Format-W3CDTF-0.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.06.tar.gz; - sha256 = "b9a542bed9c52b0a89dd590a5184e38ee334c824bbe6bac842dd7dd1f88fbd7a"; + url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz; + sha256 = "69a02b661bbf1daa14a4813cb6786eaa66dbdf2743f0b3f458e30234c3a26268"; }; propagatedBuildInputs = [ DateTime ]; meta = { From c376c6c5edbdce52c50536f8f5e7b1fee468e8d1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:36 +0000 Subject: [PATCH 1132/2743] [cpan2nix] perlPackages.DBIxClass: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a83973a06cff..993a11cc03d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4033,8 +4033,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; - buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; + buildInputs = [ DBDSQLite TestDeep TestException TestWarn ]; + propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage ModuleFind PathClass SQLAbstract ScopeGuard SubName namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; From 6aa717a6514ea567567a4de670909978e4e33bf3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:37 +0000 Subject: [PATCH 1133/2743] [cpan2nix] perlPackages.DateTimeFormatDateParse: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 993a11cc03d2..56865ce2ac7d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3581,14 +3581,13 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatDateParse = buildPerlPackage { + DateTimeFormatDateParse = buildPerlModule { name = "DateTime-Format-DateParse-0.05"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz; sha256 = "f6eca4c8be66ce9992ee150932f8fcf07809fd3d1664caf200b8a5fd3a7e5ebc"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ DateTime DateTimeTimeZone TimeDate ]; + propagatedBuildInputs = [ DateTime TimeDate ]; meta = { description = "Parses Date::Parse compatible formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From e95fda2fa517b42296ce67301065c5e9dca848fe Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:37 +0000 Subject: [PATCH 1134/2743] [cpan2nix] perlPackages.DateTimeFormatHTTP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 56865ce2ac7d..f6b79664ff36 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3607,7 +3607,7 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatHTTP = buildPerlPackage rec { + DateTimeFormatHTTP = buildPerlModule rec { name = "DateTime-Format-HTTP-0.42"; src = fetchurl { url = "mirror://cpan/authors/id/C/CK/CKRAS/${name}.tar.gz"; From 3110c76bea6504a0e18224dd891b44ab86c87260 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:37 +0000 Subject: [PATCH 1135/2743] [cpan2nix] perlPackages.DateTimeFormatMail: 0.402 -> 0.403 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f6b79664ff36..bf95b4cf92be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3650,10 +3650,10 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatMail = buildPerlPackage { - name = "DateTime-Format-Mail-0.402"; + name = "DateTime-Format-Mail-0.403"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.402.tar.gz; - sha256 = "d788c883969e1647ed0524cc130d897276de23eaa3261f3616458ddd3a4a88fb"; + url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz; + sha256 = "8df8e35c4477388ff5c7ce8b3e8b6ae4ed30209c7a5051d41737bd14d755fcb0"; }; propagatedBuildInputs = [ DateTime ParamsValidate ]; meta = { From 99a546d8e7e98199ca8930cb474c795db31b5e72 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:38 +0000 Subject: [PATCH 1136/2743] [cpan2nix] perlPackages.DateTimeSet: 0.3600 -> 0.3900 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bf95b4cf92be..98b45bc61af1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3762,13 +3762,13 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeSet = buildPerlPackage rec { - name = "DateTime-Set-0.3600"; + DateTimeSet = buildPerlModule rec { + name = "DateTime-Set-0.3900"; src = fetchurl { url = "mirror://cpan/authors/id/F/FG/FGLOCK/${name}.tar.gz"; - sha256 = "83503960c773efadfe2b0255e61bc1eb531bb6f497463d3b3880d7a516bc2f13"; + sha256 = "94f41c3924aafde4ef7fa6b58e0595d4038d8ac5ffd62ba111b13c5f4dbc0946"; }; - propagatedBuildInputs = [ DateTime SetInfinite ]; + propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ]; meta = { description = "DateTime set objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d3191808512114cc1470f1b42cc613a5f4ee7010 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:39 +0000 Subject: [PATCH 1137/2743] [cpan2nix] perlPackages.DateTimeEventRecurrence: 0.16 -> 0.19 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 98b45bc61af1..38e9e76fc5a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3560,12 +3560,12 @@ let self = _self // overrides; _self = with self; { }; DateTimeEventRecurrence = buildPerlPackage { - name = "DateTime-Event-Recurrence-0.16"; + name = "DateTime-Event-Recurrence-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.16.tar.gz; - sha256 = "3872e0126cd9527a918d3e537f85342d1fbb1e6a9ae5833262201b31879f8609"; + url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz; + sha256 = "f9408789a461107766ca1a232bb3ec1e702eec7ca8167401ea6ec3f4b6d0b5a5"; }; - propagatedBuildInputs = [ DateTime DateTimeSet ]; + propagatedBuildInputs = [ DateTimeSet ]; }; DateTimeFormatBuilder = buildPerlPackage { From ad37fdfe1b3da900fdcfbb63dd5984cfa024d894 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:39 +0000 Subject: [PATCH 1138/2743] [cpan2nix] perlPackages.DateTimeEventICal: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38e9e76fc5a8..3941cb5f50ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3552,7 +3552,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/F/FG/FGLOCK/${name}.tar.gz"; sha256 = "1skmykxbrf98ldi72d5s1v6228gfdr5iy4y0gpl0xwswxy247njk"; }; - propagatedBuildInputs = [ DateTime DateTimeEventRecurrence ]; + propagatedBuildInputs = [ DateTimeEventRecurrence ]; meta = { description = "DateTime rfc2445 recurrences"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 9c2000e7fdb1ee5c75657f8039a53ab39d0b3b51 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:40 +0000 Subject: [PATCH 1139/2743] [cpan2nix] perlPackages.DateTimeFormatICal: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3941cb5f50ee..dcc337c86207 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3620,14 +3620,13 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatICal = buildPerlPackage { + DateTimeFormatICal = buildPerlModule { name = "DateTime-Format-ICal-0.09"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ]; + propagatedBuildInputs = [ DateTimeEventICal ]; meta = { description = "Parse and format iCal datetime and duration strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 61f3c746864d6e716a0061a0f8924a410578cc7e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:40 +0000 Subject: [PATCH 1140/2743] [cpan2nix] perlPackages.DBIxClassCandy: 0.005002 -> 0.005003 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcc337c86207..ed6cc3eb1d69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4041,13 +4041,13 @@ let self = _self // overrides; _self = with self; { }; DBIxClassCandy = buildPerlPackage rec { - name = "DBIx-Class-Candy-0.005002"; + name = "DBIx-Class-Candy-0.005003"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "fb109e765674a52e9eac03f52403bb3cf717254b8b9fa46f06a6f205392f987d"; + sha256 = "b8a229a7b15f559095d4561cf8220460128541ba7fc3545ed35869923d46565c"; }; buildInputs = [ TestDeep TestFatal ]; - propagatedBuildInputs = [ DBIxClass LinguaENInflect MROCompat StringCamelCase SubExporter namespaceclean ]; + propagatedBuildInputs = [ DBIxClass LinguaENInflect SubExporter ]; meta = { homepage = https://github.com/frioux/DBIx-Class-Candy; description = "Sugar for your favorite ORM, DBIx::Class"; From 04b36915f562fbc4071b48e77f21fa1018811a01 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:41 +0000 Subject: [PATCH 1141/2743] [cpan2nix] perlPackages.DBIxClassCursorCached: 1.001002 -> 1.001004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed6cc3eb1d69..aa11c7342074 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4056,10 +4056,10 @@ let self = _self // overrides; _self = with self; { }; DBIxClassCursorCached = buildPerlPackage { - name = "DBIx-Class-Cursor-Cached-1.001002"; + name = "DBIx-Class-Cursor-Cached-1.001004"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001002.tar.gz; - sha256 = "19r7jr6pknxiirrybq0cd0lnr76xiw05arnfqgk9nrhp6c7vvil0"; + url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001004.tar.gz; + sha256 = "09b2jahn2x12qm4f7qm1jzsxbz7qn1czp6a3fnl5l2i3l4r5421p"; }; buildInputs = [ CacheCache DBDSQLite ]; propagatedBuildInputs = [ CarpClan DBIxClass ]; From d12a834e50675f4742a4b2642ea4b87344b359c3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:41 +0000 Subject: [PATCH 1142/2743] [cpan2nix] perlPackages.Moose: 2.1213 -> 2.2010 dependencies: perlPackages.DevelOverloadInfo: init at 0.005 --- pkgs/top-level/perl-packages.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa11c7342074..3074a1401559 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4286,6 +4286,20 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestDifferences ]; }; + DevelOverloadInfo = buildPerlPackage rec { + name = "Devel-OverloadInfo-0.005"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz; + sha256 = "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"; + }; + propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; + buildInputs = [ TestFatal ]; + meta = { + description = "introspect overloaded operators"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelPartialDump = buildPerlPackage { name = "Devel-PartialDump-0.20"; src = fetchurl { @@ -9713,13 +9727,13 @@ let self = _self // overrides; _self = with self; { }; Moose = buildPerlPackage { - name = "Moose-2.1213"; + name = "Moose-2.2010"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1213.tar.gz; - sha256 = "0f3b196ae67dc1daaa43c44ae7703f27c4f92c391ad3e252a90e90c50c851e03"; + url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2010.tar.gz; + sha256 = "af0905b69f18c27de1177c9bc7778ee495d4ec91be1f223e8ca8333af4de08c5"; }; - buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ModuleMetadata ]; - propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DevelStackTrace DistCheckConflicts EvalClosure ListMoreUtils MROCompat ModuleRuntime ModuleRuntimeConflicts PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; + buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ScalarListUtils SubExporter ]; preConfigure = '' export LD=$CC ''; From 430743feeb463f7bb0dd082e779b214b48c1e36d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:41 +0000 Subject: [PATCH 1143/2743] [cpan2nix] perlPackages.AnyMoose: 0.26 -> 0.27 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3074a1401559..6ec0baf43437 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -184,12 +184,12 @@ let self = _self // overrides; _self = with self; { }; AnyMoose = buildPerlPackage rec { - name = "Any-Moose-0.26"; + name = "Any-Moose-0.27"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "1wcd1lpx38hvxk6k0zpx48hb7yidxnlr34lyk51zxin9ra9f2104"; + sha256 = "0dc55mpayrixwx8dwql0vj0jalg4rlb3k64rprc84bl0z8vkx9m8"; }; - propagatedBuildInputs = [ Mouse ]; + propagatedBuildInputs = [ Moose Mouse ]; }; ApacheLogFormatCompiler = buildPerlModule rec { From 99aed2343f97e02c38cf7572a0f26db1ce1df885 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:42 +0000 Subject: [PATCH 1144/2743] [cpan2nix] perlPackages.MooseXAliases: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ec0baf43437..f9b2ce82235b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9821,7 +9821,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; sha256 = "0j07zqczjfmng3md6nkha7560i786d0cp3gdmrx49hr64jbhz1f4"; }; - buildInputs = [ TestFatal TestRequires ]; + buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose ]; }; From 8f29a533109fbb61a6e14fa6170b89309fcc64d7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:43 +0000 Subject: [PATCH 1145/2743] [cpan2nix] perlPackages.MooseXAttributeChained: 1.0.1 -> 1.0.3 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f9b2ce82235b..270f32a81798 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9958,12 +9958,12 @@ let self = _self // overrides; _self = with self; { }; MooseXAttributeChained = buildPerlModule rec { - name = "MooseX-Attribute-Chained-1.0.1"; + name = "MooseX-Attribute-Chained-1.0.3"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "101kwjzidppcsnyvp9x1vw8vpvkp1cc1csqmzbashwvqy8d0g4af"; + url = mirror://cpan/authors/id/T/TO/TOMHUKINS/MooseX-Attribute-Chained-1.0.3.tar.gz; + sha256 = "0kjydmkxh8hpkbbmsgd5wrkhgq7w69lgfg6lx4s5g2xpqfkqmqz7"; }; - propagatedBuildInputs = [ Moose TryTiny ]; + propagatedBuildInputs = [ Moose ]; }; MooseXAttributeHelpers = buildPerlPackage { From 1192026a4af4d1dbb0a916b939a1ea7a011d2327 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:43 +0000 Subject: [PATCH 1146/2743] [cpan2nix] perlPackages.MooseXAttributeHelpers: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 270f32a81798..5f6e44239e5e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9973,7 +9973,7 @@ let self = _self // overrides; _self = with self; { sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1"; }; patches = [ ../development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch ]; - buildInputs = [ Moose TestException ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; From a6bfdecb63f4cbe33dc3f7945add1e5b719b4338 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:44 +0000 Subject: [PATCH 1147/2743] [cpan2nix] perlPackages.MooseXSemiAffordanceAccessor: 0.09 -> 0.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5f6e44239e5e..dd193cd9a489 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10235,10 +10235,10 @@ let self = _self // overrides; _self = with self; { }; MooseXSemiAffordanceAccessor = buildPerlPackage rec { - name = "MooseX-SemiAffordanceAccessor-0.09"; + name = "MooseX-SemiAffordanceAccessor-0.10"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "1724cxvgy1wh1kfawcj2sanlm90zarfh7k186pgyx1lk8fhnlj4m"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.10.tar.gz; + sha256 = "1mdil9ckgmgr78z59p8wfa35ixn5855ndzx14y01dvfxpiv5gf55"; }; propagatedBuildInputs = [ Moose ]; }; From 2051067f3bdf7a6f9941c63125d4f362cdd415ed Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:44 +0000 Subject: [PATCH 1148/2743] [cpan2nix] perlPackages.MooseXSetOnce: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd193cd9a489..bcbc8bc89616 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10246,7 +10246,7 @@ let self = _self // overrides; _self = with self; { MooseXSetOnce = buildPerlPackage rec { name = "MooseX-SetOnce-0.200002"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz; sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb"; }; buildInputs = [ TestFatal ]; From 05527189f259541c24f87c3b603b141cc121686d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:45 +0000 Subject: [PATCH 1149/2743] [cpan2nix] perlPackages.MooseXSingleton: 0.29 -> 0.30 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bcbc8bc89616..ed52adb09ad4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10253,17 +10253,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; }; - MooseXSingleton = buildPerlPackage rec { - name = "MooseX-Singleton-0.29"; + MooseXSingleton = buildPerlModule rec { + name = "MooseX-Singleton-0.30"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz; - sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Singleton-0.30.tar.gz; + sha256 = "0hb5s1chsgbx2nlb0f112mdh2v1zwww8f4i3gvfvcghx3grv5135"; }; - buildInputs = [ Moose TestFatal TestRequires ]; + buildInputs = [ ModuleBuildTiny TestFatal TestRequires TestWarnings ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + propagatedBuildInputs = [ Moose ]; }; MooseXStrictConstructor = buildPerlPackage { From 24b579281c503df39f885ffc65d819d29163ea9c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:45 +0000 Subject: [PATCH 1150/2743] [cpan2nix] perlPackages.RoleIdentifiable: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed52adb09ad4..ea43ac35d41e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12583,7 +12583,6 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz; sha256 = "1bbkj2wqpbfdw1cbm99vg9d94rvzba19m18xhnylaym0l78lc4sn"; }; - buildInputs = [ Moose ]; propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; From 3b2a6570ba24a77f5d30a226f53fd51128508e42 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:46 +0000 Subject: [PATCH 1151/2743] [cpan2nix] perlPackages.DataStreamBulk: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ea43ac35d41e..0ee554eaf5d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3337,7 +3337,7 @@ let self = _self // overrides; _self = with self; { sha256 = "06e08432a6b97705606c925709b99129ad926516e477d58e4461e4b3d9f30917"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ Moose PathClass SubExporter namespaceclean ]; + propagatedBuildInputs = [ Moose PathClass namespaceclean ]; meta = { homepage = https://metacpan.org/release/Data-Stream-Bulk; description = "N at a time iteration API"; From 05c1ce53abdd3a35f1fa320511f27cfc78366955 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:46 +0000 Subject: [PATCH 1152/2743] [cpan2nix] perlPackages.DateTimeFormatNatural: 1.03 -> 1.05 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ee554eaf5d3..a4d509ac9c76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3661,14 +3661,14 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatNatural = buildPerlPackage { - name = "DateTime-Format-Natural-1.03"; + DateTimeFormatNatural = buildPerlModule { + name = "DateTime-Format-Natural-1.05"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.03.tar.gz; - sha256 = "1m3bmv90kww8xr4dda75isvzigy8y3clgvk58zp0bxc5d7k4qdxi"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.05.tar.gz; + sha256 = "10ldrhz5rnpsd8qmqn1a4s0w5hhfbjrr13a93yx7kpp89g85pxqv"; }; buildInputs = [ ModuleUtil TestMockTime ]; - propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; + propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 8c83d4ce23fb0d33c42b2564c4b138ed9358b17b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:47 +0000 Subject: [PATCH 1153/2743] [cpan2nix] perlPackages.MooseXMarkAsMethods: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a4d509ac9c76..0b46a9886e7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10110,8 +10110,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz; sha256 = "1y3yxwcjjajm66pvca54cv9fax7a6dy36xqr92x7vzyhfqrw3v69"; }; - buildInputs = [ TestMoose ]; - propagatedBuildInputs = [ BHooksEndOfScope Moose namespaceautoclean ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/MooseX-MarkAsMethods/; description = "Mark overload code symbols as methods"; From 22818bf8858d745c8d61d7d7910ee96d11e65450 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:47 +0000 Subject: [PATCH 1154/2743] [cpan2nix] perlPackages.MooseXStrictConstructor: 0.19 -> 0.21 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0b46a9886e7f..cf26f1c42c61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10267,12 +10267,12 @@ let self = _self // overrides; _self = with self; { }; MooseXStrictConstructor = buildPerlPackage { - name = "MooseX-StrictConstructor-0.19"; + name = "MooseX-StrictConstructor-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.19.tar.gz; - sha256 = "486573c16901e83c081da3d90a544281af1baa40bbf036337d6fa91994e48a31"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz; + sha256 = "c72a5ae9583706ccdec71d401dcb3054013a7536b750df1436613d858ea2920d"; }; - buildInputs = [ Moose TestFatal ]; + buildInputs = [ Moo TestFatal TestNeeds ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Make your object constructors blow up on unknown attributes"; From a451255007fa5a7148e72388a773e33af9505e7b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:48 +0000 Subject: [PATCH 1155/2743] [cpan2nix] perlPackages.MouseXNativeTraits: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cf26f1c42c61..8d33918e2c69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10495,8 +10495,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ AnyMoose ]; + buildInputs = [ AnyMoose TestFatal ]; + propagatedBuildInputs = [ Mouse ]; meta = { description = "Extend attribute interfaces for Mouse"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 136e28ca9fb412b981709a7be47be1f015794e00 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:48 +0000 Subject: [PATCH 1156/2743] [cpan2nix] perlPackages.MouseXTypes: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d33918e2c69..cdb8af94f0f3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9918,7 +9918,7 @@ let self = _self // overrides; _self = with self; { sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ AnyMoose Mouse ]; + propagatedBuildInputs = [ AnyMoose ]; meta = { description = "Organize your Mouse types in libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 79e9c6d62ddd8f2067fdaab7eb34a654202ed5fc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:49 +0000 Subject: [PATCH 1157/2743] [cpan2nix] perlPackages.DataVisitor: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cdb8af94f0f3..d67a2374e85a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3464,8 +3464,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0m7d1505af9z2hj5aw020grcmjjlvnkjpvjam457d7k5qfy4m8lf"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = - [ ClassLoad Moose TaskWeaken TieToObject namespaceclean ]; + propagatedBuildInputs = [ Moose TaskWeaken TieToObject namespaceclean ]; }; DateCalc = buildPerlPackage { From 830de68e0713a51535ebbe7ed33c62b0b5c6b7ad Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:49 +0000 Subject: [PATCH 1158/2743] [cpan2nix] perlPackages.DateExtract: 0.05 -> 0.06 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d67a2374e85a..0f26e4f01726 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3482,13 +3482,13 @@ let self = _self // overrides; _self = with self; { }; DateExtract = buildPerlPackage { - name = "Date-Extract-0.05"; + name = "Date-Extract-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHARYANTO/Date-Extract-0.05.tar.gz; - sha256 = "ef866b4d596e976a6f4e4b266a6ad7fe4513fad9ae761d7a9ef66f672695fe6d"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz; + sha256 = "bc7658d5c50c3525ec0efcb55236a5de2d5d4fc06fc147fa3929c8f0953cda2b"; }; - buildInputs = [TestMockTime]; - propagatedBuildInputs = [DateTimeFormatNatural ClassDataInheritable]; + buildInputs = [ TestMockTime ]; + propagatedBuildInputs = [ DateTimeFormatNatural ]; }; DateManip = buildPerlPackage rec { From 10f094e554fef14ffffcf2675c076c581652827b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:49 +0000 Subject: [PATCH 1159/2743] [cpan2nix] perlPackages.DateTimeFormatStrptime: 1.68 -> 1.75 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f26e4f01726..7b495b2dc5dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3704,13 +3704,13 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatStrptime = buildPerlPackage rec { - name = "DateTime-Format-Strptime-1.68"; + name = "DateTime-Format-Strptime-1.75"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "d0f97e282b4de61390b5c3a498d3b9ee553f728c169c0845c6de02102d823929"; + sha256 = "4fcfb2ac4f79d7ff2855a405f39050d2ea691ee098ce54ede8af79c8d6ab3c19"; }; buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone PackageDeprecationManager ParamsValidate TryTiny ]; + propagatedBuildInputs = [ DateTime PackageDeprecationManager ]; meta = { homepage = https://metacpan.org/release/DateTime-Format-Strptime; description = "Parse and format strp and strf time patterns"; From 2837669573fe1a9e8cc6b2e46585d7b302d5df41 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:50 +0000 Subject: [PATCH 1160/2743] [cpan2nix] perlPackages.MooseXLazyRequire: 0.10 -> 0.11 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7b495b2dc5dc..ff2cc2fe1ca1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10088,13 +10088,13 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXLazyRequire = buildPerlPackage { - name = "MooseX-LazyRequire-0.10"; + MooseXLazyRequire = buildPerlModule { + name = "MooseX-LazyRequire-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.10.tar.gz; - sha256 = "a555f80c0e91bc428f040015f00dd98f3c022704ec089516b9b3507f3d437090"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz; + sha256 = "ef620c1e019daf9cf3f23a943d25a94c91e93ab312bcd63be2e9740ec0b94288"; }; - buildInputs = [ TestCheckDeps TestFatal ModuleMetadata ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; From 4945ca672a6a1a83666ed801c4d46bb1dbb93424 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:50 +0000 Subject: [PATCH 1161/2743] [cpan2nix] perlPackages.MooseXRoleWithOverloading: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff2cc2fe1ca1..2a56f2dad0e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10206,8 +10206,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j"; }; - buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata]; - propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ]; + propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; meta = { homepage = https://metacpan.org/release/MooseX-Role-WithOverloading; description = "Roles which support overloading"; From f153bfc3dde15b142095238d785af808c17eb390 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:51 +0000 Subject: [PATCH 1162/2743] [cpan2nix] perlPackages.MooseXParamsValidate: 0.18 -> 0.21 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2a56f2dad0e0..8b713635aa84 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10172,13 +10172,13 @@ let self = _self // overrides; _self = with self; { }; MooseXParamsValidate = buildPerlPackage { - name = "MooseX-Params-Validate-0.18"; + name = "MooseX-Params-Validate-0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.18.tar.gz; - sha256 = "02yim0lmr7p2nzswy97d5ylbs4ksmgklqq350p119i2611x7ai0k"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz; + sha256 = "1n9ry6gnskkp9ir6s7d5jirn3mh14ydgpmwqz6wcp6d9md358ac8"; }; - buildInputs = [ Moose TestFatal ]; - propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ]; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ DevelCaller Moose ParamsValidate ]; meta = { description = "An extension of Params::Validate using Moose's types"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 1a79478642967c6f95f14673cfe6f355d4cc9f57 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:51 +0000 Subject: [PATCH 1163/2743] [cpan2nix] perlPackages.MooseXRoleParameterized: 1.02 -> 1.10 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b713635aa84..6822e6cc002b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10185,14 +10185,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXRoleParameterized = buildPerlPackage { - name = "MooseX-Role-Parameterized-1.02"; + MooseXRoleParameterized = buildPerlModule { + name = "MooseX-Role-Parameterized-1.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-1.02.tar.gz; - sha256 = "089czh2pipvdajjy4rxlix0y20ilp3ldbzi0vs68b7k6k9q3mqdk"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.10.tar.gz; + sha256 = "0plx25n80mv9qwhix52z79md0qil616nbcryk2f4216kghpw2ij8"; }; - buildInputs = [ TestFatal TestMoose ]; - propagatedBuildInputs = [ Moose ]; + buildInputs = [ CPANMetaCheck ModuleBuildTiny MooseXRoleWithOverloading TestFatal TestRequires ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/sartak/MooseX-Role-Parameterized/tree; description = "Roles with composition parameters"; From be92ca05e6379e57b37e9da95d2e1d0140b96d31 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:51 +0000 Subject: [PATCH 1164/2743] [cpan2nix] perlPackages.MooseXTypes: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6822e6cc002b..9da6ec9961aa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10304,14 +10304,14 @@ let self = _self // overrides; _self = with self; { [ ClassMOP Moose namespaceautoclean ListMoreUtils ]; }; - MooseXTypes = buildPerlPackage rec { + MooseXTypes = buildPerlModule rec { name = "MooseX-Types-0.50"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08"; }; - buildInputs = [ ModuleBuildTiny TestFatal TestRequires self."if" ]; - propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubExporterForMethods SubInstall SubName namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal TestRequires ]; + propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; From ba99a6da9a9f3c0b47ff63af29ca398dd98ae585 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:52 +0000 Subject: [PATCH 1165/2743] [cpan2nix] perlPackages.TestRoutine: 0.018 -> 0.025 dependencies: perlPackages.TestAbortable: init at 0.002 --- pkgs/top-level/perl-packages.nix | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9da6ec9961aa..39594b6e7490 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14156,6 +14156,21 @@ let self = _self // overrides; _self = with self; { }; }; + TestAbortable = buildPerlPackage rec { + name = "Test-Abortable-0.002"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz; + sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; + }; + propagatedBuildInputs = [ SubExporter TestSimple13 ]; + buildInputs = [ TestNeeds ]; + meta = { + description = "subtests that you can die your way out of ... but survive"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/rjbs/Test-Abortable"; + }; + }; + TestAssert = buildPerlModule { name = "Test-Assert-0.0504"; src = fetchurl { @@ -14835,13 +14850,13 @@ let self = _self // overrides; _self = with self; { }; TestRoutine = buildPerlPackage { - name = "Test-Routine-0.018"; + name = "Test-Routine-0.025"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.018.tar.gz; - sha256 = "1slaljcija2pbsxdyrqsh09pgajxbln68gb47l9fwffb6gsp5f3m"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.025.tar.gz; + sha256 = "13gxczy0mx3rqnp55vc0j2d936qldrimmad87nmf4wrj0kd2lw92"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ Moose namespaceautoclean namespaceclean ParamsUtil SubExporter ]; + buildInputs = [ TestAbortable TestFatal ]; + propagatedBuildInputs = [ Moose TestSimple13 namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; From 81753f14aec7d9419dd079dedbd16bcd8f7c2d76 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:53 +0000 Subject: [PATCH 1166/2743] [cpan2nix] perlPackages.MooseXOneArgNew: 0.004 -> 0.005 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39594b6e7490..001c5d49e6d2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10147,13 +10147,12 @@ let self = _self // overrides; _self = with self; { }; MooseXOneArgNew = buildPerlPackage { - name = "MooseX-OneArgNew-0.004"; + name = "MooseX-OneArgNew-0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.004.tar.gz; - sha256 = "1frfrqaj283z1x95cqbbj3cvmb6rj50ngs47jq8myz6d1bg4zwff"; + url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz; + sha256 = "0gqhqdkwsnxmni0xv43iplplgp6g55khdwc5117j9i569r3wykvy"; }; - buildInputs = [ Moose ]; - propagatedBuildInputs = [ Moose MooseXRoleParameterized namespaceautoclean ]; + propagatedBuildInputs = [ MooseXRoleParameterized ]; meta = { homepage = https://github.com/rjbs/moosex-oneargnew; description = "Teach ->new to accept single, non-hashref arguments"; From b42468a9f2bd52024abf4ddf98e8d9037d18266c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:53 +0000 Subject: [PATCH 1167/2743] [cpan2nix] perlPackages.MooseXRelatedClassRoles: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 001c5d49e6d2..b274d51b8964 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10163,10 +10163,9 @@ let self = _self // overrides; _self = with self; { MooseXRelatedClassRoles = buildPerlPackage rec { name = "MooseX-RelatedClassRoles-0.004"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HD/HDP/MooseX-RelatedClassRoles-0.004.tar.gz; sha256 = "17vynkf6m5d039qkr4in1c9lflr8hnwp1fgzdwhj4q6jglipmnrh"; }; - buildInputs = [ ]; propagatedBuildInputs = [ MooseXRoleParameterized ]; }; From 053a5202b621c92b11db15b57146cb84f752a715 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:54 +0000 Subject: [PATCH 1168/2743] [cpan2nix] perlPackages.MooseXTypesCommon: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b274d51b8964..583dd09cae6e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10318,14 +10318,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesCommon = buildPerlPackage rec { + MooseXTypesCommon = buildPerlModule rec { name = "MooseX-Types-Common-0.001014"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f"; }; - buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; - propagatedBuildInputs = [ MooseXTypes self."if" ]; + buildInputs = [ ModuleBuildTiny TestDeep TestWarnings ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { homepage = https://github.com/moose/MooseX-Types-Common; description = "A library of commonly used type constraints"; From 00f5cc46eba8b0cea0cd1b657724686735679375 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:54 +0000 Subject: [PATCH 1169/2743] [cpan2nix] perlPackages.MooseXTypesLoadableClass: 0.012 -> 0.015 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 583dd09cae6e..0d262f4e0a6a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10363,14 +10363,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesLoadableClass = buildPerlPackage { - name = "MooseX-Types-LoadableClass-0.012"; + MooseXTypesLoadableClass = buildPerlModule { + name = "MooseX-Types-LoadableClass-0.015"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.012.tar.gz; - sha256 = "a1d2b186c2b69f416bb0c9271dc8692c2287c2f6ce144cc3b9b2c922427060df"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.015.tar.gz; + sha256 = "e037d3778253dcf92946435715bada0e6449c0a2808fa3ff32a965064d5a3bf4"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal ]; - propagatedBuildInputs = [ ClassLoad ModuleRuntime Moose MooseXTypes namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; From c9a735387a09742714b53e8cb50dacc33917066f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:55 +0000 Subject: [PATCH 1170/2743] [cpan2nix] perlPackages.MooseXTypesPerl: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d262f4e0a6a..88317bd7b2af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10416,7 +10416,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz; sha256 = "0nijy676q27bvjb8swxrb1j4lq2xq8jbqkaxs1l9q81k7jpvx17h"; }; - propagatedBuildInputs = [ MooseXTypes ParamsUtil ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { description = "Moose types that check against Perl syntax"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 91508be0a57e8ef35c4569e9bda70ba206779740 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:55 +0000 Subject: [PATCH 1171/2743] [cpan2nix] perlPackages.MooseXTypesStringlike: 0.002 -> 0.003 --- 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 88317bd7b2af..c1bc22ddcdbd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10424,12 +10424,11 @@ let self = _self // overrides; _self = with self; { }; MooseXTypesStringlike = buildPerlPackage { - name = "MooseX-Types-Stringlike-0.002"; + name = "MooseX-Types-Stringlike-0.003"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.002.tar.gz; - sha256 = "18g07bvhcrhirb1yhcz55y7nsvkw1wq285d1hyb0jxrzgr0ga94k"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz; + sha256 = "06fgamdiz0n7cgghb8ycjd5mcidj8w769zs2gws6z6jjbkn4kqrf"; }; - buildInputs = [ Moose ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { homepage = https://github.com/dagolden/moosex-types-stringlike; From a88ccb15e6d1aedf7b2ab7fa2eeaf596b8dc5b2f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:56 +0000 Subject: [PATCH 1172/2743] [cpan2nix] perlPackages.MouseXTypesPathClass: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c1bc22ddcdbd..d745df12d7fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9903,7 +9903,7 @@ let self = _self // overrides; _self = with self; { sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; }; buildInputs = [ TestUseAllModules ]; - propagatedBuildInputs = [ Mouse MouseXTypes PathClass ]; + propagatedBuildInputs = [ MouseXTypes PathClass ]; meta = { description = "A Path::Class type library for Mouse"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 9ad3d6292615684e47d6e203bac91130275575da Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:56 +0000 Subject: [PATCH 1173/2743] [cpan2nix] perlPackages.DateTimeFormatBuilder: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d745df12d7fd..2ca6cfe8c253 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3573,7 +3573,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz; sha256 = "7cd58a8cb53bf698407cc992f89e4d49bf3dc55baf4f3f00f1def63a0fff33ef"; }; - propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ]; + propagatedBuildInputs = [ ClassFactoryUtil DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; license = stdenv.lib.licenses.artistic2; From 56108b0593dec67c0b92cd6d253e98034b638e58 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:57 +0000 Subject: [PATCH 1174/2743] [cpan2nix] perlPackages.MooseXClone: 0.05 -> 0.06 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ca6cfe8c253..22a54d44b98d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9982,17 +9982,18 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXClone = buildPerlPackage { - name = "MooseX-Clone-0.05"; + MooseXClone = buildPerlModule { + name = "MooseX-Clone-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/MooseX-Clone-0.05.tar.gz; - sha256 = "11pbw3zdbcn54hrj6z74qisnmj9k4qliy6yjj9d71qndq3xg3x0f"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Clone-0.06.tar.gz; + sha256 = "19wd74dihybnz1lbbsqn0clwxzb6y0aa0i25a8zhajz7p5fq5myb"; }; - propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ]; + propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat namespaceautoclean ]; meta = { maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ ModuleBuildTiny ]; }; MooseXConfigFromFile = buildPerlPackage rec { From 78d83c15ca33be238eba3f53769c34a1d1fed742 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:57 +0000 Subject: [PATCH 1175/2743] [cpan2nix] perlPackages.MooseXTraits: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22a54d44b98d..3bd46d3c6b76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10277,14 +10277,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTraits = buildPerlPackage rec { + MooseXTraits = buildPerlModule rec { name = "MooseX-Traits-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "74afe0c4faf4e3b97c57f289437caa60becca34cd5821f489dd4cc9da4fbe29a"; }; - buildInputs = [ ModuleBuildTiny Moose MooseXRoleParameterized TestFatal TestRequires TestSimple ]; - propagatedBuildInputs = [ ClassLoad Moose SubExporter namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny MooseXRoleParameterized TestFatal TestRequires TestSimple13 ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Traits; description = "Automatically apply roles at object creation time"; From b9f4db2d45b502e5e40c8a98367258b56ce3f7c2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:57 +0000 Subject: [PATCH 1176/2743] [cpan2nix] perlPackages.MooseXTraitsPluggable: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3bd46d3c6b76..7a185da8c772 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10298,9 +10298,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; sha256 = "1jjqmcidy4kdgp5yffqqwxrsab62mbhbpvnzdy1rpwnb1savg5mb"; }; - buildInputs =[ TestException ]; - propagatedBuildInputs = - [ ClassMOP Moose namespaceautoclean ListMoreUtils ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ ListMoreUtils Moose namespaceautoclean ]; }; MooseXTypes = buildPerlModule rec { From 2f2b30f00109e768306e0535545475e4a21b02fd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:58 +0000 Subject: [PATCH 1177/2743] [cpan2nix] perlPackages.MooseXTypesPathClass: 0.06 -> 0.09 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7a185da8c772..447bdc751ed1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10380,17 +10380,18 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesPathClass = buildPerlPackage { - name = "MooseX-Types-Path-Class-0.06"; + MooseXTypesPathClass = buildPerlModule { + name = "MooseX-Types-Path-Class-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THEPLER/MooseX-Types-Path-Class-0.06.tar.gz; - sha256 = "02lw86r6pp6saiwc7ns890mlwq93vhkqyri3cipsfwhnhcap847g"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz; + sha256 = "0zpgwzxj6d9k2lbg6v6zd1bcbzjz2h336rm816krbblq6ssvm177"; }; - propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ]; + propagatedBuildInputs = [ MooseXTypes PathClass ]; meta = { description = "A Path::Class type library for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ ModuleBuildTiny TestNeeds ]; }; MooseXTypesPathTiny = buildPerlModule { From 2dd8cbf23b086c3e7568361e0b4cc251b63aca3b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:58 +0000 Subject: [PATCH 1178/2743] [cpan2nix] perlPackages.MouseXConfigFromFile: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 447bdc751ed1..a5ee6f267f08 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9931,7 +9931,7 @@ let self = _self // overrides; _self = with self; { sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; }; buildInputs = [ TestUseAllModules ]; - propagatedBuildInputs = [ Mouse MouseXTypesPathClass ]; + propagatedBuildInputs = [ MouseXTypesPathClass ]; meta = { description = "An abstract Mouse role for setting attributes from a configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 6a3e1434b2d9e7d247bf7323df623fa1e1901de2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:59 +0000 Subject: [PATCH 1179/2743] [cpan2nix] perlPackages.ArrayFIFO: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a5ee6f267f08..8c0b8a1de2e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -438,7 +438,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; sha256 = "8082b7ca456d02c7c862ba409cbd62a9cafdb8c5832f5d7fb1d37ba8698ee5b1"; }; - buildInputs = [ TestSpec ]; + buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/dwburke/perl-Array-FIFO; From cdf44bbee455a883e06a0b7246e6aab19d7b50e4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:57:59 +0000 Subject: [PATCH 1180/2743] [cpan2nix] perlPackages.DateTimeFormatISO8601: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c0b8a1de2e1..bb94b823c499 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3632,13 +3632,13 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatISO8601 = buildPerlPackage { + DateTimeFormatISO8601 = buildPerlModule { name = "DateTime-Format-ISO8601-0.08"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz; sha256 = "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ModuleBuild ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f026648ca892504257cb4ac9b708d43792861d91 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:00 +0000 Subject: [PATCH 1181/2743] [cpan2nix] perlPackages.DateTimeFormatMySQL: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bb94b823c499..8d1145d3853d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3674,13 +3674,13 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatMySQL = buildPerlPackage rec { + DateTimeFormatMySQL = buildPerlModule rec { name = "DateTime-Format-MySQL-0.06"; src = fetchurl { url = "mirror://cpan/authors/id/X/XM/XMIKEW/${name}.tar.gz"; sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ModuleBuild ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format MySQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 193fa2391ec169e19ada94c0bbae1fa6b509e306 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:00 +0000 Subject: [PATCH 1182/2743] [cpan2nix] perlPackages.DateTimeFormatPg: 0.16008 -> 0.16013 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8d1145d3853d..86fedf7cab8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3688,19 +3688,20 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatPg = buildPerlPackage { - name = "DateTime-Format-Pg-0.16008"; + DateTimeFormatPg = buildPerlModule { + name = "DateTime-Format-Pg-0.16013"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16008.tar.gz; - sha256 = "0mvh4wp54vh7mnhfd2lndzjfikjify98vaav6vwbraxlhjvwyn3x"; + url = mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz; + sha256 = "16siw0f3a0ilzv5fnfas5s9n92drjy271yf6qvmmpm0vwnjjx1kz"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format PostgreSQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ ModuleBuildTiny ]; }; DateTimeFormatStrptime = buildPerlPackage rec { From 5960c3194560ee3171216aafafd205071d007e75 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:01 +0000 Subject: [PATCH 1183/2743] [cpan2nix] perlPackages.DateTimeFormatSQLite: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 86fedf7cab8b..7c2196645a07 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3725,7 +3725,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CF/CFAERBER/${name}.tar.gz"; sha256 = "cc1f4e0ae1d39b0d4c3dddccfd7423c77c67a70950c4b5ecabf8ca553ab294b4"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format SQLite dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 2a2b6fca57ad5d1b4954c452e9069d1fbdef8ccd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:01 +0000 Subject: [PATCH 1184/2743] [cpan2nix] perlPackages.MooseXMethodAttributes: 0.28 -> 0.31 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7c2196645a07..f2e37ad44c87 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10120,13 +10120,13 @@ let self = _self // overrides; _self = with self; { }; MooseXMethodAttributes = buildPerlPackage { - name = "MooseX-MethodAttributes-0.28"; + name = "MooseX-MethodAttributes-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.28.tar.gz; - sha256 = "0srk85z6py9brw1jfvacd76y6219wycq3dj0wackbkmmbq04ln0g"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz; + sha256 = "1whd10w7bm3dwaj7gpgw40bci9vvb2zmxs4349ifji91hvinwqck"; }; - buildInputs = [ namespaceautoclean TestCheckDeps TestException ModuleMetadata ]; - propagatedBuildInputs = [ Moose MooseXTypes namespaceautoclean ]; + buildInputs = [ MooseXRoleParameterized TestFatal TestRequires ]; + propagatedBuildInputs = [ MooseXTypes ]; meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; description = "Code attribute introspection"; From 63391feef298fcb2fe14249c9ad81324c4d47e0d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:01 +0000 Subject: [PATCH 1185/2743] [cpan2nix] perlPackages.RoleHasMessage: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f2e37ad44c87..952d6d63c4d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12565,8 +12565,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz; sha256 = "1lylfvarjfy6wy34dfny3032pc6r33mjby5yzzhmxybg8zhdp9pn"; }; - buildInputs = [ Moose ]; - propagatedBuildInputs = [ Moose MooseXRoleParameterized StringErrf TryTiny namespaceclean ]; + propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; meta = { description = "A thing with a message method"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f514eb336c338d37f6f460cc192cd6bffb9fd4da Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:02 +0000 Subject: [PATCH 1186/2743] [cpan2nix] perlPackages.TestMockClass: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 952d6d63c4d1..ec9e11f1d2be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14560,14 +14560,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestMockClass = buildPerlPackage { + TestMockClass = buildPerlModule { name = "Test-Mock-Class-0.0303"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Mock-Class-0.0303.tar.gz; sha256 = "00pkfqcz7b34q1mvx15k46sbxs22zcrvrbv15rnbn2na57z54bnd"; }; - buildInputs = [ ClassInspector TestUnitLite ]; - propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ]; + buildInputs = [ ClassInspector TestAssert TestUnitLite ]; + propagatedBuildInputs = [ FatalException Moose namespaceclean ]; meta = with stdenv.lib; { description = "Simulating other classes"; license = licenses.lgpl2Plus; From 71ff96313138b01ff453881303c96da106868bf5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:02 +0000 Subject: [PATCH 1187/2743] [cpan2nix] perlPackages.TestPodLinkCheck: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec9e11f1d2be..5d20ee8adedf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14769,14 +14769,14 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ PodCoverage ]; }; - TestPodLinkCheck = buildPerlPackage rec { + TestPodLinkCheck = buildPerlModule rec { name = "Test-Pod-LinkCheck-0.008"; src = fetchurl { url = "mirror://cpan/authors/id/A/AP/APOCAL/${name}.tar.gz"; sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0"; }; - buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ CaptureTiny Moose TestPod podlinkcheck ]; + buildInputs = [ ModuleBuildTiny TestPod ]; + propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck ]; meta = { homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/; description = "Tests POD for invalid links"; From 864716e963ab0439881bc4e1871db4bc297ee0ac Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:03 +0000 Subject: [PATCH 1188/2743] [cpan2nix] perlPackages.MooseAutobox: 0.15 -> 0.16 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5d20ee8adedf..b87329c9c14e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9784,14 +9784,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseAutobox = buildPerlPackage { - name = "Moose-Autobox-0.15"; + MooseAutobox = buildPerlModule { + name = "Moose-Autobox-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Moose-Autobox-0.15.tar.gz; - sha256 = "0xcayrfm08dqas1mq8lnf8nxkvzdgcmv6xs5lqah17bxqxgznrl9"; + url = mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz; + sha256 = "0mbhd0p7gf6qdhaylldl0ahq59zghs0vd5n1iqcbfkj8ryj1sh4j"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ Moose SyntaxKeywordJunction autobox ]; + buildInputs = [ ModuleBuildTiny TestException ]; + propagatedBuildInputs = [ ListMoreUtils Moose SyntaxKeywordJunction autobox namespaceautoclean ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From fe30e143dc79755c1cffff9c408bd927e85123f1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:03 +0000 Subject: [PATCH 1189/2743] [cpan2nix] perlPackages.MooseXGetopt: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b87329c9c14e..07552effd873 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10042,14 +10042,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXGetopt = buildPerlPackage rec { + MooseXGetopt = buildPerlModule rec { name = "MooseX-Getopt-0.71"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "de18f8ea0a5650cbbdebecb8f4c028f5f951fc5698332f7b8e20c7874902c259"; }; - buildInputs = [ ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings self."if" ]; - propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings ]; + propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; meta = { homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; From 4136cb8b8f8bf46171c979891e750a537eab60b7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:04 +0000 Subject: [PATCH 1190/2743] [cpan2nix] perlPackages.MouseXSimpleConfig: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07552effd873..7faa1b033b87 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9877,8 +9877,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; }; - buildInputs = [ Mouse PathClass ]; - propagatedBuildInputs = [ ConfigAny Mouse MouseXConfigFromFile ]; + propagatedBuildInputs = [ ConfigAny MouseXConfigFromFile ]; meta = { description = "A Mouse role for setting attributes from a simple configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 938d6fd666e9b584923039adf117acf3da951396 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:04 +0000 Subject: [PATCH 1191/2743] [cpan2nix] perlPackages.MooseXTypesURI: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7faa1b033b87..0a8d4440a4ed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10457,14 +10457,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesURI = buildPerlPackage rec { + MooseXTypesURI = buildPerlModule rec { name = "MooseX-Types-URI-0.08"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "d310d20fa361fe2dff758236df87949cc7bf98e5cf3a7c79115365eccde6ccc1"; }; - buildInputs = [ ModuleBuildTiny Moose TestSimple ]; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass URI URIFromHash namespaceautoclean self."if" ]; + buildInputs = [ ModuleBuildTiny TestSimple13 ]; + propagatedBuildInputs = [ MooseXTypesPathClass URIFromHash ]; meta = { homepage = https://github.com/moose/MooseX-Types-URI; description = "URI related types and coercions for Moose"; From 1adbbc3136aca5a1477d54fb67e0513f1d8dc3dc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:04 +0000 Subject: [PATCH 1192/2743] [cpan2nix] perlPackages.TestRun: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0a8d4440a4ed..08c1cb6cfb79 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14863,14 +14863,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRun = buildPerlPackage rec { + TestRun = buildPerlModule rec { name = "Test-Run-0.0304"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323"; }; - buildInputs = [ ModuleBuild TestTrap ]; - propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MROCompat Moose MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; + buildInputs = [ TestTrap ]; + propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Base class to run standard TAP scripts"; From 8890444ab4442f64c4a9d5148f52d4b564995c3c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:05 +0000 Subject: [PATCH 1193/2743] [cpan2nix] perlPackages.XMLRSS: 1.57 -> 1.60 --- pkgs/top-level/perl-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 08c1cb6cfb79..402b88da867c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16880,14 +16880,13 @@ let self = _self // overrides; _self = with self; { }; }; - XMLRSS = buildPerlPackage { - name = "XML-RSS-1.57"; + XMLRSS = buildPerlModule { + name = "XML-RSS-1.60"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.57.tar.gz; - sha256 = "c540a1aa7445bf611635537015590575c90c2b07c19529537677a4bcf3a4e6ae"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.60.tar.gz; + sha256 = "4b3359878bb1a2bc06dae7ed17b00143a2b89c814b8b12f6e2780f35b1528677"; }; - buildInputs = [ TestManifest ]; - propagatedBuildInputs = [ DateTime DateTimeFormatMail DateTimeFormatW3CDTF HTMLParser XMLParser ]; + propagatedBuildInputs = [ DateTimeFormatMail DateTimeFormatW3CDTF XMLParser ]; meta = { homepage = http://perl-rss.sourceforge.net/; description = "Creates and updates RSS files"; From 6c3fb8c0844bcd62a87f386c5d69411d0373215a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:05 +0000 Subject: [PATCH 1194/2743] [cpan2nix] perlPackages.MouseXGetopt: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 402b88da867c..300e9fcef919 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9946,7 +9946,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; sha256 = "a6221043e7be3217ce56d2a6425a413d9cd28e2f52053995a6ceb118e8e963bc"; }; - buildInputs = [ ModuleBuildTiny Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { homepage = https://github.com/gfx/mousex-getopt; From 44a2ddc0f3fda21583b3c3a48a3aae92b2daaf4d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:05 +0000 Subject: [PATCH 1195/2743] [cpan2nix] perlPackages.PodElemental: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 300e9fcef919..814944739e49 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12132,7 +12132,7 @@ let self = _self // overrides; _self = with self; { sha256 = "43625cde7241fb174ad9c7eb45387fba410dc141d7de2323855eeab3590072c9"; }; buildInputs = [ TestDeep TestDifferences ]; - propagatedBuildInputs = [ ClassLoad MixinLinewise Moose MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods namespaceautoclean ]; + propagatedBuildInputs = [ MooseXTypes PodEventual StringRewritePrefix StringTruncate ]; meta = { homepage = https://github.com/rjbs/Pod-Elemental; description = "Work with nestable Pod elements"; From 814d007c735d8a21f1f1252bd268998db42fbaac Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:06 +0000 Subject: [PATCH 1196/2743] [cpan2nix] perlPackages.DateTimeFormatFlexible: 0.26 -> 0.30 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 814944739e49..2545342b8796 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3594,16 +3594,17 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatFlexible = buildPerlPackage { - name = "DateTime-Format-Flexible-0.26"; + name = "DateTime-Format-Flexible-0.30"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.26.tar.gz; - sha256 = "436efbc5e87cc385112e1c44336427fea32df670caf2b7d6dbb7a113ac6e693d"; + url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.30.tar.gz; + sha256 = "e7974e0492d7801682b400dd8e9a6fbfd8a56602942883cd7867a2008734cca4"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils ModulePluggable TestMockTime ]; + propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; meta = { description = "Flexibly parse strings and turn them into DateTime objects"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestException TestMockTime TestNoWarnings ]; }; DateTimeFormatHTTP = buildPerlModule rec { From 0f82f91914934f2d84507ae0ece8356c27c67ec3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:06 +0000 Subject: [PATCH 1197/2743] [cpan2nix] perlPackages.MooseXHasOptions: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2545342b8796..557a6f728b58 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10064,8 +10064,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz; sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68"; }; - buildInputs = [ Moose TestMost namespaceautoclean ]; - propagatedBuildInputs = [ ClassLoad ListMoreUtils PackageStash StringRewritePrefix ]; + buildInputs = [ Moose TestDeep TestDifferences TestException TestMost TestWarn namespaceautoclean ]; + propagatedBuildInputs = [ ClassLoad ListMoreUtils StringRewritePrefix ]; meta = { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; From 3c84345643d3b480674baf7548000d1e95f65ae9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:07 +0000 Subject: [PATCH 1198/2743] [cpan2nix] perlPackages.RTClientREST: 0.49 -> 0.51 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 557a6f728b58..a64d497828f8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12613,13 +12613,12 @@ let self = _self // overrides; _self = with self; { }; RTClientREST = buildPerlPackage { - name = "RT-Client-REST-0.49"; + name = "RT-Client-REST-0.51"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMITRI/RT-Client-REST-0.49.tar.gz; - sha256 = "832c84b4f19e97781e8902f123a659fdcfef68e0ed9cfe09055852e9d68f7afc"; + url = mirror://cpan/authors/id/D/DM/DMITRI/RT-Client-REST-0.51.tar.gz; + sha256 = "6a9df61c7f209f634613a8824393932d2faf2497b1c580ed8e5dd7794a36ea7d"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ CGI DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies HTTPMessage LWP ParamsValidate URI ]; + buildInputs = [ CGI DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies LWP ParamsValidate TestException ]; meta = { description = "Talk to RT installation using REST protocol"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 0751713b679ae70eb25dba864f9e0bd8fb0ccfa4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:07 +0000 Subject: [PATCH 1199/2743] [cpan2nix] perlPackages.MooseXTypesPathTiny: 0.006 -> 0.012 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a64d497828f8..b39275ed283f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10396,13 +10396,13 @@ let self = _self // overrides; _self = with self; { }; MooseXTypesPathTiny = buildPerlModule { - name = "MooseX-Types-Path-Tiny-0.006"; + name = "MooseX-Types-Path-Tiny-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.006.tar.gz; - sha256 = "0260c6fbbf84d411b145238ffd92a73f754bd92434448d9f78798fba0a2dfdd6"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz; + sha256 = "19eede02dd654e70f73e34cd7af0063765173bcaefeeff1bdbe21318ecfd9158"; }; - buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ModuleMetadata ]; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesStringlike PathTiny ]; + buildInputs = [ Filepushd ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ MooseXGetopt MooseXTypesStringlike PathTiny ]; meta = { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; From 1970d02559d9350b32defa416fe93e1b7ff0eeb7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:07 +0000 Subject: [PATCH 1200/2743] [cpan2nix] perlPackages.ConfigMVP: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b39275ed283f..0cd86ffe574f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2489,7 +2489,7 @@ let self = _self // overrides; _self = with self; { sha256 = "bfb5870452a12ead4d3fd485045d1fa92b2a11741c3b93b61eb43f3dcbd6099b"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ClassLoad ModulePluggable Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ]; + propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ]; meta = { homepage = https://github.com/rjbs/Config-MVP; description = "Multivalue-property package-oriented configuration"; From 2dd785cdcfbc8bee9918a578038834b4fbfb9017 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:08 +0000 Subject: [PATCH 1201/2743] [cpan2nix] perlPackages.MooseXConfigFromFile: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0cd86ffe574f..39a6e9048bbb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9997,14 +9997,14 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuildTiny ]; }; - MooseXConfigFromFile = buildPerlPackage rec { + MooseXConfigFromFile = buildPerlModule rec { name = "MooseX-ConfigFromFile-0.14"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "9ad343cd9f86d714be9b54b9c68a443d8acc6501b6ad6b15e9ca0130b2e96f08"; }; - buildInputs = [ ModuleBuildTiny Moose MooseXGetopt TestDeep TestFatal TestRequires TestWithoutModule self."if" ]; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestRequires TestWithoutModule ]; + propagatedBuildInputs = [ MooseXTypesPathTiny ]; meta = { homepage = https://github.com/moose/MooseX-ConfigFromFile; description = "An abstract Moose role for setting attributes from a configfile"; From 2d05d1eb53160d4c39722814dddbdb6ee18bf2f2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:08 +0000 Subject: [PATCH 1202/2743] [cpan2nix] perlPackages.FinanceQuote: cleanup --- pkgs/top-level/perl-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39a6e9048bbb..5153ceffd8d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6135,9 +6135,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7"; }; - propagatedBuildInputs = [ - CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP LWPProtocolHttps MozillaCA - DateCalc DateTime JSON ]; + propagatedBuildInputs = [ CGI DateTime HTMLTableExtract JSON LWPProtocolHttps ]; meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; From c66b216d353e045dec44bd38f8726d2016f15e89 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:09 +0000 Subject: [PATCH 1203/2743] [cpan2nix] perlPackages.MooseXRunnable: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5153ceffd8d7..3b29c07402bc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10212,14 +10212,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXRunnable = buildPerlPackage rec { + MooseXRunnable = buildPerlModule rec { name = "MooseX-Runnable-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "40d8fd1b5524ae965965a1f144d7a0a0c850594c524402b2319b24d5c4af1199"; }; - buildInputs = [ ModuleBuildTiny MooseXGetopt TestFatal TestSimple TestTableDriven ]; - propagatedBuildInputs = [ ClassLoad ListSomeUtils Moose MooseXTypes MooseXTypesPathTiny ParamsUtil PathTiny namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 TestTableDriven ]; + propagatedBuildInputs = [ ListSomeUtils MooseXTypesPathTiny ]; meta = { homepage = https://github.com/moose/MooseX-Runnable; description = "Tag a class as a runnable application"; From a44287fb869aacc3d17357a54bafdb5ee8422f0a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:09 +0000 Subject: [PATCH 1204/2743] [cpan2nix] perlPackages.PerlPrereqScanner: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b29c07402bc..7eaa72da0a25 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12071,8 +12071,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; - buildInputs = [ PPI TryTiny ]; - propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Perl-PrereqScanner; description = "A tool to scan your Perl code for its prerequisites"; From 5bc2f88cc8a9c35ba39fefb7bbe77359d20fff47 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:10 +0000 Subject: [PATCH 1205/2743] [cpan2nix] perlPackages.ConfigMVPReaderINI: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7eaa72da0a25..d63fcad1b94e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2504,7 +2504,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "0iflnsh0sgihff3ra8sr7awiiscmqvrp1anaskkwksqi6yzidab9"; }; - propagatedBuildInputs = [ ConfigINI ConfigMVP Moose ]; + propagatedBuildInputs = [ ConfigINI ConfigMVP ]; meta = { homepage = https://github.com/rjbs/Config-MVP-Reader-INI; description = "An MVP config reader for .ini files"; From e31323ed2faccaaba8715ad9735c9bd660e5ac27 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:10 +0000 Subject: [PATCH 1206/2743] [cpan2nix] perlPackages.TestRunCmdLine: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d63fcad1b94e..7b4625368e00 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14875,14 +14875,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunCmdLine = buildPerlPackage rec { + TestRunCmdLine = buildPerlModule rec { name = "Test-Run-CmdLine-0.0131"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18"; }; - buildInputs = [ ModuleBuild TestTrap ]; - propagatedBuildInputs = [ Moose MooseXGetopt TestRun UNIVERSALrequire YAMLLibYAML ]; + buildInputs = [ TestRun TestTrap ]; + propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; meta = { homepage = http://web-cpan.berlios.de/modules/Test-Run/; description = "Analyze tests from the command line using Test::Run"; From 1f3464ec8505ad80b0e5362d69a228f370029cb5 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:10 +0000 Subject: [PATCH 1207/2743] [cpan2nix] perlPackages.MooseXDaemonize: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7b4625368e00..a7f91d5231b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10011,14 +10011,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXDaemonize = buildPerlPackage rec { + MooseXDaemonize = buildPerlModule rec { name = "MooseX-Daemonize-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "111f391221d00f8b09cdcc6c806ab114324cf7f529d12f627fb97d054da42225"; }; - buildInputs = [ DevelCheckOS ModuleBuildTiny Moose TestFatal ]; - propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass SubExporter namespaceautoclean ]; + buildInputs = [ DevelCheckOS ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ MooseXGetopt MooseXTypesPathClass ]; meta = { homepage = https://github.com/moose/MooseX-Daemonize; description = "Role for daemonizing your Moose based application"; From d0f3d0123801fc4f9d3e229a5338b8ce0c36cabf Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:11 +0000 Subject: [PATCH 1208/2743] [cpan2nix] perlPackages.TestRunPluginAlternateInterpreters: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a7f91d5231b1..1f17953d87bf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14890,14 +14890,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginAlternateInterpreters = buildPerlPackage rec { + TestRunPluginAlternateInterpreters = buildPerlModule rec { name = "Test-Run-Plugin-AlternateInterpreters-0.0124"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3"; }; - buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ Moose ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Define different interpreters for different test scripts with Test::Run"; From ff06a27e603043d2ee850608c64d261b71a14483 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:11 +0000 Subject: [PATCH 1209/2743] [cpan2nix] perlPackages.TestRunPluginBreakOnFailure: cleanup --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f17953d87bf..0216b371be72 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14905,14 +14905,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginBreakOnFailure = buildPerlPackage rec { - name = "Test-Run-Plugin-BreakOnFailure-v0.0.5"; + TestRunPluginBreakOnFailure = buildPerlModule rec { + name = "Test-Run-Plugin-BreakOnFailure-0.0.5"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz; sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430"; }; - buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ Moose ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Stop processing the entire test suite"; From 60f6db5496500272f47c395660bcb0b1471df7fc Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:12 +0000 Subject: [PATCH 1210/2743] [cpan2nix] perlPackages.TestRunPluginColorFileVerdicts: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0216b371be72..a1a13f57ebfd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14920,14 +14920,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginColorFileVerdicts = buildPerlPackage rec { + TestRunPluginColorFileVerdicts = buildPerlModule rec { name = "Test-Run-Plugin-ColorFileVerdicts-0.0124"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ] ++ moreInputs; + buildInputs = [ TestRun TestRunCmdLine TestTrap ]; + propagatedBuildInputs = [ Moose ]; moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { From bea5b1cbce7ab628338305c33b6914d5c2e11464 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:12 +0000 Subject: [PATCH 1211/2743] [cpan2nix] perlPackages.TestRunPluginColorSummary: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a1a13f57ebfd..ccbf0b19dad6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14943,8 +14943,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ TestRun TestRunCmdLine ] ++ moreInputs; + buildInputs = [ TestRun TestRunCmdLine TestTrap ]; moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { From 25ac1feb3629a6ada6078365eee10c50dde04238 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:13 +0000 Subject: [PATCH 1212/2743] [cpan2nix] perlPackages.TestRunPluginTrimDisplayedFilenames: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ccbf0b19dad6..22b28b48ffeb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14953,14 +14953,14 @@ let self = _self // overrides; _self = with self; { }; }; - TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec { + TestRunPluginTrimDisplayedFilenames = buildPerlModule rec { name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5"; }; - buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ]; - propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]; + buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; + propagatedBuildInputs = [ Moose ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Trim the first components"; From 846ed9831055f6687056997be2a6e249b23c2308 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:13 +0000 Subject: [PATCH 1213/2743] [cpan2nix] perlPackages.DBIxClassSchemaLoader: 0.07047 -> 0.07049 dependencies: perlPackages.curry: init at 1.001000 --- pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22b28b48ffeb..3fa3941402fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2608,6 +2608,18 @@ let self = _self // overrides; _self = with self; { }; }; + curry = buildPerlPackage rec { + name = "curry-1.001000"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz; + sha256 = "1m2n3w67cskh8ic6vf6ik0fmap9zma875kr5rhyznr1041wn064b"; + }; + meta = { + description = "Create automatic curried method call closures for any class or object"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + constantdefer = pkgs.perlPackages.constant-defer; constant-defer = buildPerlPackage rec { @@ -4108,13 +4120,13 @@ let self = _self // overrides; _self = with self; { }; DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.07047"; + name = "DBIx-Class-Schema-Loader-0.07049"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "6671fb3afbb1b4f3eb5905f34fb47ce18b29af3e055e479b06c09424bbc1421b"; + sha256 = "e869cdde1378cfebccf229b0cde58d2746dc6080b75f56d072aa5f1fce76a764"; }; - buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ]; - propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ]; + buildInputs = [ DBDSQLite TestDeep TestDifferences TestException TestWarn ]; + propagatedBuildInputs = [ CarpClan ClassUnload DBIxClass DataDump StringToIdentifierEN curry ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From bf819a8e1a06418b8c932096235100b1330e327e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:13 +0000 Subject: [PATCH 1214/2743] [cpan2nix] perlPackages.NetCoverArtArchive: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3fa3941402fe..ee6958290e64 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10763,7 +10763,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CY/CYCLES/Net-CoverArtArchive-1.02.tar.gz; sha256 = "1lfx8lrjgb3s11fcm243jp5sghngd9svkgmg7xmssmj34q4f49ap"; }; - buildInputs = [ FileFindRule TryTiny ]; + buildInputs = [ FileFindRule ]; propagatedBuildInputs = [ JSONAny LWP Moose namespaceautoclean ]; meta = { homepage = https://github.com/metabrainz/CoverArtArchive; From b4214a7407d0c0c79980aef95c20f4ef9db8a1af Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:14 +0000 Subject: [PATCH 1215/2743] [cpan2nix] perlPackages.PodElementalPerlMunger: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee6958290e64..57c3860210fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12156,8 +12156,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; sha256 = "09fd3b5d53119437a01dced66b42eafdcd53895b3c32a2b0f781f36fda0f665b"; }; - buildInputs = [ Moose PodElemental ]; - propagatedBuildInputs = [ Moose PPI PodElemental namespaceautoclean ]; + buildInputs = [ TestDifferences ]; + propagatedBuildInputs = [ PPI PodElemental ]; meta = { homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; description = "A thing that takes a string of Perl and rewrites its documentation"; From 148e83c0809c31e1c27fa23554af4ec5bf97e457 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:14 +0000 Subject: [PATCH 1216/2743] [cpan2nix] perlPackages.TaskTestRunAllPlugins: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57c3860210fd..11e685e81257 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13764,14 +13764,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Plack PSGI ModuleBuildTiny ]; }; - TaskTestRunAllPlugins = buildPerlPackage rec { + TaskTestRunAllPlugins = buildPerlModule rec { name = "Task-Test-Run-AllPlugins-0.0105"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9"; }; - buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; + buildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; meta = { homepage = http://web-cpan.shlomifish.org/modules/Test-Run/; description = "Specifications for installing all the Test::Run"; From 7575b4984f426f283cd66427eef917e8e68e3a3e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:15 +0000 Subject: [PATCH 1217/2743] [cpan2nix] perlPackages.MooseXTypesDateTime: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 11e685e81257..75a4961f0801 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10344,14 +10344,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesDateTime = buildPerlPackage rec { + MooseXTypesDateTime = buildPerlModule rec { name = "MooseX-Types-DateTime-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "b89fa26636f6a17eaa3868b4514340472b68bbdc2161a1d79a22a1bf5b1d39c6"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal TestSimple ]; - propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean self."if" ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; + propagatedBuildInputs = [ DateTime MooseXTypes ]; meta = { homepage = https://github.com/moose/MooseX-Types-DateTime; description = "DateTime related constraints and coercions for Moose"; From ed21d9535aeca0e7e48528bb2796b6ec9fb09b04 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:15 +0000 Subject: [PATCH 1218/2743] [cpan2nix] perlPackages.DateTimeXEasy: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 75a4961f0801..54eb9b8e911b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3808,8 +3808,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; }; - buildInputs = [ TestMost ModuleBuild ]; - propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; + buildInputs = [ TestMost ]; + propagatedBuildInputs = [ DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; doCheck = false; meta = { description = "Parse a date/time string using the best method available"; From 00b7c883eb5ec743661ff69f02b0eff221853a02 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:16 +0000 Subject: [PATCH 1219/2743] [cpan2nix] perlPackages.MooseXTypesStructured: 0.30 -> 0.36 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 54eb9b8e911b..5b87d91197c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10451,14 +10451,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesStructured = buildPerlPackage { - name = "MooseX-Types-Structured-0.30"; + MooseXTypesStructured = buildPerlModule { + name = "MooseX-Types-Structured-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.30.tar.gz; - sha256 = "0svfgbyzwdipywh7bfp954hncm8ihfr8xpppcyy59wr1inx2f55c"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.36.tar.gz; + sha256 = "0mrxc00sid7526c6brrnjr6288468sszic3wazij71v3z59bdka3"; }; - buildInputs = [ DateTime MooseXTypesDateTime TestFatal ]; - propagatedBuildInputs = [ DevelPartialDump Moose MooseXTypes SubExporter ]; + buildInputs = [ DateTime ModuleBuildTiny MooseXTypesDateTime TestFatal TestNeeds ]; + propagatedBuildInputs = [ DevelPartialDump MooseXTypes ]; meta = { homepage = https://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; From 60321a67e3f70886c78d8864205b580d2000cbb1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:16 +0000 Subject: [PATCH 1220/2743] [cpan2nix] perlPackages.AppSqitch: 0.9996 -> 0.9997 --- pkgs/top-level/perl-packages.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5b87d91197c3..dc9144637558 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -336,23 +336,14 @@ let self = _self // overrides; _self = with self; { }; AppSqitch = buildPerlModule rec { - version = "0.9996"; + version = "0.9997"; name = "App-Sqitch-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "864edde554e7cd6578e8fe2a4c17ea8eda82da878cdfd00fd9fb3c53f696fc1e"; + sha256 = "985ade1a4181bef776016a287194711051e79c7a3c18f1ee1ec47e22ccf319d2"; }; - buildInputs = [ - CaptureTiny PathClass TestDeep TestDir TestException - TestFile TestFileContents TestMockModule TestNoWarnings - ]; - propagatedBuildInputs = [ - Clone ConfigGitLike DBI DateTime - DevelStackTrace EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 - IPCSystemSimple ListMoreUtils Moo PathClass PerlIOutf8_strict StringFormatter - StringShellQuote SubExporter TemplateTiny Throwable TryTiny TypeTiny URI - URIdb libintlperl namespaceautoclean - ]; + buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = http://sqitch.org/; From 56373036e4a656d5bfdfa02f68fb5127540082ad Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:17 +0000 Subject: [PATCH 1221/2743] [cpan2nix] perlPackages.FormValidatorSimple: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dc9144637558..aea438d84ab8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6188,12 +6188,13 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/L/LY/LYOKATO/${name}.tar.gz"; sha256 = "fc3a63dc54b962d74586070176adaf5be869f09b561bb30f5fd32ef531792666"; }; - propagatedBuildInputs = [ CGI ClassAccessor ClassDataAccessor ClassDataInheritable ClassInspector DateCalc DateTimeFormatStrptime EmailValid EmailValidLoose ListMoreUtils MailTools TieIxHash UNIVERSALrequire YAML ]; + propagatedBuildInputs = [ ClassAccessor ClassDataAccessor DateCalc DateTimeFormatStrptime EmailValidLoose ListMoreUtils TieIxHash UNIVERSALrequire YAML ]; meta = { description = "Validation with simple chains of constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; }; + buildInputs = [ CGI ]; }; FreezeThaw = buildPerlPackage { From 2c030c0f46c861462b9cb09689eed2175db173be Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:17 +0000 Subject: [PATCH 1222/2743] [cpan2nix] perlPackages.MooseXAppCmd: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aea438d84ab8..4a9037a1d7fb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9828,14 +9828,14 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; }; - MooseXAppCmd = buildPerlPackage rec { + MooseXAppCmd = buildPerlModule rec { name = "MooseX-App-Cmd-0.32"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "2e3bbf7283a4bee72d91d26eb204436030992bbe55cbd35ec33a546f16f973ff"; }; buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; - propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXGetopt MooseXNonMoose namespaceautoclean ]; + propagatedBuildInputs = [ AppCmd MooseXGetopt MooseXNonMoose ]; meta = { homepage = https://github.com/moose/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; From 0748a2eb52da342ee15a0af2ac4137266281c896 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:18 +0000 Subject: [PATCH 1223/2743] [cpan2nix] perlPackages.X11XCB: 0.16 -> 0.17 --- pkgs/top-level/perl-packages.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a9037a1d7fb..0c34d5b6656e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16695,18 +16695,14 @@ let self = _self // overrides; _self = with self; { }; X11XCB = buildPerlPackage rec { - name = "X11-XCB-0.16"; + name = "X11-XCB-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; - sha256 = "14mnvr1001py2z1n43l18yaw0plwvjg5pcsyc7k81sa0amw8ahzw"; + sha256 = "12qyf98s5hbybmh0mblpz50c00i68srq73w5rw31m2dhclj8n96q"; }; AUTOMATED_TESTING = false; - buildInputs = [ - ExtUtilsDepends ExtUtilsPkgConfig DataDump - XMLSimple XMLDescent TestDeep TestException - pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm - ]; - propagatedBuildInputs = [ XSObjectMagic Mouse MouseXNativeTraits TryTiny ]; + buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; + propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; doCheck = false; # requires an X server meta = { From 770cf76dbdb7e6f934b6fed1750942c5c28e0cc8 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:18 +0000 Subject: [PATCH 1224/2743] [cpan2nix] perlPackages.TestMagpie: 0.05 -> 0.11 dependencies: perlPackages.UNIVERSALref: init at 0.14 --- pkgs/top-level/perl-packages.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c34d5b6656e..d265bc3f9f4e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15499,18 +15499,19 @@ let self = _self // overrides; _self = with self; { }; TestMagpie = buildPerlPackage { - name = "Test-Magpie-0.05"; + name = "Test-Magpie-0.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CY/CYCLES/Test-Magpie-0.05.tar.gz; - sha256 = "0a0c6vcj92spy6ngfdqn9yfym37jwxlds7hlw6xphkdmcklynh0b"; + url = mirror://cpan/authors/id/S/ST/STEVENL/Test-Magpie-0.11.tar.gz; + sha256 = "1c4iy35yg3fa9mrc4phmpz46fkihl6yic6a13fpcxyd3xafd5zhm"; }; - propagatedBuildInputs = [ aliased DevelPartialDump ListAllUtils Moose MooseXParamsValidate MooseXTypes MooseXTypesStructured namespaceautoclean SetObject SubExporter TestFatal ]; + propagatedBuildInputs = [ MooseXTypesStructured SetObject UNIVERSALref aliased ]; meta = { description = "Spy on objects to achieve test doubles (mock testing)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; + buildInputs = [ TestFatal Throwable ]; }; TestMinimumVersion = buildPerlPackage rec { @@ -16199,6 +16200,19 @@ let self = _self // overrides; _self = with self; { }; }; + UNIVERSALref = buildPerlPackage rec { + name = "UNIVERSAL-ref-0.14"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JJ/JJORE/UNIVERSAL-ref-0.14.tar.gz; + sha256 = "1ar8dfj90nn52cb8c6yyj4bi6ya8hk2f2sl0a5q7pmchj321bn1m"; + }; + propagatedBuildInputs = [ BUtils ]; + meta = { + description = "Turns ref() into a multimethod"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + UNIVERSALrequire = buildPerlPackage rec { name = "UNIVERSAL-require-0.18"; src = fetchurl { From cc9eaa64f4efbc3b1274ca627847cf355cfe7983 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:19 +0000 Subject: [PATCH 1225/2743] [cpan2nix] perlPackages.VMEC2SecurityCredentialCache: cleanup dependencies: perlPackages.VMEC2: 1.28 -> 1.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d265bc3f9f4e..a026169a7350 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16494,12 +16494,12 @@ let self = _self // overrides; _self = with self; { }; VMEC2 = buildPerlModule rec { - name = "VM-EC2-1.28"; + name = "VM-EC2-1.25"; src = fetchurl { url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; - sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; + sha256 = "cc8002965e3a4919527a85a84100cfc3703165a449ade29e95f4e31889fbd9ad"; }; - propagatedBuildInputs = [ AnyEventCacheDNS AnyEventHTTP JSON StringApprox XMLSimple ]; + propagatedBuildInputs = [ AnyEventHTTP JSON StringApprox XMLSimple ]; meta = { description = "Perl interface to Amazon EC2, Virtual Private Cloud, Elastic Load Balancing, Autoscaling, and Relational Database services"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f69cc6de3c47c92cb73b3d27b7eae7b71d3ef85b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:19 +0000 Subject: [PATCH 1226/2743] [cpan2nix] perlPackages.GitPurePerl: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a026169a7350..5c82183a157b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6327,7 +6327,7 @@ let self = _self // overrides; _self = with self; { sha256 = "987c74366cc4c37ee084050f985fa254359c89c12507f5b8bfc6607de538d5a8"; }; buildInputs = [ Testutf8 ]; - propagatedBuildInputs = [ ArchiveExtract ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest Moose MooseXStrictConstructor MooseXTypesPathClass namespaceautoclean ]; + propagatedBuildInputs = [ ArchiveExtract ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest MooseXStrictConstructor MooseXTypesPathClass ]; doCheck = false; meta = { description = "A Pure Perl interface to Git repositories"; From ad57cf3a974076ab842471ca6f8cf9dd5c5d655d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:20 +0000 Subject: [PATCH 1227/2743] [cpan2nix] perlPackages.Plack: 1.0039 -> 1.0047 dependencies: perlPackages.AuthenSimplePasswd: init at 0.6 perlPackages.HTTPEntityParser: init at 0.21 perlPackages.HTTPMultiPartParser: init at 0.02 perlPackages.HTTPServerSimplePSGI: init at 0.16 perlPackages.IOHandleUtil: init at 0.01 perlPackages.LWPProtocolhttp10: init at 6.03 perlPackages.TestMockTimeHiRes: init at 0.08 perlPackages.WWWFormUrlEncoded: init at 0.24 perlPackages.asa: init at 1.03 --- pkgs/top-level/perl-packages.nix | 127 ++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5c82183a157b..a9f49a53076d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -97,6 +97,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuildTiny ]; }; + asa = buildPerlPackage rec { + name = "asa-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/asa-1.03.tar.gz; + sha256 = "1w97m0gf3n9av61d0qcw7d1i1rac4gm0fd2ba5wyh53df9d7p0i2"; + }; + meta = { + description = "Lets your class/object say it works like something else"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlienTidyp = buildPerlModule rec { name = "Alien-Tidyp-${version}"; version = "1.4.7"; @@ -607,6 +619,19 @@ let self = _self // overrides; _self = with self; { }; }; + AuthenSimplePasswd = buildPerlModule rec { + name = "Authen-Simple-Passwd-0.6"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz; + sha256 = "1ckl2ry9r5nb1rcn1ik2l5b5pp1i3g4bmllsmzb0zpwy4lvbqmfg"; + }; + propagatedBuildInputs = [ AuthenSimple ]; + meta = { + description = "Simple Passwd authentication"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + autobox = buildPerlPackage rec { name = "autobox-2.85"; src = fetchurl { @@ -7140,6 +7165,21 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPEntityParser = buildPerlModule rec { + name = "HTTP-Entity-Parser-0.21"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.21.tar.gz; + sha256 = "1n7qhyscllialds5jsk1k8x2vmfbjvisa3342as5x15hpm13wkf1"; + }; + propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; + buildInputs = [ HTTPMessage ModuleBuildTiny ]; + meta = { + description = "PSGI compliant HTTP Entity Parser"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/HTTP-Entity-Parser"; + }; + }; + HTTPDAV = buildPerlPackage rec { name = "HTTP-DAV-0.48"; src = fetchurl { @@ -7199,6 +7239,19 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPMultiPartParser = buildPerlPackage rec { + name = "HTTP-MultiPartParser-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz; + sha256 = "04hbs0b1lzv2c8dqfcc9qjm5akh25fn40903is36zlalkwaxmpay"; + }; + buildInputs = [ TestDeep ]; + meta = { + description = "HTTP MultiPart Parser"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPNegotiate = buildPerlPackage { name = "HTTP-Negotiate-6.01"; src = fetchurl { @@ -7295,6 +7348,20 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPServerSimplePSGI = buildPerlPackage rec { + name = "HTTP-Server-Simple-PSGI-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz; + sha256 = "1fhx2glycd66m4l4m1gja81ixq8nh4r5g9wjhhkrffq4af2cnz2z"; + }; + propagatedBuildInputs = [ HTTPServerSimple ]; + meta = { + description = "PSGI handler for HTTP::Server::Simple"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/HTTP-Server-Simple-PSGI"; + }; + }; + I18NCollate = buildPerlPackage { name = "I18N-Collate-1.02"; src = fetchurl { @@ -7480,6 +7547,17 @@ let self = _self // overrides; _self = with self; { }; }; + IOHandleUtil = buildPerlPackage rec { + name = "IO-Handle-Util-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/IO-Handle-Util-0.01.tar.gz; + sha256 = "1g7746gh3y9a9df3xb3l504czgwrrzr7lp87j7jwm2mklarrig6k"; + }; + propagatedBuildInputs = [ IOString SubExporter asa ]; + meta = { + }; + }; + IOInteractive = buildPerlPackage { name = "IO-Interactive-1.022"; src = fetchurl { @@ -8654,6 +8732,19 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequiresInternet ]; }; + LWPProtocolhttp10 = buildPerlPackage rec { + name = "LWP-Protocol-http10-6.03"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz; + sha256 = "1lxq40qfwfai9ryhzhsdnycc4189c8kfl43rf7qq34fmz48skzzk"; + }; + propagatedBuildInputs = [ LWP ]; + meta = { + description = "Legacy HTTP/1.0 support for LWP"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LWPUserAgent = LWP; LWPUserAgentDetermined = buildPerlPackage { @@ -11707,13 +11798,13 @@ let self = _self // overrides; _self = with self; { }; Plack = buildPerlPackage rec { - name = "Plack-1.0039"; + name = "Plack-1.0047"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "d24a572e88644c7d39c7e6ff1af005b728dec94a878cf06d9027ab7d1a2fd0a9"; + sha256 = "322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561"; }; - buildInputs = [ FileShareDirInstall TestRequires ]; - propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPBody HTTPHeadersFast HTTPMessage HashMultiValue StreamBuffered TestTCP TryTiny URI ]; + buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; + propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPEntityParser HTTPHeadersFast HTTPMessage TryTiny ]; meta = { homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; @@ -14640,6 +14731,20 @@ let self = _self // overrides; _self = with self; { }; }; + TestMockTimeHiRes = buildPerlModule rec { + name = "Test-MockTime-HiRes-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz; + sha256 = "1hfykcjrls6ywgbd49w29c7apj3nq4wlyx7jzpd2glwmz2pgfjaz"; + }; + buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; + meta = { + description = "Replaces actual time with simulated high resolution time"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tarao/perl5-Test-MockTime-HiRes"; + }; + }; + TestMojibake = buildPerlPackage { name = "Test-Mojibake-1.3"; src = fetchurl { @@ -16552,6 +16657,20 @@ let self = _self // overrides; _self = with self; { doCheck = false; # performs network access }; + WWWFormUrlEncoded = buildPerlModule rec { + name = "WWW-Form-UrlEncoded-0.24"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.24.tar.gz; + sha256 = "04fh54zgmrlhrmdaqs2yrwqmqwk9hd737z7rnbbd438l36skn7vd"; + }; + buildInputs = [ JSON ]; + meta = { + description = "parser and builder for application/x-www-form-urlencoded"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/WWW-Form-UrlEncoded"; + }; + }; + WWWMechanize = buildPerlPackage { name = "WWW-Mechanize-1.88"; src = fetchurl { From 8fabe0bd2163a9f25b6eca481145152da345e8c2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:20 +0000 Subject: [PATCH 1228/2743] [cpan2nix] perlPackages.PlackMiddlewareFixMissingBodyInRedirect: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9f49a53076d..8460b22b0111 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11833,7 +11833,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SW/SWEETKID/${name}.tar.gz"; sha256 = "6c22d069f5a57ac206d4659b28b8869bb9270640bb955efddd451dcc58cdb391"; }; - buildInputs = [ HTTPMessage Plack ]; propagatedBuildInputs = [ HTMLParser Plack ]; meta = { homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect; From 4d9bb43f62bce759bb62f6f6458fa5d2ff0548f9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:21 +0000 Subject: [PATCH 1229/2743] [cpan2nix] perlPackages.PlackMiddlewareMethodOverride: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8460b22b0111..93525af613f1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11847,7 +11847,6 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; sha256 = "2b4a6e67006f97a2b4cf7980900f6a8ababb1cf97d6597319f9897ada3c555bc"; }; - buildInputs = [ Plack URI ]; propagatedBuildInputs = [ Plack ]; meta = { description = "Override REST methods to Plack apps via POST"; From 4a5d7fd38b8606f73a6023f99f0cc94ced24b868 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:21 +0000 Subject: [PATCH 1230/2743] [cpan2nix] perlPackages.PlackMiddlewareRemoveRedundantBody: 0.05 -> 0.07 --- 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 93525af613f1..0c4783db7ac0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11855,12 +11855,11 @@ let self = _self // overrides; _self = with self; { }; PlackMiddlewareRemoveRedundantBody = buildPerlPackage { - name = "Plack-Middleware-RemoveRedundantBody-0.05"; + name = "Plack-Middleware-RemoveRedundantBody-0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.05.tar.gz; - sha256 = "a0676e1c792bea7f25f1d901bee59054d35012d5ea8cd42529d336143fa87cd8"; + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.07.tar.gz; + sha256 = "64b841d5d74b4c4a595b85749d69297f4f5f5c0829a6e99e0099f05dd69be3c3"; }; - buildInputs = [ HTTPMessage Plack ]; propagatedBuildInputs = [ Plack ]; meta = { homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody; From 2d27c1d34913bdb83578ce7f8ffc0167f250f6d1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:22 +0000 Subject: [PATCH 1231/2743] [cpan2nix] perlPackages.PlackTestExternalServer: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c4783db7ac0..f91dd9ae1d25 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11887,8 +11887,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "5baf5c57fe0c06412deec9c5abe7952ab8a04f8c47b4bbd8e9e9982268903ed0"; }; - buildInputs = [ HTTPMessage Plack TestTCP ]; - propagatedBuildInputs = [ LWP URI ]; + buildInputs = [ Plack TestSharedFork TestTCP ]; + propagatedBuildInputs = [ LWP ]; meta = { homepage = https://github.com/perl-catalyst/Plack-Test-ExternalServer; description = "Run HTTP tests on external live servers"; From ef8eb79a5ebb77fd83d5fe1dd924a93f996bc45e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:23 +0000 Subject: [PATCH 1232/2743] [cpan2nix] perlPackages.ConfigVersioned: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f91dd9ae1d25..f3ddccf7198b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2554,8 +2554,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz; sha256 = "bc9a4ae3738bd89f86a07bca673627ca3c92ba969737cd6dbc7ab7ad17cd2348"; }; - buildInputs = [ DateTime PathClass ]; - propagatedBuildInputs = [ ConfigStd GitPurePerl Moose ]; + propagatedBuildInputs = [ ConfigStd GitPurePerl ]; doCheck = false; meta = { description = "Simple, versioned access to configuration data"; From 2c2ab865d26345d18f020e84f9175d5e8e33495a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:23 +0000 Subject: [PATCH 1233/2743] [cpan2nix] perlPackages.DBIxClassHelpers: 2.032001 -> 2.033004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f3ddccf7198b..b66ba7427e1a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4107,13 +4107,13 @@ let self = _self // overrides; _self = with self; { }; DBIxClassHelpers = buildPerlPackage rec { - name = "DBIx-Class-Helpers-2.032001"; + name = "DBIx-Class-Helpers-2.033004"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "c7af96d17e11f0957b7187bb6002341a7b130bb79b61f6d91b39178ef000eff5"; + sha256 = "14bc7adda3b30867311717faa11a4534bceda3061229dc2533647c1906d8784c"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; - propagatedBuildInputs = [ CarpClan DBIxClass DBIxClassCandy DBIxIntrospector LinguaENInflect ModuleRuntime Moo SafeIsa StringCamelCase SubExporterProgressive TextBrew TryTiny namespaceclean ]; + propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ]; meta = { homepage = https://github.com/frioux/DBIx-Class-Helpers; description = "Simplify the common case stuff for DBIx::Class"; From edd4573991558bcf1dcaa92043d3efd14fdb8e33 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:24 +0000 Subject: [PATCH 1234/2743] [cpan2nix] perlPackages.Starman: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b66ba7427e1a..9f3a59e51a9f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13168,8 +13168,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-${version}.tar.gz"; sha256 = "1sbb5rb3vs82rlh1fjkgkcmj5pj62b4y9si4ihh45sl9m8c2qxx5"; }; - buildInputs = [ LWP ModuleBuildTiny TestRequires ]; - propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ]; + buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; + propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ]; doCheck = false; # binds to various TCP ports meta = { inherit version; From a77e420e43e8d5c1fa5efaa67fcc6f824e79dc1f Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:24 +0000 Subject: [PATCH 1235/2743] [cpan2nix] perlPackages.PlackMiddlewareDebug: 0.16 -> 0.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9f3a59e51a9f..2db067774640 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11812,13 +11812,13 @@ let self = _self // overrides; _self = with self; { }; PlackMiddlewareDebug = buildPerlModule rec { - name = "Plack-Middleware-Debug-0.16"; + name = "Plack-Middleware-Debug-0.17"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "e1e4ff6e9b246fe67547ebac8a3e83d4ae77873f889d1f63411c21c8c6bf96d5"; + sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; - propagatedBuildInputs = [ ClassMethodModifiers DataDump FileShareDir Plack TextMicroTemplate ]; + propagatedBuildInputs = [ ClassMethodModifiers DataDump DataDumperConcise Plack TextMicroTemplate ]; meta = { homepage = https://github.com/miyagawa/Plack-Middleware-Debug; description = "Display information about the current request/response"; From 64a35d4993dbe5864b2112e03f42659bad9b0c8b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:25 +0000 Subject: [PATCH 1236/2743] [cpan2nix] perlPackages.TestWWWMechanizePSGI: 0.35 -> 0.38 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2db067774640..8751f367198b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15349,13 +15349,13 @@ let self = _self // overrides; _self = with self; { }; TestWWWMechanizePSGI = buildPerlPackage { - name = "Test-WWW-Mechanize-PSGI-0.35"; + name = "Test-WWW-Mechanize-PSGI-0.38"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-PSGI-0.35.tar.gz; - sha256 = "1hih8s49zf38bisvhnhzrrj0zwyiivkrbs7nmmdqm1qqy27wv7pc"; + url = mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.38.tar.gz; + sha256 = "0fsh2i05kf1kfavv2r9kmnjl7qlyqrd11ikc0qcqzzxsqzzjkg9r"; }; - buildInputs = [ TestPod CGI ]; - propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; + buildInputs = [ CGI TestLongString TestWWWMechanize ]; + propagatedBuildInputs = [ Plack ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 4ca40b04cfcb706299c36b752e29380bc91294a3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:26 +0000 Subject: [PATCH 1237/2743] [cpan2nix] perlPackages.Starlet: 0.28 -> 0.31 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8751f367198b..931939997ab0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13149,12 +13149,12 @@ let self = _self // overrides; _self = with self; { }; Starlet = buildPerlPackage { - name = "Starlet-0.28"; + name = "Starlet-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.28.tar.gz; - sha256 = "245f606cdc8acadbe12e7e56dfa0752a8e8daa9a094373394fc17a45f5dde850"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz; + sha256 = "b9603b8e62880cb4582f6a7939eafec65e6efd3d900f2c7dd342e5f4c68d62d8"; }; - buildInputs = [ LWP TestTCP ]; + buildInputs = [ LWP TestSharedFork TestTCP ]; propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ]; meta = { description = "A simple, high-performance PSGI/Plack HTTP server"; From 91aeec7df6d46cfb0ecb668f5b833c0dbd947871 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:26 +0000 Subject: [PATCH 1238/2743] [cpan2nix] perlPackages.MooseXTypesDateTimeMoreCoercions: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 931939997ab0..2c7b64a3ba93 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10441,14 +10441,14 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesDateTimeMoreCoercions = buildPerlPackage rec { + MooseXTypesDateTimeMoreCoercions = buildPerlModule rec { name = "MooseX-Types-DateTime-MoreCoercions-0.15"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796"; }; - buildInputs = [ ModuleBuildTiny TestFatal TestSimple ]; - propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean self."if" ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; + propagatedBuildInputs = [ DateTimeXEasy MooseXTypesDateTime TimeDurationParse ]; meta = { homepage = https://github.com/moose/MooseX-Types-DateTime-MoreCoercions; description = "Extensions to MooseX::Types::DateTime"; From 8825e5f9bc21e5ef3aed30cd99aa88cca2e0583c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:27 +0000 Subject: [PATCH 1239/2743] [cpan2nix] perlPackages.HTMLFormHandler: 0.40057 -> 0.40068 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2c7b64a3ba93..af38090f495e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6886,15 +6886,15 @@ let self = _self // overrides; _self = with self; { }; HTMLFormHandler = buildPerlPackage { - name = "HTML-FormHandler-0.40057"; + name = "HTML-FormHandler-0.40068"; src = fetchurl { - url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40057.tar.gz; - sha256 = "1hn9shhbsi4pdp396ia2hky3i0imnxgwvhy57gp0jjhy5qyvafvm"; + url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40068.tar.gz; + sha256 = "09z8rpb3avdd8984rm6j6gd2igbzjz9rc0ycig654mqjlgfphyzb"; }; # a single test is failing on perl 5.20 doCheck = false; - buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle ]; - propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ]; + buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle TestWarn ]; + propagatedBuildInputs = [ CryptBlowfish CryptCBC DataClone DateTimeFormatStrptime EmailValid HTMLTree JSONMaybeXS MooseXGetopt MooseXTypesCommon MooseXTypesLoadableClass aliased ]; meta = { description = "HTML forms using Moose"; maintainers = with maintainers; [ ]; From 4e9973ef98c34a2c299e008eb77078eb999c8ffa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:27 +0000 Subject: [PATCH 1240/2743] [cpan2nix] perlPackages.Connector: 1.22 -> 1.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index af38090f495e..d230fe495d3b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2563,12 +2563,12 @@ let self = _self // overrides; _self = with self; { }; Connector = buildPerlPackage rec { - name = "Connector-1.22"; + name = "Connector-1.26"; src = fetchurl { url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/${name}.tar.gz"; - sha256 = "aa178d1865817ad2dea5c79645c8e6420ca2cfb951f20c98b5154307de219016"; + sha256 = "9852c2b43a8201996530deb1d3aa7fda18abe1ce24c80fbdebd7981cd2f05c45"; }; - buildInputs = [ ConfigMerge ConfigStd ConfigVersioned CryptSSLeay DBDSQLite DBI IOSocketSSL LWPProtocolhttps LWPUserAgent TemplateToolkit YAML ]; + buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; prePatch = '' # Attempts to use network. From cca94b2b19afbe5f4fc7890a943eb00fbd305355 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:28 +0000 Subject: [PATCH 1241/2743] [cpan2nix] perlPackages.PodWeaver: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d230fe495d3b..b49151d296a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12435,7 +12435,7 @@ let self = _self // overrides; _self = with self; { sha256 = "5af25b29a55783e495a9df5ef6293240e2c9ab02764613d79f1ed50b12dec5ae"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; - propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli PodElemental ]; meta = { homepage = https://github.com/rjbs/Pod-Weaver; description = "Weave together a Pod document from an outline"; From cf8c6fe7001b551dc21163c4e36ac4ddc5b855eb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:28 +0000 Subject: [PATCH 1242/2743] [cpan2nix] perlPackages.Workflow: 1.42 -> 1.45 --- pkgs/top-level/perl-packages.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b49151d296a1..0311915fb2e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16747,16 +16747,14 @@ let self = _self // overrides; _self = with self; { }; }; - Workflow = buildPerlPackage rec { - name = "Workflow-1.42"; + Workflow = buildPerlModule rec { + name = "Workflow-1.45"; src = fetchurl { url = "mirror://cpan/authors/id/J/JO/JONASBN/${name}.tar.gz"; - sha256 = "0d93wc9cgw862x9x5zmbx6l6326dhq8py25yqpw7nqym6yphisnc"; + sha256 = "0w814z4j85gghzqnbxzsr60m8dbqc02yi7137sq58lhbsfshmvhx"; }; - buildInputs = [ DBDMock ListMoreUtils TestException ]; - propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI - DateTime DateTimeFormatStrptime ExceptionClass FileSlurp LogDispatch - Log4Perl XMLSimple DataUUID ]; + buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; + propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; meta = { homepage = https://github.com/jonasbn/perl-workflow; description = "Simple, flexible system to implement workflows"; From 7c1127b1854922a984649f30d4497987009c4951 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:29 +0000 Subject: [PATCH 1243/2743] [cpan2nix] perlPackages.TaskFreecellSolverTesting: v0.0.10 -> v0.0.11 dependencies: perlPackages.CodeTidyAll: init at 0.69 perlPackages.FileZglob: init at 0.11 perlPackages.SpecioLibraryPathTiny: init at 0.04 perlPackages.TestClassMost: init at 0.08 perlPackages.librelative: init at 0.002 --- pkgs/top-level/perl-packages.nix | 78 ++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0311915fb2e8..dd3445ad3243 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2328,6 +2328,21 @@ let self = _self // overrides; _self = with self; { }; }; + CodeTidyAll = buildPerlPackage rec { + name = "Code-TidyAll-0.69"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.69.tar.gz; + sha256 = "0pl5pnq9flcak1m9rvqxbygk9vp5ma7dymr90waaazpdqrx4zyhk"; + }; + propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich FileZglob Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; + buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; + meta = { + description = "Engine for tidyall, your all-in-one code tidier and validator"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://metacpan.org/release/Code-TidyAll"; + }; + }; + # For backwards compatibility. CommonSense = self.commonsense; @@ -6132,6 +6147,18 @@ let self = _self // overrides; _self = with self; { }; }; + FileZglob = buildPerlPackage rec { + name = "File-Zglob-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz; + sha256 = "16v61rn0yimpv5kp6b20z2f1c93n5kpsyjvr0gq4w2dc43gfvc8w"; + }; + meta = { + description = "Extended globs."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Filter = buildPerlPackage { name = "Filter-1.58"; src = fetchurl { @@ -8109,6 +8136,19 @@ let self = _self // overrides; _self = with self; { }; }; + librelative = buildPerlPackage rec { + name = "lib-relative-0.002"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-0.002.tar.gz; + sha256 = "1i51qa22lgm1gpakn1vy4sf574fsmz141dx90i6pq84w9hc9xbry"; + }; + meta = { + description = "Add paths relative to the current file to @INC"; + license = with stdenv.lib.licenses; [ artistic2 ]; + homepage = "https://github.com/Grinnz/lib-relative"; + }; + }; + libxml_perl = buildPerlPackage rec { name = "libxml-perl-0.08"; src = fetchurl { @@ -13031,6 +13071,21 @@ let self = _self // overrides; _self = with self; { }; }; + SpecioLibraryPathTiny = buildPerlPackage rec { + name = "Specio-Library-Path-Tiny-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz; + sha256 = "0cyfx8gigsgisdwynjamh8jkpad23sr8v6a98hq285zmibm16s7g"; + }; + propagatedBuildInputs = [ PathTiny Specio ]; + buildInputs = [ Filepushd TestFatal ]; + meta = { + description = "Path::Tiny types and coercions for Specio"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "http://metacpan.org/release/Specio-Library-Path-Tiny"; + }; + }; + Spiffy = buildPerlPackage rec { name = "Spiffy-0.46"; src = fetchurl { @@ -13820,13 +13875,13 @@ let self = _self // overrides; _self = with self; { }; TaskFreecellSolverTesting = buildPerlModule rec { - name = "Task-FreecellSolver-Testing-v0.0.10"; + name = "Task-FreecellSolver-Testing-0.0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "ce8960c0250a9947ae5b4485e8a3e807bb2d87b1120096464b3d2247d2c194ff"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz; + sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; - buildInputs = [ ModuleBuild perl ]; - propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify Inline InlineC ListMoreUtils Moo MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace YAMLLibYAML ]; + buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; + propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; meta = { homepage = https://metacpan.org/release/Task-FreecellSolver-Testing; description = "Install the CPAN dependencies of the Freecell Solver test suite"; @@ -14330,6 +14385,19 @@ let self = _self // overrides; _self = with self; { }; }; + TestClassMost = buildPerlModule rec { + name = "Test-Class-Most-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz; + sha256 = "1zvx9hil0mg0pnb8xfa4m0xgjpvh8s5gnbyprq3xwpdsdgcdwk33"; + }; + buildInputs = [ TestClass TestDeep TestDifferences TestException TestMost TestWarn ]; + meta = { + description = "Test Classes the easy way"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestCleanNamespaces = buildPerlPackage { name = "Test-CleanNamespaces-0.22"; src = fetchurl { From 18d3b269d42e8217b49f1198956d583d1596b21b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:30 +0000 Subject: [PATCH 1244/2743] [cpan2nix] perlPackages.HTMLScrubber: 0.15 -> 0.17 dependencies: perlPackages.ConfigIdentity: init at 0.0019 perlPackages.ConstFast: init at 0.014 perlPackages.LocaleMOFile: init at 0.08 perlPackages.LocaleTextDomainOO: init at 1.033 perlPackages.LocaleTextDomainOOUtil: init at 3.008 perlPackages.LocaleUtilsPlaceholderBabelFish: init at 0.006 perlPackages.LocaleUtilsPlaceholderMaketext: init at 1.005 perlPackages.LocaleUtilsPlaceholderNamed: init at 1.004 perlPackages.Mo: init at 0.40 perlPackages.MooXCmd: init at 0.017 perlPackages.MooXLocalePassthrough: init at 0.001 perlPackages.MooXLocaleTextDomainOO: init at 0.001 perlPackages.MooXOptions: init at 4.103 perlPackages.MooXSingleton: init at 1.20 perlPackages.MooXStrictConstructor: init at 0.010 perlPackages.PAUSEPermissions: init at 0.17 perlPackages.ParseLocalDistribution: init at 0.19 perlPackages.ParsePMFile: init at 0.41 perlPackages.TestHexDifferences: init at 1.001 perlPackages.TestPAUSEPermissions: init at 0.06 perlPackages.TieSub: init at 1.001 --- pkgs/top-level/perl-packages.nix | 303 ++++++++++++++++++++++++++++++- 1 file changed, 300 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd3445ad3243..92e904c4b97e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2485,6 +2485,21 @@ let self = _self // overrides; _self = with self; { }; }; + ConfigIdentity = buildPerlPackage rec { + name = "Config-Identity-0.0019"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz; + sha256 = "1a0jx12pxwpbnkww4xg4lav8j6ls89hrdimhj4a697k56zdhnli9"; + }; + propagatedBuildInputs = [ FileHomeDir IPCRun ]; + buildInputs = [ TestDeep ]; + meta = { + description = "Load (and optionally decrypt via GnuPG) user/pass identity information "; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/dagolden/Config-Identity"; + }; + }; + ConfigIniFiles = buildPerlModule rec { name = "Config-IniFiles-2.95"; src = fetchurl { @@ -2595,6 +2610,20 @@ let self = _self // overrides; _self = with self; { }; }; + ConstFast = buildPerlModule rec { + name = "Const-Fast-0.014"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz; + sha256 = "1nwlldgrx86yn7y6a53cqgvzm2ircsvxg1addahlcy6510x9a1gq"; + }; + propagatedBuildInputs = [ SubExporterProgressive ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; + meta = { + description = "Facility for creating read-only scalars, arrays, and hashes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConvertASN1 = buildPerlPackage rec { name = "Convert-ASN1-0.27"; src = fetchurl { @@ -7025,12 +7054,13 @@ let self = _self // overrides; _self = with self; { }; HTMLScrubber = buildPerlPackage rec { - name = "HTML-Scrubber-0.15"; + name = "HTML-Scrubber-0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/PODMASTER/${name}.tar.gz"; - sha256 = "0xb5zj67y2sjid9bs3yfm81rgi91fmn38wy1ryngssw6vd92ijh2"; + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.17.tar.gz; + sha256 = "06p7w4zd42b2yh541mlzyqj40lwmvvn3fyqi8big4mf34la7m2jm"; }; propagatedBuildInputs = [ HTMLParser ]; + buildInputs = [ PodCoverageTrustPod TestCPANMeta TestDifferences TestEOL TestKwalitee TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage ]; }; HTMLTableExtract = buildPerlPackage rec { @@ -8453,6 +8483,20 @@ let self = _self // overrides; _self = with self; { LANG="C"; }; + LocaleMOFile = buildPerlPackage rec { + name = "Locale-MO-File-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.08.tar.gz; + sha256 = "1flpk7jdn5cp7pld3f0vi3v5527p76jp1fqp4pzrhhqjlhyp3im4"; + }; + propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestHexDifferences TestNoWarnings ]; + meta = { + description = "Locale::MO::File - Write or read gettext MO files."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LocaleMaketext = buildPerlPackage { name = "Locale-Maketext-1.28"; src = fetchurl { @@ -8521,6 +8565,76 @@ let self = _self // overrides; _self = with self; { }; }; + LocaleTextDomainOO = buildPerlPackage rec { + name = "Locale-TextDomain-OO-1.033"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.033.tar.gz; + sha256 = "1nkjncwa5kg7avrly0ldfxijgkrjgwj3rggb2r6mi72h427xwjic"; + }; + propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::TextDomain::OO - Perl OO Interface to Uniforum Message Translation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleTextDomainOOUtil = buildPerlPackage rec { + name = "Locale-TextDomain-OO-Util-3.008"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-3.008.tar.gz; + sha256 = "1kj633apv20ah5nazjlig4w25l021lvmlb6a6fhwrixis08mdqxb"; + }; + propagatedBuildInputs = [ namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::TextDomain::OO::Util - Lexicon utils"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleUtilsPlaceholderBabelFish = buildPerlPackage rec { + name = "Locale-Utils-PlaceholderBabelFish-0.006"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz; + sha256 = "1k54njj8xz19c8bjb0iln1mnfq55j3pvbff7samyrab3k59h071f"; + }; + propagatedBuildInputs = [ HTMLParser MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderBabelFish - Utils to expand BabelFish palaceholders"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleUtilsPlaceholderMaketext = buildPerlPackage rec { + name = "Locale-Utils-PlaceholderMaketext-1.005"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz; + sha256 = "1srlbp8sfnzhndgh9s4d8bglpzw0vb8gnab9r8r8sggkv15n0a2h"; + }; + propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderMaketext - Utils to expand maketext placeholders"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LocaleUtilsPlaceholderNamed = buildPerlPackage rec { + name = "Locale-Utils-PlaceholderNamed-1.004"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz; + sha256 = "1gd68lm5w5c6ndcilx91rn84zviqyrk3fx92jjx5khxm76i8xmvg"; + }; + propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderNamed - Utils to expand named placeholders"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + locallib = buildPerlPackage rec { name = "local-lib-2.000024"; src = fetchurl { @@ -9341,6 +9455,19 @@ let self = _self // overrides; _self = with self; { }; }; + Mo = buildPerlPackage rec { + name = "Mo-0.40"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz; + sha256 = "1fff81awg9agfawf3wxx0gpf6vgav8w920rmxsbjg30z75943lli"; + }; + meta = { + description = "Micro Objects. Mo is less."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/ingydotnet/mo-pm"; + }; + }; + MockConfig = buildPerlPackage rec { name = "Mock-Config-0.03"; src = fetchurl { @@ -9893,6 +10020,79 @@ let self = _self // overrides; _self = with self; { }; }; + MooXLocalePassthrough = buildPerlPackage rec { + name = "MooX-Locale-Passthrough-0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz; + sha256 = "04h5xhqdvydd4xk9ckb6a79chn0ygf915ix55vg1snmba9z841bs"; + }; + propagatedBuildInputs = [ Moo ]; + meta = { + description = "provide API used in translator modules without translating"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-Locale-Passthrough"; + }; + }; + + MooXLocaleTextDomainOO = buildPerlPackage rec { + name = "MooX-Locale-TextDomain-OO-0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz; + sha256 = "0g8pwj45ccqrzvs9cqyhw29nm68vai1vj46ad39rajnqzp7m53jv"; + }; + propagatedBuildInputs = [ LocaleTextDomainOO MooXLocalePassthrough ]; + meta = { + description = "provide API used in translator modules without translating"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-Locale-TextDomain-OO"; + }; + }; + + MooXOptions = buildPerlPackage rec { + name = "MooX-Options-4.103"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz; + sha256 = "0v9j0wxx4f6z6lrmdqf2k084b2c2f2jbvh86pwib0vgjz1sdbyad"; + }; + propagatedBuildInputs = [ GetoptLongDescriptive MROCompat MooXLocalePassthrough PathClass UnicodeLineBreak strictures ]; + buildInputs = [ Mo MooXCmd MooXLocaleTextDomainOO Moose TestTrap ]; + meta = { + description = "Explicit Options eXtension for Object Class"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/celogeek/MooX-Options"; + }; + }; + + MooXSingleton = buildPerlModule rec { + name = "MooX-Singleton-1.20"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz; + sha256 = "03i1wfag279ldjjkwi9gvpfs8fgi05my47icq5ggi66yzxpn5mzp"; + }; + propagatedBuildInputs = [ RoleTiny ]; + buildInputs = [ Moo ]; + meta = { + description = "turn your Moo class into singleton"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://search.cpan.org/dist/MooX-Singleton"; + }; + }; + + MooXStrictConstructor = buildPerlPackage rec { + name = "MooX-StrictConstructor-0.010"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz; + sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr"; + }; + propagatedBuildInputs = [ Moo strictures ]; + buildInputs = [ TestFatal ]; + meta = { + description = "Make your Moo-based object constructors blow up on unknown attributes."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-StrictConstructor"; + }; + }; + MooXTypesMooseLike = buildPerlPackage rec { name = "MooX-Types-MooseLike-0.29"; src = fetchurl { @@ -9989,6 +10189,21 @@ let self = _self // overrides; _self = with self; { }; }; + MooXCmd = buildPerlPackage rec { + name = "MooX-Cmd-0.017"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz; + sha256 = "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl"; + }; + propagatedBuildInputs = [ ListMoreUtils ModulePluggable Moo PackageStash ParamsUtil RegexpCommon ]; + buildInputs = [ CaptureTiny ]; + meta = { + description = "Giving an easy Moo style way to make command organized CLI apps"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://metacpan.org/release/MooX-Cmd"; + }; + }; + MooXlate = buildPerlPackage { name = "MooX-late-0.015"; src = fetchurl { @@ -11508,6 +11723,21 @@ let self = _self // overrides; _self = with self; { }; }; + PAUSEPermissions = buildPerlPackage rec { + name = "PAUSE-Permissions-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz; + sha256 = "021ink414w4mdk6rd54cc1f23kfqg0zk4njx4ngr0bw3wc6r4kks"; + }; + propagatedBuildInputs = [ FileHomeDir HTTPDate MooXOptions TimeDurationParse ]; + buildInputs = [ PathTiny ]; + meta = { + description = "interface to PAUSE's module permissions file (06perms.txt)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/PAUSE-Permissions"; + }; + }; + Parent = buildPerlPackage { name = "parent-0.236"; src = fetchurl { @@ -11543,6 +11773,33 @@ let self = _self // overrides; _self = with self; { }; }; + ParseLocalDistribution = buildPerlPackage rec { + name = "Parse-LocalDistribution-0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz; + sha256 = "17p92nj4k3acrqqjnln1j5x8hbra9jkx5hdcybrq37ld9qnc62vb"; + }; + propagatedBuildInputs = [ ParsePMFile ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "parses local .pm files as PAUSE does"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ParsePMFile = buildPerlPackage rec { + name = "Parse-PMFile-0.41"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.41.tar.gz; + sha256 = "1ffv9msp4xjfaylay2zfqangxhgyr5xk993k5n1k08hh6qagq8df"; + }; + buildInputs = [ ExtUtilsMakeMakerCPANfile ]; + meta = { + description = "parses .pm file as PAUSE does"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ParseRecDescent = buildPerlModule rec { name = "Parse-RecDescent-1.967015"; src = fetchurl { @@ -14639,6 +14896,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestHexDifferences = buildPerlPackage rec { + name = "Test-HexDifferences-1.001"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz; + sha256 = "18lh6shpfx567gjikrid4hixydgv1hi3mycl20qzq2j2vpn4afd6"; + }; + propagatedBuildInputs = [ SubExporter TextDiff ]; + buildInputs = [ TestDifferences TestNoWarnings ]; + meta = { + }; + }; + TestHTTPServerSimple = buildPerlPackage { name = "Test-HTTP-Server-Simple-0.11"; src = fetchurl { @@ -14894,6 +15163,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CaptureTiny ]; }; + TestPAUSEPermissions = buildPerlPackage rec { + name = "Test-PAUSE-Permissions-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-PAUSE-Permissions-0.06.tar.gz; + sha256 = "1rspdxwfr1mxjrpcsd4asd5q1qpmiyw0sm7g008yy1gsz6i2yl88"; + }; + propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "tests module permissions in your distribution"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestPerlCritic = buildPerlModule rec { name = "Test-Perl-Critic-1.04"; src = fetchurl { @@ -16177,6 +16460,20 @@ let self = _self // overrides; _self = with self; { }; }; + TieSub = buildPerlPackage rec { + name = "Tie-Sub-1.001"; + src = fetchurl { + url = mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz; + sha256 = "1cgiyj85hhw2m4x2iv4zgaj3hzf3fghircpcfqmjndni4r4a0wgg"; + }; + propagatedBuildInputs = [ ParamsValidate ]; + buildInputs = [ ModuleBuild TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Tie::Sub - Tying a subroutine, function or method to a hash"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TieToObject = buildPerlPackage { name = "Tie-ToObject-0.03"; src = fetchurl { From dc73a01adb1c9b1c0ae4819c60b5481656829335 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:31 +0000 Subject: [PATCH 1245/2743] [cpan2nix] perlPackages.CatalystRuntime: 5.90104 -> 5.90117 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 92e904c4b97e..7ac00700f430 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1327,13 +1327,13 @@ let self = _self // overrides; _self = with self; { }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90104"; + name = "Catalyst-Runtime-5.90117"; src = fetchurl { url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "91d551944beb3a0ae8635c78d5f2e1583ef1e7873d5c8ee407e2f64380ad870b"; + sha256 = "fe12d82c4e0704d1f15946651554ca069abccb6afbe5d9de315e97d90c0c92a3"; }; - buildInputs = [ DataDump HTTPMessage IOstringy JSONMaybeXS TestFatal TypeTiny ]; - propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable ClassLoad DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI HashMultiValue JSONMaybeXS LWP ListMoreUtils MROCompat ModulePluggable Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StreamBuffered StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI URIws namespaceautoclean namespaceclean ]; + buildInputs = [ TestFatal TypeTiny ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable DataDump HTTPBody HTTPRequestAsCGI ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; From 7ab7e69d18e64cfc8149636ab0c3989ef7bd0e80 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:32 +0000 Subject: [PATCH 1246/2743] [cpan2nix] perlPackages.CatalystComponentInstancePerContext: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7ac00700f430..881935f2a0ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1209,7 +1209,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz"; sha256 = "7f63f930e1e613f15955c9e6d73873675c50c0a3bc2a61a034733361ed26d271"; }; - propagatedBuildInputs = [ CatalystRuntime Moose ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Moose role to create only one instance of component per context"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 8982dad5d9e59f343d53b065586319d30f0c21f7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:32 +0000 Subject: [PATCH 1247/2743] [cpan2nix] perlPackages.CatalystDispatchTypeRegex: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 881935f2a0ca..09f213117293 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1268,7 +1268,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MG/MGRIMES/${name}.tar.gz"; sha256 = "06jq1lmpq88rmp9zik5gqczg234xac0hiyc3l698iif7zsgcyb80"; }; - propagatedBuildInputs = [ Moose TextSimpleTable ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Regex DispatchType"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c1052f68197b689dae34ae6592ea576fd2b3ddba Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:33 +0000 Subject: [PATCH 1248/2743] [cpan2nix] perlPackages.CatalystPluginCache: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 09f213117293..1dff2783a3d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1401,7 +1401,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1q23aipvrl888h06ldr4mmjbykz0j4rqwipxg1jv094kki2fspr9"; }; buildInputs = [ TestDeep TestException ]; - propagatedBuildInputs = [ CatalystRuntime MROCompat TaskWeaken ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Flexible caching support for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From e84d0d432cd859394c218b47508dd9f9539c621c Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:33 +0000 Subject: [PATCH 1249/2743] [cpan2nix] perlPackages.CatalystPluginStackTrace: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1dff2783a3d8..9e5f2cdd4291 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1592,7 +1592,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz; sha256 = "1b2ksz74cpigxqzf63rddar3vfmnbpwpdcbs11v0ml89pb8ar79j"; }; - propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Display a stack trace on the debug screen"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From ee6fe42030409fcd848abcc0c6bebb109ce028d9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:34 +0000 Subject: [PATCH 1250/2743] [cpan2nix] perlPackages.CatalystPluginStaticSimple: 0.33 -> 0.36 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9e5f2cdd4291..c56505fea9b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1601,14 +1601,13 @@ let self = _self // overrides; _self = with self; { }; CatalystPluginStaticSimple = buildPerlPackage rec { - name = "Catalyst-Plugin-Static-Simple-0.33"; + name = "Catalyst-Plugin-Static-Simple-0.36"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "1h8f12bhzh0ssq9gs8r9g3hqn8zn2k0q944vc1vm8j81bns16msy"; + url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz; + sha256 = "0m4l627p2fvzr4i6sgdxhdvsx4wpa6qmaibsbxlg5x5yjs7k7drn"; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; - propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes - namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime MIMETypes ]; meta = { description = "Make serving static pages painless"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 202b0570390e13c49b4b19a08beda95a0f286488 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:34 +0000 Subject: [PATCH 1251/2743] [cpan2nix] perlPackages.CatalystActionREST: 1.20 -> 1.21 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c56505fea9b1..4b49cd4c4438 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1149,13 +1149,13 @@ let self = _self // overrides; _self = with self; { }; CatalystActionREST = buildPerlPackage rec { - name = "Catalyst-Action-REST-1.20"; + name = "Catalyst-Action-REST-1.21"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.20.tar.gz; - sha256 = "c0470541ec0016b837db3186ed77915813c8b856b941db89b86db8602e31ead6"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.21.tar.gz; + sha256 = "ccf81bba5200d3a0ad6901f923af173a3d4416618aea08a6938baaffdef4cb20"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ CatalystRuntime ClassInspector JSONMaybeXS MROCompat ModulePluggable Moose ParamsValidate URIFind namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime URIFind ]; meta = { description = "Automated REST Method Dispatching"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From adf9324aec271656937918333823712c87fbb7b7 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:35 +0000 Subject: [PATCH 1252/2743] [cpan2nix] perlPackages.CatalystPluginStatusMessage: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4b49cd4c4438..1c21b794bf0c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1620,7 +1620,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz"; sha256 = "649c894ab16f9f48ada8f9cc599a7ecbb8891ab3761ff6fd510520c6de407c1f"; }; - propagatedBuildInputs = [ CatalystRuntime SubName strictures ]; + propagatedBuildInputs = [ CatalystRuntime strictures ]; meta = { description = "Handle passing of status messages between screens of a web application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From fbdd420fb1451eafb4c8bdf6c3f0631dc48a383e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:35 +0000 Subject: [PATCH 1253/2743] [cpan2nix] perlPackages.CatalystXRoleApplicator: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1c21b794bf0c..b64f6068442d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1702,8 +1702,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/H/HD/HDP/${name}.tar.gz"; sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ MooseXRelatedClassRoles CatalystRuntime ]; + propagatedBuildInputs = [ CatalystRuntime MooseXRelatedClassRoles ]; }; CatalystTraitForRequestProxyBase = buildPerlPackage { From bd784e989903df076c4c2a20ad9ce31195b327aa Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:36 +0000 Subject: [PATCH 1254/2743] [cpan2nix] perlPackages.CatalystActionRenderView: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b64f6068442d..9102983b4cd1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1140,8 +1140,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "8565203950a057d43ecd64e9593715d565c2fbd8b02c91f43c53b2111acd3948"; }; - buildInputs = [ HTTPRequestAsCGI ]; - propagatedBuildInputs = [ CatalystRuntime DataVisitor MROCompat ]; + propagatedBuildInputs = [ CatalystRuntime DataVisitor ]; meta = { description = "Sensible default end action"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 056c895e0948595ee022337939b007036b9a6314 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:37 +0000 Subject: [PATCH 1255/2743] [cpan2nix] perlPackages.CatalystTraitForRequestProxyBase: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9102983b4cd1..5e6dab2e8a45 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1710,8 +1710,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz; sha256 = "a7bf0faa7e12ca5df625d9f5fc710f11bfd16ba5385837e48d42b3d286c9710a"; }; - buildInputs = [ CatalystRuntime HTTPMessage ]; - propagatedBuildInputs = [ CatalystXRoleApplicator Moose URI namespaceautoclean ]; + buildInputs = [ CatalystRuntime CatalystXRoleApplicator HTTPMessage ]; + propagatedBuildInputs = [ Moose URI namespaceautoclean ]; meta = { description = "Replace request base with value passed by HTTP proxy"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 5153579203a51e3cdfd562adae500c4de07da0ea Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:37 +0000 Subject: [PATCH 1256/2743] [cpan2nix] perlPackages.CatalystPluginConfigLoader: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5e6dab2e8a45..ce6ff487d0ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1444,7 +1444,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"; }; - propagatedBuildInputs = [CatalystRuntime DataVisitor ConfigAny MROCompat]; + propagatedBuildInputs = [ CatalystRuntime ConfigAny DataVisitor ]; }; CatalystPluginFormValidator = buildPerlPackage rec { From 39083eeba3adb0ad26c1c9520e51d948bec24fce Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:38 +0000 Subject: [PATCH 1257/2743] [cpan2nix] perlPackages.DistZilla: 4.300039 -> 6.011 dependencies: perlPackages.ArchiveTarWrapper: init at 0.23 perlPackages.LogMessageSimple: init at 0.10 perlPackages.TermUI: init at 0.46 --- pkgs/top-level/perl-packages.nix | 48 ++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ce6ff487d0ae..0b321ee2dfb5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -503,6 +503,18 @@ let self = _self // overrides; _self = with self; { }; }; + ArchiveTarWrapper = buildPerlPackage rec { + name = "Archive-Tar-Wrapper-0.23"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSCHILLI/Archive-Tar-Wrapper-0.23.tar.gz; + sha256 = "1ykl0r2dwa93l0nxrjgs8qqkwjxn44qbvxpmrwiy269na4x3j0jc"; + }; + propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; + meta = { + description = "API wrapper around the 'tar' utility"; + }; + }; + ArchiveZip = buildPerlPackage { name = "Archive-Zip-1.60"; src = fetchurl { @@ -4560,13 +4572,13 @@ let self = _self // overrides; _self = with self; { }; DistZilla = buildPerlPackage { - name = "Dist-Zilla-4.300039"; + name = "Dist-Zilla-6.011"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-4.300039.tar.gz; - sha256 = "10cighwsqp53kbk2gwlnl9m18sbs7ijr2v37vwca9qxbscy2yr21"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.011.tar.gz; + sha256 = "0cai08gzrvf9mkqsj3b8vhcwxaxs30h4gx0wffq8c5dja9fhzjxs"; }; - buildInputs = [ FileShareDirInstall SoftwareLicense TestFatal TestFileShareDir TestScript ]; - propagatedBuildInputs = [ AppCmd CPANUploader ClassLoad ConfigINI ConfigMVP ConfigMVPReaderINI DataSection DateTime FileCopyRecursive FileFindRule FileHomeDir FileShareDir FileShareDirInstall Filepushd HashMergeSimple JSON ListAllUtils ListMoreUtils LogDispatchouli Moose MooseAutobox MooseXLazyRequire MooseXRoleParameterized MooseXSetOnce MooseXTypes MooseXTypesPathClass MooseXTypesPerl PPI ParamsUtil PathClass PerlPrereqScanner PerlVersion PodEventual SoftwareLicense StringFormatter StringRewritePrefix SubExporter SubExporterForMethods TermReadKey TestDeep TextGlob TextTemplate TryTiny YAMLTiny autobox namespaceautoclean CPANMetaRequirements ]; + buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; + propagatedBuildInputs = [ AppCmd ArchiveTarWrapper CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ]; meta = { homepage = http://dzil.org/; description = "Distribution builder; installer not included!"; @@ -8726,6 +8738,19 @@ let self = _self // overrides; _self = with self; { }; }; + LogMessageSimple = buildPerlPackage rec { + name = "Log-Message-Simple-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz; + sha256 = "15nxi935nfrf8dkdrgvcrf2qlai4pbz03yj8sja0n9mcq2jd24ma"; + }; + propagatedBuildInputs = [ LogMessage ]; + meta = { + description = "Simplified interface to Log::Message"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LogTrace = buildPerlPackage rec { name = "Log-Trace-1.070"; src = fetchurl { @@ -14474,6 +14499,19 @@ let self = _self // overrides; _self = with self; { }; }; + TermUI = buildPerlPackage rec { + name = "Term-UI-0.46"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz; + sha256 = "19p92za5cx1v7g57pg993amprcvm1az3pp7y9g5b1aplsy06r54i"; + }; + propagatedBuildInputs = [ LogMessageSimple ]; + meta = { + description = "User interfaces via Term::ReadLine made easy"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermVT102 = buildPerlPackage { name = "Term-VT102-0.91"; src = fetchurl { From f7ca6522100981184845a88d6e4f326dd31f47af Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:39 +0000 Subject: [PATCH 1258/2743] [cpan2nix] perlPackages.CatalystViewTT: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0b321ee2dfb5..bce400b7bb85 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1689,7 +1689,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; }; - propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; + propagatedBuildInputs = [ CatalystRuntime TemplateTimer ]; meta = { description = "Template View Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 6d84df5961dd689c92b0d5bf62c12ab4f51e654e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:39 +0000 Subject: [PATCH 1259/2743] [cpan2nix] perlPackages.CatalystXComponentTraits: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bce400b7bb85..4db01b401670 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1703,8 +1703,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; sha256 = "0iq4ci8m6g2c4g01fvdl568y7pjz28f3widk986v3pyhr7ll8j88"; }; - propagatedBuildInputs = - [ CatalystRuntime MooseXTraitsPluggable namespaceautoclean ListMoreUtils ]; + propagatedBuildInputs = [ CatalystRuntime MooseXTraitsPluggable ]; }; CatalystXRoleApplicator = buildPerlPackage rec { From d6748863bce5e971c61767120e5716fc7f7a171e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:40 +0000 Subject: [PATCH 1260/2743] [cpan2nix] perlPackages.HTMLWidget: cleanup --- pkgs/top-level/perl-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4db01b401670..9b443c7badf1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7170,11 +7170,8 @@ let self = _self // overrides; _self = with self; { sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy"; }; doCheck = false; - propagatedBuildInputs = [ - TestNoWarnings ClassAccessor ClassAccessorChained - ClassDataAccessor ModulePluggableFast HTMLTree - HTMLScrubber EmailValid DateCalc - ]; + propagatedBuildInputs = [ ClassAccessorChained ClassDataAccessor DateCalc EmailValid HTMLScrubber HTMLTree ModulePluggableFast ]; + buildInputs = [ TestNoWarnings ]; }; HTTPBody = buildPerlPackage rec { From 0e88155094b49256131d64a39e0fc0d20e1a0d0d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:40 +0000 Subject: [PATCH 1261/2743] [cpan2nix] perlPackages.DistZillaPluginMojibakeTests: 0.5 -> 0.8 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b443c7badf1..6a440882d279 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4615,17 +4615,18 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginMojibakeTests = buildPerlPackage { - name = "Dist-Zilla-Plugin-MojibakeTests-0.5"; + name = "Dist-Zilla-Plugin-MojibakeTests-0.8"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.5.tar.gz; - sha256 = "0630acc9bcb415feba49b55a1b70da6e49a740673b4a483fc8058d03c6a21676"; + url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.8.tar.gz; + sha256 = "f1fff547ea24a8f7a483406a72ed6c4058d746d9dae963725502ddba025ab380"; }; - propagatedBuildInputs = [ DistZilla Moose TestMojibake UnicodeCheckUTF8 ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; description = "Release tests for source encoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ TestMojibake ]; }; DistZillaPluginNoTabsTests = buildPerlPackage { From 7dbc3324f7ac92dcb258919029ac5cf79267b3e1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:41 +0000 Subject: [PATCH 1262/2743] [cpan2nix] perlPackages.DistZillaPluginTestCPANChanges: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a440882d279..72f4a6053f04 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4694,8 +4694,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DO/DOHERTY/${name}.tar.gz"; sha256 = "215b3a5c3c58c8bab0ea27130441bbdaec737eecc00f0670937f608bdbf64806"; }; - buildInputs = [ CPANChanges DistZilla ]; - propagatedBuildInputs = [ CPANChanges DataSection DistZilla Moose ]; + buildInputs = [ CPANChanges TestDeep ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; description = "Release tests for your changelog"; From 210ee50ff3fad6a4ae32d1e825ca9ed263ee3e5b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:42 +0000 Subject: [PATCH 1263/2743] [cpan2nix] perlPackages.DistZillaPluginTestEOL: 0.10 -> 0.19 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72f4a6053f04..8012431969cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4748,14 +4748,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestEOL = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-EOL-0.10"; + DistZillaPluginTestEOL = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-EOL-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-EOL-0.10.tar.gz; - sha256 = "1sl7zvjzpwf7wl188a3j13k1qcb63hawx82iy6r3dx2gns8nc0nw"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-EOL-0.19.tar.gz; + sha256 = "0f23g931azz1k41xdfxw7kayy4snhw4qdr9ysknk5k1cl33mkfd2"; }; - buildInputs = [ DistZilla TestScript ]; - propagatedBuildInputs = [ DistZilla Moose TestEOL namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestEOL TestWarnings ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-EOL/; description = "Author tests making sure correct line endings are used"; From 4a92474d4f64bd8399f1e883abdab53f76cd5bb6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:42 +0000 Subject: [PATCH 1264/2743] [cpan2nix] perlPackages.DistZillaPluginTestPortability: 2.000005 -> 2.001000 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8012431969cb..bd94e71e5f4c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4823,14 +4823,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestPortability = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Portability-2.000005"; + DistZillaPluginTestPortability = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-Portability-2.001000"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Portability-2.000005.tar.gz; - sha256 = "b32d0a4b1d78ba76fabedd299c1a11efed05c3ce9752d7da6babe06d3515242b"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz; + sha256 = "e08ff5bd9e24cf9503055330148913808d91a3dfe320a2bdf8b0fc638719b179"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestPortabilityFiles ]; + buildInputs = [ ModuleBuildTiny TestDeep TestPortabilityFiles TestWarnings ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; description = "Release tests for portability"; From 086bb65799dfc079e8bca2eea354f7537b2108df Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:43 +0000 Subject: [PATCH 1265/2743] [cpan2nix] perlPackages.DistZillaPluginTestSynopsis: 2.000004 -> 2.000007 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd94e71e5f4c..65db81f685a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4839,13 +4839,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestSynopsis = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Synopsis-2.000004"; + name = "Dist-Zilla-Plugin-Test-Synopsis-2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000004.tar.gz; - sha256 = "d073de3206c5e588f60f55e4be64fab4c2595f5bc3013cd91307993691598d59"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000007.tar.gz; + sha256 = "e7d5e2530cd8a5bb5aadf3e1669a653aaa96e32cad7bd6b9caba6b425ceab563"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestSynopsis ]; + buildInputs = [ TestDeep TestOutput TestSynopsis ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; description = "Release tests for synopses"; From c97b1764f6cec128c37f2ba568f6fec54d487291 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:43 +0000 Subject: [PATCH 1266/2743] [cpan2nix] perlPackages.DistZillaPluginTestUnusedVars: 2.000005 -> 2.000007 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 65db81f685a8..03b90fe4b6b4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4853,14 +4853,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestUnusedVars = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-UnusedVars-2.000005"; + DistZillaPluginTestUnusedVars = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-UnusedVars-2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000005.tar.gz; - sha256 = "37ec462dc82f45cfd9d6d92ee59b8fd215a9a14b18d179b05912baee77359804"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz; + sha256 = "ea0199a3a0043213ddc132508b9ed9b131ef717735b8f93d78291191d04b43c2"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestVars namespaceautoclean ]; + buildInputs = [ TestDeep TestOutput TestVars ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; description = "Release tests for unused variables"; From c1e2677670a1112cd060300e711f50ded266f179 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:44 +0000 Subject: [PATCH 1267/2743] [cpan2nix] perlPackages.NetAmazonS3: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03b90fe4b6b4..aa6a1b56b826 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11046,8 +11046,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; sha256 = "efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848"; }; - buildInputs = [ LWP TestException ]; - propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI VMEC2SecurityCredentialCache XMLLibXML ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RegexpCommon TermEncoding TermProgressBarSimple VMEC2SecurityCredentialCache XMLLibXML ]; meta = { homepage = http://search.cpan.org/dist/Net-Amazon-S3/; description = "Use the Amazon S3 - Simple Storage Service"; From e1fc2271f97aa864a75f2cc6837c6def868054c9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:45 +0000 Subject: [PATCH 1268/2743] [cpan2nix] perlPackages.CatalystPluginAccessLog: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa6a1b56b826..5ac886dc84af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1359,7 +1359,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; sha256 = "873db8e4e72a994e3e17aeb53d2b837e6d524b4b8b0f3539f262135c88cc2120"; }; - propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; + propagatedBuildInputs = [ CatalystRuntime DateTime ]; meta = { homepage = https://metacpan.org/release/Catalyst-Plugin-AccessLog; description = "Request logging from within Catalyst"; From c0ee9d7d12ebbc50980c5c4e059cfc9a57e0a306 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:45 +0000 Subject: [PATCH 1269/2743] [cpan2nix] perlPackages.CatalystViewJSON: 0.35 -> 0.36 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ac886dc84af..17e2e4811273 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1669,13 +1669,13 @@ let self = _self // overrides; _self = with self; { }; CatalystViewJSON = buildPerlPackage rec { - name = "Catalyst-View-JSON-0.35"; + name = "Catalyst-View-JSON-0.36"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK//${name}.tar.gz"; - sha256 = "184pyghlrkl7p387bnyvswi2d9myvdg4v3lax6xrd59shskvpmkm"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-JSON-0.36.tar.gz; + sha256 = "0x943j1n2r0zqanyzdrs1xsnn8ayn2wqskn7h144xcqa6v6gcisl"; }; - buildInputs = [ JSON ]; - propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; + buildInputs = [ YAML ]; + propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "JSON view for your data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From b142e38d0d8263c20e38cdfceea4566de20d791d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:46 +0000 Subject: [PATCH 1270/2743] [cpan2nix] perlPackages.DistZillaPluginTestDistManifest: 2.000004 -> 2.000005 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 17e2e4811273..8ff18ae8840b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4733,14 +4733,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestDistManifest = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-DistManifest-2.000004"; + DistZillaPluginTestDistManifest = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-DistManifest-2.000005"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000004.tar.gz; - sha256 = "a832d9d04f85e9dd09f30af67c5d636efe79847ec3790939de081ee5e412fb68"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz; + sha256 = "4f0af27bb38745d2dec7d941bcf749e6d7fbeaf8e7bcf8a79a1310a9639b0f65"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestDistManifest ]; + buildInputs = [ TestDeep TestDistManifest TestOutput ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; description = "Release tests for the manifest"; From ad3b7e1252955b8e7e7c96242705e430af0170d0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:46 +0000 Subject: [PATCH 1271/2743] [cpan2nix] perlPackages.CatalystPluginSession: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ff18ae8840b..57970397892e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1536,7 +1536,7 @@ let self = _self // overrides; _self = with self; { sha256 = "171vi9xcl775scjaw4fcfdmqvz0rb1nr0xxg2gb3ng6bjzpslhgv"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; - propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; + propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 9b357987d32bb1efa646d2258c8ebffcbd95a2b0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:47 +0000 Subject: [PATCH 1272/2743] [cpan2nix] perlPackages.CatalystPluginAuthentication: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 57970397892e..79174f5e1fec 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1373,8 +1373,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "0v6hb4r1wv3djrnqvnjcn3xx1scgqzx8nyjdg9lfc1ybvamrl0rn"; }; - buildInputs = [ ClassMOP Moose TestException ]; - propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ]; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From fbb529df25ee2ec5c622007ceb2f2c937e556098 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:48 +0000 Subject: [PATCH 1273/2743] [cpan2nix] perlPackages.CatalystPluginSessionDynamicExpiry: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 79174f5e1fec..4e199910be30 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1549,7 +1549,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; sha256 = "7707c56734cdb1512f733dc400fadf6f4c53cb217b58207857824dad6780a079"; }; - propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime MROCompat Moose namespaceautoclean ]; + propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Per-session custom expiry times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 2ceeffaa838f604dc62ef8edb2596f6ed16422cd Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:48 +0000 Subject: [PATCH 1274/2743] [cpan2nix] perlPackages.CatalystPluginSessionStateCookie: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4e199910be30..acf6d5177008 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1563,8 +1563,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; }; - buildInputs = [ TestMockObject ]; - propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession ]; + propagatedBuildInputs = [ CatalystPluginSession ]; meta = { platforms = stdenv.lib.platforms.linux; }; From cb27dd9993ff5957d1cc799b0af99235b6588c89 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:49 +0000 Subject: [PATCH 1275/2743] [cpan2nix] perlPackages.DistZillaPluginTestCPANMetaJSON: 0.003 -> 0.004 dependencies: perlPackages.TestCPANMetaJSON: init at 0.16 --- pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index acf6d5177008..689331641590 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4702,14 +4702,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestCPANMetaJSON = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.003"; + DistZillaPluginTestCPANMetaJSON = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.003.tar.gz; - sha256 = "c76b9f5745f4626969bb9c60e1330ebd0d8b197f8dd33f9a6e6fce63877b4883"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004.tar.gz; + sha256 = "0a573e1d5640374e6ee4d56d4fb94a3c67d4e75d52b3ddeae70cfa6450e1af22"; }; - buildInputs = [ DistZilla ]; - propagatedBuildInputs = [ DistZilla Moose MooseAutobox ]; + buildInputs = [ MooseAutobox TestCPANMetaJSON TestDeep ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; description = "Release tests for your META.json"; @@ -14739,6 +14739,19 @@ let self = _self // overrides; _self = with self; { }; }; + TestCPANMetaJSON = buildPerlPackage rec { + name = "Test-CPAN-Meta-JSON-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz; + sha256 = "1jg9ka50ixwq083wd4k12rhdjq87w0ihb34gd8jjn7gvvyd51b37"; + }; + propagatedBuildInputs = [ JSON ]; + meta = { + description = "Validate your CPAN META.json files"; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + TestDataSplit = buildPerlModule rec { name = "Test-Data-Split-0.2.1"; src = fetchurl { From 81406179308bdf787bf2d3207b76e7485231afa1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:50 +0000 Subject: [PATCH 1276/2743] [cpan2nix] perlPackages.TaskPlack: cleanup dependencies: perlPackages.CGICompile: init at 0.22 perlPackages.Coro: init at 6.514 perlPackages.Corona: init at 0.1004 perlPackages.FCGIClient: init at 0.08 perlPackages.JavaScriptValueEscape: init at 0.07 perlPackages.NetFastCGI: init at 0.14 perlPackages.NetServerCoro: init at 1.3 perlPackages.PlackAppProxy: init at 0.29 perlPackages.PlackMiddlewareAuthDigest: init at 0.05 perlPackages.PlackMiddlewareConsoleLogger: init at 0.05 perlPackages.PlackMiddlewareDeflater: init at 0.12 perlPackages.PlackMiddlewareHeader: init at 0.04 perlPackages.PlackMiddlewareSession: init at 0.30 perlPackages.TestHexString: init at 0.03 perlPackages.Twiggy: init at 0.1025 --- pkgs/top-level/perl-packages.nix | 209 ++++++++++++++++++++++++++++++- 1 file changed, 208 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 689331641590..66ab02da15c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1764,6 +1764,21 @@ let self = _self // overrides; _self = with self; { }; }; + CGICompile = buildPerlModule rec { + name = "CGI-Compile-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Compile-0.22.tar.gz; + sha256 = "1bycbdgbsn88kavy0q8p2i7vn6lf3xk1y7v2rdl32gkrdff4w2gm"; + }; + propagatedBuildInputs = [ Filepushd ]; + buildInputs = [ ModuleBuildTiny TestNoWarnings TestRequires ]; + meta = { + description = "Compile .cgi scripts to a code reference like ModPerl::Registry"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/CGI-Compile"; + }; + }; + CGICookieXS = buildPerlPackage rec { name = "CGI-Cookie-XS-0.18"; src = fetchurl { @@ -2729,6 +2744,32 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGICookieXS ]; }; + Coro = buildPerlPackage rec { + name = "Coro-6.514"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.514.tar.gz; + sha256 = "0qndvq74knyra9r98pyllsxz0s80dzc1ljx10arjv9whja1l6cyq"; + }; + propagatedBuildInputs = [ AnyEvent Guard commonsense ]; + buildInputs = [ CanaryStability ]; + meta = { + }; + }; + + Corona = buildPerlPackage rec { + name = "Corona-0.1004"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz; + sha256 = "0g5gpma3998rn61qfjv5csv2nrdi4sc84ipkb4k6synyhfgd3xgz"; + }; + propagatedBuildInputs = [ NetServerCoro Plack ]; + buildInputs = [ TestSharedFork TestTCP ]; + meta = { + description = "Coro based PSGI web server"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CPAN = buildPerlPackage rec { name = "CPAN-2.16"; src = fetchurl { @@ -5660,6 +5701,19 @@ let self = _self // overrides; _self = with self; { }; }; + FCGIClient = buildPerlPackage rec { + name = "FCGI-Client-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.08.tar.gz; + sha256 = "1rvhfnyhib1aslr06x8s0yfykaf44j5glj0rxz9ani7z6l0p2vqa"; + }; + propagatedBuildInputs = [ AnyMoose ]; + meta = { + description = "client library for fastcgi protocol"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FCGIProcManager = buildPerlPackage { name = "FCGI-ProcManager-0.28"; src = fetchurl { @@ -7983,6 +8037,19 @@ let self = _self // overrides; _self = with self; { }; }; + JavaScriptValueEscape = buildPerlModule rec { + name = "JavaScript-Value-Escape-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz; + sha256 = "1p5365lvnax8kbcfrj169lx05af3i3qi5wg5x9mizqgd10vxmjws"; + }; + meta = { + description = "Avoid XSS with JavaScript value interpolation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/JavaScript-Value-Escape"; + }; + }; + JSON = buildPerlPackage { name = "JSON-2.90"; @@ -11184,6 +11251,19 @@ let self = _self // overrides; _self = with self; { }; }; + NetFastCGI = buildPerlPackage rec { + name = "Net-FastCGI-0.14"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz; + sha256 = "0sjrnlzci21sci5m52zz0x9bf889j67i6vnhrjlypsfm9w5914qi"; + }; + buildInputs = [ TestException TestHexString ]; + meta = { + description = "FastCGI Toolkit"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetHTTP = buildPerlPackage rec { name = "Net-HTTP-6.17"; src = fetchurl { @@ -11300,6 +11380,19 @@ let self = _self // overrides; _self = with self; { }; }; + NetServerCoro = buildPerlPackage rec { + name = "Net-Server-Coro-1.3"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz; + sha256 = "11pvfxsi0q37kd17z597wb8r9dv3r96fiagq57kc746k1lmp06hy"; + }; + propagatedBuildInputs = [ Coro NetServer ]; + meta = { + description = "A co-operative multithreaded server using Coro"; + license = with stdenv.lib.licenses; [ mit ]; + }; + }; + NetSMTP = libnet; NetSMTPSSL = buildPerlPackage { @@ -12126,6 +12219,50 @@ let self = _self // overrides; _self = with self; { }; }; + PlackAppProxy = buildPerlPackage rec { + name = "Plack-App-Proxy-0.29"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz; + sha256 = "03x6yb6ykz1ms90jp1s0pq19yplf7wswljvhzqkr16jannfrmah4"; + }; + propagatedBuildInputs = [ AnyEventHTTP LWP Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "proxy requests"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + PlackMiddlewareAuthDigest = buildPerlModule rec { + name = "Plack-Middleware-Auth-Digest-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz; + sha256 = "1sqm23kfsl3ac4060zcclc3r86x1vxzhsgvgzg6mxk9njj93zgcs"; + }; + propagatedBuildInputs = [ DigestHMAC Plack ]; + buildInputs = [ LWP ModuleBuildTiny TestSharedFork TestTCP ]; + meta = { + description = "Digest authentication"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Plack-Middleware-Auth-Digest"; + }; + }; + + PlackMiddlewareConsoleLogger = buildPerlModule rec { + name = "Plack-Middleware-ConsoleLogger-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz; + sha256 = "1ngvhwdw9ll4cwnvf0i89ppa9pbyiwng6iba04scrqjda353lrsm"; + }; + propagatedBuildInputs = [ JavaScriptValueEscape Plack ]; + buildInputs = [ ModuleBuildTiny TestRequires ]; + meta = { + description = "Write logs to Firebug or Webkit Inspector"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Plack-Middleware-ConsoleLogger"; + }; + }; + PlackMiddlewareDebug = buildPerlModule rec { name = "Plack-Middleware-Debug-0.17"; src = fetchurl { @@ -12141,6 +12278,20 @@ let self = _self // overrides; _self = with self; { }; }; + PlackMiddlewareDeflater = buildPerlPackage rec { + name = "Plack-Middleware-Deflater-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz; + sha256 = "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"; + }; + propagatedBuildInputs = [ Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "Compress response body with Gzip or Deflate"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PlackMiddlewareFixMissingBodyInRedirect = buildPerlPackage rec { name = "Plack-Middleware-FixMissingBodyInRedirect-0.12"; src = fetchurl { @@ -12155,6 +12306,19 @@ let self = _self // overrides; _self = with self; { }; }; + PlackMiddlewareHeader = buildPerlPackage rec { + name = "Plack-Middleware-Header-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz; + sha256 = "0pjxxbnilphn38s3mmv0fmg9q2hm4z02ngp2a1lxblzjfbzvkdjy"; + }; + propagatedBuildInputs = [ Plack ]; + meta = { + description = "modify HTTP response headers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PlackMiddlewareMethodOverride = buildPerlPackage rec { name = "Plack-Middleware-MethodOverride-0.15"; src = fetchurl { @@ -12195,6 +12359,21 @@ let self = _self // overrides; _self = with self; { }; }; + PlackMiddlewareSession = buildPerlModule rec { + name = "Plack-Middleware-Session-0.30"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.30.tar.gz; + sha256 = "0cwlhfj1644jq8axv4cghsqqjsx2y7hj7g0y5l179fcgmbp2ndzf"; + }; + propagatedBuildInputs = [ DigestHMAC DigestSHA1 Plack ]; + buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; + meta = { + description = "Middleware for session management"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/plack/Plack-Middleware-Session"; + }; + }; + PlackTestExternalServer = buildPerlPackage rec { name = "Plack-Test-ExternalServer-0.02"; src = fetchurl { @@ -14170,7 +14349,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; sha256 = "0ajwkyr9nwn11afi6fz6kx4bi7a3p8awjsldmsakz3sl0s42pmbr"; }; - propagatedBuildInputs = [ Plack PSGI ModuleBuildTiny ]; + propagatedBuildInputs = [ CGICompile CGIEmulatePSGI CGIPSGI Corona FCGI FCGIClient FCGIProcManager HTTPServerSimplePSGI IOHandleUtil NetFastCGI PSGI PlackAppProxy PlackMiddlewareAuthDigest PlackMiddlewareConsoleLogger PlackMiddlewareDebug PlackMiddlewareDeflater PlackMiddlewareHeader PlackMiddlewareReverseProxy PlackMiddlewareSession Starlet Starman Twiggy ]; + buildInputs = [ ModuleBuildTiny TestSharedFork ]; }; TaskTestRunAllPlugins = buildPerlModule rec { @@ -14952,6 +15132,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestHexString = buildPerlModule rec { + name = "Test-HexString-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz; + sha256 = "0h1zl2l1ljlcxsn0xvin9dwiymnhyhnfnxgzg3f9899g37f4qk3x"; + }; + meta = { + description = "test binary strings with hex dump diagnostics"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestHTTPServerSimple = buildPerlPackage { name = "Test-HTTP-Server-Simple-0.11"; src = fetchurl { @@ -16659,6 +16851,21 @@ let self = _self // overrides; _self = with self; { }; }; + Twiggy = buildPerlPackage rec { + name = "Twiggy-0.1025"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz; + sha256 = "1a57knbwync7rlzhsz1kdc0sd380xnaccwgiy1qwj5d87abdynnp"; + }; + propagatedBuildInputs = [ AnyEvent Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "AnyEvent HTTP server for PSGI (like Thin)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Twiggy"; + }; + }; + TypeTiny = buildPerlPackage { name = "Type-Tiny-1.002001"; src = fetchurl { From 889cac2fe65635ae906230c1aa288a85143743ab Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:50 +0000 Subject: [PATCH 1277/2743] [cpan2nix] perlPackages.CatalystPluginSessionStoreFastMmap: cleanup --- pkgs/top-level/perl-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 66ab02da15c1..b099c95923ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1572,11 +1572,10 @@ let self = _self // overrides; _self = with self; { CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { name = "Catalyst-Plugin-Session-Store-FastMmap-0.16"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-Store-FastMmap-0.16.tar.gz; sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs"; }; - propagatedBuildInputs = - [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; + propagatedBuildInputs = [ CacheFastMmap CatalystPluginSession ]; meta = { platforms = stdenv.lib.platforms.linux; }; From a63bfe331a66c75b684927cb9e154af0980f46cb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:51 +0000 Subject: [PATCH 1278/2743] [cpan2nix] perlPackages.DistZillaPluginPodWeaver: 3.102000 -> 4.008 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b099c95923ee..9be0fbb9b1fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4683,13 +4683,12 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginPodWeaver = buildPerlPackage { - name = "Dist-Zilla-Plugin-PodWeaver-3.102000"; + name = "Dist-Zilla-Plugin-PodWeaver-4.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-3.102000.tar.gz; - sha256 = "0xayy50fgfc7wlsnygz28ka2ax9pmr0rn845i8d6p40amrkzzlml"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz; + sha256 = "0ff1i26s54z292j8w8vm3gw3p7w1yq35wi8g978c84ia7y1y7n8z"; }; - buildInputs = [ FileFindRule ]; - propagatedBuildInputs = [ DistZilla ListMoreUtils Moose PPI PodElementalPerlMunger PodWeaver namespaceautoclean ]; + propagatedBuildInputs = [ DistZilla PodElementalPerlMunger PodWeaver ]; meta = { homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; description = "Weave your Pod together from configuration and Dist::Zilla"; From c25c258c5f35cc821796dde6c25bd98658e7ce7a Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:52 +0000 Subject: [PATCH 1279/2743] [cpan2nix] perlPackages.DistZillaPluginTestPodLinkCheck: 1.002 -> 1.004 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9be0fbb9b1fe..1a06a81b3043 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4847,13 +4847,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestPodLinkCheck = buildPerlPackage rec { - name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.002"; + name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004"; src = fetchurl { url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz"; - sha256 = "26f3b257d5037aeec8335910cfdaf76fc8612f38f5d3134f46cd433e116947b0"; + sha256 = "325d236da0940388d2aa86ec5c1326516b4ad45adef8e7a4f83bb91d5ee15490"; }; -# buildInputs = [ ModuleBuild ]; - propagatedBuildInputs = [ DistZilla Moose TestPodLinkCheck ]; +# buildInputs = [ TestPodLinkCheck ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; description = "Add release tests for POD links"; From e9aff43419cb3c2c07b7e8d3d8f29d675013770e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:52 +0000 Subject: [PATCH 1280/2743] [cpan2nix] perlPackages.DistZillaPluginTestVersion: 0.002004 -> 1.09 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a06a81b3043..e93522368c61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4907,13 +4907,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestVersion = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Version-0.002004"; + name = "Dist-Zilla-Plugin-Test-Version-1.09"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XENO/Dist-Zilla-Plugin-Test-Version-0.002004.tar.gz; - sha256 = "4ae5055071e07442223d07d818e9484430368b59c15966b90b18c8abc06f8e36"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-Test-Version-1.09.tar.gz; + sha256 = "7240508731bc1bf6dfad7701ec65450a18ef9245a521ab26ebd6acb39a9ebe17"; }; - buildInputs = [ DistZilla TestNoTabs TestScript ]; - propagatedBuildInputs = [ DistZilla Moose TestVersion namespaceautoclean ]; + buildInputs = [ Filechdir TestDeep TestEOL TestNoTabs TestScript TestVersion ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Version/; description = "Release Test::Version tests"; From 16d5109a79be71f4c13359b34d433f0df846ced6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:53 +0000 Subject: [PATCH 1281/2743] [cpan2nix] perlPackages.TestWWWMechanizeCatalyst: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e93522368c61..40082d718541 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15911,12 +15911,12 @@ let self = _self // overrides; _self = with self; { sha256 = "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv"; }; doCheck = false; # listens on an external port - propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean - TestWWWMechanize WWWMechanize ]; + propagatedBuildInputs = [ CatalystRuntime WWWMechanize ]; meta = { description = "Test::WWW::Mechanize for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ CatalystPluginSession CatalystPluginSessionStateCookie TestException TestWWWMechanize Testutf8 ]; }; TestWWWMechanizeCGI = buildPerlPackage { From 52a585d58fc6bd8578dfffbc8157e98bcafec500 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:53 +0000 Subject: [PATCH 1282/2743] [cpan2nix] perlPackages.CatalystPluginCacheHTTP: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40082d718541..76f5a3a817fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1427,8 +1427,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz; sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba"; }; - buildInputs = [ CatalystRuntime Testuseok TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; + buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ ClassAccessor HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d41820cf3de59a1415d5110ba10c35fc846204ca Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:54 +0000 Subject: [PATCH 1283/2743] [cpan2nix] perlPackages.CatalystPluginCaptcha: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 76f5a3a817fd..b2074069b5a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1443,7 +1443,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz; sha256 = "0llyj3v5nx9cx46jdbbvxf1lc9s9cxq5ml22xmx3wkb201r5qgaa"; }; - propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession GDSecurityImage HTTPDate ]; + propagatedBuildInputs = [ CatalystPluginSession GDSecurityImage ]; meta = { description = "Create and validate Captcha for Catalyst"; platforms = stdenv.lib.platforms.linux; From 2b2a35e7eaf368daf0ec6feefd95fe7e464258db Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:55 +0000 Subject: [PATCH 1284/2743] [cpan2nix] perlPackages.CatalystPluginAuthorizationRoles: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b2074069b5a8..93f9b271d1e6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1397,7 +1397,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0l83lkwmq0lngwh8b1rv3r719pn8w1gdbyhjqm74rnd0wbjl8h7f"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ]; + propagatedBuildInputs = [ CatalystPluginAuthentication SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From c2b0bc7cacdb66582962e7a0e4087f594ada2d24 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:56 +0000 Subject: [PATCH 1285/2743] [cpan2nix] perlPackages.CatalystPluginFormValidator: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 93f9b271d1e6..6bbaa017d9ce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1465,7 +1465,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; sha256 = "5834f11bf5c9f4b5d336d65c7ce6639b76ce7bfe7a2875eb048d7ea1c82ce05a"; }; - propagatedBuildInputs = [ CatalystRuntime DataFormValidator MROCompat Moose ]; + propagatedBuildInputs = [ CatalystRuntime DataFormValidator ]; meta = { description = "Data::FormValidator"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From b54c8163178d2d1b39e6dc6a39e0b936c751d059 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:56 +0000 Subject: [PATCH 1286/2743] [cpan2nix] perlPackages.CatalystPluginSessionStoreFile: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6bbaa017d9ce..9f41ff58423d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1587,7 +1587,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f"; }; - propagatedBuildInputs = [ CacheCache CatalystPluginSession CatalystRuntime ClassDataInheritable MROCompat ]; + propagatedBuildInputs = [ CacheCache CatalystPluginSession ]; meta = { description = "File storage backend for session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d57a08dcf873cb72a3f0cbfa1e18a8cb5ebf76bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:57 +0000 Subject: [PATCH 1287/2743] [cpan2nix] perlPackages.DistZillaPluginCheckChangeLog: 0.01 -> 0.05 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9f41ff58423d..07da3204374f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4641,16 +4641,17 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginCheckChangeLog = buildPerlPackage { - name = "Dist-Zilla-Plugin-CheckChangeLog-0.01"; + name = "Dist-Zilla-Plugin-CheckChangeLog-0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.01.tar.gz; - sha256 = "153dbe5ff8cb3c060901e003237a0515d7b9b5cc870eebfd417a6c91e28edec2"; + url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.05.tar.gz; + sha256 = "b0b34d6d70b56f1944d03c5f0dc3b8f6f24474c816d07b657a116c692c2e052a"; }; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ PathClass PodCoverage PodCoverageTrustPod PodMarkdown TestDeep TestException TestPod TestPodCoverage ]; }; DistZillaPluginMojibakeTests = buildPerlPackage { From b3526f54b6b14d29f866e2d2d2f777b073b2b6af Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:57 +0000 Subject: [PATCH 1288/2743] [cpan2nix] perlPackages.DistZillaPluginReadmeAnyFromPod: 0.131500 -> 0.163250 dependencies: perlPackages.DistZillaRoleFileWatcher: init at 0.006 perlPackages.PodMarkdownGithub: init at 0.03 --- pkgs/top-level/perl-packages.nix | 39 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 07da3204374f..355e18fa8691 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4698,13 +4698,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginReadmeAnyFromPod = buildPerlPackage { - name = "Dist-Zilla-Plugin-ReadmeAnyFromPod-0.131500"; + name = "Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.131500.tar.gz; - sha256 = "4d02ce5f185e0d9061019c1925a410931d0c1848db7e5ba5f8e676f04634b06e"; + url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250.tar.gz; + sha256 = "d44f2799922f78b2a7961ed89123e11bdd77abfe85ba2040d82b80ad72ed13bc"; }; - buildInputs = [ DistZilla TestMost ]; - propagatedBuildInputs = [ DistZilla FileSlurp IOstringy Moose MooseAutobox MooseXHasSugar PodMarkdown ]; + buildInputs = [ TestDeep TestDifferences TestException TestFatal TestMost TestRequires TestSharedFork TestWarn ]; + propagatedBuildInputs = [ DistZillaRoleFileWatcher MooseXHasSugar PodMarkdownGithub ]; meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; description = "Automatically convert POD to a README in any format for Dist::Zilla"; @@ -4922,6 +4922,21 @@ let self = _self // overrides; _self = with self; { }; }; + DistZillaRoleFileWatcher = buildPerlModule rec { + name = "Dist-Zilla-Role-FileWatcher-0.006"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz; + sha256 = "15jfpr257xxp27gz156npgpj7kh2dchzgfmvzivi5bvdb2wl8fpy"; + }; + propagatedBuildInputs = [ DistZilla SafeIsa ]; + buildInputs = [ ModuleBuildTiny TestDeep TestFatal ]; + meta = { + description = "Receive notification when something changes a file's contents"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Role-FileWatcher"; + }; + }; + EmailAbstract = buildPerlPackage rec { name = "Email-Abstract-3.008"; src = fetchurl { @@ -12878,6 +12893,20 @@ let self = _self // overrides; _self = with self; { }; }; + PodMarkdownGithub = buildPerlPackage rec { + name = "Pod-Markdown-Github-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.03.tar.gz; + sha256 = "0y555pb78j0lz24kdgiwkmk1vcv4lg3a3mvnw9vm2qqnkp7p0nag"; + }; + propagatedBuildInputs = [ PodMarkdown ]; + buildInputs = [ TestDifferences ]; + meta = { + description = "Convert POD to Github's specific markdown"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PodSimple = buildPerlPackage { name = "Pod-Simple-3.35"; src = fetchurl { From de2d6985ff09dcb418b21031b85d661ab5be1a34 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:58 +0000 Subject: [PATCH 1289/2743] [cpan2nix] perlPackages.CatalystXScriptServerStarman: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 355e18fa8691..8067fb83aec0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1739,7 +1739,7 @@ let self = _self // overrides; _self = with self; { ../development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch ]; buildInputs = [ TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; + propagatedBuildInputs = [ CatalystRuntime Starman ]; meta = { description = "Replace the development server with Starman"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 8d566e5777c39bc27f0229e4be17a744d2e6b56e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:59 +0000 Subject: [PATCH 1290/2743] [cpan2nix] perlPackages.DistZillaPluginReadmeMarkdownFromPod: 0.120120 -> 0.141140 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8067fb83aec0..9ff8b3d4af21 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4713,13 +4713,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginReadmeMarkdownFromPod = buildPerlPackage { - name = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.120120"; + name = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.120120.tar.gz; - sha256 = "5a3346daab4e2bba850ee4a7898467da9f80bc93cc10d2d625f9880a46092160"; + url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140.tar.gz; + sha256 = "9caad7b366ea59119ad73cdd99dcdd53f877a515bd0164fc28b339c01739a801"; }; - buildInputs = [ DistZilla TestMost ]; - propagatedBuildInputs = [ DistZillaPluginReadmeAnyFromPod Moose ]; + buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; + propagatedBuildInputs = [ DistZillaPluginReadmeAnyFromPod ]; meta = { homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; From 8762802ed668ca9a0f014aa8d40ce56b315ef3a6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:58:59 +0000 Subject: [PATCH 1291/2743] [cpan2nix] perlPackages.CatalystAuthenticationCredentialHTTP: 1.015 -> 1.016 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9ff8b3d4af21..3f5bb92f16af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1174,13 +1174,13 @@ let self = _self // overrides; _self = with self; { }; CatalystAuthenticationCredentialHTTP = buildPerlPackage { - name = "Catalyst-Authentication-Credential-HTTP-1.015"; + name = "Catalyst-Authentication-Credential-HTTP-1.016"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Credential-HTTP-1.015.tar.gz; - sha256 = "02gyq0vkhj2psd7hvw4b095mvsz7vbq8kv4k8lq748jnx5kmnfrq"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Credential-HTTP-1.016.tar.gz; + sha256 = "0r4kah3qr9d7iq16i64qbj6hxjfwv5fjy3jzwgs2qmr4mjixsg51"; }; buildInputs = [ TestException TestMockObject ]; - propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime ClassAccessorFast DataUUID StringEscape URI ]; + propagatedBuildInputs = [ CatalystPluginAuthentication DataUUID StringEscape ]; meta = { description = "HTTP Basic and Digest authentication"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From d00c6518a235f06422f9d2303f06984817b164ed Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:00 +0000 Subject: [PATCH 1292/2743] [cpan2nix] perlPackages.CatalystAuthenticationStoreHtpasswd: 1.003 -> 1.006 --- pkgs/top-level/perl-packages.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3f5bb92f16af..055d786ea9c7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1189,15 +1189,14 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystAuthenticationStoreHtpasswd = buildPerlPackage rec { - name = "Catalyst-Authentication-Store-Htpasswd-1.003"; + CatalystAuthenticationStoreHtpasswd = buildPerlModule rec { + name = "Catalyst-Authentication-Store-Htpasswd-1.006"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "09mn0wjwfvnfi28y47g816nx50zdpvwvbxp0nrpsap0ir1m80wi3"; + url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Store-Htpasswd-1.006.tar.gz; + sha256 = "0kw0w2g1qmym896bgnqr1bfhvgb6xja39mv10701ipp8fmi8bzf7"; }; - buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; - propagatedBuildInputs = - [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ]; + buildInputs = [ ModuleBuildTiny TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ AuthenHtpasswd CatalystPluginAuthentication ]; }; CatalystAuthenticationStoreDBIxClass = buildPerlPackage { From 9e199debbb3fc11160111cf6a1f457527870781b Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:01 +0000 Subject: [PATCH 1293/2743] [cpan2nix] perlPackages.CatalystDevel: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 055d786ea9c7..94a25dc74a8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1263,7 +1263,7 @@ let self = _self // overrides; _self = with self; { sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple CatalystRuntime ConfigGeneral FileChangeNotify FileCopyRecursive FileShareDir ModuleInstall Moose MooseXDaemonize MooseXEmulateClassAccessorFast PathClass TemplateToolkit Starman namespaceautoclean namespaceclean ]; + propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; From 79875a54effc7144f8b109d23e8e2d6e49111f86 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:01 +0000 Subject: [PATCH 1294/2743] [cpan2nix] perlPackages.DistZillaPluginTestPerlCritic: 2.112410 -> 3.001 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94a25dc74a8b..11d7524e7a6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4832,13 +4832,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestPerlCritic = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-Perl-Critic-2.112410"; + name = "Dist-Zilla-Plugin-Test-Perl-Critic-3.001"; src = fetchurl { - url = mirror://cpan/authors/id/J/JQ/JQUELIN/Dist-Zilla-Plugin-Test-Perl-Critic-2.112410.tar.gz; - sha256 = "3ce59ce3ef6cf56d7de0debb33c26f899492d9742c8b82073e257787fd85630f"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz; + sha256 = "9250b59d5dc1ae4c6893ba783bd3f05131b14ff9e91afb4555314f55268a3825"; }; - buildInputs = [ DistZilla MooseAutobox ]; - propagatedBuildInputs = [ DataSection DistZilla Moose namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestPerlCritic ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Perl-Critic/; description = "Tests to check your code against best practices"; From 30cd94523aa5c00dccef5a13496b215a65f742f3 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:02 +0000 Subject: [PATCH 1295/2743] [cpan2nix] perlPackages.CatalystPluginAuthorizationACL: cleanup --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 11d7524e7a6b..500c2506df78 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1387,6 +1387,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0z4328rr6l9xi45hyv6q9pwwamp0864q6skcp29jrz9f919ycdra"; }; propagatedBuildInputs = [ CatalystRuntime ClassThrowable ]; + buildInputs = [ CatalystPluginAuthentication CatalystPluginAuthorizationRoles CatalystPluginSession CatalystPluginSessionStateCookie TestWWWMechanizeCatalyst ]; }; CatalystPluginAuthorizationRoles = buildPerlPackage { From 67bb9385d4f777095b65f097da358d07e219417e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:02 +0000 Subject: [PATCH 1296/2743] [cpan2nix] perlPackages.CatalystViewDownload: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 500c2506df78..37f233f28e19 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1658,8 +1658,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz"; sha256 = "1qgq6y9iwfbhbkbgpw9czang2ami6z8jk1zlagrzdisy4igqzkvs"; }; - buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; - propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; + buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; From 1356d70593799490804748ee55a05d4137d2e9d6 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:03 +0000 Subject: [PATCH 1297/2743] [cpan2nix] perlPackages.DistZillaPluginTestCompile: 2.054 -> 2.058 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 37f233f28e19..a2f7fff19dd2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4756,14 +4756,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestCompile = buildPerlPackage rec { - name = "Dist-Zilla-Plugin-Test-Compile-2.054"; + DistZillaPluginTestCompile = buildPerlModule rec { + name = "Dist-Zilla-Plugin-Test-Compile-2.058"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "363fc251785a36a0b2028fda3b38d71d30c7048b09145362bbfac13fc41eab7e"; + sha256 = "d0cf93e525f102eca0f7f3967124d2e59d0a212f738ce54c1ddd91dda268d88a"; }; - buildInputs = [ CPANMetaCheck DistZilla Filepushd ModuleBuildTiny PerlPrereqScanner TestDeep TestMinimumVersion TestWarnings self."if" ]; - propagatedBuildInputs = [ DataSection DistZilla Moose PathTiny SubExporterForMethods namespaceautoclean ]; + buildInputs = [ CPANMetaCheck ModuleBuildTiny TestDeep TestMinimumVersion TestWarnings ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile; description = "Common tests to check syntax of your modules, only using core modules"; From 9d40041a990ac0dcf03c6004299a1563b41316ae Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:04 +0000 Subject: [PATCH 1298/2743] [cpan2nix] perlPackages.DistZillaPluginTestMinimumVersion: 2.000005 -> 2.000008 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a2f7fff19dd2..320853149836 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4817,13 +4817,13 @@ let self = _self // overrides; _self = with self; { }; DistZillaPluginTestMinimumVersion = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-MinimumVersion-2.000005"; + name = "Dist-Zilla-Plugin-Test-MinimumVersion-2.000008"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000005.tar.gz; - sha256 = "988c71a3158e94e7a0b23f346f19af4a0ed67e101a2653c3185c5ae49981132b"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000008.tar.gz; + sha256 = "d924ce79aaaa1885510ca6ecfcb4d8bc250fb6995bc96627f1536cb589e3b660"; }; - buildInputs = [ DistZilla MooseAutobox TestOutput ]; - propagatedBuildInputs = [ DistZilla Moose TestMinimumVersion ]; + buildInputs = [ TestDeep TestMinimumVersion TestOutput ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; description = "Release tests for minimum required versions"; From 1252454d7d7a591bb25d6241bfd1b7ece1de53a2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:04 +0000 Subject: [PATCH 1299/2743] [cpan2nix] perlPackages.DBIxClassHTMLWidget: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 320853149836..7dd80e689d38 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4193,7 +4193,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AN/ANDREMAR/${name}.tar.gz"; sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1"; }; - propagatedBuildInputs = [DBIxClass HTMLWidget]; + propagatedBuildInputs = [ DBIxClass HTMLWidget ]; }; DBIxClassHelpers = buildPerlPackage rec { From 9db6fd4a66d0ac14a4e5a9dfa83e39250432cb24 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:05 +0000 Subject: [PATCH 1300/2743] [cpan2nix] perlPackages.DistZillaPluginTestKwalitee: 2.06 -> 2.12 --- pkgs/top-level/perl-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7dd80e689d38..2f3dbb91c4f9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4801,14 +4801,14 @@ let self = _self // overrides; _self = with self; { }; }; - DistZillaPluginTestKwalitee = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Kwalitee-2.06"; + DistZillaPluginTestKwalitee = buildPerlModule { + name = "Dist-Zilla-Plugin-Test-Kwalitee-2.12"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.06.tar.gz; - sha256 = "1723beb96d4048fd4fb0fea2ed36c0c6f3ea4648ce7f93d4cb73e5d49e274bf6"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.12.tar.gz; + sha256 = "bddbcfcc75e8eb2d2d9c8611552f00cdc1b051f0f00798623b8692ff5030af2f"; }; - buildInputs = [ CaptureTiny DistZilla PathClass perl ]; - propagatedBuildInputs = [ DataSection DistZilla Moose SubExporterForMethods namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestKwalitee ]; + propagatedBuildInputs = [ DistZilla ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Kwalitee; description = "Release tests for kwalitee"; From b26e5f146738fd4e606146f03ac276fac8345672 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:05 +0000 Subject: [PATCH 1301/2743] [cpan2nix] perlPackages.CatalystPluginFormValidatorSimple: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f3dbb91c4f9..6801e018ef7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1478,7 +1478,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; sha256 = "486c6a0e8f410fd017279f4804ab9e35ba46321d33a0a9721fe1e08a391de7a0"; }; - propagatedBuildInputs = [ CatalystPluginFormValidator CatalystRuntime FormValidatorSimple ]; + propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; From 19ff0c776feb937339f508d6a6c4377beace5d27 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:06 +0000 Subject: [PATCH 1302/2743] [cpan2nix] perlPackages.CatalystControllerPOD: cleanup --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6801e018ef7f..2f21c4841d89 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1240,14 +1240,14 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystControllerPOD = buildPerlPackage rec { + CatalystControllerPOD = buildPerlModule rec { name = "Catalyst-Controller-POD-1.0.0"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9"; }; - buildInputs = [ CatalystRuntime ModuleBuild ModuleInstall TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystPluginStaticSimple CatalystRuntime ClassAccessor FileShareDir FileSlurp JSONXS LWP ListMoreUtils PathClass PodPOM PodPOMViewTOC TestWWWMechanizeCatalyst XMLSimple ]; + buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ CatalystPluginStaticSimple FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ]; meta = { homepage = http://search.cpan.org/dist/Catalyst-Controller-POD/; description = "Serves PODs right from your Catalyst application"; From 0a60e00a874f880b2ac6a445aa1ecba99b0b3825 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:06 +0000 Subject: [PATCH 1303/2743] [cpan2nix] perlPackages.HTMLFormFu: 2.01 -> 2.05 --- pkgs/top-level/perl-packages.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f21c4841d89..f3ec3607141e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6999,17 +6999,13 @@ let self = _self // overrides; _self = with self; { }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-2.01"; + name = "HTML-FormFu-2.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "0fvilng85wc65pna898x7mp4hx73mhahl7j2s10gj76avmxdizsw"; + url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-2.05.tar.gz; + sha256 = "0xz41ap0vyw9yfjci84i5ixc6jshjrd2swhiv8dsy5xx9x71iw1q"; }; - buildInputs = [ FileShareDirInstall TestAggregate TestException ]; - propagatedBuildInputs = [ CGI Clone ConfigAny DataVisitor DateTime - DateTimeFormatBuilder DateTimeFormatNatural DateTimeFormatStrptime - DateTimeLocale EmailValid FileShareDir HTMLScrubber HTMLTokeParserSimple - HTTPMessage HashFlatten ListMoreUtils ModulePluggable Moose MooseXAliases - NumberFormat PathClass Readonly RegexpCommon TaskWeaken YAMLLibYAML ]; + buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle ]; + propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten MooseXAliases NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ]; meta = { description = "HTML Form Creation, Rendering and Validation Framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From a7039d6acf13980e04e7322f50603f84a50cc8af Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:07 +0000 Subject: [PATCH 1304/2743] [cpan2nix] perlPackages.CatalystModelDBICSchema: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f3ec3607141e..705d0efc2781 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1328,7 +1328,7 @@ let self = _self // overrides; _self = with self; { sha256 = "26a911ef5ef7ffc81b6ce65c3156f71fb35083c456ad27e6d82d2dc02493eeea"; }; buildInputs = [ DBDSQLite TestException TestRequires ]; - propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassSchemaLoader HashMerge ListMoreUtils ModuleRuntime Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes MooseXTypesLoadableClass TieIxHash TryTiny namespaceautoclean namespaceclean ]; + propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystXComponentTraits DBIxClassSchemaLoader MooseXMarkAsMethods MooseXNonMoose MooseXTypesLoadableClass TieIxHash ]; meta = { description = "DBIx::Class::Schema Model Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f8e8426af066c0c15e165bab6b8efe4df9cadffe Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:08 +0000 Subject: [PATCH 1305/2743] [cpan2nix] perlPackages.CatalystViewCSV: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 705d0efc2781..4df584ea10b9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1643,8 +1643,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MC/MCB/${name}.tar.gz"; sha256 = "e41326b6099891f244b432921ed10096ac619f32b8c4f8b41633313bd54662db"; }; - buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystRuntime CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass Moose TestException ]; - propagatedBuildInputs = [ CatalystRuntime TextCSV URI ]; + buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass TestException ]; + propagatedBuildInputs = [ CatalystRuntime TextCSV ]; meta = { description = "CSV view class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 0e8421ca115724de5cadf27dad7e0fa90482711e Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:09 +0000 Subject: [PATCH 1306/2743] [cpan2nix] perlPackages.CatalystAuthenticationStoreDBIxClass: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4df584ea10b9..36070ab8fea0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1205,12 +1205,13 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz; sha256 = "0i5ja7690fs9nhxcij6lw51j804sm8s06m5mvk1n8pi8jljrymvw"; }; - propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ]; + propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; + buildInputs = [ TestWarn ]; }; CatalystComponentInstancePerContext = buildPerlPackage rec { From 898dfd2dd4a6ef9de5da6b264f9e4aa1cd26d3bb Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:11 +0000 Subject: [PATCH 1307/2743] [cpan2nix] perlPackages.DistZillaPluginBundleTestingMania: 0.21 -> 0.25 dependencies: perlPackages.DistZillaPluginTestNoTabs: init at 0.15 --- pkgs/top-level/perl-packages.nix | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 36070ab8fea0..f2d097f15fef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4625,19 +4625,20 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; - DistZillaPluginBundleTestingMania = buildPerlPackage { - name = "Dist-Zilla-PluginBundle-TestingMania-0.21"; + DistZillaPluginBundleTestingMania = buildPerlModule { + name = "Dist-Zilla-PluginBundle-TestingMania-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.21.tar.gz; - sha256 = "1cbq7v799bf93iqp19v1ln6bcf6gvmc0qw3gf4bq445wsm7w62wy"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.25.tar.gz; + sha256 = "072rsilh88xnk18ldbr8d0svji72r79sabyird6xc3ql1z0b42sy"; }; - buildInputs = [ CaptureTiny DistZilla MooseAutobox perl ]; - propagatedBuildInputs = [ DistZilla DistZillaPluginMojibakeTests DistZillaPluginNoTabsTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion JSONPP ListMoreUtils Moose PodCoverageTrustPod TestCPANMeta TestPerlCritic TestVersion namespaceautoclean ]; + buildInputs = [ MooseAutobox TestCPANMeta TestPerlCritic TestVersion ]; + propagatedBuildInputs = [ DistZillaPluginMojibakeTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestNoTabs DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion PodCoverageTrustPod ]; meta = { homepage = https://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; description = "Test your dist with every testing plugin conceivable"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; DistZillaPluginCheckChangeLog = buildPerlPackage { @@ -4832,6 +4833,21 @@ let self = _self // overrides; _self = with self; { }; }; + DistZillaPluginTestNoTabs = buildPerlModule rec { + name = "Dist-Zilla-Plugin-Test-NoTabs-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz; + sha256 = "196hchmn8y591533v3p7kl75nlhpaygbfdiw2iqbnab9j510qq8v"; + }; + propagatedBuildInputs = [ DistZilla ]; + buildInputs = [ ModuleBuildTiny TestDeep TestNoTabs TestRequires ]; + meta = { + description = "Author tests that ensure hard tabs are not used"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-NoTabs"; + }; + }; + DistZillaPluginTestPerlCritic = buildPerlModule { name = "Dist-Zilla-Plugin-Test-Perl-Critic-3.001"; src = fetchurl { From 88a72016bdfe74e8e7413757305a0af7a6608b37 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:12 +0000 Subject: [PATCH 1308/2743] [cpan2nix] perlPackages.CatalystControllerHTMLFormFu: 1.00 -> 2.02 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f2d097f15fef..9175e149eae9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1228,13 +1228,13 @@ let self = _self // overrides; _self = with self; { }; CatalystControllerHTMLFormFu = buildPerlPackage rec { - name = "Catalyst-Controller-HTML-FormFu-1.00"; + name = "Catalyst-Controller-HTML-FormFu-2.02"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz"; - sha256 = "84329b287716cdc6d3c5a9ee185458cd2ce7abd9d902eac1c6240ef17572f12c"; + url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.02.tar.gz; + sha256 = "5ddfd4983bfb0c722995c964b4d9264b3a26a89c820c921648631a7717be0551"; }; - buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT TemplateToolkit TestAggregate TestWWWMechanize TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystRuntime ConfigAny HTMLFormFu Moose MooseXAttributeChained RegexpAssemble TaskWeaken namespaceautoclean ]; + buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT TemplateToolkit TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFu RegexpAssemble ]; meta = { description = "Catalyst integration for HTML::FormFu"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From baf6efe321a567befd8eea02baf72bf9e7d0945d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 7 Apr 2018 07:59:14 +0000 Subject: [PATCH 1309/2743] [cpan2nix] perlPackages.TaskCatalystTutorial: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9175e149eae9..0727540cded7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14360,12 +14360,12 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; sha256 = "75b1b2d96155647842587146cefd0de30943b85195e8e3eca51e0f0b8642d61e"; }; - buildInputs = [TestPodCoverage]; - propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystModelDBICSchema CatalystPluginAuthentication CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystRuntime CatalystViewTT DBIxClass ]; + propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystViewTT ]; meta = { description = "Everything you need to follow the Catalyst Tutorial"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + doCheck = false; }; TaskFreecellSolverTesting = buildPerlModule rec { From 766e48aec15c8202fe28d2a643c792475cefcc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 28 Mar 2018 11:59:34 +0100 Subject: [PATCH 1310/2743] e2fsprogs: 1.43.8 -> 1.44.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e6114781b0fad5345a2430fac3587d618273bda2) Signed-off-by: Domen Kožar --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index a97e024c0aa9..1c8835a2ed4c 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.44.0"; + name = "e2fsprogs-1.44.1"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1l8z17zfzhi00f56xl6c4f2g3fi9m4ixlmwpmaihm9y9qz1giaq4"; + sha256 = "1rn1nvp8kcvjmbh2bxrjfbrz7zz519d52rrxqvc50l0hzs6hda55"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; From e9dbe1a2a31c4ad02ff6118449c2b476b706a094 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 08:36:04 -0700 Subject: [PATCH 1311/2743] 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 1a59c8d09cd5e30e14dd9a8bc8e59ad9e4fc3d19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 08:53:21 -0700 Subject: [PATCH 1312/2743] harfbuzz: 1.7.5 -> 1.7.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/harfbuzz/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.7.6 with grep in /nix/store/q29jj339iyq46gh6dx7zrpbgx07b7826-harfbuzz-1.7.6 - directory tree listing: https://gist.github.com/ea2a4f299a574853f5fa5137ff8505ca --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index bb68ae94a7f0..2c59fb3f9ea6 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.7.5"; + version = "1.7.6"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"; + sha256 = "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys"; }; outputs = [ "out" "dev" ]; From e1f79fdea8b6b6b6c73849359b0e7aa717d4fac0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 08:54:55 -0700 Subject: [PATCH 1313/2743] iproute: 4.15.0 -> 4.16.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/iproute2/versions. These checks were done: - built on NixOS - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ctstat -h’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ctstat --help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ifstat help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/lnstat -h’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/lnstat --help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/nstat help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routef -h’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routef --help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routef help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routel --help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routel help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtpr -h’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtpr --help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtpr help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtstat -h’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtstat --help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ss -h’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ss --help’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/tc -h’ got 0 exit code - ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/tc help’ got 0 exit code - found 4.16.0 with grep in /nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0 - directory tree listing: https://gist.github.com/3cbeb932502256cc3c7505200003d620 --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 269c59f5e6fe..7d412d7e15d0 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.15.0"; + version = "4.16.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0mc3g4kj7h3jhwz2b2gdf41gp6bhqn7axh4mnyvhkdnpk5m63m28"; + sha256 = "02pfalg319jpbjz273ph725br8dnkzpfvi98azi9yd6p1w128p0c"; }; preConfigure = '' From 6961b585d3705bee5b1d22ddf4c3ce2b7923bb81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 08:56:06 -0700 Subject: [PATCH 1314/2743] iasl: 20170303 -> 20180313 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/iasl/versions. These checks were done: - built on NixOS - ran ‘/nix/store/hqhn3nlmqm58nkh71a97sd5s60yd2fdd-iasl-20180313/bin/iasl -h’ got 0 exit code - directory tree listing: https://gist.github.com/15e34bd3c2286ed995ac1e3040a1e568 --- pkgs/development/compilers/iasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 5e0970ea12f4..22f80ae559f7 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iasl-${version}"; - version = "20170303"; + version = "20180313"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1dc933rr11gv1nlaf5j8ih1chdakbjbjkn34jgbm330zppmck4y0"; + sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; }; NIX_CFLAGS_COMPILE = "-O3"; From c550af544633fc57f43c417a898d3db861e36a03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 09:48:11 -0700 Subject: [PATCH 1315/2743] gdbm: 1.14 -> 1.14.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/gdbm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool -h’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool --help’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool help’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_load -h’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_load --help’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_dump -h’ got 0 exit code - ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_dump --help’ got 0 exit code - found 1.14.1 with grep in /nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1 - directory tree listing: https://gist.github.com/fdbeceb9acdfc810ba2c598902e40881 --- pkgs/development/libraries/gdbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 310aaa430daf..3fd0bb082440 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.14"; + name = "gdbm-1.14.1"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "02dakgrq93xwgln8qfv3vs5jyz5yvds5nyzkx6rhg9v585x478dd"; + sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd"; }; doCheck = true; # not cross; From a2c1a90f76ee6c1f8570168b63b3f9c505dad070 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 10:04:51 -0700 Subject: [PATCH 1316/2743] 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 636c6344433d3e0941b9f03216a26df057761cc7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 7 Apr 2018 18:43:24 +0100 Subject: [PATCH 1317/2743] pythonPackages.jupyterlab_launcher: init at 0.10.5 --- .../jupyterlab_launcher/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/jupyterlab_launcher/default.nix diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix new file mode 100644 index 000000000000..f316fe10563d --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: +buildPythonPackage rec { + pname = "jupyterlab_launcher"; + version = "0.10.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7"; + }; + + propagatedBuildInputs = [ + jsonschema + notebook + ]; + + # depends on requests and a bunch of other libraries + doCheck = false; + + meta = with lib; { + description = "This package is used to launch an application built using JupyterLab"; + license = with licenses; [ bsd3 ]; + homepage = "http://jupyter.org/"; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5c453378ea7..4ad40af8145d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3449,6 +3449,8 @@ in { jupyter_console = callPackage ../development/python-modules/jupyter_console { }; + jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + jupyterlab = buildPythonPackage rec { name = "jupyterlab-${version}"; version = "0.4.1"; From 878ca5b68e735e3ba6feb26fe92d648bedfb9ee1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 7 Apr 2018 19:00:09 +0100 Subject: [PATCH 1318/2743] python3Packages.jupyterlab: 0.4.1 -> 0.31.12 --- .../python-modules/jupyterlab/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/jupyterlab/default.nix diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix new file mode 100644 index 000000000000..7717ff24a819 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }: +buildPythonPackage rec { + pname = "jupyterlab"; + version = "0.31.12"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1hp6p9bsr863glildgs2iy1a4l99m7rxj2sy9fmkxp5zhyhqvsrz"; + }; + + propagatedBuildInputs = [ + ipython_genutils + jupyterlab_launcher + notebook + ]; + + # No tests in archive + doCheck = false; + + meta = with lib; { + description = "Jupyter lab environment notebook server extension."; + license = with licenses; [ bsd3 ]; + homepage = "http://jupyter.org/"; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ad40af8145d..fc30394f3f2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3451,26 +3451,7 @@ in { jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; - jupyterlab = buildPythonPackage rec { - name = "jupyterlab-${version}"; - version = "0.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jupyterlab/${name}.tar.gz"; - sha256 = "91dc4d7dfb1e6ab97e28d6e3a2fc38f5f65d368201c00fd0ed077519258e67bb"; - }; - - propagatedBuildInputs = with self; [ notebook ]; - - # No tests in archive - doCheck = false; - - meta = { - description = "Jupyter lab environment notebook server extension."; - license = with licenses; [ bsd3 ]; - homepage = "http://jupyter.org/"; - }; - }; + jupyterlab = callPackage ../development/python-modules/jupyterlab {}; PyLTI = callPackage ../development/python-modules/pylti { }; From 2e18f1661b5b1e316cb4d9f4468cc3f7b0e015a3 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 7 Apr 2018 22:14:08 +0100 Subject: [PATCH 1319/2743] Update default.nix --- pkgs/development/python-modules/jupyterlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 7717ff24a819..6e942a6286fa 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { notebook ]; - # No tests in archive + # Depends on npm doCheck = false; meta = with lib; { From e4975973546912ce2d4dbc8469194364f4c2bbe6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 17:00:36 -0700 Subject: [PATCH 1320/2743] dbus: 1.10.24 -> 1.12.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/dbus/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-monitor --help’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-cleanup-sockets -h’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-cleanup-sockets --help’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-cleanup-sockets help’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-run-session -h’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-run-session --help’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-uuidgen --help’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-launch -h’ got 0 exit code - ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-launch --help’ got 0 exit code - found 1.12.6 with grep in /nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6 - directory tree listing: https://gist.github.com/f7926c86c6572ac1a02dab3468dbbb95 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index aa2af9a2ebc3..55484b85a8e6 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.24"; - sha256 = "06ydmrg76l1kwl3190d72zpiy3qxy248x6gskxbj9qiqfsr4w63i"; + version = "1.12.6"; + sha256 = "05picaq8j60wlwyi84qvw5liw3nd0cws9va3krnc3pms0wm906v2"; self = stdenv.mkDerivation { name = "dbus-${version}"; From 2dac22719b9d14c0bd761d6609653d2584d53f79 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 17:09:47 -0700 Subject: [PATCH 1321/2743] dbus-glib: 0.108 -> 0.110 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dbus-glib/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.110 with grep in /nix/store/745gjl73bz311i35h57d3slqd320bvjr-dbus-glib-0.110 - directory tree listing: https://gist.github.com/67635c95fed84872248291f96f1c4e51 --- pkgs/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 4d27552d7351..5d78e084e983 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.108"; + name = "dbus-glib-0.110"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z"; + sha256 = "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w"; }; outputs = [ "out" "dev" "devdoc" ]; From b3cbb2414b63a2efb12d32d442cf27e62a9a4073 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 19:34:21 -0700 Subject: [PATCH 1322/2743] alsaLib: 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-lib/versions. These checks were done: - built on NixOS - ran ‘/nix/store/37xgjr2ij3mvfrncywd23q2csnpbc1id-alsa-lib-1.1.6/bin/aserver -h’ got 0 exit code - ran ‘/nix/store/37xgjr2ij3mvfrncywd23q2csnpbc1id-alsa-lib-1.1.6/bin/aserver --help’ got 0 exit code - found 1.1.6 with grep in /nix/store/37xgjr2ij3mvfrncywd23q2csnpbc1id-alsa-lib-1.1.6 - directory tree listing: https://gist.github.com/9d2e30dc8cb0e3b643b48b4ddbe3a418 --- pkgs/os-specific/linux/alsa-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 5b0d404faaf0..c2c612db5422 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.5"; + name = "alsa-lib-1.1.6"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "1rhacnlj0grvfagjx5qzsnbhw7m7lyccghqs4jsv0dnsqv9qmxpl"; + sha256 = "096pwrnhj36yndldvs2pj4r871zhcgisks0is78f1jkjn9sd4b2z"; }; patches = [ From ba86aa7d43b6f9235b202be1d6453fc3157b9aaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 19:44:24 -0700 Subject: [PATCH 1323/2743] automake: 1.16 -> 1.16.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/automake/versions. These checks were done: - built on NixOS - ran ‘/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake --help’ got 0 exit code - ran ‘/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/aclocal --help’ got 0 exit code - ran ‘/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/automake-1.16 --help’ got 0 exit code - ran ‘/nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1/bin/aclocal-1.16 --help’ got 0 exit code - found 1.16.1 with grep in /nix/store/jiqmw5sf5crwh8gc6fnc0g40xb7fpmhz-automake-1.16.1 - directory tree listing: https://gist.github.com/13dcf476ba2260c529545daecd2a7571 --- pkgs/development/tools/misc/automake/automake-1.16.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 43efcf462800..affc400a9ed0 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.16"; + name = "automake-1.16.1"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr"; + sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; }; nativeBuildInputs = [ autoconf perl ]; From 016f9d67c82d97436a150dd93d7cbc431044d5f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 20:59:59 -0700 Subject: [PATCH 1324/2743] check: 0.11.0 -> 0.12.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/check/versions. These checks were done: - built on NixOS - ran ‘/nix/store/884zd0n1kqjfm8gkk2ql8rzwshr6ldhl-check-0.12.0/bin/checkmk -h’ got 0 exit code - ran ‘/nix/store/884zd0n1kqjfm8gkk2ql8rzwshr6ldhl-check-0.12.0/bin/checkmk --help’ got 0 exit code - found 0.12.0 with grep in /nix/store/884zd0n1kqjfm8gkk2ql8rzwshr6ldhl-check-0.12.0 - directory tree listing: https://gist.github.com/96299205c5d86d2f1eda8b58f2c95588 --- pkgs/development/libraries/check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 1db991f63fee..ddaf022edfd4 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "check-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; - sha256 = "05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4"; + sha256 = "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 From af5aeafbcdfb5b9977a515e5151014d8649906f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:07 +0200 Subject: [PATCH 1325/2743] python: fava: 1.6 -> 1.7 --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 9040e5cb8857..9c8f39d52f1d 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,12 +5,12 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.6"; + version = "1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0iif4imx76ra0lsisksrq5vf54wbivnrb3xqz6mkx9lik3pp5sbx"; + sha256 = "c4eba4203bddaa7bc9d54971d2afeeebab0bc80ce89be1375a41a07c4e82b62f"; }; doCheck = false; From cd49f95976f242b3fc5ca84e86ed976f16a0a14e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:14 +0200 Subject: [PATCH 1326/2743] python: JPype1: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/JPype1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index b52871793bee..13bddd3ffb8f 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "09bzmnzkjbrf60h39wapxc1l8mb3r9km486cly0mm78bv096884r"; + sha256 = "6841523631874a731e1f94e1b1f130686ad3772030eaa3b6946256eeb1d10dd1"; }; patches = [ ./set-compiler-language.patch ]; From 32c507bdcf624d77fb370c6519f958851679cccc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:20 +0200 Subject: [PATCH 1327/2743] python: Nikola: 7.8.11 -> 7.8.14 --- pkgs/development/python-modules/Nikola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 99cc4c3eab8a..bb6eddb46d1e 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "7.8.11"; + version = "7.8.14"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -46,7 +46,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10d95b3af84e61496ef729665eafa2235fd0fd4cc6c57644dd0f2c19a968dd0f"; + sha256 = "0d838817ac30ac6d4b8139a2adc8b49bed22dbb8fbc6261958d2775e10447d92"; }; meta = { From c6b521c18af6266b6bd9629d380b388f319f7e31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:26 +0200 Subject: [PATCH 1328/2743] python: absl-py: 0.1.10 -> 0.1.13 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 5acbf12aafc3..8e3f3939b363 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.1.10"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "908eba9a96a37c10f10074aba57d685070b814906b02a1ea2cf54bb10a6b8c74"; + sha256 = "d160f7dc39f2f05ddc0bbf3a7bea4cc659fedc45fd9042e87346b24fe1cd00bb"; }; propagatedBuildInputs = [ six ]; From 03e67b0aaf92de4958a8bbff6dd6790c702d9f49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:32 +0200 Subject: [PATCH 1329/2743] python: adal: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/adal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index bfd23ab584f9..0ba846bb0f6e 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.5.0"; + version = "0.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "120821f72ca9d59a7c7197fc14d0e27448ff8d331fae230f92d713b9b5c721f7"; + sha256 = "dd3ecb2dfb2de9393320d0ed4e6115ed07a6984a28e18adf46499b91d3c3a494"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; From 8e9a3aa94949260b163bc8bf26cd8960265d702f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:39 +0200 Subject: [PATCH 1330/2743] python: agate: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/agate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 3ff097a78cf3..8e480d4a3dfd 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm"; + sha256 = "c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3"; }; propagatedBuildInputs = [ discid six parsedatetime From 2523b939f3e92ced17c42334e53f0f250f878047 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:45 +0200 Subject: [PATCH 1331/2743] python: aiohttp-jinja2: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/aiohttp-jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 7b3bd6bbcc52..4865901713a3 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "0.16.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1ps182yrc5g9ph55927a7ssqx6m9kx0bivfxpaj8sa3znrdkl94d"; + sha256 = "8139c63fe989e140dceae378440680258dfb72f3301c79173945245299d795e6"; }; propagatedBuildInputs = [ aiohttp jinja2 ]; From 39975a88314d4af7286e248fe1a4b6cc0b175875 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:52 +0200 Subject: [PATCH 1332/2743] python: ajpy: 0.0.2 -> 0.0.4 --- pkgs/development/python-modules/ajpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 9d1905fe914b..373c35440620 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ajpy"; - version = "0.0.2"; + version = "0.0.4"; src = fetchPypi { inherit pname version; - sha256 = "740e7daf728ba58dabaf4af2c4305262eb207a6e41791424a146a21396ceb9ad"; + sha256 = "0a5f62b765f59ffc37e759d3f343de16cd782cc4e9e8be09c73b71dfbe383d9b"; }; # ajpy doesn't have tests From 87f768b5fc9a88d9f182792213006aa58a14ec0a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:00:58 +0200 Subject: [PATCH 1333/2743] python: alembic: 0.9.8 -> 0.9.9 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 176805e57e5c..503ce5da4b52 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.8"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "13b8611788acf0d7b617775db5c2ae26554a6d4263c590ef628d448fd05aef56"; + sha256 = "85bd3ea7633024e4930900bc64fb58f9742dedbc6ebb6ecf25be2ea9a3c1b32e"; }; buildInputs = [ pytest pytestcov mock coverage ]; From 9113864664e7874c15081c7c596202d6df24e98d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:04 +0200 Subject: [PATCH 1334/2743] python: amqp: 2.1.4 -> 2.2.2 --- pkgs/development/python-modules/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index eb2b6a8058ae..fa5b27a4ced8 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.1.4"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; + sha256 = "cba1ace9d4ff6049b190d8b7991f9c1006b443a5238021aca96dd6ad2ac9da22"; }; buildInputs = [ pytest case ]; From 490ef98daab26a02a9c705a15eba6a99f3fe59a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:10 +0200 Subject: [PATCH 1335/2743] python: aniso8601: 2.0.1 -> 3.0.0 --- pkgs/development/python-modules/aniso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 04df5d2fde84..6e596172d9e7 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "2.0.1"; + version = "3.0.0"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b7215a41e5194a829dc87d1ea5039315be85a6158ba15c8157a284c29fa6808b"; + sha256 = "7cf068e7aec00edeb21879c2bbda048656c34d281e133a77425be03b352122d8"; }; } From 9b41fc5de9c74bf114b5710f7c0b6407160272c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:16 +0200 Subject: [PATCH 1336/2743] python: astroid: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index d22a10ec1502..bcc75f2f2acf 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "f0a0e386dbca9f93ea9f3ea6f32b37a24720502b7baa9cb17c3976a680d43a06"; + sha256 = "a92c1197dd496ef2470e73e1c296fc02a719907ee07259744e26a13bda9d4862"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] From 85b60f82250765fa5f1344332000ef0256d7f7c4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:22 +0200 Subject: [PATCH 1337/2743] python: astropy: 3.0 -> 3.0.1 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 4ff4841cf5f9..d4c038a1afdc 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.0"; + version = "3.0.1"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9e0ad19b9d6d227bdf0932bbe64a8c5dd4a47d4ec078586cf24bf9f0c61d9ecf"; + sha256 = "c35f4433c14ddfcaf2407cc815385f3d85396727e9a1e660cf66a7c4f5dd1067"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires From 1ba092955c109c102a73b2428f9da6b7b07d2932 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:29 +0200 Subject: [PATCH 1338/2743] python: async-timeout: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/async_timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index 53010a2a031d..5f9318aa5c21 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; + sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; }; # Circular dependency on aiohttp From 25fd1bd55e1c7a39d8d5c42345671b25789270c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:35 +0200 Subject: [PATCH 1339/2743] python: atomicwrites: 0.1.9 -> 1.1.5 --- pkgs/development/python-modules/atomicwrites/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 724f662e5d3c..b93ff7825fcd 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atomicwrites"; - version = "0.1.9"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw"; + sha256 = "240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585"; }; meta = with stdenv.lib; { From 162fa67587182db226c6af69dfcdc8b54d583151 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:41 +0200 Subject: [PATCH 1340/2743] python: autobahn: 17.9.3 -> 18.3.1 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 69ee2b1b15f6..a48ab10474ed 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "autobahn"; - version = "17.9.3"; + version = "18.3.1"; src = fetchurl { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "206a3a579a580ca3ce2532ac12ec52d447135c9ace7c4bf6065b832a7cff25ba"; + sha256 = "fc1d38227bb44a453b54cffa48de8b2e6ce48ddc5e97fb5950b0faa27576f385"; }; # Upstream claim python2 support, but tests require pytest-asyncio which From 661dfce65190c6f5f861ee1035af1e4d45add2c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:47 +0200 Subject: [PATCH 1341/2743] python: avro: 1.7.6 -> 1.8.2 --- pkgs/development/python-modules/avro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index ab95120f8dfc..045790b9bc2d 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro"; - version = "1.7.6"; + version = "1.8.2"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1mbsf1y7gnzmnfmqh8aw62yrwnpwm5bhmmkkbbq92a5vr91l3wgd"; + sha256 = "8f9ee40830b70b5fb52a419711c9c4ad0336443a6fba7335060805f961b04b59"; }; meta = with stdenv.lib; { From 1d01edacdacfd8c9b41add735de3ffcd909e5c79 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:53 +0200 Subject: [PATCH 1342/2743] python: aws-xray-sdk: 0.95 -> 0.97 --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index dae88b34900e..972b8f847bf2 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -4,19 +4,20 @@ , jsonpickle , wrapt , requests +, future }: buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "0.95"; + version = "0.97"; src = fetchPypi { inherit pname version; - sha256 = "9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943"; + sha256 = "43eca57bb48b718ea58968608cfd22f4b9c62c2d904bb08aa2f8afe56eeb9de4"; }; propagatedBuildInputs = [ - jsonpickle wrapt requests + jsonpickle wrapt requests future ]; meta = { From 620d32dc78f435434040a16fd99a5cea38846eba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:01:59 +0200 Subject: [PATCH 1343/2743] python: batinfo: 0.3 -> 0.4.2 --- pkgs/development/python-modules/batinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index 6240186f0688..3e21fae1de66 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "batinfo"; - version = "0.3"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0gyzkxzvj5l6qrw706bnm3cckqzzzbrjr7jkxc087d7775a73499"; + sha256 = "497e29efc9353ec52e71d43bd040bdfb6d685137ddc2b9143cded4583af572f5"; }; # No tests included From 7005de0f53cf62acd395e8f3dca253c3bf72175b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:05 +0200 Subject: [PATCH 1344/2743] python: bayespy: 0.5.12 -> 0.5.14 --- pkgs/development/python-modules/bayespy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index a1b49da34a4a..dcc1a45b1cf0 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.12"; + version = "0.5.14"; name = "${pname}-${version}"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9609a3e85f88434a47c8263f40567cd24363d0e10d236354630b670fca313c00"; + sha256 = "129bac6a1c494eedabdd04abf14aac35db176d25db44e27f755c758a18adf03c"; }; checkInputs = [ pytest glibcLocales ]; From f520b3f1ff40dde3cf7d7091f8d4456e9a5f1d91 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:11 +0200 Subject: [PATCH 1345/2743] python: bcdoc: 0.14.0 -> 0.16.0 --- pkgs/development/python-modules/bcdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix index c13fce802655..b4db16476d12 100644 --- a/pkgs/development/python-modules/bcdoc/default.nix +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bcdoc"; - version = "0.14.0"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8"; + sha256 = "f568c182e06883becf7196f227052435cffd45604700c82362ca77d3427b6202"; }; buildInputs = [ docutils six ]; From 8d90142c78fb23dcee89957de097a923b4c26e88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:18 +0200 Subject: [PATCH 1346/2743] python: billiard: 3.5.0.2 -> 3.5.0.3 --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index fa68a8497f14..6b21a1492bd1 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "billiard"; - version = "3.5.0.2"; + version = "3.5.0.3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; + sha256 = "1d7b22bdc47aa52841120fcd22a74ae4fc8c13e9d3935643098184f5788c3ce6"; }; buildInputs = [ pytest case ]; From ce15d5e6274885184b4ac1a08b3cbad376f95d12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:24 +0200 Subject: [PATCH 1347/2743] python: biopython: 1.70 -> 1.71 --- pkgs/development/python-modules/biopython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index ea09a003c66e..8f99c0d75d34 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.70"; + version = "1.71"; src = fetchPypi { inherit pname version; - sha256 = "4a7c5298f03d1a45523f32bae1fffcff323ea9dce007fb1241af092f5ab2e45b"; + sha256 = "4f1770a29a5b18fcaca759bbc888083cdde2b301f073439ff640570d4a93e033"; }; propagatedBuildInputs = [ numpy ]; From 4290db5d5ac1d06839bbb573d3b617e02c45ada6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:31 +0200 Subject: [PATCH 1348/2743] python: bitbucket-api: 0.4.4 -> 0.5.0 --- pkgs/development/python-modules/bitbucket-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix index 86ce1262f6c7..0d1ac109179b 100644 --- a/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "bitbucket-api"; - version = "0.4.4"; + version = "0.5.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1cl5xa55ijjd23xs8znsd4w4vb3q1vkbmchy7hh6z6nmjcwbr478"; + sha256 = "b541d9d7f234074a74214505aff1846eb21e5dd6d3915139e817d4675d34f4e3"; }; propagatedBuildInputs = [ requests_oauthlib nose sh ]; From c121c0e6aeb5a29d9eae6f5bfc40ef0002743a9d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:37 +0200 Subject: [PATCH 1349/2743] python: bokeh: 0.12.14 -> 0.12.15 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 66a5a542bf1e..1d2ccc2d5106 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.14"; + version = "0.12.15"; src = fetchPypi { inherit pname version; - sha256 = "42abada2e484d2d5b290d14a943e1c3cd7adabd39933b5f074f57b6cf7920a87"; + sha256 = "2891b883b30107dc610a7e963a21222f1fd096844d157c09db115179cfab6513"; }; disabled = isPyPy; From 4e1df2e95538c67b5d55f815b3c656786cb66c58 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:43 +0200 Subject: [PATCH 1350/2743] python: bottle: 0.12.11 -> 0.12.13 --- pkgs/development/python-modules/bottle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 6b3d5d6dff81..50df0d5842cf 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.11"; + version = "0.12.13"; src = fetchPypi { inherit pname version; - sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1"; + sha256 = "39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355"; }; propagatedBuildInputs = [ setuptools ]; From 2d84581473e61e0a93406d930db04c9c5b217376 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:50 +0200 Subject: [PATCH 1351/2743] python: zc.buildout: 2.11.1 -> 2.11.2 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 5c21757421b2..cb54f588f9d2 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.11.1"; + version = "2.11.2"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "08017dcd8f4b60b48b7d830da835a9350c07e7f383fa56d45925ab5144400281"; + sha256 = "e304f3604a4235e896e94ea79230cfb9c0bc54569f04d5c6c4b49cc9dc4fdbf6"; }; patches = [ ./nix.patch ]; From 6006195214ba043d79559f7b67b8cb0f68c20245 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:02:56 +0200 Subject: [PATCH 1352/2743] python: cairosvg: 1.0.18 -> 2.1.3 --- pkgs/development/python-modules/cairosvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 73e648378f5f..0d110721fd12 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cairosvg"; - version = "1.0.18"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "01lpm38qp7xlnv8jv7qg48j44p5088dwfsrcllgs5fz355lrfds1"; + sha256 = "0b334f4ec436d78ecbc934c652f961a73a27d770f1133082cac265afab3dd64a"; }; propagatedBuildInputs = [ cairocffi ]; From 2317c471434cb000c8a7d8d35ad5ec06b578f375 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:02 +0200 Subject: [PATCH 1353/2743] python: case: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/case/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 7b90b1561c0d..0f1bba36def6 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "case"; - version = "1.5.2"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "1zbhbw87izcxj9rvqg432a7r69ps2ks20mqq3g3hgd42sckcy3ca"; + sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; }; propagatedBuildInputs = [ six nose unittest2 mock ]; From c69cb24264a07a20bb1b8bf44fcdc01db82f98ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:08 +0200 Subject: [PATCH 1354/2743] python: Cerberus: 0.9.2 -> 1.1 --- pkgs/development/python-modules/cerberus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 6b3128cac9c3..941979c39903 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cerberus"; - version = "0.9.2"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "1km7hvns1snrmcwz58bssi4wv3gwd34zm1z1hwjylmpqrfrcf8mi"; + sha256 = "a5b39090fde3ec3294c9d7030b8eda935b42222160a66a922e0c8aea34cabfdf"; }; meta = with stdenv.lib; { From 27dded3b061c349e8c6ef471ad790e1dc93cd54c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:15 +0200 Subject: [PATCH 1355/2743] python: chainer: 3.4.0 -> 3.5.0 --- pkgs/development/python-modules/chainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 31cd0236a59f..fe1f84aa1bba 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b7bcd8fc1a39b3602b4a78a0be6012721ba6c8792c4d14773496a4c6d038f886"; + sha256 = "d72c1f5ff5f4743b141900d5e50aeb8337a213e553a28012dad4a4d2335bbabb"; }; checkInputs = [ From 42553b531598767e6e8f5b59e9d55fe2b1be2b80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:21 +0200 Subject: [PATCH 1356/2743] python: check-manifest: 0.30 -> 0.36 --- pkgs/development/python-modules/check-manifest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 04f2b9ccc7fc..56c6c551ee7c 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.30"; + version = "0.36"; src = fetchPypi { inherit pname version; - sha256 = "0005vp3r7wh87pf41cr4rw015lbnzn228a607nx34r98p7cd17xi"; + sha256 = "2bb906a736a0f026cc5fd6c0dab5a481793b3d7a7d70106cca6e238da5f52d84"; }; doCheck = false; From 762c93c00dce5f2b3cf670f90bb3ce68c0be261b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:27 +0200 Subject: [PATCH 1357/2743] python: CherryPy: 14.0.0 -> 14.0.1 --- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 5167cc443194..18c0ab826b3a 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "CherryPy"; - version = "14.0.0"; + version = "14.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5f5ee020d6547a8d452b3560775ca2374ffe2ff8c0aec1b272e93b6af80d850e"; + sha256 = "721d09bbeedaf5b3493e9e644ae9285d776ea7f16b1d4a0a5aaec7c0d22e5074"; }; propagatedBuildInputs = [ cheroot portend routes six ]; From e693162d1d1a1c7ef479ea1ce3237833c6ef3d45 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:33 +0200 Subject: [PATCH 1358/2743] python: circus: 0.11.1 -> 0.14.0 --- pkgs/development/python-modules/circus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 93350a60b7db..b703bce2cc7a 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "circus"; - version = "0.11.1"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "0ip87wlq864k2rhk2r0rqq12ard1iggb61r6dsga4gh7lm538mrp"; + sha256 = "b8ca91d8bd87b350fda199488ac9ddff91a546b0c6214a28a2f13393713cf062"; }; doCheck = false; # weird error From b07e125ac7278aa3c78ac95f39751dc71e9e7161 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:39 +0200 Subject: [PATCH 1359/2743] python: python-cjson: 1.1.0 -> 1.2.1 --- pkgs/development/python-modules/cjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix index 60f38e4e0907..2042a2d629bb 100644 --- a/pkgs/development/python-modules/cjson/default.nix +++ b/pkgs/development/python-modules/cjson/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "python-cjson"; - version = "1.1.0"; + version = "1.2.1"; disabled = isPy3k || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1cz87pd411h1fj5am99i19jp53yizcz9mkg1a7cc6a1pb6vsn7x0"; + sha256 = "52db2745264624768bfd9b604acb38f631bde5c2ec9b23861677d747e4558626"; }; meta = with stdenv.lib; { From f7d19c1ffb2f26a64461af8f7a47da23999526c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:45 +0200 Subject: [PATCH 1360/2743] python: clf: 0.5.2 -> 0.5.7 --- pkgs/development/python-modules/clf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index ca91829adef2..9303f90141da 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "clf"; - version = "0.5.2"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5"; + sha256 = "abc919a1e99667f32fdde15dfb4bc527dbe22cf86a17acb78a449d7f2dfe937e"; }; patchPhase = '' From 96803923563353506505e061069a7a59a6139afa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:52 +0200 Subject: [PATCH 1361/2743] python: click: 5.1 -> 6.7 --- pkgs/development/python-modules/click/5_1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click/5_1.nix b/pkgs/development/python-modules/click/5_1.nix index d1c39cc5d2c1..e98ae1ed3617 100644 --- a/pkgs/development/python-modules/click/5_1.nix +++ b/pkgs/development/python-modules/click/5_1.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "click"; - version = "5.1"; + version = "6.7"; src = fetchPypi { inherit pname version; - sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"; + sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; }; meta = with stdenv.lib; { From 2670ff39d6f0da29df110f8a4743b69a1fd8c20e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:03:58 +0200 Subject: [PATCH 1362/2743] python: cloudpickle: 0.2.2 -> 0.5.2 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index b7c79bbc2827..ec5f8bcba3b2 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "0.2.2"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0x4fbycipkhfax7lydaxcnc14g42g274qba17j51shr5gbq6m8lx"; + sha256 = "b0e63dd89ed5285171a570186751bc9b84493675e99e12789e9a5dc5490ef554"; }; buildInputs = [ pytest mock ]; From 0732145251c3265d0e9f2ce985231e6e01e08949 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:04 +0200 Subject: [PATCH 1363/2743] python: cmdline: 0.1.6 -> 0.1.8 --- pkgs/development/python-modules/cmdline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 4c53126cf5c2..1f8d913aa2a8 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cmdline"; - version = "0.1.6"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "0sjkcfp4w3rxy2lm2n60dbfkc33kdb3f6254hrrvn4ci3rqv8b5y"; + sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7"; }; # No tests, https://github.com/rca/cmdline/issues/1 From af344a2704e8104d1f2be36e920ba6da2c622e77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:10 +0200 Subject: [PATCH 1364/2743] python: cogapp: 2.3 -> 2.5.1 --- pkgs/development/python-modules/cogapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 5f70437ec4fb..b660ed022577 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "2.3"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn"; + sha256 = "f8cf2288fb5a2087eb4a00d8b347ddc86e9058d4ab26b8c868433eb401adfe1c"; }; # there are no tests From 7b13b402c6ab6375cae8ec71f44557d6f8fc17ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:16 +0200 Subject: [PATCH 1365/2743] python: CoilMQ: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/coilmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix index ea008e46631d..11d39e411ce5 100644 --- a/pkgs/development/python-modules/coilmq/default.nix +++ b/pkgs/development/python-modules/coilmq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "CoilMQ"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0wwa6fsqw1mxsryvgp0yrdjil8axyj0kslzi7lr45cnhgp5ab375"; + sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d"; }; propagatedBuildInputs = [ stompclient pythondaemon redis pid ]; From 755a217d3d4da283a7ae276a132d2beef17e8e18 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:23 +0200 Subject: [PATCH 1366/2743] python: colour: 0.1.2 -> 0.1.5 --- pkgs/development/python-modules/colour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index 527696622831..a162b21b083d 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colour"; - version = "0.1.2"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "0w1j43l76zw10dvs2kk7jz7kqj2ss7gfgfdxyls27pckwin89gxb"; + sha256 = "af20120fefd2afede8b001fbef2ea9da70ad7d49fafdb6489025dae8745c3aee"; }; buildInputs = [ d2to1 ]; From 2c14093e3523a70ff0351734370e389845f995b1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:29 +0200 Subject: [PATCH 1367/2743] python: python-consul: 0.7.0 -> 0.7.2 --- pkgs/development/python-modules/consul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 4a4b351e20ca..5722893a8537 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-consul"; - version = "0.7.0"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm"; + sha256 = "ef0b7c8a2d8efba5f9602f45aadbe5035e22a511d245624ed732af81223a6571"; }; buildInputs = [ requests six pytest ]; From 68bc584f5f25762dd95720be6594e4154e634dae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:35 +0200 Subject: [PATCH 1368/2743] python: contexter: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/contexter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix index c5d35087eaad..0fa72dfa687d 100644 --- a/pkgs/development/python-modules/contexter/default.nix +++ b/pkgs/development/python-modules/contexter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "contexter"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0xrnkjya29ya0hkj8y4k9ni2mnr58i6r0xfqlj7wk07v4jfrkc8n"; + sha256 = "c730890b1a915051414a6350d8ea1cddca7d01d8f756badedb30b9bf305ea0a8"; }; meta = with stdenv.lib; { From 3a18d042f2b7765ad6c2d9ec7d3478627eed971d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:41 +0200 Subject: [PATCH 1369/2743] python: cookiecutter: 1.4.0 -> 1.6.0 --- .../python-modules/cookiecutter/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index bcbda3653273..abccd1e136d8 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,23 +1,29 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy -, itsdangerous, pytest, freezegun, docutils, jinja2, future, binaryornot, click -, whichcraft, poyo, jinja2_time }: +, pytest, pytestcov, pytest-mock, freezegun +, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests }: buildPythonPackage rec { pname = "cookiecutter"; - version = "1.4.0"; + version = "1.6.0"; # not sure why this is broken disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1clxnabmc5s4b519r1sxyj1163x833ir8xcypmdfpf6r9kbb35vn"; + sha256 = "1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e"; }; - buildInputs = [ itsdangerous pytest freezegun docutils ]; + checkInputs = [ pytest pytestcov pytest-mock freezegun ]; propagatedBuildInputs = [ - jinja2 future binaryornot click whichcraft poyo jinja2_time + jinja2 future binaryornot click whichcraft poyo jinja2_time requests ]; + + # requires network access for cloning git repos + doCheck = false; + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { homepage = https://github.com/audreyr/cookiecutter; From 1b96bdc9f5da19050d37fa866fd666b729fea46f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:47 +0200 Subject: [PATCH 1370/2743] python: coveralls: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/coveralls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 4d11354df0aa..f57e0fe86095 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "coveralls"; name = "${pname}-python-${version}"; - version = "1.2.0"; + version = "1.3.0"; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3"; + sha256 = "664794748d2e5673e347ec476159a9d87f43e0d2d44950e98ed0e27b98da8346"; }; checkInputs = [ From c09552008e3914f356036a5f7fd4ebce06d0de9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:53 +0200 Subject: [PATCH 1371/2743] python: cryptography: 2.1.4 -> 2.2.2 --- pkgs/development/python-modules/cryptography/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 606b174a514d..8fe8ccc31a95 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -21,7 +21,7 @@ }: let - version = "2.1.4"; + version = "2.2.2"; in assert version == cryptography_vectors.version; buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; @@ -29,7 +29,7 @@ in assert version == cryptography_vectors.version; buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291"; + sha256 = "9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63"; }; outputs = [ "out" "dev" ]; From b907028269d0167a75758b0142086e772789ed26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:04:59 +0200 Subject: [PATCH 1372/2743] python: cryptography_vectors: 2.1.4 -> 2.2.2 --- .../python-modules/cryptography_vectors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index ce272d29ca19..bcab5c434759 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.1.4"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "78c4b4f3f84853ea5d038e2f53d355229dd8119fe9cf949c3e497c85c760a5ca"; + sha256 = "28b52c84bae3a564ce51bfb0753cbe360218bd648c64efa2808c886c18505688"; }; # No tests included From 0fc10643e78f90e5ac48bf1a03c76796eafb6611 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:06 +0200 Subject: [PATCH 1373/2743] python: cssselect: 0.9.1 -> 1.0.3 --- pkgs/development/python-modules/cssselect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index e9a6239971aa..d086360b7d7c 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cssselect"; - version = "0.9.1"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "10h623qnp6dp1191jri7lvgmnd4yfkl36k9smqklp1qlf3iafd85"; + sha256 = "066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204"; }; # AttributeError: 'module' object has no attribute 'tests' From fd604998ce479b6453afa61898848c847d98c548 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:12 +0200 Subject: [PATCH 1374/2743] python: cssutils: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/cssutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 30398fd50062..6dd680fe11f1 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cssutils"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq"; + sha256 = "a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf"; }; buildInputs = [ mock ]; From b288f3737af95e5b09704c30252e7290ed4af9ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:18 +0200 Subject: [PATCH 1375/2743] python: csvkit: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/csvkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index badf33f8c12e..7fbdaa8909d6 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "csvkit"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; + sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c"; }; propagatedBuildInputs = [ From 6b9f16cb0542563c0c377392564b9bd7da527d84 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:25 +0200 Subject: [PATCH 1376/2743] python: cupy: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index bfb296470cf4..44d258a3de55 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "96ac44dface1a73673e9c0549fc897f8fa31a7648ff9963dff799ddabd67fde2"; + sha256 = "60e36add95b0bc15f0863e7b4a425c00111dab0985075a96ede689510a9c56be"; }; checkInputs = [ From c1932f5156b3adc81bbee872608fb898fd49cb7a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:32 +0200 Subject: [PATCH 1377/2743] python: cx_Oracle: 6.1 -> 6.2.1 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index e63c4107e091..f2e10caad726 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "6.1"; + version = "6.2.1"; buildInputs = [ oracle-instantclient @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "80545fc7acbdda917dd2b1604c938141256bdfed3ad464a44586c9c2f09c3004"; + sha256 = "01970bc843b3c699a7fd98af19e0401fe69abfbd2acdf464e0bf2ae06ea372b9"; }; # Check need an Oracle database to run From 0fdf7778b21498b04789416dc746ce554370eef0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:38 +0200 Subject: [PATCH 1378/2743] python: cytoolz: 0.9.0 -> 0.9.0.1 --- pkgs/development/python-modules/cytoolz/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index f7022d91626a..aefe250effec 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -9,12 +9,11 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.9.0"; - name = "${pname}-${version}"; + version = "0.9.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5ebb55855a8bb7800afa58e52408763935527e0305f35600c71b43c86013dec2"; + sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5"; }; # Extension types @@ -23,12 +22,6 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; - # File as accidentally included in release - # See https://github.com/pytoolz/cytoolz/issues/116#issuecomment-355770073 - postPatch = '' - rm cytoolz/tests/test_curried_doctests.py - ''; - # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 checkPhase = '' NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} From 94ee86539d697aa800043fe7cf69385366fa3736 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:44 +0200 Subject: [PATCH 1379/2743] python: dask: 0.17.1 -> 0.17.2 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 70b4b55f5c6e..5527e4617e7c 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.17.1"; + version = "0.17.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0a6aec8b3489419c97486afd46e30b63caafc642205726a884b7fe488906d359"; + sha256 = "27e470b8cfdd0516189e641b1213fceec0ddc4f37ead1fbce733d3381134fccd"; }; checkInputs = [ pytest ]; From 6956ddfe6814f3948cd1293e5a7c921887af672f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:05:51 +0200 Subject: [PATCH 1380/2743] python: datadog: 0.10.0 -> 0.20.0 --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 20d6db20404a..7b07f343d21f 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.10.0"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "0y2if4jj43n5jis20imragvhhyhr840w4m1g7j7fxh9bn7h273zp"; + sha256 = "7bb4af836d7422a6138f983b81c16acd56c2d608913982602856cc273ae74768"; }; buildInputs = [ pillow tox mock six nose ]; From 7562c120c1002825e259a3d54b79c8eb4d06a2d6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:10 +0200 Subject: [PATCH 1381/2743] python: dbf: 0.96.8 -> 0.97.2 --- pkgs/development/python-modules/dbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index ac8087be63ed..cdcc313ed82d 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.96.8"; + version = "0.97.2"; src = fetchPypi { inherit pname version; - sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1"; + sha256 = "b4c5165d29f6ca893797974aa9f228d2ad39aa864c166ce5bcb89c636489c8e6"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; From 5c0d4e55d6bbed2f680ab8aee83b7938a8f134ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:17 +0200 Subject: [PATCH 1382/2743] python: python-debian: 0.1.23 -> 0.1.32 --- pkgs/development/python-modules/debian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 38d81c1f16b5..937b6df42292 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.23"; + version = "0.1.32"; src = fetchPypi { inherit pname version; - sha256 = "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh"; + sha256 = "143887ac647ad30819f289f5a4ca13b77e56df27b686b84c34669447f7591280"; }; propagatedBuildInputs = [ chardet six ]; From 17ce1758d80ef8abc36c38673e94364c83265b75 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:24 +0200 Subject: [PATCH 1383/2743] python: deluge-client: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/deluge-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 838cc8463872..0c06bc55c7a9 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "048zfidv08sr4hivdd3xxf1pywhqbnszj5qcn51h2f4y1588fhpf"; + sha256 = "27a7f4c6da8f057e03171a493f17340f39f288199a21beb3226a188ab3c02cea"; }; # it will try to connect to a running instance From 051d649b23d9fd2158e8e8fcfe5c4dabc0b2d6f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:30 +0200 Subject: [PATCH 1384/2743] python: derpconf: 0.4.9 -> 0.8.2 --- pkgs/development/python-modules/derpconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 9968ab044af2..3a0ecffe526a 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "derpconf"; - version = "0.4.9"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "0si3xnhyjk8dykr377v35bldsjv1ikgx4ff3crizwxv47ag42aci"; + sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f"; }; propagatedBuildInputs = [ six ]; From abc588a9af9af193b835e810020a6b00489eb08d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:36 +0200 Subject: [PATCH 1385/2743] python: detox: 0.10.0 -> 0.11 --- pkgs/development/python-modules/detox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix index faf59978fdc0..ea50eebb38cb 100644 --- a/pkgs/development/python-modules/detox/default.nix +++ b/pkgs/development/python-modules/detox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "detox"; - version = "0.10.0"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "1v5sq3ak1b6388k1q31cd4pds56z76l2myvj022ncwv5lp109drk"; + sha256 = "4719ca48c4ea5ffd908b1bc3d5d1b593b41e71dee17180d58d8a3e7e8f588d45"; }; buildInputs = [ pytest ]; From 886048fdff39963ec6ba89a650954c4c641a93e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:43 +0200 Subject: [PATCH 1386/2743] python: python-digitalocean: 1.10.1 -> 1.13.2 --- pkgs/development/python-modules/digitalocean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 0e4bb15fe18f..1d36f7b5486e 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-digitalocean"; - version = "1.10.1"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "12qybflfnl08acspz7rpaprmlabgrzimacbd7gm9qs5537hl3qnp"; + sha256 = "06391cf0b253c8b4a5a10b3a4b7b7808b890a1d1e3b43d5ce3b5293a9c77af6b"; }; propagatedBuildInputs = [ requests ]; From 46d4af0640950cff762780c7dfe5ce2a40229b83 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:49 +0200 Subject: [PATCH 1387/2743] python: Django: 2.0.2 -> 2.0.4 --- pkgs/development/python-modules/django/2_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 907d2ba6e000..89bd0407ca00 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "2.0.2"; + version = "2.0.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dc3b61d054f1bced64628c62025d480f655303aea9f408e5996c339a543b45f0"; + sha256 = "d81a1652963c81488e709729a80b510394050e312f386037f26b54912a3a10d0"; }; patches = stdenv.lib.optionals withGdal [ From b3e480c6ab1de01643e43a12fa4bc0af1866d4af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:06:55 +0200 Subject: [PATCH 1388/2743] python: django-redis: 4.8.0 -> 4.9.0 --- pkgs/development/python-modules/django_redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 5c00ef604177..3cbf6d2ce713 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,12 +2,12 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.8.0"; + version = "4.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5229da5b07ccb8d3e3e9ee098c0b7c03e20eba48634bc456697dd73d62c68b19"; + sha256 = "15b47faef6aefaa3f47135a2aeb67372da300e4a4cf06809c66ab392686a2155"; }; doCheck = false; From 47065601627e7fa958b79d088b7dbf71a1ca87c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:02 +0200 Subject: [PATCH 1389/2743] python: djangorestframework: 3.7.7 -> 3.8.0 --- .../python-modules/djangorestframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index b11847beaa92..5d0718f05f3b 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.7.7"; + version = "3.8.0"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "9f9e94e8d22b100ed3a43cee8c47a7ff7b185e778a1f2da9ec5c73fc4e081b87"; + sha256 = "be299fb3f289e22ddca0ff88294924cd06aa3bcfa5043f72792d2a18d96dabe8"; }; # Test settings are missing From c3c0fa6e6d2899afc1940e8caed056e196eda0a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:08 +0200 Subject: [PATCH 1390/2743] python: docker-pycreds: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/docker-pycreds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index a19b9876e811..9cc510bf9af3 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "docker-pycreds"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0j3k5wk3bww5y0f2rvgzsin0q98k0i9j308vpsmxidw0y8n3m0wk"; + sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299"; }; # require docker-credential-helpers binaries From ed5c6557acb0a37bb537cd2dd48c55c975e6d95c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:15 +0200 Subject: [PATCH 1391/2743] python: docker: 2.7.0 -> 3.2.1 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index bb39ccd7cf6e..c290c6bd177b 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.7.0"; + version = "3.2.1"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; + sha256 = "0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43"; }; propagatedBuildInputs = [ From 8ba787722852924939765ef726934fe18b5b0b27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:21 +0200 Subject: [PATCH 1392/2743] python: docker-compose: 1.19.0 -> 1.20.1 --- pkgs/development/python-modules/docker_compose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 711babe9518e..a739c341b62d 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.19.0"; + version = "1.20.1"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "f227e0e4b7d88aaf8f892b03a2068942c56ea16bcf2a0fb9fe2a3a071c5fef0b"; + sha256 = "34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66"; }; # lots of networking and other fails From 79adc25b2c3fac095face68a891c08f01dfafa1f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:27 +0200 Subject: [PATCH 1393/2743] python: dogpile.cache: 0.6.4 -> 0.6.5 --- pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 657a4db41159..bb9bc62d9405 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.4"; + version = "0.6.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a73aa3049cd88d7ec57a1c2e8946abdf4f14188d429c1023943fcc55c4568da1"; + sha256 = "631197e78b4471bb0e93d0a86264c45736bc9ae43b4205d581dcc34fbe9b5f31"; }; # Disable concurrency tests that often fail, From 973a60a4c2dab938fed2c2773d03f934e997ef16 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:33 +0200 Subject: [PATCH 1394/2743] python: dropbox: 8.0.0 -> 8.7.1 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index bdb406ffd6d5..1be9e34ec18f 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "8.0.0"; + version = "8.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0bixx80zjq0286dwm4zhg8bdhc8pqlrqy4n2jg7i6m6a4gv4gak5"; + sha256 = "019f1529631d335f2b57ffd65a4545406bd3d139d0a9611cb6ca8c66c4ae7309"; }; # Set DROPBOX_TOKEN environment variable to a valid token. From 62cbe9f0d08db8214682e5cedf58f162d0878893 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:39 +0200 Subject: [PATCH 1395/2743] python: dulwich: 0.18.6 -> 0.19.0 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 13bcb6471869..0053e9259dca 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -3,13 +3,13 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.18.6"; + version = "0.19.0"; pname = "dulwich"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "38a04406bc68315794c3bab37c7d4ed137fb8a839482d8894e72b0d9b3eb41a9"; + sha256 = "91aad98f37a5494c6eabf08c78ed2b6e1b1ce6e7a5556406245d8763a352b99e"; }; LC_ALL = "en_US.UTF-8"; From 3529e1dd74d878ac70fdc727d7b7e25f126effe3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:45 +0200 Subject: [PATCH 1396/2743] python: ECPy: 0.8.3 -> 0.9.0 --- pkgs/development/python-modules/ecpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 277a5cece567..334778c93aab 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "ECPy"; - version = "0.8.3"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ef3d95419d53368f52fb7d4b883b8df0dfc2dd19a76243422d24981c3e5f27bd"; + sha256 = "ef41346ae24789699f3bc3ddefbfac03ad6b73b7d3d19b998ba9ce47b67c7277"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ]; From 6434ff9b44dcd01886b7218ed7a25168310a4e15 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:52 +0200 Subject: [PATCH 1397/2743] python: elasticsearch-curator: 5.4.1 -> 5.5.1 --- .../python-modules/elasticsearch-curator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index bdace9220849..cf87bc66885d 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "elasticsearch-curator"; - version = "5.4.1"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1bhiqa61h6bbrfp0aygwwchr785x281hnwk8qgnjhb8g4r8ppr3s"; + sha256 = "2d2762fa55613855b0a04f22e1c6c2c5b53d60301b437205d0e2533e4185671a"; }; # The integration tests require a running elasticsearch cluster. From b28b84a44ad7ad76279abe4a520d0fbe17b15ae3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:07:58 +0200 Subject: [PATCH 1398/2743] python: elasticsearch: 6.1.1 -> 6.2.0 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 88399d316975..502da4b1b604 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "6.1.1"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8d91a3fce12123a187b673f18c23bcffa6e7b49ba057555d59eeeded0ba15dce"; + sha256 = "b106fa3e01750376a42f8a9882bd84d630fda58c7aba38b4fec797d11c0bd0a2"; }; # Check is disabled because running them destroy the content of the local cluster! From 81a49b812e9de3a263a27ac4cbbd47a48fa1ad46 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:05 +0200 Subject: [PATCH 1399/2743] python: emoji: 0.4.5 -> 0.5.0 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 321259d99395..d7cce7b906b0 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "emoji"; name = "${pname}-${version}"; - version = "0.4.5"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "13i9mgkpll8m92b8mgm5yab4i78nwsl9h38nriavg105id94mg6q"; + sha256 = "001b92b9c8a157e1ca49187745fa450513bc8b31c87328dfd83d674b9d7dfa63"; }; checkInputs = [ nose ]; From 26047e26a1aa6a2f080bb018e275da1dd2d6fd9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:11 +0200 Subject: [PATCH 1400/2743] python: evdev: 0.7.0 -> 0.8.1 --- pkgs/development/python-modules/evdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 250a2f559325..472a630549b2 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "0.7.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "188ahmqnh5y1f46m7pyjdmi9zfxswaggn6xga65za554d72azvap"; + sha256 = "3f10c22f15ffedb34519e4af2201f1a088a958efedfd50da0da1aa3887283dff"; }; buildInputs = [ linuxHeaders ]; From 750067b08aa1a45290f845d54730f185d46e3591 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:17 +0200 Subject: [PATCH 1401/2743] python: Faker: 0.8.11 -> 0.8.12 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 55750f5bf3b4..7a7d24d070cb 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.11"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "126kdy6lj10rwgchzz0lzjabx0zcyskamhn0qib67k69fcksjmq8"; + sha256 = "9cc12b821f32ff45f6edfdc1ab7be3893b60b1224e952d68322a57e5b26a4a15"; }; checkInputs = [ From d1add704674bc4879c45d0bbec2e39cefd5f6e81 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:24 +0200 Subject: [PATCH 1402/2743] python: flake8-import-order: 0.17 -> 0.17.1 --- .../python-modules/flake8-import-order/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 128a8d18d819..79ad50a63ffe 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.17"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "60ea6674c77e4d916071beabf2b31b9b45e2f5b3bbda48a34db65766a5b25678"; + sha256 = "68d430781a9ef15c85a0121500cf8462f1a4bc7672acb2a32bfdbcab044ae0b7"; }; propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; From 21d5ac3d9647e4e323f8759b3b30f99f14430a55 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:31 +0200 Subject: [PATCH 1403/2743] python: fonttools: 3.24.1 -> 3.25.0 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index fdfa4e530cf9..1381fc45c228 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.24.1"; + version = "3.25.0"; src = fetchPypi { inherit pname version; - sha256 = "d13e98c9f3b635a5334dab69eb471d7286928ac82db7ca57b5bf4cdf3824789a"; + sha256 = "c1b7eb0469d4e684bb8995906c327109beac870a33900090d64f85d79d646360"; extension = "zip"; }; From 8ab60b2210ae0930a01d0802921dab5c764d3612 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:43 +0200 Subject: [PATCH 1404/2743] python: gensim: 3.3.0 -> 3.4.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 0c1ffacd827b..5186f7b25ea5 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6b2a813887583e63c8cedd26a91782e5f1e416a11f85394a92ae3ff908e0be03"; + sha256 = "05844c82c7c176449218fd3fc31e55e5d8b3fae460f261b11231f4c8ef2ed5e0"; }; propagatedBuildInputs = [ smart_open numpy six scipy From 3497b8ee4a8948d21e10819ca2b107c65acfce27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:50 +0200 Subject: [PATCH 1405/2743] python: google-api-core: 0.1.4 -> 1.1.0 --- pkgs/development/python-modules/google_api_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index df148b1ede34..34e0e6ca7933 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "0.1.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0144d467083ed54d2e8ccb4212d42c3724fe0b844b7d3a0ff85aea54b7ae8347"; + sha256 = "b4f103de6bd38ab346f7d17236f6098a51ebdff733ff69956a0f1e29cb35f10b"; }; propagatedBuildInputs = [ google_auth protobuf3_5 googleapis_common_protos requests grpcio ]; From 1f186204660f43e9f949ac6743705b6a7578ba26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:08:56 +0200 Subject: [PATCH 1406/2743] python: google-gax: 0.15.16 -> 0.16.0 --- pkgs/development/python-modules/google_gax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix index a8ac37e7e8cd..7de42bf8ec8c 100644 --- a/pkgs/development/python-modules/google_gax/default.nix +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-gax"; - version = "0.15.16"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "0p1ribd2xy7a04wnjv12agkcdi6f9cpj838884hayx07p5g8v3ji"; + sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; }; propagatedBuildInputs = [ google_auth ply protobuf3_5 grpcio requests googleapis_common_protos dill future ]; From 3d46fcdc3b586110981ffdf5776530b935127381 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:02 +0200 Subject: [PATCH 1407/2743] python: hupper: 1.0 -> 1.1 --- pkgs/development/python-modules/hupper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 8002ae478cb5..9bcb61751de4 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.0"; + version = "1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "02lj6kgaf9xpr0binxwac3gpdhljglyj9fr78s165jc7qd7mifdg"; + sha256 = "e18037fa43fb4af7c00bd262ca6f5d7bcd22debd5d71e43b0fb1437f56e78035"; }; checkPhase = '' From f88d4f43efcb5a71649818c880d9734ad4586b5f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:09 +0200 Subject: [PATCH 1408/2743] python: interruptingcow: 0.7 -> 0.8 --- pkgs/development/python-modules/interruptingcow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index 24a9abb625ff..5cf3c9e9db06 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "interruptingcow"; - version = "0.7"; + version = "0.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0j6d0rbh8xjfw7bf8vcjld6q45i7vr9xsw5b9q6j87nhf4qhzx53"; + sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c"; }; meta = with stdenv.lib; { From 0ce3f99ad9fea3282a573d00d4f05f70a7884c76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:22 +0200 Subject: [PATCH 1409/2743] python: ipython: 6.2.1 -> 6.3.0 --- pkgs/development/python-modules/ipython/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 64139f5d9050..af39872e2695 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -18,16 +18,16 @@ , pexpect , appnope , typing +, backcall }: buildPythonPackage rec { pname = "ipython"; - version = "6.2.1"; - name = "${pname}-${version}"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "51c158a6c8b899898d1c91c6b51a34110196815cc905f9be0fa5878e19355608"; + sha256 = "c785ab502b1a63624baeb89fedb873a118d4da6c9a796ae06e4f4aaef74e9ea0"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -46,6 +46,7 @@ buildPythonPackage rec { traitlets prompt_toolkit pexpect + backcall ] ++ lib.optionals stdenv.isDarwin [appnope] ++ lib.optionals (pythonOlder "3.5") [ typing ]; From b560534df6562cdd95b83a463828972099c213c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:29 +0200 Subject: [PATCH 1410/2743] python: ipywidgets: 7.1.2 -> 7.2.0 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index c504062cba61..af7ebfb1c432 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.1.2"; + version = "7.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4263ce721a1e5b53a84c4595a5e296d270ae0dc534401b536f4dda64e0b0ca02"; + sha256 = "f23aac2447f593dbdc89a86833a2d59666ed44af42b23c267de380c324599507"; }; # Tests are not distributed From b42011bf9c58f62a68d514678939a3fa77fbf9a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:36 +0200 Subject: [PATCH 1411/2743] python: jdatetime: 1.7.1 -> 2.0.0 --- pkgs/development/python-modules/jdatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index bf7ba56eb4ea..a43dbf737167 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "1.7.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1b1ksspm86r272ar8v0v4ip1821i4azpix6xhxpb4l133iwsb2y0"; + sha256 = "7facd437d27365e217787e1013ecdc402aa77af7248e16128f6a753920000905"; }; propagatedBuildInputs = [ six ]; From 84aa1ddfa550614c3bb309d1879fb51e7e37ab58 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:43 +0200 Subject: [PATCH 1412/2743] python: jsonpatch: 1.21 -> 1.23 --- pkgs/development/python-modules/jsonpatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 8d238b4746df..ceb697adcaf8 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.21"; + version = "1.23"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153"; + sha256 = "49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9"; }; # test files are missing From db44ac32b982c6b6f8bf27525210c95f49a14d27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:49 +0200 Subject: [PATCH 1413/2743] python: jsonrpc-websocket: 0.5 -> 0.6 --- pkgs/development/python-modules/jsonrpc-websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index b8a0c07d5a5d..0914100b5aa6 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "0.5"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "0cijqb8fvv9iq5ds9y5sj0gd6lapi90mgqvpkczp28fxz440ihq4"; + sha256 = "cf349bee4ab96db2e457b6a71a45380e1a9cf3e1ceb08260ecfd9928040ebe71"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; From 1b0b6b4b2686470e66ab4e84e8b76b49aa5103c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:09:56 +0200 Subject: [PATCH 1414/2743] python: Jug: 1.6.4 -> 1.6.5 --- pkgs/development/python-modules/jug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 7a6104aacf35..8adb43ee0113 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Jug"; - version = "1.6.4"; + version = "1.6.5"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e739b20e7fe53ac50f5954b9e32568bdd92012dd4bd199d13e2a675ccd69d97d"; + sha256 = "982e18c4b837dd7828e718bb252b4ba78da3e2dfe65d1d92b85e03e9c9e0146a"; }; meta = with stdenv.lib; { From cb724d805ac5de95a66038c86afacf98df51df2b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:02 +0200 Subject: [PATCH 1415/2743] python: jupyter_client: 5.2.2 -> 5.2.3 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index d94842ade126..5ee99d5071f8 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.2.2"; + version = "5.2.3"; src = fetchPypi { inherit pname version; - sha256 = "83d5e23132f0d8f79ccd3939f53fb9fa97f88a896a85114dc48d0e86909b06c4"; + sha256 = "27befcf0446b01e29853014d6a902dd101ad7d7f94e2252b1adca17c3466b761"; }; checkInputs = [ ipykernel ipython mock pytest ]; From cbcf48cb36d957997cdd858e2cbb0e55890afff2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:09 +0200 Subject: [PATCH 1416/2743] python: kafka-python: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/kafka-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index f88a021d53d7..eef9dc493f60 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; - version = "1.4.1"; + version = "1.4.2"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "596e9b4e302a0dc04d35be159cf23d31c4cba73a218e16fc8cd1be0ad57f8c22"; + sha256 = "6a5c516f540f4b13b78c64a85dd42dc38fe29257e2fae6393fc5daff9106389b"; }; checkInputs = [ pytest six mock ]; From fa05fc06f4a1feeee9ac016aa7ceedd6055eecde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:16 +0200 Subject: [PATCH 1417/2743] python: Keras: 2.1.4 -> 2.1.5 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 4c42a4ebafea..860a14f7a4da 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.1.4"; + version = "2.1.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7ee1fcc79072ac904a4f008d715bcb78c60250ae3cd41d99e268c60ade8d0d3a"; + sha256 = "907ad29add1fff27342a9f4fe3e60003d450d3af41a38f22f629c7736fc8399d"; }; checkInputs = [ From d9cc503245e354e1c49f7be0505e4d1faf8e85f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:22 +0200 Subject: [PATCH 1418/2743] python: keyring: 11.0.0 -> 12.0.0 --- .../python-modules/keyring/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 8c97b18e9b61..2029eabba026 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,30 +1,26 @@ { stdenv, buildPythonPackage, fetchPypi -, secretstorage -, fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm -, mock, pytest, pytestrunner }: +, setuptools_scm, entrypoints, secretstorage +, pytest, pytest-flake8 }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "keyring"; - version = "11.0.0"; + version = "12.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b4607520a7c97be96be4ddc00f4b9dac65f47a45af4b4cd13ed5a8879641d646"; + sha256 = "846c9c709ee1203bac5444abec19b5228f4601377686f33cba672aa0ba313abd"; }; - buildInputs = [ - fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm - ]; + nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ mock pytest pytestrunner ]; + checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ secretstorage ]; + propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; doCheck = !stdenv.isDarwin; checkPhase = '' - py.test $out + py.test ''; meta = with stdenv.lib; { From 3c70e4af24851e642c51b54d22aff89299d69ab7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:29 +0200 Subject: [PATCH 1419/2743] python: python-ldap: 2.5.2 -> 3.0.0 --- pkgs/development/python-modules/ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 32f25eeda42c..cc851227fb2d 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "2.5.2"; + version = "3.0.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b8c134dfedaef0e6ff4a4b94277708dcadb758b448905a83b8946df077356ed2"; + sha256 = "86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1"; }; checkInputs = [ pytest pyasn1 ]; From b7b51154c38c25627ccc65ac18d0c287b4a51f93 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:35 +0200 Subject: [PATCH 1420/2743] python: ledgerblue: 0.1.16 -> 0.1.17 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 9b2499cd5b23..dfd5d5dfde9f 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ledgerblue"; - version = "0.1.16"; + version = "0.1.17"; src = fetchPypi { inherit pname version; - sha256 = "eba56b887339fb5f8582771e4e398df4fa5a017183b908d4f8950588157c1504"; + sha256 = "ac403b074337b9b58cae97ea00b3d94fc8efeea1717a80c49e79dc8aad6fc58f"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ]; From 1126220b8be1a07b9c64cc3d63670b096c1be997 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:41 +0200 Subject: [PATCH 1421/2743] python: libtmux: 0.7.7 -> 0.8.0 --- pkgs/development/python-modules/libtmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 3fe0b3911c26..417baed95603 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.7.7"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "5670c8da8d0192d932ac1e34f010e0eeb098cdb2af6daad0307b5418e7a37733"; + sha256 = "2b969b507c26d9db08b85be4808d75774b6418ecf5a0f61956f7a1da44519585"; }; checkInputs = [ pytest ]; From d489cf676894865729d506d7bd332d962178fe92 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:48 +0200 Subject: [PATCH 1422/2743] python: llfuse: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/llfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index ef4d9fb5d020..f53ff3cbebaa 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.3.2"; + version = "1.3.3"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "96252a286a2be25810904d969b330ef2a57c2b9c18c5b503bbfbae40feb2bb63"; + sha256 = "e514fa390d143530c7395f640c6b527f4f80b03f90995c7b38ff0b2f86e11ce7"; }; nativeBuildInputs = [ pkgconfig ]; From 8cd243ec0505d82e55d9788a37f42e2865934be1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:10:54 +0200 Subject: [PATCH 1423/2743] python: lxml: 4.1.1 -> 4.2.1 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index bfd0c8227ee7..9fd050ac35ed 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.1.1"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + sha256 = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b"; }; buildInputs = [ libxml2 libxslt ]; From f41667e28288e0bb5fcacfdd5d29f950ca0eac38 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:01 +0200 Subject: [PATCH 1424/2743] python: m2r: 0.1.13 -> 0.1.14 --- pkgs/development/python-modules/m2r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index c1a6721bb804..9ec291439cef 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.13"; + version = "0.1.14"; src = fetchPypi { inherit pname version; - sha256 = "b19e3703a3a897859f01ff6a068ee9a0eea8e8fdf75e896e00e88b3476a12f87"; + sha256 = "a14635cdeedb125f0f85e014eb5898fd634e2da358a160c124818e9c9f851add"; }; propagatedBuildInputs = [ mistune docutils ]; From d9da586190957d366b763397d76ce87e9ba9e633 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:07 +0200 Subject: [PATCH 1425/2743] python: magic-wormhole-transit-relay: 0.1.1 -> 0.1.2 --- .../python-modules/magic-wormhole-transit-relay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index e6be19198efb..a553a3bf4335 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "magic-wormhole-transit-relay"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "faac36266c72745102a1a8b93abc5b25feed1be5bca7b29968a156966c312567"; + sha256 = "b13f1bfab295150b25958014d93fcd9f744d92011d186d7381575465587b8587"; }; propagatedBuildInputs = [ twisted ]; From f927d46e6f4a1ef61c9cc30275924874cc5e9325 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:14 +0200 Subject: [PATCH 1426/2743] python: matplotlib: 2.1.2 -> 2.2.2 --- pkgs/development/python-modules/matplotlib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 3579c22e92b9..46f85b654c72 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, buildPythonPackage, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado +, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection @@ -21,13 +21,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.2"; + version = "2.2.2"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "725a3f12739d133adfa381e1b33bd70c6f64db453bfc536e148824816e568894"; + sha256 = "4dc7ef528aad21f22be85e95725234c5178c0f938e2228ca76640e5e84d8cde8"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -39,7 +39,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype + [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver libpng pkgconfig mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk From c00d035f33b0ed4ae37e291f5e3e742f9a9f04d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:20 +0200 Subject: [PATCH 1427/2743] python: moto: 1.2.0 -> 1.3.1 --- pkgs/development/python-modules/moto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 84096d8aa921..79daf9d8ac5b 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "moto"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c42b894cdf35412c95f0c6b40309cf802436e049cd172dc5db7516c7b845191b"; + sha256 = "e6b25a32b61ba97bbc2236960ad6865ab111962a927de720c907475adff4499b"; }; propagatedBuildInputs = [ From a6a1819fafcabd3eca66d72c9e641a9115f67fd5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:27 +0200 Subject: [PATCH 1428/2743] python: msgpack-numpy: 0.4.1 -> 0.4.3 --- pkgs/development/python-modules/msgpack-numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 0244b03c4842..57230cb7e2c7 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "1czf125nixzwskiqiw0145kfj15030sp334cb89gp5w4rz3h7img"; + sha256 = "9d6da0bbb04d7cab2bf9f08f78232c954f00ac95cf2384149e779a31ce859126"; }; buildInputs = [ From aebaf3b286b01eae570f9b376e8acd31b7edc73c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:34 +0200 Subject: [PATCH 1429/2743] python: multipledispatch: 0.4.9 -> 0.5.0 --- pkgs/development/python-modules/multipledispatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 73d0f5a2dbe3..8edd8429d0d4 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "multipledispatch"; - version = "0.4.9"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; + sha256 = "9e92d63efad2c9b68562175d9148d8cb32d04bf5557991190e643749bf4ed954"; }; # No tests in archive From e5f1688a215634465cb317dc76f62df30edf6baf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:40 +0200 Subject: [PATCH 1430/2743] python: nilearn: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 6133abac7052..ef4473e4066f 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.4.0"; + version = "0.4.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "bb692254bde35d7e1d3d1534d9b3117810b35a744724625f150fbbc64d519c02"; + sha256 = "c2ef16d357d24699abced07e89a50d465c8fbaa8537f1a9d4d5cb8a612926dbc"; }; checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; From 60e656c692462b44f53b6484beceda62a281302e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:47 +0200 Subject: [PATCH 1431/2743] python: nipype: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 668e34a22476..39fc0995b43d 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -33,11 +33,11 @@ assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "47f62fda3d6b9a37aa407a6b78c80e91240aa71e61191ed00da68b02839fe258"; + sha256 = "1ed65f3e97fd0f82c418ad48af2107050e86d9e39eea4d22381ad7df932bf1ec"; }; # see https://github.com/nipy/nipype/issues/2240 From baa6d42177c4c056f07e7adf8f68f3f2a5b3b903 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:11:53 +0200 Subject: [PATCH 1432/2743] python: numpy-stl: 2.3.2 -> 2.4.1 --- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 835e39cc43e1..d05284b62dd4 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "numpy-stl"; name = "${pname}-${version}"; - version = "2.3.2"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0w3f9yhw4mg88drqnn17gaqxbx941p3hg0rn8fsqrf5ry56h93k2"; + sha256 = "33e88013ed2f4f9ec45598f0e0930a0d602ab3c49aa19e92703a867f37ffe520"; }; checkInputs = [ pytest pytestrunner ]; From a0819c95e580ab2b1ebcf1a365fda00b245d59c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:00 +0200 Subject: [PATCH 1433/2743] python: numpydoc: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/numpydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 3af324c87652..0e6fa25bd537 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname; inherit version; - sha256 = "2dc7b2c4e3914745e38e370946fa4c109817331e6d450806285c08bce5cd575a"; + sha256 = "61f4bf030937b60daa3262e421775838c945dcdd671f37b69e8e4854c7eb5ffd"; }; checkInputs = [ nose ]; From cdd869307fe1ba80d0f60787493cea3d28353215 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:06 +0200 Subject: [PATCH 1434/2743] python: openidc-client: 0.2.0 -> 0.5.0 --- pkgs/development/python-modules/openidc-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index 9380654f472b..d1aaebee5c0c 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "openidc-client"; - version = "0.2.0"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1fca4bpnswyji5nivsrbak5vsfphl4njyfrb8rm2034nq6mzb8ah"; + sha256 = "59d59d6fbfd26c5b57c53e582bdf2379274602f96133a163e7ff1ef39c363353"; }; propagatedBuildInputs = [ requests ]; From 93a72935b387dfb53d337cfce554633291ada607 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:13 +0200 Subject: [PATCH 1435/2743] python: openpyxl: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index fe13b575afc1..bd39c988c862 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.0"; + version = "2.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0ff2e0c2c85cbf42e82dd223e7f2401a62dc73c18cd9e5dd7763dc6c8014ebde"; + sha256 = "c875fbefae29c4ac9ceaa88470b682834495173cbe9cd37e7286285b7fbc2602"; }; checkInputs = [ pytest ]; From 80ebf6f7a838350a8f67bee7e81e782280fe7e39 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:19 +0200 Subject: [PATCH 1436/2743] python: packaging: 16.8 -> 17.1 --- pkgs/development/python-modules/packaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index f335bfa135f9..6c72947fff69 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "16.8"; + version = "17.1"; src = fetchPypi { inherit pname version; - sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; + sha256 = "f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b"; }; propagatedBuildInputs = [ pyparsing six ]; From 7a2b46f88a22bcc59d58709cbf57062357dc7eda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:25 +0200 Subject: [PATCH 1437/2743] python: pandas: 0.17.1 -> 0.22.0 --- pkgs/development/python-modules/pandas/0.17.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index 02b8211a256d..274cf1b28343 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -27,12 +27,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.17.1"; + version = "0.22.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; + sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c"; }; LC_ALL = "en_US.UTF-8"; From fbb762a6291e3bb5079fb265eda567a6cb3e6013 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:31 +0200 Subject: [PATCH 1438/2743] python: path.py: 11.0 -> 11.0.1 --- pkgs/development/python-modules/path.py/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 53754fd3dc29..ea780f964f42 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "path.py"; - version = "11.0"; + version = "11.0.1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "16134e5b287aba4a4125a6722e7837cf2a149fccc5000c500ae6c71a5525488b"; + sha256 = "e7eb9d0ca4110d9b4d7c9baa0696d8c94f837d622409cefc5ec9e7c3d02ea11f"; }; checkInputs = [ pytest pytestrunner glibcLocales packaging ]; @@ -30,6 +30,8 @@ buildPythonPackage rec { }; checkPhase = '' + # Ignore pytest configuration + rm pytest.ini py.test test_path.py ''; } From f9b05ec268cc2f29daf085b64ea4fd5226b67d99 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:37 +0200 Subject: [PATCH 1439/2743] python: pbr: 3.1.1 -> 4.0.1 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 75052f271510..993dab3aceeb 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "3.1.1"; + version = "4.0.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"; + sha256 = "56b7a8ba7d64bf6135a9dfefb85a80d95924b3fde5ed6343a1a1d464a040dae3"; }; # circular dependencies with fixtures From 949ccdbae04ffe8d8fecb060c0db96b1ee9cf207 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:44 +0200 Subject: [PATCH 1440/2743] python: pendulum: 1.4.2 -> 1.4.4 --- pkgs/development/python-modules/pendulum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 2d3ccf83a8a5..f603c98e6d87 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "1.4.2"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "39a255776528afe11ea0d57814f9bf3729c1e0b99063af2e5c6cfd750c3e1f7f"; + sha256 = "601e52cb0425e94b1784b6613a9085e0066ae1fa1915d18771884b67e93cac5c"; }; propagatedBuildInputs = [ dateutil pytzdata tzlocal ]; From 36c78e8345b947c3e0bf8a5057f4168c3e18e619 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:51 +0200 Subject: [PATCH 1441/2743] python: phonenumbers: 8.9.0 -> 8.9.2 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index e00aeb5d70de..750ec25190f3 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.0"; + version = "8.9.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2cb4822ba895200b06f46a788e852d6ae8200fdc97e1d7c86b0ee10c99d4ff3a"; + sha256 = "9c60423cdd0eee3a65dd2d8280fab08e4d9fa4675dce1651c164a6408fecacfc"; }; meta = { From 87bb866a7e936b26cdc1576ea365fe634a126376 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:12:57 +0200 Subject: [PATCH 1442/2743] python: Pillow: 5.0.0 -> 5.1.0 --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index cb6008ea9a2b..e9a0acac1cba 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "5.0.0"; + version = "5.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "12f29d6c23424f704c66b5b68c02fe0b571504459605cfe36ab8158359b0e1bb"; + sha256 = "cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"; }; doCheck = !stdenv.isDarwin && !isPyPy; From 0e918d3558fbbcc61de77a89b21aadb2d4881c8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:04 +0200 Subject: [PATCH 1443/2743] python: pkginfo: 1.3.2 -> 1.4.2 --- pkgs/development/python-modules/pkginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 2e01b8479ff4..db323e671d40 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.3.2"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0qg4sq3m0pxvjahc3sncwhw42z5rfw22k0ybskmdqkl2agykay7q"; + sha256 = "5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. From 84be45672c1c97c51c52ddfe9cc0dbbcf82f6e94 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:10 +0200 Subject: [PATCH 1444/2743] python: plaster_pastedeploy: 0.4.2 -> 0.5 --- .../python-modules/plaster-pastedeploy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 03182c902655..336a098c3a36 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "plaster_pastedeploy"; - version = "0.4.2"; + version = "0.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2a401228c7cfbe38f728249e75af7a666f91c61d642cbb8fcb78a71df69d2754"; + sha256 = "70a3185b2a3336996a26e9987968cf35e84cf13390b7e8a0a9a91eb8f6f85ba9"; }; checkPhase = '' From 40f4f814e6b3b2db5332569cf1822432b42ae461 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:16 +0200 Subject: [PATCH 1445/2743] python: plotly: 2.4.1 -> 2.5.1 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index fb5a5c93a12f..09a465b96d7c 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.4.1"; + version = "2.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f588991dce15437debd825eca935c8cfbabf438cdc0dcd2ce7a88f429d982f69"; + sha256 = "9dd816c36271cf81d82c854fba866c743cbd8cc71f1c95384195307def859a69"; }; propagatedBuildInputs = [ From 4f44b42647f42cb59b6c5e27bdc31a60029b3210 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:22 +0200 Subject: [PATCH 1446/2743] python: polib: 1.0.4 -> 1.1.0 --- pkgs/development/python-modules/polib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index 3b2ee20c8251..2e3928b742c1 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "polib"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb"; + sha256 = "fad87d13696127ffb27ea0882d6182f1a9cf8a5e2b37a587751166c51e5a332a"; }; # error: invalid command 'test' From 57b8d5a12a7068110fb2a18fdfec7e60f9530aee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:28 +0200 Subject: [PATCH 1447/2743] python: progressbar: 2.2 -> 2.3 --- pkgs/development/python-modules/progressbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index 18dfa693f5b5..5fd86fcf1987 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "progressbar"; - version = "2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3"; + sha256 = "b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254"; }; # invalid command 'test' From 597af7df9ba92538abd25b656d1b1652bc5d61a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:34 +0200 Subject: [PATCH 1448/2743] python: py: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index cd945f7bfc61..efe4e9df6724 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "py"; - version = "1.5.2"; + version = "1.5.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ca18943e28235417756316bfada6cd96b23ce60dd532642690dcfdaba988a76d"; + sha256 = "29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881"; }; # Circular dependency on pytest From ffe7db68b30f607fe2ac1198ba104b6b5a203a2c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:41 +0200 Subject: [PATCH 1449/2743] python: pybase64: 0.2.1 -> 0.3.1 --- pkgs/development/python-modules/pybase64/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index c81d60ced4df..0547a5d3ba04 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,19 +1,19 @@ -{ buildPythonPackage, stdenv, fetchPypi, parameterized, six, nose }: +{ buildPythonPackage, stdenv, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1hggg69s5r8jyqdwyzri5sn3f19p7ayl0fjhjma0qzgfp7bk6zjc"; + sha256 = "c974bff394e16817596fab686a0c7deb4995a468b035b02a788b6dbfd1e6bdeb"; }; propagatedBuildInputs = [ six ]; - checkInputs = [ parameterized nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests + py.test ''; meta = with stdenv.lib; { From ab52140c728e0131b2ea95bd748a0fe1fdd1f788 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:47 +0200 Subject: [PATCH 1450/2743] python: pyblake2: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/pyblake2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index c2f4e7db43fc..7d70fd30a254 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyblake2"; - version = "1.1.0"; + version = "1.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3a850036bf42053c74bfc52c063323ca78e40ba1f326b01777da5750a143631a"; + sha256 = "8ec8e9087d13c99b354ab6d8b4cadb1758633db5946ff95a6bc7ac538b6d7b3d"; }; # requires setting up sphinx doctest From a3f1ed8bb5c0170405dee8a56add60ec4402cfe8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:53 +0200 Subject: [PATCH 1451/2743] python: PyChromecast: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 0b41b6ef0b10..e90fc4b26366 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.0.0"; + version = "2.1.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "1cp1ssfb8zk4sz74nsnf72b7dd5fzkwc4qdgc7rq8nfr4v611w6c"; + sha256 = "a18fee9bf32f62fcb539783c3888e811015c1f6377bcdb383b13d6537691f336"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; From eefcf0e2c748931ea88ada4781aacd5184134053 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:13:59 +0200 Subject: [PATCH 1452/2743] python: PyContracts: 1.7.9 -> 1.8.3 --- pkgs/development/python-modules/pycontracts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index bd933b872ab5..23633ce248db 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.7.9"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf"; + sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d"; }; buildInputs = [ nose ]; From b49e0f0cc12586d26b8bd8081b6401267037c320 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:05 +0200 Subject: [PATCH 1453/2743] python: pycparser: 2.14 -> 2.18 --- pkgs/development/python-modules/pycparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index afc3bc42dc2a..4a0dbe878f66 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycparser"; - version = "2.14"; + version = "2.18"; src = fetchPypi { inherit pname version; - sha256 = "0wvzyb6rxsfj3xcnpa4ynbh9qc7rrbk2277d5wqpphmx9akv8nbr"; + sha256 = "99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226"; }; checkPhase = '' From bf919791efca69f89bf29111fdf1baec14efafa1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:11 +0200 Subject: [PATCH 1454/2743] python: pycryptodome: 3.4.9 -> 3.5.1 --- pkgs/development/python-modules/pycryptodome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index a086658cd7b7..85024baa26e4 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.9"; + version = "3.5.1"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "00cc7767c7bbe91f15a65a1b2ebe7a08002b8ae8221c1dcecc5c5c9ab6f79753"; + sha256 = "b7957736f5e868416b06ff033f8525e64630c99a8880b531836605190b0cac96"; }; meta = { From 1624dbf46f80c4be43dcd9833996a3dcde745c30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:18 +0200 Subject: [PATCH 1455/2743] python: pycryptodomex: 3.4.9 -> 3.5.1 --- pkgs/development/python-modules/pycryptodomex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 8cc22c986e25..c5af0c91317e 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; name = "${pname}-${version}"; - version = "3.4.9"; + version = "3.5.1"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d078b67be76ccafa8b7cc391e87151b80b0ef9bfbeee8a95d286e522cc7537f7"; + sha256 = "bb60d38111ebc383a5a1c909545562926c66c846d03fc65ba7b8a3487cb23078"; }; } From e1fb84ce57d298b99c79f7bdc902fa0e357395a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:24 +0200 Subject: [PATCH 1456/2743] python: pyechonest: 8.0.2 -> 9.0.0 --- pkgs/development/python-modules/pyechonest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix index 6a2559710a90..33e8d9c3fa9d 100644 --- a/pkgs/development/python-modules/pyechonest/default.nix +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyechonest"; - version = "8.0.2"; + version = "9.0.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; + sha256 = "1da4b3b8b457232a7eb35b59a48390b3c208759b01d596acaa71e6a172b40495"; }; meta = with stdenv.lib; { From 4791b8387f7789d837fe5ab77c7c13b55062e4d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:31 +0200 Subject: [PATCH 1457/2743] python: pyfakefs: 3.3 -> 3.4.1 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 25c286414a3c..0dc0ecf16200 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, unittest2 }: buildPythonPackage rec { - version = "3.3"; + version = "3.4.1"; pname = "pyfakefs"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "19hj5wyi8wy8n8hdj5dwlryl3frrn783y4dsfdxn5mg0lpg9iqg3"; + sha256 = "96f1d008ae6cc4d9866dd674ee852748a11c67784f1f369221a5fd2750cc0883"; }; propagatedBuildInputs = [ pytest unittest2 ]; From c85ffe1069f2a8f4ae9f5f74ffea7eacb357367f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:44 +0200 Subject: [PATCH 1458/2743] python: pylint: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index c38b71c7f47c..7bb030c698a5 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.8.2"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "4fe3b99da7e789545327b75548cee6b511e4faa98afe268130fea1af4b5ec022"; + sha256 = "c77311859e0c2d7932095f30d2b1bfdc4b6fe111f534450ba727a52eae330ef2"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; From a56a8c22d515e539240fac4e29bf5dd471f80eb1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:51 +0200 Subject: [PATCH 1459/2743] python: pyobjc: 4.1 -> 4.2.1 --- pkgs/development/python-modules/pyobjc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 874e0d47fc9e..ea557938d20f 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyobjc"; - version = "4.1"; + version = "4.2.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "287db11f912ac7d05c4907dbf6e74abaa475e36368f7c92e05aca2886a94562c"; + sha256 = "b156abab60da3f3c4bc65a919eabb2c98539a94163a277efba5828358396d23e"; }; meta = { From 403e123e912d70c21d11e598732751a42a853ec9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:14:57 +0200 Subject: [PATCH 1460/2743] python: pyodbc: 4.0.22 -> 4.0.23 --- pkgs/development/python-modules/pyodbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 0fab9979aaca..d8d61c56c357 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.22"; + version = "4.0.23"; name = "${pname}-${version}"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "e2d742b42c8b92b10018c51d673fe72d925ab90d4dbaaccd4f209e10e228ba73"; + sha256 = "bb33d032c1f25781db64e2e4fecf77047fab2ddde42a6cd9496e3c66fb8e9f66"; }; buildInputs = [ libiodbc ]; From 8251ffa997220a7a69a6bb9faec28172fb45f890 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:03 +0200 Subject: [PATCH 1461/2743] python: pyroute2: 0.4.21 -> 0.5.0 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 7a59690e5b04..6e2d923f80c4 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.4.21"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "7afad28ee0a0f3e7c34adaa9f953d00560ed9910203e93f107833b6e8d151171"; + sha256 = "bb02fe5a02fb4e8baad4d7ccf7ba5e748044ee0a1ad7d2fa4927f68f396863c4"; }; # requires root priviledges From 53fec0708a48ebf7fd871bea3372f380dcd47bd7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:09 +0200 Subject: [PATCH 1462/2743] python: pytest-cov: 2.4.0 -> 2.5.1 --- pkgs/development/python-modules/pytest-cov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 1bb47c3c9dfb..915884b5dd4a 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.4.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k"; + sha256 = "03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d"; }; buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; From 9f19c32377d09fac1bc726ee8546296f3c074f1f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:16 +0200 Subject: [PATCH 1463/2743] python: pytest-fixture-config: 1.0.1 -> 1.3.0 --- .../python-modules/pytest-fixture-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index db2e1768afa7..852a1e5fe05d 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-fixture-config"; - version = "1.0.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1dpdf36hpkfhgmca4rwmf0vnzz7xqbiw479v11zp12pq4p5w2z3x"; + sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08"; }; buildInputs = [ pytest ]; From 1701d51bed61e31aa0586cbad83edb59a011e42d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:22 +0200 Subject: [PATCH 1464/2743] python: pytest-flakes: 1.0.1 -> 2.0.0 --- pkgs/development/python-modules/pytest-flakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index ce6ed5b110b9..83fcdaf1b776 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-flakes"; - version = "1.0.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0flag3n33kbhyjrhzmq990rvg4yb8hhhl0i48q9hw0ll89jp28lw"; + sha256 = "3e880927fd2a77d31715eaab3876196e76d779726c9c24fe32ee5bab23281f82"; }; buildInputs = [ pytestpep8 pytest ]; From 15cedbb618e7b82fd78d135c7141e0864275aae3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:29 +0200 Subject: [PATCH 1465/2743] python: pytest-raisesregexp: 2.0 -> 2.1 --- .../python-modules/pytest-raisesregexp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix index 485729364331..bc7d14132003 100644 --- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-raisesregexp"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "0q8yby4g3il86rp7rhk89792wm17cykzsqcwbxpbbyal3an8mphg"; + sha256 = "b54372494fc1f11388b1b9348aeb36b69609699eb8f46e0e010afc733d78236a"; }; buildInputs = [ py pytest ]; From f1e33dd13c75e5378ae96dcd68e56649c992566c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:35 +0200 Subject: [PATCH 1466/2743] python: pytest-server-fixtures: 1.1.0 -> 1.3.0 --- .../python-modules/pytest-server-fixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index a6e5f45c5d99..4749b8f74bce 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.1.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1gs9qimcn8q6xi9d6i5624l0dziwvn6nj2rda07fg15g1cq66s8l"; + sha256 = "21eef04612ed42f73534c45ddbaef8458c800809354a5f5a96a8fde88b2a97e7"; }; buildInputs = [ pytest ]; From 35ab2e2a4fbce4cd2f51e7974d66682cb4416282 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:41 +0200 Subject: [PATCH 1467/2743] python: pytest-shutil: 1.2.8 -> 1.3.0 --- pkgs/development/python-modules/pytest-shutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 6eb5f95217cb..9ab317259bdc 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-shutil"; - version = "1.2.8"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0gdzarg3l7d80lj0gh9bcsw9r12gmf306n4y2cb18y7kqfpcqjlj"; + sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1"; }; buildInputs = [ cmdline pytest ]; From 55670818b049a373869cd8102d497484069fb4c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:48 +0200 Subject: [PATCH 1468/2743] python: pytest-virtualenv: 1.2.7 -> 1.3.0 --- pkgs/development/python-modules/pytest-virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 1338cbb153f3..413d090bbcc9 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-virtualenv"; - version = "1.2.7"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0mb76zhlak4qjjq2h7kaxbihk1b9plmimbzcb8qv4906cxl69ysi"; + sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f"; }; buildInputs = [ pytest pytestcov mock cmdline ]; From 2744b4ff28a4cd322e7cc8dec0421bd2e1ea0ac9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:54 +0200 Subject: [PATCH 1469/2743] python: pytest: 3.4.2 -> 3.5.0 --- pkgs/development/python-modules/pytest/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 71696085b094..457826f26cbc 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,8 +1,8 @@ { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py -, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools }: buildPythonPackage rec { - version = "3.4.2"; + version = "3.5.0"; pname = "pytest"; preCheck = '' @@ -12,12 +12,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1idq7s8da2p82ynf9fcg77rzj1dsagg3bpsrlslf31x7q4vasyqi"; + sha256 = "fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1"; }; checkInputs = [ hypothesis ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy ] + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools ] ++ (stdenv.lib.optional (!isPy3k) funcsigs) ++ (stdenv.lib.optional isPy26 argparse); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6f8e2a6e797..e134eb23993b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1893,9 +1893,9 @@ in { }; }; - pytest = self.pytest_34; + pytest = self.pytest_35; - pytest_34 = callPackage ../development/python-modules/pytest { + pytest_35 = callPackage ../development/python-modules/pytest { hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -1904,7 +1904,7 @@ in { }; # Needed for celery - pytest_32 = self.pytest_34.overrideAttrs( oldAttrs: rec { + pytest_32 = self.pytest_35.overrideAttrs( oldAttrs: rec { version = "3.2.5"; src = oldAttrs.src.override { inherit version; From 7b7c4b1c353d0346507d367067c17ede4d8790da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:01 +0200 Subject: [PATCH 1470/2743] python: pytest-runner: 4.0 -> 4.2 --- pkgs/development/python-modules/pytestrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 4f15adcd90e5..71b1260a5407 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "4.0"; + version = "4.2"; src = fetchPypi { inherit pname version; - sha256 = "183f3745561b1e00ea51cd97634ba5c540848ab4aa8016a81faba7fb7f33ec76"; + sha256 = "d23f117be39919f00dd91bffeb4f15e031ec797501b717a245e377aee0f577be"; }; buildInputs = [ setuptools_scm pytest ]; From 787f368822a25e1bc1275678686a5e84b8d59589 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:07 +0200 Subject: [PATCH 1471/2743] python: python-slugify: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/python-slugify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 03c37f7a6c45..c0a398a3399d 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-slugify"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp"; + sha256 = "5dbb360b882b2dabe0471a1a92f604504d83c2a73c71f2098d004ab62e695534"; }; doCheck = !isPy3k; # (only) on python3 unittest loader (loadTestsFromModule) fails From 5df8233eba5528740aa6b7012365c7450a77a120 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:13 +0200 Subject: [PATCH 1472/2743] python: pytools: 2018.1 -> 2018.3 --- pkgs/development/python-modules/pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 1fba3303e3fe..a34924374819 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.1"; + version = "2018.3"; src = fetchPypi { inherit pname version; - sha256 = "0063b87285cb1172e3602a996bfd7342bf407361cf67b562cb6d806f70422e71"; + sha256 = "26143e4ce415919272a5a8d05727bf5e026faa6536fe0ba85302e5b88ebae9f5"; }; checkInputs = [ pytest ]; From 6731e19ed2feb81bf495a07f9fa4e4b1694fb44f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:19 +0200 Subject: [PATCH 1473/2743] python: QtPy: 1.3.1 -> 1.4.0 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 035ea32b3989..d1aa4f096fe6 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "04skhjb2dbbhvpq0x71nnz2h68805fkxfpkdjhwvd7lzsljjbbq8"; + sha256 = "8e78e7ce28015c1041be68b90f43048c9815e8c89d3362f8073feecdc70eafba"; }; # no concrete propagatedBuildInputs as multiple backends are supposed From da160d496cc9712f9ca1aec6bcd5171df50d74ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:26 +0200 Subject: [PATCH 1474/2743] python: readme_renderer: 17.4 -> 18.1 --- pkgs/development/python-modules/readme_renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index d99829194939..138f99d16377 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "readme_renderer"; - version = "17.4"; + version = "18.1"; src = fetchPypi { inherit pname version; - sha256 = "82d68175feec897af2a38fe8590778f14c3be5324cc62e3ce5752a9b1e4b60ab"; + sha256 = "e18cab7f1b07412990df1b59e1be04e1538f514a5bba53ec8777bfc5aac27563"; }; checkInputs = [ pytest ]; From 79c70c398368cdbe9086249ef969a437b9dae24b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:32 +0200 Subject: [PATCH 1475/2743] python: responses: 0.4.0 -> 0.9.0 --- pkgs/development/python-modules/responses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 193c116fe55a..4cc74431fc85 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.4.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5"; + sha256 = "c6082710f4abfb60793899ca5f21e7ceb25aabf321560cc0726f8b59006811c9"; }; propagatedBuildInputs = [ cookies mock requests six ]; From 0e431659ca9936b04da07f13c25e19ba3f1119d7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:39 +0200 Subject: [PATCH 1476/2743] python: s3fs: 0.0.8 -> 0.1.4 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 1412268c42ba..956a96f14046 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "0.0.8"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "0zbdzqrim0zig94fk1hswg4vfdjplw6jpx3pdi42qc830h0nscn8"; + sha256 = "f19b2e81cfcf6f2849fa8195c366c6e81d2378400bab0611f461c4e55d4f6bed"; }; buildInputs = [ docutils ]; From 7e107c2e7c9d56d9ce5c15fdfc0a4e3381029e6a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:46 +0200 Subject: [PATCH 1477/2743] python: scipy: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 9523b08ed728..9adac49bdcc8 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10"; + sha256 = "8739c67842ed9a1c34c62d6cca6301d0ade40d50ef14ba292bd331f0d6c940ba"; }; checkInputs = [ nose pytest ]; From 9b85cb50cb4fd454089c7953d27b84bc917a0ba4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:16:59 +0200 Subject: [PATCH 1478/2743] python: setuptools_scm: 1.15.6 -> 1.17.0 --- pkgs/development/python-modules/setuptools_scm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index 260f899f56d8..3e78c9b45bf6 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "setuptools_scm"; name = "${pname}-${version}"; - version = "1.15.6"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9"; + sha256 = "70a4cf5584e966ae92f54a764e6437af992ba42ac4bca7eb37cc5d02b98ec40a"; }; buildInputs = [ pip ]; From 8ce570770ff8c7a7c8ba44ea1f0ebc9263cd3343 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:06 +0200 Subject: [PATCH 1479/2743] python: Sphinx: 1.7.1 -> 1.7.2 --- pkgs/development/python-modules/sphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index fb37279ea847..a87362dfc3c0 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "da987de5fcca21a4acc7f67a86a363039e67ac3e8827161e61b91deb131c0ee8"; + sha256 = "5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2"; }; LC_ALL = "en_US.UTF-8"; From b444ca4c763cf621f61edb602f828bd095623cb7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:13 +0200 Subject: [PATCH 1480/2743] python: SQLAlchemy: 1.2.4 -> 1.2.6 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 00ea37e3adae..6ac6fe21e4d2 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.2.4"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "6997507af46b10630e13b605ac278b78885fd683d038896dbee0e7ec41d809d2"; + sha256 = "7cb00cc9b9f92ef8b4391c8a2051f81eeafefe32d63c6b395fd51401e9a39edb"; }; checkInputs = [ From b1550d7d7ca9c10a20c860f17db81998622c3744 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:20 +0200 Subject: [PATCH 1481/2743] python: sqlmap: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 5d5e6d4bfd2b..d5c89aefef7c 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.3"; + version = "1.2.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0db9d1dd2e9624befff25f7e1a356f32366e4f05fd7e1a1783499816416ae28e"; + sha256 = "cb70fdedd8dc0a30cf361d8e5401a5b07fc75c13847b13567b98966be4e3d063"; }; # No tests in archive From 871d81e0440b839bc3530aba817d9bd08c675d32 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:26 +0200 Subject: [PATCH 1482/2743] python: tblib: 1.3.0 -> 1.3.2 --- pkgs/development/python-modules/tblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 1ba3c98492c5..37091da1b499 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.3.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"; + sha256 = "436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7"; }; meta = with stdenv.lib; { From 9d3198abf8eebcdb565b1c29850ddfe7c290553f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:33 +0200 Subject: [PATCH 1483/2743] python: testfixtures: 5.4.0 -> 6.0.0 --- pkgs/development/python-modules/testfixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 933b4be1caf3..55631f291c74 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "5.4.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "338aed9695c432b7c9b8a271dabb521e3e7e2c96b11f7b4e60552f1c8408a8f0"; + sha256 = "f6c4cf24d043f9d8e9a9337371ec1d2f6638a0032504bd67dbd724224fd64969"; }; checkInputs = [ mock manuel pytest sybil zope_component ]; From e9a1f1ce4342f51a6500c0f7219b3d4736b03dde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:39 +0200 Subject: [PATCH 1484/2743] python: tiros: 1.0.42 -> 1.0.44 --- pkgs/development/python-modules/tiros/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index 7bf21b025219..6161b0492be6 100644 --- a/pkgs/development/python-modules/tiros/default.nix +++ b/pkgs/development/python-modules/tiros/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tiros"; name = "${pname}-${version}"; - version = "1.0.42"; + version = "1.0.44"; src = fetchPypi { inherit pname version; - sha256 = "d0f9bc6d463654c971a78e02a3159ec62a2db684a217a7e940e66d4a381bdd52"; + sha256 = "d6bf7410967554ec283f9d4eabc0ce6821d6e6d36001afbdb7fe0826423d4f37"; }; patchPhase = '' From dd936ccdb9bb04436f4e045998f305de12a67eb2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:46 +0200 Subject: [PATCH 1485/2743] python: tornado: 4.5.3 -> 5.0.1 --- .../python-modules/tornado/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index ec431a6e85b3..ec21cd164ff4 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -7,15 +7,17 @@ , certifi , singledispatch , pythonOlder +, futures }: buildPythonPackage rec { pname = "tornado"; - version = "4.5.3"; - name = "${pname}-${version}"; + version = "5.0.1"; + propagatedBuildInputs = [ backports_abc certifi singledispatch ] - ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname; + ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname + ++ lib.optional (pythonOlder "3.2") futures; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -25,6 +27,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a"; + sha256 = "3e9a2333362d3dad7876d902595b64aea1a2f91d0df13191ea1f8bca5a447771"; + }; + + meta = { + description = "A web framework and asynchronous networking library"; + homepage = http://www.tornadoweb.org/; + license = lib.licenses.asl20; }; } From 668a23890e47e7dbf1c3e3a7dd446def050ea42f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:52 +0200 Subject: [PATCH 1486/2743] python: tox: 2.9.1 -> 3.0.0 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index bc70d65cc1f8..359f13e2a00b 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tox"; - version = "2.9.1"; + version = "3.0.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ py virtualenv pluggy six ]; @@ -19,6 +19,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8"; + sha256 = "96efa09710a3daeeb845561ebbe1497641d9cef2ee0aea30db6969058b2bda2f"; }; } \ No newline at end of file From e7cd0625f9ecddbaaed56863919577bd6f8cc8bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:17:59 +0200 Subject: [PATCH 1487/2743] python: tqdm: 4.19.6 -> 4.20.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 44943cdababd..7b45d8ca5925 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.19.6"; + version = "4.20.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5ec0d4442358e55cdb4a0471d04c6c831518fd8837f259db5537d90feab380df"; + sha256 = "4f2eb1d14804caf7095500fe11da0e481a47af912e7b57c93f886ac3c40a49dd"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; From 8d55d88749764463f4916bed99978d91870173ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:05 +0200 Subject: [PATCH 1488/2743] python: transaction: 2.1.2 -> 2.2.1 --- pkgs/development/python-modules/transaction/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 34c221324283..afb35b579731 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "transaction"; - version = "2.1.2"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r"; + sha256 = "f2242070e437e5d555ea3df809cb517860513254c828f33847df1c5e4b776c7a"; }; propagatedBuildInputs = [ zope_interface mock ]; From f52f478411e583bfc59edf5a2957f33d9dc941c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:11 +0200 Subject: [PATCH 1489/2743] python: trezor: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/trezor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 16fc8530a0da..cc31939ff032 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "trezor"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "2dd01e11d669cb8f5e40fcf1748bcabc41fb5f41edb010fc807dc3088f9bd7de"; + sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; }; propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 ]; From 9af285712735c7eeb5b037830e4751868a09fd18 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:24 +0200 Subject: [PATCH 1490/2743] python: txaio: 2.8.2 -> 2.9.0 --- pkgs/development/python-modules/txaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index b4662c640a35..075e7e11259f 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "txaio"; - version = "2.8.2"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571"; + sha256 = "dfc3a7d04b4b484ae5ff241affab5bb01306b1e950dd6f54fd036cfca94345d0"; }; buildInputs = [ pytest mock ]; From 7643c9230dea3c803f824825e351310fc144b3c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:30 +0200 Subject: [PATCH 1491/2743] python: u-msgpack-python: 2.4.1 -> 2.5.0 --- pkgs/development/python-modules/u-msgpack-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index bab0bc288502..cbb3f9bfa8f8 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.4.1"; + version = "2.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "2f31fc1b6dd8632c230ea7012470e40f77119f20999274dda6f1afa9c305e590"; + sha256 = "7ff18ae3721fa75571f9329c08f7c0120416a6ae36194bd8674f65b3b78d0702"; }; LC_ALL="en_US.UTF-8"; From 1f23a948e03d4e681ee220669057896e4a88b84a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:36 +0200 Subject: [PATCH 1492/2743] python: virtualenv: 15.1.0 -> 15.2.0 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index df0c83605f75..ffb2bb761900 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "15.1.0"; + version = "15.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a"; + sha256 = "1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54"; }; # Doubt this is needed - FRidh 2017-07-07 From c9e555ca899bb3e8fd5df4d46dadc4bfe500d180 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:43 +0200 Subject: [PATCH 1493/2743] python: vowpalwabbit: 8.4.0 -> 8.5.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index f2b5e06baaa2..589f8de99ee5 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { pname = "vowpalwabbit"; name = "${pname}-${version}"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl{ url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "abd22bfae99fb102cf8a6aec49e8c278cb7317d3a7eb60f70cd102be9c336fd5"; + sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304"; }; # vw tries to write some explicit things to home # python installed: The directory '/homeless-shelter/.cache/pip/http' From 41b5ac48d484c79cef96b1b23acd75188eb0d739 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:49 +0200 Subject: [PATCH 1494/2743] python: wakeonlan: 1.0.0 -> 1.1.6 --- pkgs/development/python-modules/wakeonlan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index d4a47138d4ab..6e6b5f53d9d6 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "1.0.0"; + version = "1.1.6"; src = fetchPypi { inherit pname version; - sha256 = "1snkyc6ph0bnypqs5yjw35mx3f9ij4808r5i06gl2vhn1rfzgyh1"; + sha256 = "5e6013a17004809e676c150689abd94bcc0f12a37ad3fbce1f6270968f95ffa9"; }; meta = with stdenv.lib; { From e19342e7c040fa3e81b70e2f726d83992811fbfc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:18:56 +0200 Subject: [PATCH 1495/2743] python: wheel: 0.30.0 -> 0.31.0 --- pkgs/development/python-modules/wheel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index c77d8a3859ed..6db21baf7509 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.30.0"; + version = "0.31.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9515fe0a94e823fd90b08d22de45d7bde57c90edce705b22f5e1ecf7e1b653c8"; + sha256 = "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce"; }; checkInputs = [ pytest pytestcov coverage ]; From f61a6a913e9a56082257e23ce3a65d64264a4992 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:02 +0200 Subject: [PATCH 1496/2743] python: widgetsnbextension: 3.1.4 -> 3.2.0 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 3228e928e193..2e21ead19e09 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.1.4"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "79f164a644620abbe351440a70468ac3a5b22b392afa4577c8d5f91577a2669b"; + sha256 = "9b584b9210dadc98f1fae384fff5f4db047df0b94a81b2388c7b0b14a99c3f32"; }; propagatedBuildInputs = [ notebook ]; From 3ebbcfc0138ab7251dbcc68a63a5b8be4e8465df Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:08 +0200 Subject: [PATCH 1497/2743] python: ws4py: 0.4.3 -> 0.5.1 --- pkgs/development/python-modules/ws4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 5e65940e8468..f5a83a7bc029 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ws4py"; - version = "0.4.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "ee12b58384bab8bfdcd1c76dcd6852047aec163af17175fc0f73e255d107dd7a"; + sha256 = "29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483"; }; checkInputs = [ pytest mock git ]; From 4baa0bc461c534617f833b829dc5798331dbab34 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:15 +0200 Subject: [PATCH 1498/2743] python: xarray: 0.10.1 -> 0.10.2 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 0cf38e80d2d0..1d18b5830aaf 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.10.1"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "cc183c2d7b1788cdaeb895102b1b6c2b6a3544182ff714e92f404c29db93cc9d"; + sha256 = "dd5af05cc9ddd5713016ec1a7f0d481daf2f0bb4d4e0bd66790503f6412bbc59"; }; checkInputs = [ pytest ]; From 28ada28a7c74cd011e6769a3ba031d74bf9acf67 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:21 +0200 Subject: [PATCH 1499/2743] python: xcffib: 0.5.1 -> 0.6.0 --- pkgs/development/python-modules/xcffib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 9b136531a4b9..0f4c081e6260 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.1"; + version = "0.6.0"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "09gbnmr5vn58mm8xi3fmd7fz6743cks6c46dphnxzwax6zsxmy60"; + sha256 = "36142cb72535933e8e1ed39ff2c45559fa7038823bd6be6961ef8ee5bb0f6912"; }; patchPhase = '' From eda010ecaf02628cc3743d893250237db0700c45 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:27 +0200 Subject: [PATCH 1500/2743] python: yapf: 0.20.2 -> 0.21.0 --- pkgs/development/python-modules/yapf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index d257db704451..c1914a034586 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.20.2"; + version = "0.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7f5efdb7edf0318b91e53721d934580a77153e24a222f52f6e1c3b7629aead43"; + sha256 = "7d8ae3567f3fb2d288f127d35e4decb3348c96cd091001e02e818465da618f90"; }; meta = with stdenv.lib; { From 32f398ef317daeef0ef7a69eb20688bd99b40861 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:34 +0200 Subject: [PATCH 1501/2743] python: zict: 0.1.1 -> 0.1.3 --- pkgs/development/python-modules/zict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 0d1a806b2f86..bfc5caea4d07 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "0.1.1"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "12h95vbkbar1hc6cr1kpr6zr486grj3mpx4lznvmnai0iy6pbqp4"; + sha256 = "63377f063086fc92e5c16e4d02162c571f6470b9e796cf3411ef9e815c96b799"; }; buildInputs = [ pytest ]; From bb3b4a6741ed30ee612d9cfe53365560fdd670b5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:41 +0200 Subject: [PATCH 1502/2743] python: ZODB: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/zodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index f704f3052781..25ab7dcd31ad 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.3.0"; + version = "5.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; + sha256 = "0b306042f4f0d558a477d65c34b0dd6e7604c6e583f55dfda52befa2fa13e076"; }; patches = [ From 90e69e245b803c3e00aee09052d40aad6b8b9896 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:47 +0200 Subject: [PATCH 1503/2743] python: zxcvbn-python: 4.4.16 -> 4.4.22 --- pkgs/development/python-modules/zxcvbn-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 49ff6e505f41..633270b9480f 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.16"; + version = "4.4.22"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "63cc481bfb8950c43d4a87926be22cf8c4bb281ef7f818a8ef2d30b55a97c3e0"; + sha256 = "402d4222dc9994baed66a19a1cf5cb5c3fafd065f9cabc4cf7d5a2915e980979"; }; # No tests in archive From dfc24265630b5f6a9fb5cf3e0645b84562c50d05 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:19:54 +0200 Subject: [PATCH 1504/2743] python: buildbot-pkg: 1.0.0 -> 1.1.0 --- pkgs/development/tools/build-managers/buildbot/pkg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index 07480d15f211..7fe1c0bcd2f3 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1rs2x0b2v92xfsfk0f2nr9x8lz5baawf768s58brj4jiab6mq312"; + sha256 = "2276c1e7e01908490bffcebd5502456fa34223e302853e744a79467de82ab219"; }; propagatedBuildInputs = [ setuptools ]; From 869854dd09fba6193889723a22bba0f23acc3e88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:20:00 +0200 Subject: [PATCH 1505/2743] python: pantsbuild.pants: 1.4.0 -> 1.5.0 --- pkgs/development/tools/build-managers/pants/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 0b40353ffef2..54e6d38f716a 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; with pythonPackages; let - version = "1.4.0"; + version = "1.5.0"; in buildPythonApplication rec { inherit version; pname = "pantsbuild.pants"; @@ -12,7 +12,7 @@ in buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1jd041av1kipg4psbcwk70nwh0bsh5mkbjjcmnw4vrqdd09vg1gz"; + sha256 = "7c0a1206594c615fce0a7f6daa4ea1028645bc20afa5599c2cf0ad7c06223fa7"; }; prePatch = '' From 24a0cfd2ba40073a1584cec2d62ff8c51c0ff9bf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:20:07 +0200 Subject: [PATCH 1506/2743] python: mypy: 0.570 -> 0.580 --- pkgs/development/tools/mypy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index 2fb6a8b7d4ec..e0288b686efe 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1ng3j3nmsklrg8middvc9ycvv87hx5dxh4b96s9pc3w1d49mmn9v"; + sha256 = "3bd95a1369810f7693366911d85be9f0a0bd994f6cb7162b7a994e5ded90e3d9"; }; propagatedBuildInputs = [ lxml typed-ast psutil ]; From 5ecc7b55cafd4cdf418425fd07534dfde07148b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:20:14 +0200 Subject: [PATCH 1507/2743] python: pipenv: 10.1.2 -> 11.9.0 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index c5c406ef36c0..153c0f76a405 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "10.1.2"; + version = "11.9.0"; src = fetchPypi { inherit pname version; - sha256 = "ce6dbb305fb1f262dba0dcb50c06591e4d146f7bfe079cc9f0ce3f89c7516ae9"; + sha256 = "7b3c52fb57e17ca61b6141b75c8f5ba61a95c713ca470754240f7f1dbd0a4968"; }; LC_ALL = "en_US.UTF-8"; From ebaf89be71dd8c80d62d86202626b281d635fbc9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:20:20 +0200 Subject: [PATCH 1508/2743] python: vcstool: 0.1.33 -> 0.1.35 --- pkgs/development/tools/vcstool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 0822b33aef00..aafff7290c5c 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -6,11 +6,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "vcstool"; - version = "0.1.33"; + version = "0.1.35"; src = fetchPypi { inherit pname version; - sha256 = "1140d3ecafb2c42c2c1a309950c7f327b09b548c00fbf6e37c8f44b8a610dfbc"; + sha256 = "c52ef4bae424deb284d042005db22844dae290758af77d76cac37d26bed9ad1c"; }; propagatedBuildInputs = [ pyyaml ]; From e561b8a7b91877245630cf7e028d6939f6e40a20 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:20:26 +0200 Subject: [PATCH 1509/2743] python: yq: 2.4.1 -> 2.5.0 --- pkgs/development/tools/yq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index c911cdb58250..201e85985d82 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "yq"; - version = "2.4.1"; + version = "2.5.0"; propagatedBuildInputs = [ pyyaml xmltodict jq ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "4833d4055b0f1c1f1a2fd292421b3472da39c7dc2727d7819efd11065a5fd310"; + sha256 = "e9fd2aa32defcd051058e3b6f665873282aa4eed19e11b1db94fe70847535d4c"; }; meta = with lib; { From 4b3be6cd1d1f634c8fe0a9c90e4d8bed102cee1c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:20:32 +0200 Subject: [PATCH 1510/2743] python: home-assistant-frontend: 20180310.0 -> 20180404.0 --- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b6f8826130ff..fbafa87e622e 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180310.0"; + version = "20180404.0"; src = fetchPypi { inherit pname version; - sha256 = "5a7cca7ed461d650859df7d036ff4c579366bbcde5eb6407b1aff6a0dbbae2c2"; + sha256 = "ac36d4f5e30e93b02dadd2ecdc07218fde3d97ffc2f69a6f1acf5e601cd4e5ad"; }; propagatedBuildInputs = [ user-agents ]; From 3ed297511df6b5dc5ab3938db078650ea1194cde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:20:39 +0200 Subject: [PATCH 1511/2743] python: aws-shell: 0.1.1 -> 0.2.0 --- pkgs/tools/admin/aws_shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index 6eee98269481..c319c47ea7e4 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-shell"; - version = "0.1.1"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; + sha256 = "b46a673b81254e5e014297e08c9ecab535773aa651ca33dc3786a1fd612f9810"; }; # Why does it propagate packages that are used for testing? From 9c8c8852e1af7421549643ed629c843d208273e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 19:50:53 +0200 Subject: [PATCH 1512/2743] python.pkgs.more-itertools: move expression --- .../python-modules/more-itertools/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/more-itertools/default.nix diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix new file mode 100644 index 000000000000..e618f039ebdf --- /dev/null +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, six +}: + + +buildPythonPackage rec { + pname = "more-itertools"; + version = "4.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e134eb23993b..2e0c02261584 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18320,24 +18320,7 @@ EOF moreItertools = self.more-itertools; - more-itertools = buildPythonPackage rec { - name = "more-itertools-${version}"; - version = "4.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/more-itertools/${name}.tar.gz"; - sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ six ]; - - meta = { - homepage = https://more-itertools.readthedocs.org; - description = "Expansion of the itertools module"; - license = licenses.mit; - }; - }; + more-itertools = callPackage ../development/python-modules/more-itertools { }; jaraco_functools = buildPythonPackage rec { name = "jaraco.functools-${version}"; From 828160d15e166c917372e2d2556691e70b549fc9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 20:53:45 +0200 Subject: [PATCH 1513/2743] python.pkgs.backcall: init at 0.1.0 --- .../python-modules/backcall/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/backcall/default.nix diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix new file mode 100644 index 000000000000..2eb44cb36245 --- /dev/null +++ b/pkgs/development/python-modules/backcall/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "backcall"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Specifications for callback functions passed in to an API"; + homepage = https://github.com/takluyver/backcall; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e0c02261584..9da50bc01a60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -860,6 +860,8 @@ in { }; }; + backcall = callPackage ../development/python-modules/backcall { }; + backports_abc = callPackage ../development/python-modules/backports_abc { }; backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; From ad79af6ab4ea884e5e70e84e6b76439440226f12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 20:55:16 +0200 Subject: [PATCH 1514/2743] python.pkgs.ipython_5: 5.5.0 -> 5.6.0 --- pkgs/development/python-modules/ipython/5.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index 808853891e95..083c1f3b08dd 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -27,12 +27,11 @@ buildPythonPackage rec { pname = "ipython"; - version = "5.5.0"; - name = "${pname}-${version}"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "66469e894d1f09d14a1f23b971a410af131daa9ad2a19922082e02e0ddfd150f"; + sha256 = "00g696r9rk1c4p3sycnv7by55cp9mm7r6zkkdqbiw9l0mk8k58wb"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' From c10f34445e545cc9b0e7a731a9974fbbfa229588 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 21:07:22 +0200 Subject: [PATCH 1515/2743] python.pkgs.kiwisolver: init at 1.0.1 --- .../python-modules/kiwisolver/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/kiwisolver/default.nix diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix new file mode 100644 index 000000000000..6ee732a06cb1 --- /dev/null +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "kiwisolver"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278"; + }; + + # Does not include tests + doCheck = false; + + meta = { + description = "A fast implementation of the Cassowary constraint solver"; + homepage = https://github.com/nucleic/kiwi; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9da50bc01a60..29445c171d95 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7080,6 +7080,8 @@ in { keyutils = callPackage ../development/python-modules/keyutils { }; + kiwisolver = callPackage ../development/python-modules/kiwisolver { }; + klein = callPackage ../development/python-modules/klein { }; koji = callPackage ../development/python-modules/koji { }; From 954880ed544aeb5297652a313346150b56e24d2c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 21:18:15 +0200 Subject: [PATCH 1516/2743] python.pkgs.pyzmq: move expression --- .../python-modules/pyzmq/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------- 2 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/pyzmq/default.nix diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix new file mode 100644 index 000000000000..0e06584f20db --- /dev/null +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, tornado +, zeromq3 +, py +, python +}: + +buildPythonPackage rec { + pname = "pyzmq"; + version = "16.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d"; + }; + + checkInputs = [ pytest tornado ]; + buildInputs = [ zeromq3]; + propagatedBuildInputs = [ py ]; + + # Disable broken test + # https://github.com/zeromq/pyzmq/issues/799 + checkPhase = '' + py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send and not test_recv_json_cancelled" + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29445c171d95..9ff744cfea56 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15995,21 +15995,7 @@ EOF }; }; - pyzmq = buildPythonPackage rec { - name = "pyzmq-16.0.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyzmq/${name}.tar.gz"; - sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d"; - }; - buildInputs = with self; [ pkgs.zeromq3 pytest tornado ]; - propagatedBuildInputs = [ self.py ]; - - # Disable broken test - # https://github.com/zeromq/pyzmq/issues/799 - checkPhase = '' - py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send and not test_recv_json_cancelled" - ''; - }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; testfixtures = callPackage ../development/python-modules/testfixtures {}; From 508bce0f9a3996423466d9f10202b85729b1c84a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 5 Apr 2018 21:18:35 +0200 Subject: [PATCH 1517/2743] python: pyzmq: 16.0.2 -> 17.0.0 --- pkgs/development/python-modules/pyzmq/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 0e06584f20db..26107ea3c4af 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -10,20 +10,25 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "16.0.2"; + version = "17.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d"; + sha256 = "0145ae59139b41f65e047a3a9ed11bbc36e37d5e96c64382fcdff911c4d8c3f0"; }; checkInputs = [ pytest tornado ]; buildInputs = [ zeromq3]; propagatedBuildInputs = [ py ]; - # Disable broken test - # https://github.com/zeromq/pyzmq/issues/799 + # test_socket.py seems to be hanging + # others fail checkPhase = '' - py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send and not test_recv_json_cancelled" + py.test $out/${python.sitePackages}/zmq/ -k "not test_socket \ + and not test_current \ + and not test_instance \ + and not test_callable_check \ + and not test_on_recv_basic \ + and not test_on_recv_wake" ''; } From a77bed927a239ef647d04f852f8cf6c47bb109ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 21:58:14 +0200 Subject: [PATCH 1518/2743] python.pkgs.Babel: move expression --- .../python-modules/Babel/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +--------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/Babel/default.nix diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix new file mode 100644 index 000000000000..c828bc11d310 --- /dev/null +++ b/pkgs/development/python-modules/Babel/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, pytz, pytest }: + +buildPythonPackage rec { + pname = "Babel"; + version = "2.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5"; + }; + + propagatedBuildInputs = [ pytz ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + homepage = http://babel.edgewall.org; + description = "A collection of tools for internationalizing Python applications"; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ff744cfea56..4b45061fabd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10637,24 +10637,7 @@ in { pygit2 = callPackage ../development/python-modules/pygit2 { }; - Babel = buildPythonPackage (rec { - name = "Babel-2.3.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/B/Babel/${name}.tar.gz"; - sha256 = "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ pytz ]; - - meta = { - homepage = http://babel.edgewall.org; - description = "A collection of tools for internationalizing Python applications"; - license = licenses.bsd3; - maintainers = with maintainers; [ garbas ]; - }; - }); + Babel = callPackage ../development/python-modules/Babel { }; pybfd = callPackage ../development/python-modules/pybfd { }; From 959f6cb28481c32ee85a4ef734c90820d56b01b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 21:59:06 +0200 Subject: [PATCH 1519/2743] python: Babel: 2.3.4 -> 2.5.3 --- pkgs/development/python-modules/Babel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index c828bc11d310..e9dda44997fb 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -1,17 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, pytz, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun }: buildPythonPackage rec { pname = "Babel"; - version = "2.3.4"; + version = "2.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5"; + sha256 = "8ce4cb6fdd4393edd323227cba3a077bceb2a6ce5201c902c65e730046f41f14"; }; propagatedBuildInputs = [ pytz ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest freezegun ]; meta = with lib; { homepage = http://babel.edgewall.org; From b038c92b03e85de27593016d2e64d17335126d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:05:51 +0200 Subject: [PATCH 1520/2743] python.pkgs.uritemplate: move expression --- .../python-modules/uritemplate/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/uritemplate/default.nix diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix new file mode 100644 index 000000000000..bb358e677e28 --- /dev/null +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, simplejson }: + +buildPythonPackage rec { + pname = "uritemplate"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; + }; + + # No tests in archive + doCheck = false; + + propagatedBuildInputs = [ simplejson ]; + + meta = with lib; { + homepage = https://github.com/uri-templates/uritemplate-py; + description = "Python implementation of URI Template"; + license = licenses.asl20; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b45061fabd3..8d8374149a65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14960,27 +14960,7 @@ in { update_checker = callPackage ../development/python-modules/update_checker {}; - uritemplate = buildPythonPackage rec { - name = "uritemplate-${version}"; - version = "0.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uritemplate/${name}.tar.gz"; - sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; - }; - - # No tests in archive - doCheck = false; - - propagatedBuildInputs = with self; [ simplejson ]; - - meta = with stdenv.lib; { - homepage = https://github.com/uri-templates/uritemplate-py; - description = "Python implementation of URI Template"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; - }; + uritemplate = callPackage ../development/python-modules/uritemplate { }; uptime = buildPythonPackage rec { name = "uptime-${version}"; From f01bd848fccd235a535aa80c271adcb10861d7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:06:41 +0200 Subject: [PATCH 1521/2743] python: uritemplate: 0.6 -> 3.0.0 --- pkgs/development/python-modules/uritemplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index bb358e677e28..531d34f9a8d7 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uritemplate"; - version = "0.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; + sha256 = "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d"; }; # No tests in archive From 762378a5d7da9281610e9f079f7efb880c5157a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:13:24 +0200 Subject: [PATCH 1522/2743] python.pkgs.uritemplate: update expression * run tests * update meta info --- .../python-modules/uritemplate/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index 531d34f9a8d7..c469fd8dd1cc 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, simplejson }: +{ lib, buildPythonPackage, fetchPypi, simplejson, pytest, glibcLocales }: buildPythonPackage rec { pname = "uritemplate"; @@ -9,15 +9,18 @@ buildPythonPackage rec { sha256 = "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d"; }; - # No tests in archive - doCheck = false; - propagatedBuildInputs = [ simplejson ]; + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.UTF-8 py.test + ''; + meta = with lib; { - homepage = https://github.com/uri-templates/uritemplate-py; - description = "Python implementation of URI Template"; - license = licenses.asl20; + homepage = https://github.com/python-hyper/uritemplate; + description = "URI template parsing for Humans"; + license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ matthiasbeyer ]; }; } From 63193b19b364ba33b7c63959ce4729c3517bb2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:32:01 +0200 Subject: [PATCH 1523/2743] beancount: move to pythonPackages --- .../python-modules}/beancount/default.nix | 20 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +--- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 15 insertions(+), 11 deletions(-) rename pkgs/{applications/office => development/python-modules}/beancount/default.nix (72%) diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix similarity index 72% rename from pkgs/applications/office/beancount/default.nix rename to pkgs/development/python-modules/beancount/default.nix index d500be8a1f22..2991ae9be82f 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchhg, pkgs, pythonPackages }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, beautifulsoup4, bottle, chardet, dateutil +, google_api_python_client, lxml, ply, python_magic +, nose }: -pythonPackages.buildPythonApplication rec { +buildPythonPackage rec { version = "2.0.0"; - name = "beancount-${version}"; - namePrefix = ""; + pname = "beancount"; - src = pkgs.fetchurl { - url = "mirror://pypi/b/beancount/${name}.tar.gz"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; sha256 = "0wxwf02d3raglwqsxdsgf89fniakv1m19q825w76k5z004g18y42"; }; - buildInputs = with pythonPackages; [ nose ]; + checkInputs = [ nose ]; # Automatic tests cannot be run because it needs to import some local modules for tests. doCheck = false; @@ -18,7 +22,7 @@ pythonPackages.buildPythonApplication rec { nosetests ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ beautifulsoup4 bottle chardet diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e98111c43da..71f2a508840c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18775,9 +18775,7 @@ with pkgs; bastet = callPackage ../games/bastet {}; - beancount = callPackage ../applications/office/beancount { - pythonPackages = python3Packages; - }; + beancount = with python3.pkgs; toPythonApplication beancount; bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d8374149a65..5a5ce5a50639 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -931,6 +931,8 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc {}; + beancount = callPackage ../development/python-modules/beancount { }; + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; beaker = buildPythonPackage rec { From 3dfe742e83f6c6c793c547d38a46a5d56fad335a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:37:52 +0200 Subject: [PATCH 1524/2743] python.pkgs.google_api_python_client: move expression --- .../google-api-python-client/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/google-api-python-client/default.nix diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix new file mode 100644 index 000000000000..7c6375b47929 --- /dev/null +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi +, httplib2, six, oauth2client, uritemplate }: + +buildPythonPackage rec { + pname = "google-api-python-client"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; + }; + + # No tests included in archive + doCheck = false; + + propagatedBuildInputs = [ httplib2 six oauth2client uritemplate ]; + + meta = with lib; { + description = "The core Python library for accessing Google APIs"; + homepage = https://github.com/google/google-api-python-client; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a5ce5a50639..922dd586d50a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6302,27 +6302,7 @@ in { google_api_core = callPackage ../development/python-modules/google_api_core { }; - google_api_python_client = buildPythonPackage rec { - name = "google-api-python-client-${version}"; - version = "1.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/google-api-python-client/${name}.tar.gz"; - sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = with self; [ httplib2 six oauth2client uritemplate ]; - - meta = { - description = "The core Python library for accessing Google APIs"; - homepage = "https://code.google.com/p/google-api-python-client/"; - license = licenses.asl20; - platforms = platforms.unix; - }; - }; + google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; google_apputils = buildPythonPackage rec { name = "google-apputils-0.4.1"; From 60b67d0874a5053a0241f8afce86303a8d83b391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:38:22 +0200 Subject: [PATCH 1525/2743] python: google-api-python-client: 1.5.1 -> 1.6.6 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 7c6375b47929..d4de33b5a837 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.5.1"; + version = "1.6.6"; src = fetchPypi { inherit pname version; - sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; + sha256 = "ec72991f95201996a4edcea44a079cae0292798086beaadb054d91921632fe1b"; }; # No tests included in archive From 54201ddf245ab821e3aac6a0b8718bf2b0c14a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:42:47 +0200 Subject: [PATCH 1526/2743] python.pkgs.oauth2client: move expression --- .../python-modules/oauth2client/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/oauth2client/default.nix diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix new file mode 100644 index 000000000000..1707e9d99445 --- /dev/null +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi +, six, httplib2, pyasn1-modules, rsa }: + +buildPythonPackage rec { + pname = "oauth2client"; + version = "1.4.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; + }; + + propagatedBuildInputs = [ six httplib2 pyasn1-modules rsa ]; + doCheck = false; + + meta = with lib; { + description = "A client library for OAuth 2.0"; + homepage = https://github.com/google/oauth2client/; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 922dd586d50a..d90104423fb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9088,23 +9088,7 @@ in { }; }); - oauth2client = buildPythonPackage rec { - name = "oauth2client-1.4.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oauth2client/${name}.tar.gz"; - sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; - }; - - propagatedBuildInputs = with self; [ six httplib2 pyasn1-modules rsa ]; - doCheck = false; - - meta = { - description = "A client library for OAuth 2.0"; - homepage = https://github.com/google/oauth2client/; - license = licenses.bsd2; - }; - }; + oauth2client = callPackage ../development/python-modules/oauth2client { }; oauthlib = buildPythonPackage rec { version = "2.0.0"; From 77225d05786826de61e3a8d5d2de99035cf5df62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:49:34 +0200 Subject: [PATCH 1527/2743] python: oauth2client: 1.4.12 -> 4.1.2 --- pkgs/development/python-modules/oauth2client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix index 1707e9d99445..81742a99da8d 100644 --- a/pkgs/development/python-modules/oauth2client/default.nix +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "oauth2client"; - version = "1.4.12"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; + sha256 = "bd3062c06f8b10c6ef7a890b22c2740e5f87d61b6e1f4b1c90d069cdfc9dadb5"; }; propagatedBuildInputs = [ six httplib2 pyasn1-modules rsa ]; From 66cce2d15e10aa4486f8f915c45f96647b22ab1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 10:08:12 +0200 Subject: [PATCH 1528/2743] home-assistant: pin async-timeout version --- pkgs/servers/home-assistant/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 75f8b309a406..6a8997aace3e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -35,6 +35,13 @@ let sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6"; }; }); + async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; + }; + }); hass-frontend = super.callPackage ./frontend.nix { }; }; }; From fe2e07451f387ba73f9ce9c7506d70cc963b61c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 13:00:43 +0200 Subject: [PATCH 1529/2743] python: aiohttp: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 19c616b3cfa8..ab5c4b625780 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.1.1"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f"; + sha256 = "df49fe4452a942e0031174c78917f9926d122d4603bf56bae4591639f2a3dc6a"; }; disabled = pythonOlder "3.5"; From 889cbd5c12158f4b200ae11051c42673bd6b0a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 13:06:04 +0200 Subject: [PATCH 1530/2743] bonfire: fix build Loosen version constraints to not have an upper bound. The upper bounds would have to be updated again on the next keyring update, so they don't make sense. --- pkgs/tools/misc/bonfire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 0d6e93118d82..9355f3e54076 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -19,8 +19,8 @@ buildPythonApplication rec { postPatch = '' # https://github.com/blue-yonder/bonfire/pull/24 substituteInPlace requirements.txt \ - --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.13" \ - --replace "keyring>=9,<10" "keyring>=9,<=11" + --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4" \ + --replace "keyring>=9,<10" "keyring>=9" # pip fails when encountering the git hash for the package version substituteInPlace setup.py \ --replace "version=version," "version='${version}'," From 67131083075df9a2907cb921ae981a2c84099bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 13:19:06 +0200 Subject: [PATCH 1531/2743] buku: fix build Loosen pytest version constraint by applying https://github.com/jarun/Buku/commit/495d6eac4d9371e8ce6d3f601e2bb9e5e74962b4. --- pkgs/applications/misc/buku/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index fb1f6403ce44..83ba02933fd5 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,8 +1,8 @@ -{ stdenv, python3, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { version = "3.7"; - name = "buku-${version}"; + pname = "buku"; src = fetchFromGitHub { owner = "jarun"; @@ -11,7 +11,12 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "0qc6xkrhf2phaj9fhym19blr4rr2vllvnyljjz909xr4vsynvb41"; }; - nativeBuildInputs = [ + patches = fetchpatch { + url = https://github.com/jarun/Buku/commit/495d6eac4d9371e8ce6d3f601e2bb9e5e74962b4.patch; + sha256 = "0py4l5qcgdzqr0iqmcc8ddld1bspk8iwypz4dcr88y70j86588gk"; + }; + + checkInputs = [ pytestcov pytest-catchlog hypothesis From 991a60e186a97239aed6bfed1ed27f891c2f9271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 13:34:03 +0200 Subject: [PATCH 1532/2743] python.pkgs.whichcraft: move expression --- .../python-modules/whichcraft/default.nix | 19 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/whichcraft/default.nix diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix new file mode 100644 index 000000000000..ca67b1fccbcd --- /dev/null +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "whichcraft"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "5df20674e0a90028b5633417510f0001b63bc0f345ab3cbb184dd4b221d125ec"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + homepage = https://github.com/pydanny/whichcraft; + description = "Cross-platform cross-python shutil.which functionality"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d90104423fb2..619c289b75ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16049,25 +16049,7 @@ EOF }; }; - - whichcraft = buildPythonPackage rec { - name = "whichcraft-${version}"; - version = "0.1.1"; - - src = pkgs.fetchurl { - url = "https://github.com/pydanny/whichcraft/archive/${version}.tar.gz"; - sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv"; - }; - - buildInputs = with self; [ pytest ]; - - meta = { - homepage = https://github.com/pydanny/whichcraft; - description = "Cross-platform cross-python shutil.which functionality"; - license = licenses.bsd3; - }; - }; - + whichcraft = callPackage ../development/python-modules/whichcraft { }; whisper = buildPythonPackage rec { name = "whisper-${version}"; From effb3782633c1baa2ad4bbae731b9ae6d014e290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 13:34:36 +0200 Subject: [PATCH 1533/2743] python: whichcraft: 0.1.1 -> 0.4.1 --- pkgs/development/python-modules/whichcraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index ca67b1fccbcd..c02114735ba6 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whichcraft"; - version = "0.1.1"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "5df20674e0a90028b5633417510f0001b63bc0f345ab3cbb184dd4b221d125ec"; + sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd"; }; checkInputs = [ pytest ]; From fd764a1383f1be1c12e62587754a9119faa3b38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 13:36:48 +0200 Subject: [PATCH 1534/2743] python.pkgs.whichcraft: run tests --- pkgs/development/python-modules/whichcraft/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index c02114735ba6..89be87e18491 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + checkPhase = '' + py.test + ''; + meta = with lib; { homepage = https://github.com/pydanny/whichcraft; description = "Cross-platform cross-python shutil.which functionality"; From 3c6d505281445d0a007d229ddc8b85325f090f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 14:45:56 +0200 Subject: [PATCH 1535/2743] mitmproxy: 3.0.2 -> 3.0.4 --- pkgs/tools/networking/mitmproxy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index c969119e1d76..5f7537eda18d 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonPackage rec { pname = "mitmproxy"; - version = "3.0.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw"; + sha256 = "10l761ds46r1p2kjxlgby9vdxbjjlgq72s6adjypghi41s3qf034"; }; postPatch = '' @@ -29,13 +29,13 @@ buildPythonPackage rec { blinker click certifi cryptography h2 hyperframe kaitaistruct passlib pyasn1 pyopenssl pyparsing pyperclip - requests ruamel_yaml tornado urwid - brotlipy sortedcontainers ldap3 + ruamel_yaml tornado urwid brotlipy + sortedcontainers ldap3 wsproto ]; - buildInputs = [ + checkInputs = [ beautifulsoup4 flask pytest - pytestrunner glibcLocales + requests glibcLocales ]; meta = with stdenv.lib; { From 026f65273c0bba3139be8407ac5a29d0c6de4ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 14:50:16 +0200 Subject: [PATCH 1536/2743] python.pkgs.pyperclip: move expression --- .../python-modules/pyperclip/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------------- 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pyperclip/default.nix diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix new file mode 100644 index 000000000000..d46bdd666149 --- /dev/null +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "1.5.27"; + pname = "pyperclip"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1i9zxm7qc49n9yxfb41c0jbmmp2hpzx98kaizjl7qmgiv3snvjx3"; + }; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/asweigart/pyperclip"; + license = licenses.bsdOriginal; + description = "Cross-platform clipboard module"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 619c289b75ad..f458b58b0b28 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11873,23 +11873,7 @@ in { }; }; - pyperclip = buildPythonPackage rec { - version = "1.5.27"; - name = "pyperclip-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyperclip/${name}.zip"; - sha256 = "1i9zxm7qc49n9yxfb41c0jbmmp2hpzx98kaizjl7qmgiv3snvjx3"; - }; - - doCheck = false; - - meta = { - homepage = "https://github.com/asweigart/pyperclip"; - license = licenses.bsdOriginal; - description = "Cross-platform clipboard module"; - }; - }; + pyperclip = callPackage ../development/python-modules/pyperclip { }; pysqlite = buildPythonPackage rec { name = "pysqlite-2.8.3"; From 1e24bcf9dc71409f9a273c22a47ba65b1f9a2ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 14:52:04 +0200 Subject: [PATCH 1537/2743] python: pyperclip: 1.5.27 -> 1.6.0 --- pkgs/development/python-modules/pyperclip/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index d46bdd666149..282f9b65cb69 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,13 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.5.27"; + version = "1.6.0"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "1i9zxm7qc49n9yxfb41c0jbmmp2hpzx98kaizjl7qmgiv3snvjx3"; + sha256 = "ce829433a9af640e08ee89b20f7c62132714bcc5d77df114044d0fccb8c3b3b8"; }; doCheck = false; From 2bf437f0c8fafdbc3b409cf5ee57cffef29054aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 15:06:16 +0200 Subject: [PATCH 1538/2743] python.pkgs.wakeonlan: fix build --- .../python-modules/wakeonlan/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 6e6b5f53d9d6..b5c9e14da355 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }: buildPythonPackage rec { pname = "wakeonlan"; @@ -9,6 +9,19 @@ buildPythonPackage rec { sha256 = "5e6013a17004809e676c150689abd94bcc0f12a37ad3fbce1f6270968f95ffa9"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools-scm ~= 1.15.7" "setuptools-scm" + ''; + + checkInputs = [ pytest mock ]; + + nativeBuildInputs = [ setuptools_scm ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "A small python module for wake on lan"; homepage = https://github.com/remcohaszing/pywakeonlan; From b1ef2e596fde11fe73441d37f4d0f7e6999006df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 15:13:18 +0200 Subject: [PATCH 1539/2743] python.pkgs.vobject: move expression --- .../python-modules/vobject/default.nix | 24 +++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------------ 2 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/vobject/default.nix diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix new file mode 100644 index 000000000000..8d52f65d498e --- /dev/null +++ b/pkgs/development/python-modules/vobject/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: + +buildPythonPackage rec { + version = "0.9.5"; + pname = "vobject"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; + }; + + disabled = isPyPy; + + propagatedBuildInputs = [ dateutil ]; + + checkPhase = "${python.interpreter} tests.py"; + + meta = with lib; { + description = "Module for reading vCard and vCalendar files"; + homepage = http://eventable.github.io/vobject/; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f458b58b0b28..0074f05d433f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10553,32 +10553,7 @@ in { }; }; - - - vobject = buildPythonPackage rec { - version = "0.9.5"; - name = "vobject-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "eventable"; - repo = "vobject"; - sha256 = "1f5lw9kpssr66bdirkjba3izbnm68p8pd47546m5yl4c7x76s1ld"; - rev = version; - }; - - disabled = isPyPy; - - propagatedBuildInputs = with self; [ dateutil ]; - - checkPhase = "${python.interpreter} tests.py"; - - meta = { - description = "Module for reading vCard and vCalendar files"; - homepage = http://eventable.github.io/vobject/; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; - }; + vobject = callPackage ../development/python-modules/vobject { }; pycarddav = buildPythonPackage rec { version = "0.7.0"; From 9440d4825ce7ddfc43a94242db2398d5b74024b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 15:21:42 +0200 Subject: [PATCH 1540/2743] python.pkgs.txaio: fix build --- pkgs/development/python-modules/txaio/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 075e7e11259f..4abd97d24362 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "txaio"; version = "2.9.0"; @@ -10,18 +9,12 @@ buildPythonPackage rec { sha256 = "dfc3a7d04b4b484ae5ff241affab5bb01306b1e950dd6f54fd036cfca94345d0"; }; - buildInputs = [ pytest mock ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ six twisted ]; - patchPhase = '' - sed -i '152d' test/test_logging.py - ''; - - # test_chained_callback has been removed just post-2.7.1 because the functionality was decided against and the test - # breaks on python 3.6 https://github.com/crossbario/txaio/pull/104 checkPhase = '' - py.test -k "not (test_sdist or test_chained_callback)" + py.test -k "not test_sdist" ''; meta = with stdenv.lib; { From 3558ed8416a36ef0a5182edd7d512f677c27351b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 15:53:24 +0200 Subject: [PATCH 1541/2743] python.pkgs.dulwich: 0.19.0 -> 0.19.1, fix build --- .../python-modules/dulwich/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 0053e9259dca..4e1e1d711655 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,21 +1,23 @@ -{ stdenv, buildPythonPackage, fetchurl +{ stdenv, buildPythonPackage, fetchPypi +, urllib3, certifi , gevent, geventhttpclient, mock, fastimport , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.0"; + version = "0.19.1"; pname = "dulwich"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "91aad98f37a5494c6eabf08c78ed2b6e1b1ce6e7a5556406245d8763a352b99e"; + src = fetchPypi { + inherit pname version; + sha256 = "c7334bd6ac8d14189ab42b20e0b0593ebd97ae922875562a8c111ee298fb194f"; }; LC_ALL = "en_US.UTF-8"; + propagatedBuildInputs = [ urllib3 certifi ]; + # Only test dependencies - buildInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; + checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; doCheck = !stdenv.isDarwin; From dcb13a7a060a1bf5947c754867c31c7eb4c57d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 15:59:31 +0200 Subject: [PATCH 1542/2743] python.pkgs.msgpack-numpy: replace msgpack-python by msgpack --- pkgs/development/python-modules/msgpack-numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 57230cb7e2c7..cae571fe2f5c 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , cython -, msgpack-python +, msgpack , numpy , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - msgpack-python + msgpack numpy ]; From adf1a734ff197872ba8c512f74d47c8683ae3f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 16:30:14 +0200 Subject: [PATCH 1543/2743] mkdocs: fix build --- pkgs/development/tools/documentation/mkdocs/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 95c2a6a28a78..128eed603b03 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -5,7 +5,6 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; version = "0.17.3"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mkdocs"; @@ -14,6 +13,11 @@ buildPythonApplication rec { sha256 = "15lv60gdc837zja5kn2rfp78kwyb1ckc43jg01zfzqra4qz7b6rw"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "tornado>=4.1,<5.0" "tornado>=4.1" + ''; + checkInputs = [ nose nose-exclude mock ]; From d6e8e946fcda63da13642b975eb2018cfdf83408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 17:00:27 +0200 Subject: [PATCH 1544/2743] octoprint: fix build --- pkgs/applications/misc/octoprint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 6587305a770f..37aace548d54 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -94,6 +94,8 @@ in pythonPackages.buildPythonApplication rec { -e 's,pyserial>=[^"]*,pyserial,g' \ -e 's,semantic_version>=[^"]*,semantic_version,g' \ -e 's,wrapt>=[^"]*,wrapt,g' \ + -e 's,python-dateutil>=[^"]*,python-dateutil,g' \ + -e 's,emoji>=[^"]*,emoji,g' \ setup.py ''; From 8b85031f0737ab839dad48e6b6377fdcb6c00d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 17:31:40 +0200 Subject: [PATCH 1545/2743] python.pkgs.pyfakefs: run tests --- .../python-modules/pyfakefs/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 0dc0ecf16200..cfb575c7675e 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,21 +1,37 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, unittest2 }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, pytest, glibcLocales }: buildPythonPackage rec { version = "3.4.1"; pname = "pyfakefs"; - name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "96f1d008ae6cc4d9866dd674ee852748a11c67784f1f369221a5fd2750cc0883"; + # no tests in PyPI tarball + # https://github.com/jmcgeheeiv/pyfakefs/pull/361 + src = fetchFromGitHub { + owner = "jmcgeheeiv"; + repo = pname; + rev = "v${version}"; + sha256 = "0i8kq7sl8bczr927hllgfhsmirjqjh89c9184kcqmprc13ac4kxy"; }; - propagatedBuildInputs = [ pytest unittest2 ]; + postPatch = '' + # test doesn't work in sandbox + substituteInPlace tests/fake_filesystem_test.py \ + --replace "test_expand_root" "notest_expand_root" + substituteInPlace tests/fake_os_test.py \ + --replace "test_append_mode" "notest_append_mode" + ''; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.UTF-8 ${python.interpreter} -m tests.all_tests + py.test tests/pytest_plugin_test.py + ''; meta = with stdenv.lib; { description = "Fake file system that mocks the Python file system modules"; license = licenses.asl20; - homepage = "http://pyfakefs.org/"; + homepage = http://pyfakefs.org/; maintainers = with maintainers; [ gebner ]; }; } From 59bfd1246e7de9e41a70ae13e59dd2cd770cc45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 18:01:59 +0200 Subject: [PATCH 1546/2743] pubs: pin pyfakefs version --- pkgs/tools/misc/pubs/default.nix | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index aa8c43b7cdd7..c9ab32035de4 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -1,7 +1,24 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, python3 }: -python3Packages.buildPythonApplication rec { - name = "pubs-${version}"; +let + python3Packages = (python3.override { + packageOverrides = self: super: { + # https://github.com/pubs/pubs/issues/131 + pyfakefs = super.pyfakefs.overridePythonAttrs (oldAttrs: rec { + version = "3.3"; + src = self.fetchPypi { + pname = "pyfakefs"; + inherit version; + sha256 = "e3e198dea5e0d5627b73ba113fd0b139bb417da6bc15d920b2c873143d2f12a6"; + }; + postPatch = ""; + doCheck = false; + }); + }; + }).pkgs; + +in python3Packages.buildPythonApplication rec { + pname = "pubs"; version = "0.7.0"; src = fetchFromGitHub { @@ -13,9 +30,10 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ dateutil configobj bibtexparser pyyaml requests beautifulsoup4 - pyfakefs ddt ]; + checkInputs = with python3Packages; [ pyfakefs ddt ]; + preCheck = '' # API tests require networking rm tests/test_apis.py @@ -29,6 +47,5 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/pubs/pubs; license = licenses.lgpl3; maintainers = with maintainers; [ gebner ]; - platforms = platforms.all; }; } From 3b0221b003f9de59fec4e2d79a1206b48f50d104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 18:40:43 +0200 Subject: [PATCH 1547/2743] python: sybil: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/sybil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 31fd0977c144..6930cb2a559f 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "86332553392f865403883e44695bd8d9d47fe3887c01e17591955237b8fd2d8f"; + sha256 = "1e17e10bac4c56ef5b6752866a7d100f5ae856ff97d805c4d6cac73be80863d3"; }; checkInputs = [ pytest nose ]; From e15ba18cee713bf43f56d7f6b1ba4a9bad559669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 18:46:49 +0200 Subject: [PATCH 1548/2743] python.pkgs.cerberus: specify checkInputs --- pkgs/development/python-modules/cerberus/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 941979c39903..12536584f051 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, pytestrunner, pytest }: buildPythonPackage rec { pname = "Cerberus"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "a5b39090fde3ec3294c9d7030b8eda935b42222160a66a922e0c8aea34cabfdf"; }; + checkInputs = [ pytestrunner pytest ]; + meta = with stdenv.lib; { homepage = http://python-cerberus.org/; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; From e110d297c3cecca9e6e916e6b487bf0aa91b7a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 18:59:50 +0200 Subject: [PATCH 1549/2743] python.pkgs.datadog: fix build --- .../python-modules/datadog/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 7b07f343d21f..35d830f81b58 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,19 +1,25 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pillow, tox, mock, six, nose, requests, decorator, simplejson }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, decorator, requests, simplejson +, nose, mock }: buildPythonPackage rec { pname = "datadog"; version = "0.20.0"; - src = fetchPypi { - inherit pname version; - sha256 = "7bb4af836d7422a6138f983b81c16acd56c2d608913982602856cc273ae74768"; + # no tests in PyPI tarball + # https://github.com/DataDog/datadogpy/pull/259 + src = fetchFromGitHub { + owner = "DataDog"; + repo = "datadogpy"; + rev = "v${version}"; + sha256 = "1p4p14853yrsl8py4ca7za7a12qzw0xwgz64f5kzx8a6vpv3p3md"; }; - buildInputs = [ pillow tox mock six nose ]; - propagatedBuildInputs = [ requests decorator simplejson ]; + propagatedBuildInputs = [ decorator requests simplejson ]; - meta = with stdenv.lib; { + checkInputs = [ nose mock ]; + + meta = with lib; { description = "The Datadog Python library"; license = licenses.bsd3; homepage = https://github.com/DataDog/datadogpy; From 28419df2e37e7c028df72684e788cb7c4a261813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 20:37:04 +0200 Subject: [PATCH 1550/2743] python.pkgs.futures: move expression --- .../python-modules/futures/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +----------------- 2 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/futures/default.nix diff --git a/pkgs/development/python-modules/futures/default.nix b/pkgs/development/python-modules/futures/default.nix new file mode 100644 index 000000000000..c4a39c39c339 --- /dev/null +++ b/pkgs/development/python-modules/futures/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, python }: + +buildPythonPackage rec { + pname = "futures"; + version = "3.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z9j05fdj2yszjmz4pmjhl2jdnwhdw80cjwfqq3ci0yx19gv9v2i"; + }; + + # This module is for backporting functionality to Python 2.x, it's builtin in py3k + disabled = isPy3k; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + # Tests fail + doCheck = false; + + meta = with lib; { + description = "Backport of the concurrent.futures package from Python 3.2"; + homepage = "https://github.com/agronholm/pythonfutures"; + license = licenses.bsd2; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0074f05d433f..6c563ccee4a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5950,32 +5950,7 @@ in { }; }); - futures = buildPythonPackage rec { - name = "futures-${version}"; - version = "3.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/futures/${name}.tar.gz"; - sha256 = "1z9j05fdj2yszjmz4pmjhl2jdnwhdw80cjwfqq3ci0yx19gv9v2i"; - }; - - # This module is for backporting functionality to Python 2.x, it's builtin in py3k - disabled = isPy3k; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - # Tests fail - doCheck = false; - - meta = with pkgs.stdenv.lib; { - description = "Backport of the concurrent.futures package from Python 3.2"; - homepage = "https://github.com/agronholm/pythonfutures"; - license = licenses.bsd2; - maintainers = with maintainers; [ garbas ]; - }; - }; + futures = callPackage ../development/python-modules/futures { }; futures_2_2 = self.futures.override rec { version = "2.2.0"; From c5d3633cbc00d095d6c416bc0b5df21c16d42247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 20:37:43 +0200 Subject: [PATCH 1551/2743] python: futures: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/futures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/futures/default.nix b/pkgs/development/python-modules/futures/default.nix index c4a39c39c339..c0c389d49d19 100644 --- a/pkgs/development/python-modules/futures/default.nix +++ b/pkgs/development/python-modules/futures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "futures"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1z9j05fdj2yszjmz4pmjhl2jdnwhdw80cjwfqq3ci0yx19gv9v2i"; + sha256 = "9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265"; }; # This module is for backporting functionality to Python 2.x, it's builtin in py3k From a80628091180c8566ff3ae90f53cad9320ab889f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 20:41:33 +0200 Subject: [PATCH 1552/2743] python.pkgs.futures: fix tests --- pkgs/development/python-modules/futures/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/futures/default.nix b/pkgs/development/python-modules/futures/default.nix index c0c389d49d19..5a774b6fa3d5 100644 --- a/pkgs/development/python-modules/futures/default.nix +++ b/pkgs/development/python-modules/futures/default.nix @@ -13,12 +13,9 @@ buildPythonPackage rec { disabled = isPy3k; checkPhase = '' - ${python.interpreter} -m unittest discover + ${python.interpreter} test_futures.py ''; - # Tests fail - doCheck = false; - meta = with lib; { description = "Backport of the concurrent.futures package from Python 3.2"; homepage = "https://github.com/agronholm/pythonfutures"; From e5cebc7cff0febde297bdd1cba7ac188385cdfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 21:22:26 +0200 Subject: [PATCH 1553/2743] python.pkgs.google_api_core: fix build --- .../python-modules/google_api_core/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 34e0e6ca7933..abd4b886478a 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, google_auth, protobuf3_5, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, google_auth, protobuf3_5, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: buildPythonPackage rec { pname = "google-api-core"; @@ -10,14 +10,17 @@ buildPythonPackage rec { sha256 = "b4f103de6bd38ab346f7d17236f6098a51ebdff733ff69956a0f1e29cb35f10b"; }; - propagatedBuildInputs = [ google_auth protobuf3_5 googleapis_common_protos requests grpcio ]; - checkInputs = [ setuptools mock pytest ]; + propagatedBuildInputs = [ + googleapis_common_protos protobuf3_5 + google_auth requests grpcio + ] ++ lib.optional (pythonOlder "3.2") futures; + checkInputs = [ mock pytest ]; checkPhase = '' py.test ''; - meta = with stdenv.lib; { + meta = with lib; { description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients."; homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; From 1c7e1f0ef9f6ba0dc0f3bfddde173aa1414abc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 21:31:14 +0200 Subject: [PATCH 1554/2743] python.pkgs.futures_2_2: uninit There should only be a single version inside pythonPackages. This one isn't used anyway. --- pkgs/top-level/python-packages.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c563ccee4a0..6cc264d4de1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5952,16 +5952,6 @@ in { futures = callPackage ../development/python-modules/futures { }; - futures_2_2 = self.futures.override rec { - version = "2.2.0"; - name = "futures-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/futures/${name}.tar.gz"; - sha256 = "1lqfzl3z3pkxakgbcrfy6x7x0fp3q18mj5lpz103ljj7fdqha70m"; - }; - }; - gcovr = buildPythonPackage rec { name = "gcovr-2.4"; From 887f8b99927569ff316bc9a16a400d2b9b703547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 21:39:52 +0200 Subject: [PATCH 1555/2743] python.pkgs.ldap: fix build --- .../python-modules/ldap/default.nix | 37 +++++-------------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index cc851227fb2d..c039bcc043a2 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,18 +1,21 @@ -{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi -, openldap, cyrus_sasl, openssl, pytest, pyasn1 }: +{ lib, buildPythonPackage, fetchPypi +, pyasn1, pyasn1-modules, pytest +, openldap, cyrus_sasl }: buildPythonPackage rec { pname = "python-ldap"; version = "3.0.0"; - name = "${pname}-${version}"; - disabled = isPy3k; src = fetchPypi { inherit pname version; sha256 = "86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1"; }; - checkInputs = [ pytest pyasn1 ]; + propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; + + buildInputs = [ openldap cyrus_sasl ]; + + checkInputs = [ pytest ]; checkPhase = '' # Needed by tests to setup a mockup ldap server. @@ -21,28 +24,6 @@ buildPythonPackage rec { export SLAPD="${openldap}/libexec/slapd" export SCHEMA="${openldap}/etc/schema" - # AssertionError: expected errno=107, got 57 -> nix sandbox related ? - py.test -k 'not TestLdapCExtension and \ - not Test01_SimpleLDAPObject and \ - not Test02_ReconnectLDAPObject' Tests/*.py + py.test ''; - - patches = lib.singleton (writeText "avoid-syslog.diff" '' - diff a/Lib/slapdtest.py b/Lib/slapdtest.py - --- a/Lib/slapdtest.py - +++ b/Lib/slapdtest.py - @@ -60,7 +60,8 @@ def combined_logger( - pass - # for writing to syslog - new_logger = logging.getLogger(log_name) - - if sys_log_format: - + # /dev/log does not exist in nix build environment. - + if False: - my_syslog_formatter = logging.Formatter( - fmt=' '.join((log_name, sys_log_format))) - my_syslog_handler = logging.handlers.SysLogHandler( - ''); - - NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; - propagatedBuildInputs = [openldap cyrus_sasl openssl]; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cc264d4de1c..ea14a6ffa171 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11525,7 +11525,7 @@ in { progressbar2 = callPackage ../development/python-modules/progressbar2 { }; ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl openssl; + inherit (pkgs) openldap cyrus_sasl; }; ldap3 = callPackage ../development/python-modules/ldap3 {}; From ee34f20e8b246c3dce509b7bec55bc9ee5037bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Apr 2018 22:43:13 +0200 Subject: [PATCH 1556/2743] octoprint: fix build --- pkgs/applications/misc/octoprint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 37aace548d54..ca381e14dd17 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -96,6 +96,7 @@ in pythonPackages.buildPythonApplication rec { -e 's,wrapt>=[^"]*,wrapt,g' \ -e 's,python-dateutil>=[^"]*,python-dateutil,g' \ -e 's,emoji>=[^"]*,emoji,g' \ + -e 's,futures>=[^"]*,futures,g' \ setup.py ''; From 5b313abd49c5761aa2e647fbc5a1488013a4fcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 12:25:04 +0200 Subject: [PATCH 1557/2743] python.pkgs.moto: fix build --- pkgs/development/python-modules/moto/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 79daf9d8ac5b..222e54c871a0 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -11,6 +11,15 @@ buildPythonPackage rec { sha256 = "e6b25a32b61ba97bbc2236960ad6865ab111962a927de720c907475adff4499b"; }; + postPatch = '' + # dateutil upper bound was just to keep compatibility with Python 2.6 + # see https://github.com/spulec/moto/pull/1519 and https://github.com/boto/botocore/pull/1402 + # regarding aws-xray-sdk: https://github.com/spulec/moto/commit/31eac49e1555c5345021a252cb0c95043197ea16 + substituteInPlace setup.py \ + --replace "python-dateutil<2.7.0" "python-dateutil<3.0.0" \ + --replace "aws-xray-sdk<0.96," "aws-xray-sdk" + ''; + propagatedBuildInputs = [ aws-xray-sdk boto From 5bd9342a7b8772e7a91700bac48b2c6d9e7aeebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 12:41:04 +0200 Subject: [PATCH 1558/2743] python.pkgs.prawcore: 0.12.0 -> 0.15.0 --- pkgs/development/python-modules/prawcore/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index eb3fb784dc97..b59327cd0590 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -6,15 +6,19 @@ buildPythonPackage rec { pname = "prawcore"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "prawcore"; rev = "v${version}"; - sha256 = "1z5fz6v4bv6xw84l4q3rpw3j63bb2dldl0fd6ckz8wqlpb2l45br"; + sha256 = "0v16n6bzf483i00bn0qykrg3wvw9dbnfdl512pw8n635ld1g7cb8"; }; + postPatch = '' + sed -i "s/'testfixtures >4.13.2, <6'/'testfixtures >4.13.2'/g" setup.py + ''; + propagatedBuildInputs = [ requests ]; From 77f9ebc8ada5a1aabcedeaadab70dab673255dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 13:20:00 +0200 Subject: [PATCH 1559/2743] python.pkgs.pytest-isort: init at 0.1.0 --- .../python-modules/pytest-isort/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-isort/default.nix diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix new file mode 100644 index 000000000000..c1866f174ea2 --- /dev/null +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytestcache, pytest, isort }: + +buildPythonPackage rec { + pname = "pytest-isort"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe"; + }; + + propagatedBuildInputs = [ pytestcache pytest isort ]; + + # no tests in PyPI tarball, no tags on GitHub + # https://github.com/moccu/pytest-isort/pull/8 + doCheck = false; + + meta = with lib; { + description = "Pytest plugin to perform isort checks (import ordering)"; + homepage = https://github.com/moccu/pytest-isort/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea14a6ffa171..15a6f5a15480 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1942,6 +1942,8 @@ in { pytestflakes = callPackage ../development/python-modules/pytest-flakes { }; + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + pytest-mock = callPackage ../development/python-modules/pytest-mock { }; pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; From 6133e6525ab5f372d1ffe0425cee4b6a2759e726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 13:23:09 +0200 Subject: [PATCH 1560/2743] python.pkgs.tinycss2: init at 0.6.1 --- .../python-modules/tinycss2/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/tinycss2/default.nix diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix new file mode 100644 index 000000000000..6d0ee30bbb48 --- /dev/null +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, webencodings, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: + +buildPythonPackage rec { + pname = "tinycss2"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c53c2c0e914c7711c295b3101bcc78e0b7eda23ff20228a936efe11cdcc7136"; + }; + + propagatedBuildInputs = [ webencodings ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "Low-level CSS parser for Python"; + homepage = https://github.com/Kozea/tinycss2; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 15a6f5a15480..f4bc3861f44d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2005,6 +2005,8 @@ in { }; }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; + cssselect = callPackage ../development/python-modules/cssselect { }; cssutils = callPackage ../development/python-modules/cssutils { }; From 701c6ed36084eed5a81a2856dad5a44de18d1971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 13:31:54 +0200 Subject: [PATCH 1561/2743] python.pkgs.cssselect2: init at 0.2.1 --- .../python-modules/cssselect2/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/cssselect2/default.nix diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix new file mode 100644 index 000000000000..5fe0f792856e --- /dev/null +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, tinycss2, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: + +buildPythonPackage rec { + pname = "cssselect2"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab"; + }; + + propagatedBuildInputs = [ tinycss2 ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "CSS selectors for Python ElementTree"; + homepage = https://github.com/Kozea/cssselect2; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4bc3861f44d..4163692a9c76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2009,6 +2009,8 @@ in { cssselect = callPackage ../development/python-modules/cssselect { }; + cssselect2 = callPackage ../development/python-modules/cssselect2 { }; + cssutils = callPackage ../development/python-modules/cssutils { }; darcsver = callPackage ../development/python-modules/darcsver { }; From 9b3bb26f6009960da14cf55a1c22afbd3a3f531e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 13:57:20 +0200 Subject: [PATCH 1562/2743] python.pkgs.cairosvg: 2.1.3 -> 2.1.2 The tarball for 2.1.3 is strangely called CairoSVG-2.1.3.linux-x86_64.tar.gz. Using version 2.1.2 for now. See https://github.com/Kozea/CairoSVG/issues/188. --- .../python-modules/cairosvg/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 0d110721fd12..0d0b26eb474c 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, cairocffi }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, cairocffi, cssselect2, defusedxml, pillow, tinycss2 +, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: buildPythonPackage rec { - pname = "cairosvg"; - version = "2.1.3"; + pname = "CairoSVG"; + version = "2.1.2"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b334f4ec436d78ecbc934c652f961a73a27d770f1133082cac265afab3dd64a"; + sha256 = "70f32d0a7aec46629975d584f43093f59022a47dde403c52b095dcea10cf5b80"; }; - propagatedBuildInputs = [ cairocffi ]; + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; + + checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with stdenv.lib; { homepage = https://cairosvg.org; From 7aa6131c8e2dbeb6add0d96a269f70007d4fbd47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 14:16:28 +0200 Subject: [PATCH 1563/2743] python: pytest-mock: 1.7.1 -> 1.8.0 --- pkgs/development/python-modules/pytest-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index defbbdbc0c25..88b6a662d471 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0jgr1h1f0m9dl3alxiiw55as28pj2lpihz12gird9z1i3vvdyydq"; + sha256 = "2dd545496af6a0559432b11de79f1fd4fa4a541ae2e01892d5ba6041f85f0994"; }; propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; From d223d125d26007a9b2b239f8da88cf8d11f4e251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 14:51:26 +0200 Subject: [PATCH 1564/2743] python.pkgs.pytest-fixture-config: fix build --- .../python-modules/pytest-fixture-config/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 852a1e5fe05d..df700526d1b4 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, coverage, virtualenv, pytestcov, six }: +, setuptools-git, pytest, six }: buildPythonPackage rec { pname = "pytest-fixture-config"; @@ -10,11 +10,14 @@ buildPythonPackage rec { sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08"; }; + nativeBuildInputs = [ setuptools-git ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage virtualenv pytestcov six ]; + + checkInputs = [ six ]; checkPhase = '' - py.test -k "not test_yield_requires_config_doesnt_skip and not test_yield_requires_config_skips" + py.test ''; meta = with stdenv.lib; { From fdbb0f9040b5c0ac5f4a9027a81bc8962c331a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 14:55:34 +0200 Subject: [PATCH 1565/2743] python.pkgs.pytest-shutil: add termcolor dependency --- pkgs/development/python-modules/pytest-shutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 9ab317259bdc..4fa11dbd7d13 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet -, contextlib2 }: +, contextlib2, termcolor }: buildPythonPackage rec { pname = "pytest-shutil"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; + propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; checkPhase = '' py.test From a3688867c571e4ea8b5a1100c84bb37e800437eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 14:56:42 +0200 Subject: [PATCH 1566/2743] python.pkgs.pytest-server-fixtures: add future dependency --- .../python-modules/pytest-server-fixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 4749b8f74bce..c50795a66698 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , pytest, setuptools-git, pytest-shutil, pytest-fixture-config, psutil -, requests}: +, requests, future }: buildPythonPackage rec { pname = "pytest-server-fixtures"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests ]; + propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests future ]; # RuntimeError: Unable to find a free server number to start Xvfb doCheck = false; From 6cec0a6dc66e4a0d1022c0b7bc9227a9c4489f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 15:13:05 +0200 Subject: [PATCH 1567/2743] python.pkgs.python-jose: 1.3.2 -> 2.0.2 --- .../python-modules/python-jose/default.nix | 27 ++++++++------ .../python-jose/pycryptodome.patch | 37 ------------------- 2 files changed, 16 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/python-modules/python-jose/pycryptodome.patch diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 8c78cfeacbd4..68b46743d35f 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,29 +1,34 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, future, six, ecdsa, pycryptodome, pytest +, future, six, ecdsa, pycryptodome, pytest, cryptography }: buildPythonPackage rec { pname = "python-jose"; - name = "${pname}-${version}"; - version = "1.3.2"; + version = "2.0.2"; + + # no tests in PyPI tarball src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; - rev = version; - sha256 = "0933pbflv2pvws5m0ksz8y1fqr8m123smmrbr5k9a71nssd502sv"; + # 2.0.2 not tagged on GitHub + # see https://github.com/mpdavis/python-jose/issues/86 + rev = "28cc6719eceb89129eed59c25f7bdac015665bdd"; + sha256 = "03wkq2rszy0rzy5gygsh4s7i6ls8zflgbcvxnflvmh7nis7002fp"; }; - buildInputs = [ pytest ]; - checkPhase = "py.test ."; - patches = [ - # to use pycryptodme instead of pycrypto - ./pycryptodome.patch + checkInputs = [ + pytest + cryptography # optional dependency, but needed in tests ]; + checkPhase = '' + py.test + ''; + propagatedBuildInputs = [ future six ecdsa pycryptodome ]; + meta = with stdenv.lib; { homepage = https://github.com/mpdavis/python-jose; description = "A JOSE implementation in Python"; - platforms = platforms.all; license = licenses.mit; maintainers = [ maintainers.jhhuh ]; }; diff --git a/pkgs/development/python-modules/python-jose/pycryptodome.patch b/pkgs/development/python-modules/python-jose/pycryptodome.patch deleted file mode 100644 index 665ad5980343..000000000000 --- a/pkgs/development/python-modules/python-jose/pycryptodome.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ru python-jose-1.3.2/requirements.txt python-jose-1.3.2.new/requirements.txt ---- python-jose-1.3.2/requirements.txt 2016-09-05 15:13:49.000000000 +0200 -+++ python-jose-1.3.2.new/requirements.txt 2017-03-15 11:35:47.118001810 +0100 -@@ -1,3 +1,3 @@ --pycrypto -+pycryptodome - six - future -diff -ru python-jose-1.3.2/setup.py python-jose-1.3.2.new/setup.py ---- python-jose-1.3.2/setup.py 2016-09-05 15:13:49.000000000 +0200 -+++ python-jose-1.3.2.new/setup.py 2017-03-15 11:37:15.725077184 +0100 -@@ -25,12 +25,8 @@ - - - def get_install_requires(): -- if platform.python_implementation() == 'PyPy': -- crypto_lib = 'pycryptodome >=3.3.1, <3.4.0' -- else: -- crypto_lib = 'pycrypto >=2.6.0, <2.7.0' - return [ -- crypto_lib, -+ 'pycryptodome >=3.3.1, <3.5.0', - 'six <2.0', - 'ecdsa <1.0', - 'future <1.0', -diff -ru python-jose-1.3.2/tox.ini python-jose-1.3.2.new/tox.ini ---- python-jose-1.3.2/tox.ini 2016-09-05 15:13:49.000000000 +0200 -+++ python-jose-1.3.2.new/tox.ini 2017-03-15 11:36:50.423055657 +0100 -@@ -6,7 +6,7 @@ - py.test --cov-report term-missing --cov jose - deps = - future -- pycrypto -+ pycryptodome - ecdsa - pytest - pytest-cov From 19945a3dfc4b8157066eb05350c67ba603654101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 15:26:08 +0200 Subject: [PATCH 1568/2743] python.pkgs.cmarkgfm: init at 0.3.0 --- .../python-modules/cmarkgfm/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/cmarkgfm/default.nix diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix new file mode 100644 index 000000000000..2dcd8422ebec --- /dev/null +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, cffi, pytest }: + +buildPythonPackage rec { + pname = "cmarkgfm"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "84465f6534f49687f1a8069d48044799d2dd3f4e7ff06b66b7eea1502f3c402d"; + }; + + propagatedBuildInputs = [ cffi ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + # no tests in PyPI tarball + # see https://github.com/jonparrott/cmarkgfm/pull/6 + doCheck = false; + + meta = with lib; { + description = "Minimal bindings to GitHub's fork of cmark"; + homepage = https://github.com/jonparrott/cmarkgfm; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4163692a9c76..3e043aba7b87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1125,6 +1125,8 @@ in { cheroot = callPackage ../development/python-modules/cheroot {}; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; + circus = callPackage ../development/python-modules/circus {}; colorclass = callPackage ../development/python-modules/colorclass {}; From 23e1cded28ef6092c28637b904d76acec41715b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 15:27:59 +0200 Subject: [PATCH 1569/2743] python.pkgs.readme_renderer: correct dependencies --- .../python-modules/readme_renderer/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 138f99d16377..aa3928db8911 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchPypi , pytest -, CommonMark +, mock +, cmarkgfm , bleach , docutils +, future , pygments , six }: @@ -18,10 +20,10 @@ buildPythonPackage rec { sha256 = "e18cab7f1b07412990df1b59e1be04e1538f514a5bba53ec8777bfc5aac27563"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest mock ]; propagatedBuildInputs = [ - CommonMark bleach docutils pygments six + bleach cmarkgfm docutils future pygments six ]; checkPhase = '' From 5600034f917823c1b2825bfbd339d027ebf29957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 15:46:50 +0200 Subject: [PATCH 1570/2743] python.pkgs.redNotebook: remove alias --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e043aba7b87..3d391609d946 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16678,8 +16678,6 @@ EOF }; }; - redNotebook = pkgs.rednotebook; # Backwards compatibility alias. - uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = buildPythonPackage rec { From c9330ca79b0418a79208a97d816944d3f2949502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 16:12:42 +0200 Subject: [PATCH 1571/2743] python.pkgs.thinc: loosen version constraints --- pkgs/development/python-modules/thinc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 2c6df953e169..62e0d28959a2 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,13 +28,18 @@ buildPythonPackage rec { pname = "thinc"; version = "6.10.2"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "msgpack-python==" "msgpack-python>=" \ + --replace "msgpack-numpy==" "msgpack-numpy>=" + ''; + propagatedBuildInputs = [ cython cymem From 8dd4e0711f7ea43d9b4264eeb225dd313359131e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 16:34:18 +0200 Subject: [PATCH 1572/2743] python.pkgs.spacy: loosen version constraints --- .../python-modules/spacy/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index b94374aeda86..18fc6a745fe1 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -30,21 +30,13 @@ buildPythonPackage rec { }; prePatch = '' - substituteInPlace setup.py --replace \ - "'html5lib==1.0b8'," \ - "'html5lib'," - - substituteInPlace setup.py --replace \ - "'regex==2017.4.5'," \ - "'regex'," - - substituteInPlace setup.py --replace \ - "'ftfy==2017.4.5'," \ - "'ftfy'," - - substituteInPlace setup.py --replace \ - "'pathlib'," \ - "\"pathlib; python_version<'3.4'\"," + substituteInPlace setup.py \ + --replace "html5lib==" "html5lib>=" \ + --replace "regex==" "regex>=" \ + --replace "ftfy==" "ftfy>=" \ + --replace "msgpack-python==" "msgpack-python>=" \ + --replace "msgpack-numpy==" "msgpack-numpy>=" \ + --replace "pathlib" "pathlib; python_version<\"3.4\"" ''; propagatedBuildInputs = [ From dc35d7bc7c0e1b9bcf7c732287a504693e8c535b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 16:48:02 +0200 Subject: [PATCH 1573/2743] python.pkgs.spacy: clean up propagatedBuildInputs --- .../python-modules/spacy/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 18fc6a745fe1..16c1841a3d62 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib , pkgs , buildPythonPackage , python , fetchPypi +, pythonOlder , html5lib , pytest -, cython , preshed , ftfy , numpy @@ -16,8 +16,11 @@ , dill , requests , thinc -, pip , regex +, cymem +, pathlib +, msgpack-python +, msgpack-numpy }: buildPythonPackage rec { @@ -40,20 +43,22 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - cython - dill - html5lib - murmurhash numpy - plac + murmurhash + cymem preshed - regex - requests - six thinc + plac + six + html5lib ujson + dill + requests + regex ftfy - ]; + msgpack-python + msgpack-numpy + ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ pytest @@ -64,7 +69,7 @@ buildPythonPackage rec { # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow # ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = https://github.com/explosion/spaCy; license = licenses.mit; From cb1c0c46d8d2fb2a894cbfc7a6a40d79eddbf8ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 19:43:00 +0200 Subject: [PATCH 1574/2743] python.pkgs.mozterm: disable on python 3 --- pkgs/development/python-modules/mozterm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix index 6adba7ef2b96..98e8d5b4078c 100644 --- a/pkgs/development/python-modules/mozterm/default.nix +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -1,9 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "mozterm"; version = "0.1.0"; + # name 'unicode' is not defined + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561"; From 59b5600af62765f7946204fdddecd34c82f119a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 19:45:50 +0200 Subject: [PATCH 1575/2743] python.pkgs.progressbar: disable on python 3 --- pkgs/development/python-modules/progressbar/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index 5fd86fcf1987..59ef547dba36 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -1,9 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "progressbar"; version = "2.3"; + # https://github.com/niltonvolpato/python-progressbar/issues/54 + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254"; From a7bcc079fa0dc63ba04d2f1c9540d2709bb0cd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 20:28:12 +0200 Subject: [PATCH 1576/2743] python3.pkgs.git-annex-adapter: replace eject by utillinux --- .../python-modules/git-annex-adapter/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index f99acb8db5df..04fae0db1b7a 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,12 +1,11 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl -, eject, pygit2, gitMinimal, git-annex }: +, utillinux, pygit2, gitMinimal, git-annex }: buildPythonPackage rec { pname = "git-annex-adapter"; version = "0.2.0"; - name = "${pname}-${version}"; - disabled = (!isPy3k); + disabled = !isPy3k; # There is only a wheel on PyPI - build from source instead src = fetchFromGitHub { @@ -28,8 +27,8 @@ buildPythonPackage rec { sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp"; }; - nativeBuildInputs = [ - eject # `rev` is needed in tests/test_process.py + checkInputs = [ + utillinux # `rev` is needed in tests/test_process.py ]; propagatedBuildInputs = [ pygit2 gitMinimal ]; From c664dc8d190b6edad82f587b2a6af71bde94f567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 23:00:21 +0200 Subject: [PATCH 1577/2743] platformio: move out of pythonPackages --- .../arduino/platformio/chrootenv.nix | 41 +++++++++++++------ .../platformio/core.nix} | 9 ++-- .../platformio/fix-searchpath.patch | 0 pkgs/top-level/python-packages.nix | 1 - 4 files changed, 32 insertions(+), 19 deletions(-) rename pkgs/development/{python-modules/platformio/default.nix => arduino/platformio/core.nix} (80%) rename pkgs/development/{python-modules => arduino}/platformio/fix-searchpath.patch (100%) diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 69182c3aa0d8..f46e705fb901 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,23 +1,40 @@ -{ stdenv, lib, buildFHSUserEnv -}: +{ lib, buildFHSUserEnv }: + let - pio-pkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle - python27Packages.platformio + pio-pkgs = pkgs: + let + python = pkgs.python.override { + packageOverrides = self: super: { + + # https://github.com/platformio/platformio-core/issues/349 + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; + }; + }); + + platformio = self.callPackage ./core.nix { }; + }; + }; + in (with pkgs; [ zlib + ]) ++ (with python.pkgs; [ + python + setuptools + pip + bottle + platformio ]); -in -buildFHSUserEnv { + +in buildFHSUserEnv { name = "platformio"; targetPkgs = pio-pkgs; multiPkgs = pio-pkgs; - meta = with stdenv.lib; { + meta = with lib; { description = "An open source ecosystem for IoT development"; homepage = http://platformio.org; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/arduino/platformio/core.nix similarity index 80% rename from pkgs/development/python-modules/platformio/default.nix rename to pkgs/development/arduino/platformio/core.nix index 01d47b458606..9e3005c595c7 100644 --- a/pkgs/development/python-modules/platformio/default.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -1,16 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi -, bottle, click_5, colorama +, bottle, click, colorama , lockfile, pyserial, requests , semantic-version -, isPy3k, isPyPy , git }: -buildPythonPackage rec { - disabled = isPy3k || isPyPy; +buildPythonPackage rec { pname = "platformio"; version="3.5.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -18,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - bottle click_5 colorama git lockfile + bottle click colorama git lockfile pyserial requests semantic-version ]; diff --git a/pkgs/development/python-modules/platformio/fix-searchpath.patch b/pkgs/development/arduino/platformio/fix-searchpath.patch similarity index 100% rename from pkgs/development/python-modules/platformio/fix-searchpath.patch rename to pkgs/development/arduino/platformio/fix-searchpath.patch diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d391609d946..52769810e7bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10084,7 +10084,6 @@ in { }; pika-pool = callPackage ../development/python-modules/pika-pool { }; - platformio = callPackage ../development/python-modules/platformio { }; kmsxx = callPackage ../development/libraries/kmsxx { }; From 579023d69892c38b4dc90cbd487d455005b75f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 23:01:07 +0200 Subject: [PATCH 1578/2743] python.pkgs.click_5: uninit Was only used by platformio, which now pins the click version using packageOverrides. --- pkgs/development/python-modules/click/5_1.nix | 22 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/python-modules/click/5_1.nix diff --git a/pkgs/development/python-modules/click/5_1.nix b/pkgs/development/python-modules/click/5_1.nix deleted file mode 100644 index e98ae1ed3617..000000000000 --- a/pkgs/development/python-modules/click/5_1.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "click"; - version = "6.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; - }; - - meta = with stdenv.lib; { - homepage = http://click.pocoo.org/; - description = "Create beautiful command line interfaces in Python"; - longDescription = '' - A Python package for creating beautiful command line interfaces in a - composable way, with as little code as necessary. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52769810e7bc..e78aefef5604 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1550,8 +1550,6 @@ in { click = callPackage ../development/python-modules/click {}; - click_5 = callPackage ../development/python-modules/click/5_1.nix {}; - click-log = callPackage ../development/python-modules/click-log {}; click-plugins = callPackage ../development/python-modules/click-plugins {}; From b1c6c0af87f6a32a33e017290938d89fa75bf53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 Apr 2018 23:03:42 +0200 Subject: [PATCH 1579/2743] platformio: 3.5.1 -> 3.5.2 --- pkgs/development/arduino/platformio/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 9e3005c595c7..9d30c2268554 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "platformio"; - version="3.5.1"; + version = "3.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0cc15mzh7p1iykip0jpxldz81yz946vrgvhwmfl8w3z5kgjjgx3n"; + sha256 = "bb311ce5b8f12c95bc45c2071626a4887a3632fb2472b4d69a873b2acfc2e4ec"; }; propagatedBuildInputs = [ From 35b38b021b47064e973c948b5377753a57150cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Apr 2018 00:04:44 +0200 Subject: [PATCH 1580/2743] python.pkgs.protobuf: use 3.5 by default --- .../python-modules/google_api_core/default.nix | 4 ++-- pkgs/development/python-modules/google_gax/default.nix | 4 ++-- .../python-modules/googleapis_common_protos/default.nix | 4 ++-- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 8 +------- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index abd4b886478a..baf590f99572 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, google_auth, protobuf3_5, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: +, google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: buildPythonPackage rec { pname = "google-api-core"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - googleapis_common_protos protobuf3_5 + googleapis_common_protos protobuf google_auth requests grpcio ] ++ lib.optional (pythonOlder "3.2") futures; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix index 7de42bf8ec8c..daabba6c390a 100644 --- a/pkgs/development/python-modules/google_gax/default.nix +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, google_auth, ply, protobuf3_5, grpcio, requests +, google_auth, ply, protobuf, grpcio, requests , googleapis_common_protos, dill, future, pytest, mock, unittest2 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; }; - propagatedBuildInputs = [ google_auth ply protobuf3_5 grpcio requests googleapis_common_protos dill future ]; + propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; checkInputs = [ pytest mock unittest2 ]; # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 7427e590c0ca..28e84f4846e7 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, protobuf3_5, pytest }: +, protobuf, pytest }: buildPythonPackage rec { pname = "googleapis-common-protos"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0"; }; - propagatedBuildInputs = [ protobuf3_5 ]; + propagatedBuildInputs = [ protobuf ]; checkInputs = [ pytest ]; doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 47e9d179eea7..d1f0903238c7 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34 }: +, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }: buildPythonPackage rec { pname = "grpcio"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d"; }; - propagatedBuildInputs = [ six protobuf3_5 ] + propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy26 || isPy27) [ futures ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e78aefef5604..e37d17f8fd14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10320,7 +10320,7 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; - protobuf = pkgs.protobuf; + protobuf = pkgs.protobuf3_5; }; protobuf3_1 = callPackage ../development/python-modules/protobuf { @@ -10329,12 +10329,6 @@ in { protobuf = pkgs.protobuf3_1; }; - protobuf3_5 = callPackage ../development/python-modules/protobuf { - disabled = isPyPy; - doCheck = !isPy3k; - protobuf = pkgs.protobuf3_5; - }; - psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { }; From 0fc352367acd866e254da110199f7087277120eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Apr 2018 00:21:33 +0200 Subject: [PATCH 1581/2743] python: cmarkgfm: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/cmarkgfm/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index 2dcd8422ebec..5867c33642f5 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "84465f6534f49687f1a8069d48044799d2dd3f4e7ff06b66b7eea1502f3c402d"; + sha256 = "977d7061779c7ebc5cbe7af71adb795ced96058552fe5f6b646d95b5055959be"; }; propagatedBuildInputs = [ cffi ]; @@ -17,10 +17,6 @@ buildPythonPackage rec { py.test ''; - # no tests in PyPI tarball - # see https://github.com/jonparrott/cmarkgfm/pull/6 - doCheck = false; - meta = with lib; { description = "Minimal bindings to GitHub's fork of cmark"; homepage = https://github.com/jonparrott/cmarkgfm; From b6ce94bcb4d0d4889369a744abf255ceeef83c11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:32:08 +0200 Subject: [PATCH 1582/2743] python: astroid: 1.6.2 -> 1.6.3 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index bcc75f2f2acf..91b98d8b6ac0 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "a92c1197dd496ef2470e73e1c296fc02a719907ee07259744e26a13bda9d4862"; + sha256 = "35cfae47aac19c7b407b7095410e895e836f2285ccf1220336afba744cc4c5f2"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] From 4714de44133d8637fb8e55f83cffdd2df1a57092 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:32:34 +0200 Subject: [PATCH 1583/2743] python: djangorestframework: 3.8.0 -> 3.8.2 --- .../python-modules/djangorestframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 5d0718f05f3b..81f406c9ef2e 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.8.0"; + version = "3.8.2"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "be299fb3f289e22ddca0ff88294924cd06aa3bcfa5043f72792d2a18d96dabe8"; + sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; }; # Test settings are missing From af711951a131652ef44f4b8ee3b6b2f39c774a78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:32:40 +0200 Subject: [PATCH 1584/2743] python: dulwich: 0.19.1 -> 0.19.2 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 4e1e1d711655..80a42ac30fd5 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.1"; + version = "0.19.2"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "c7334bd6ac8d14189ab42b20e0b0593ebd97ae922875562a8c111ee298fb194f"; + sha256 = "c51e10c260543240e0806052af046e1a78b98cbe1ac1ef3880a78d2269e09da4"; }; LC_ALL = "en_US.UTF-8"; From 09e16249c6993ad473d29a4d50650fae8d115982 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:32:47 +0200 Subject: [PATCH 1585/2743] python: flit: 0.13 -> 1.0 --- .../interpreters/python/build-python-package-flit.nix | 2 +- pkgs/development/python-modules/flit/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix index 1beff0ebd834..911078a5e340 100644 --- a/pkgs/development/interpreters/python/build-python-package-flit.nix +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -10,7 +10,7 @@ attrs // { buildInputs = [ flit ]; buildPhase = attrs.buildPhase or '' runHook preBuild - flit wheel + flit build --format wheel runHook postBuild ''; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 3a73b464a46f..17b9d018c397 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "flit"; - version = "0.13"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "8f558351bf4bb82b872d3bdbea7055cbb2e33ed2bdf809284bf927d4c78bf0ee"; + sha256 = "95b8577b2232da39ee14ae237575b7a85afeeabc1e87f4a19485fac34f85aa89"; }; disabled = !isPy3k; From 989c4994018b6d7ecf4e6659aafb07a76ac9a2a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:33:19 +0200 Subject: [PATCH 1586/2743] python: ipython: 6.3.0 -> 6.3.1 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index af39872e2695..d44a708befb2 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "ipython"; - version = "6.3.0"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c785ab502b1a63624baeb89fedb873a118d4da6c9a796ae06e4f4aaef74e9ea0"; + sha256 = "a6ac981381b3f5f604b37a293369963485200e3639fb0404fa76092383c10c41"; }; prePatch = lib.optionalString stdenv.isDarwin '' From f7e8cdb876c07f7c9822729762c0133e64909efa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:33:31 +0200 Subject: [PATCH 1587/2743] python: Jug: 1.6.5 -> 1.6.6 --- pkgs/development/python-modules/jug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 8adb43ee0113..d9315193d19f 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Jug"; - version = "1.6.5"; + version = "1.6.6"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "982e18c4b837dd7828e718bb252b4ba78da3e2dfe65d1d92b85e03e9c9e0146a"; + sha256 = "897ffbbbe8061772c238b4f436512ea3696016a04473c45a716d78c0de103ec1"; }; meta = with stdenv.lib; { From 416188f8a0fa2dbe26fe08b6586079c6d565568c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:33:37 +0200 Subject: [PATCH 1588/2743] python: mozrunner: 6.14 -> 6.15 --- .../python-modules/marionette-harness/mozrunner.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index 368ab51845c0..51344a8a95a5 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "mozrunner"; - version = "6.14"; + version = "6.15"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a401ea5141cdd15d8f047f19a30ccbeabeb0aea079674b684121acddc5dcf810"; + sha256 = "985d4d4cf7597f09ed1b42165997d966fa35b0130a7a6bbcb2c71ecd5f4c453f"; }; propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess From 50ae6e353168751ac01c3e08e9cd62acea5d515a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:33:50 +0200 Subject: [PATCH 1589/2743] python: openpyxl: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index bd39c988c862..d8a419189312 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.1"; + version = "2.5.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c875fbefae29c4ac9ceaa88470b682834495173cbe9cd37e7286285b7fbc2602"; + sha256 = "63165adcc806a5c281febb344f3594541f778f05b99a3a5e802941a3c0a85f71"; }; checkInputs = [ pytest ]; From c705acef6e0b5826fdddfa0cc1cbf1b125872a5a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:33:56 +0200 Subject: [PATCH 1590/2743] python: pathspec: 0.5.5 -> 0.5.6 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index bf74906d9e57..4d812ec3b4f9 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.5.5"; + version = "0.5.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; + sha256 = "be664567cf96a718a68b33329862d1e6f6803ef9c48a6e2636265806cfceb29d"; }; meta = { From 36f3111bdaaa904b7216b1d984b7046f3632c05e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:34:03 +0200 Subject: [PATCH 1591/2743] python: phonenumbers: 8.9.2 -> 8.9.3 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 750ec25190f3..47a154a529c7 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.2"; + version = "8.9.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9c60423cdd0eee3a65dd2d8280fab08e4d9fa4675dce1651c164a6408fecacfc"; + sha256 = "68f7402c6d2646adff4df895471f2b47fd61d0cf57c59a06aacc88dfff04a1cb"; }; meta = { From fae0aa6fbf204e6980f8121e5c358770049c9483 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:34:22 +0200 Subject: [PATCH 1592/2743] python: pylint: 1.8.3 -> 1.8.4 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 7bb030c698a5..5e053891164e 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "c77311859e0c2d7932095f30d2b1bfdc4b6fe111f534450ba727a52eae330ef2"; + sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; From 438355f99e77c29531842b67ba0cf183dc62eb7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:34:34 +0200 Subject: [PATCH 1593/2743] python: robotframework: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 22f351211191..be3316cf697e 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - version = "3.0.2"; + version = "3.0.3"; pname = "robotframework"; disabled = isPy3k; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/r/robotframework/${name}.tar.gz"; - sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; + sha256 = "a5ffe9283c9247c3a1e81228fcc009819d8f94b48768170268a3e6274a998bca"; }; meta = with stdenv.lib; { From 86c805fa2ee688290fd53c7f741bd2affdf29faa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:34:46 +0200 Subject: [PATCH 1594/2743] python: tornado: 5.0.1 -> 5.0.2 --- pkgs/development/python-modules/tornado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index ec21cd164ff4..37b1c7bcf5cb 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "5.0.1"; + version = "5.0.2"; propagatedBuildInputs = [ backports_abc certifi singledispatch ] @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3e9a2333362d3dad7876d902595b64aea1a2f91d0df13191ea1f8bca5a447771"; + sha256 = "1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7"; }; meta = { From 6ea152f18423ea14e2db3b4356674782202709a9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:34:53 +0200 Subject: [PATCH 1595/2743] python: tqdm: 4.20.0 -> 4.21.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 7b45d8ca5925..23ad1bc2624d 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.20.0"; + version = "4.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4f2eb1d14804caf7095500fe11da0e481a47af912e7b57c93f886ac3c40a49dd"; + sha256 = "b94af236084ceaad93a6ada00bd9976900b172ec9b821828ed0d4b53f7431170"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; From a799c45192a3ba3ac7d8b13304aa63a8c85bb1f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:35:05 +0200 Subject: [PATCH 1596/2743] python: buildbot-pkg: 1.1.0 -> 1.1.1 --- pkgs/development/tools/build-managers/buildbot/pkg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index 7fe1c0bcd2f3..ef8a0cdc38ef 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2276c1e7e01908490bffcebd5502456fa34223e302853e744a79467de82ab219"; + sha256 = "7b255f5ec97946c3d32e822b8fcbff0459cfe4f94fb26ee4813ffd80440c93e8"; }; propagatedBuildInputs = [ setuptools ]; From d775b0350a406021b4ec2e548818f86ee6549d30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:35:12 +0200 Subject: [PATCH 1597/2743] python: diceware: 0.9.4 -> 0.9.5 --- pkgs/tools/security/diceware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index ce7f1d0e1b4b..07061aa0d117 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -7,11 +7,11 @@ with pythonPackages; buildPythonApplication rec { pname = "diceware"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0855n4dh16ws1dhw1ixxwk3wx7qr45xff7pn32pjg58p4z4cx168"; + sha256 = "22a998361fd2afbc7890062e228235b3501084de1e6a5bb61f16d2637977f50d"; }; nativeBuildInputs = [ pytestrunner ]; From 4421dbc2175a8402a31580c8d146b716ec2b6ad2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:40:08 +0200 Subject: [PATCH 1598/2743] python.pkgs.pip: move expression --- .../python-modules/pip/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------- 2 files changed, 35 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/pip/default.nix diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix new file mode 100644 index 000000000000..1da0cc1da5b5 --- /dev/null +++ b/pkgs/development/python-modules/pip/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, scripttest +, virtualenv +, pretend +, pytest +}: + +buildPythonPackage rec { + pname = "pip"; + version = "9.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d"; + }; + + # pip detects that we already have bootstrapped_pip "installed", so we need + # to force it a little. + installFlags = [ "--ignore-installed" ]; + + checkInputs = [ mock scripttest virtualenv pretend pytest ]; + # Pip wants pytest, but tests are not distributed + doCheck = false; + + meta = { + description = "The PyPA recommended tool for installing Python packages"; + license = lib.licenses.mit; + homepage = https://pip.pypa.io/; + priority = 10; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e37d17f8fd14..6b694e727352 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10029,31 +10029,7 @@ in { piexif = callPackage ../development/python-modules/piexif { }; - pip = buildPythonPackage rec { - pname = "pip"; - version = "9.0.1"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d"; - }; - - # pip detects that we already have bootstrapped_pip "installed", so we need - # to force it a little. - installFlags = [ "--ignore-installed" ]; - - checkInputs = with self; [ mock scripttest virtualenv pretend pytest ]; - # Pip wants pytest, but tests are not distributed - doCheck = false; - - meta = { - description = "The PyPA recommended tool for installing Python packages"; - license = licenses.mit; - homepage = https://pip.pypa.io/; - priority = 10; - }; - }; + pip = callPackage ../development/python-modules/pip { }; pip-tools = callPackage ../development/python-modules/pip-tools { git = pkgs.gitMinimal; From 1ab32ba44170cea9e9d4e535885395083b775eea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:40:26 +0200 Subject: [PATCH 1599/2743] python: pip: 9.0.1 -> 9.0.3 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 1da0cc1da5b5..a566e31e035f 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "9.0.1"; + version = "9.0.3"; src = fetchPypi { inherit pname version; - sha256 = "09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d"; + sha256 = "7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796"; }; # pip detects that we already have bootstrapped_pip "installed", so we need From 58cdabf9cf91db18523924c008e86ea7cde941b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:42:46 +0200 Subject: [PATCH 1600/2743] python.pkgs.setuptools: 38.4.1 -> 39.0.1 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index cd07a64ae49b..972d8e90bf63 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "38.4.1"; + version = "39.0.1"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3b5f74bd33b046a121f052632f248b580f5e83848bb4cebda9e38741a445a969"; + sha256 = "bec7badf0f60e7fc8153fac47836edc41b74e5d541d7692e614e635720d6a7c7"; }; nativeBuildInputs = [ unzip wrapPython ]; From e450ce6b7f1dc301cfdeaa9e748eae08543b57d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Apr 2018 08:46:36 +0200 Subject: [PATCH 1601/2743] python.pkgs.bootstrapped-pip: pip 9.0.1 -> 9.0.3 , setuptools 38.4.1 -> 39.0.1 --- .../python-modules/bootstrapped-pip/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 86e45e17ed55..4ff4c687e5c0 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,12 +9,12 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "38.4.1"; + version = "39.0.1"; format = "wheel"; - sha256 = "22f8bcff5ce7fd1867785701769eaba42b79331d0abf890974a9288787dc015b"; + sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8"; }; - # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + # TODO: Shouldn't be necessary anymore for pip >= 10! # https://github.com/NixOS/nixpkgs/issues/26392 # https://github.com/pypa/setuptools/issues/885 pkg_resources = fetchurl { @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "pip"; - version = "9.0.1"; + version = "9.0.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0"; + sha256 = "c3ede34530e0e0b2381e7363aded78e0c33291654937e7373032fda04e8803e5"; }; unpackPhase = '' @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { unzip -d $out/${python.sitePackages} $src unzip -d $out/${python.sitePackages} ${setuptools_source} unzip -d $out/${python.sitePackages} ${wheel_source} - # TODO: Shouldn't be necessary anymore for pip > 9.0.1! + # TODO: Shouldn't be necessary anymore for pip >= 10! cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py ''; From 94f8800b67b19106d04e433b00d3215da68e9b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Apr 2018 10:38:01 +0200 Subject: [PATCH 1602/2743] python.pkgs.cairosvg: 2.1.2 -> 2.1.3 --- pkgs/development/python-modules/cairosvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 0d0b26eb474c..68b1924e5a86 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "CairoSVG"; - version = "2.1.2"; + version = "2.1.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "70f32d0a7aec46629975d584f43093f59022a47dde403c52b095dcea10cf5b80"; + sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9"; }; propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; From 99ba1cb4245694874d63e84994f32d58d726ed21 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 7 Apr 2018 15:14:47 +0200 Subject: [PATCH 1603/2743] Increase max group name length to 32 characters With #36556, a check was introduced to make sure the user and group names do not exceed their respective maximum length. This is in part because systemd also enforces that length, but only at runtime. So in general it's a good idea to catch as much as we can during evaluation time, however the maximum length of the group name was set to 16 characters according groupadd(8). The maximum length of the group names however is a compile-time option and even systemd allows more than 16 characters. In the mentioned pull request (#36556) there was already a report that this has broken evaluation for people out there. I have also checked what other distributions are doing and they set the length to either 31 characters or 32 characters, the latter being more common. Unfortunately there is a difference between the maximum length enforced by the shadow package and systemd, both for user name lengths and group name lengths. However, systemd enforces both length to have a maximum of 31 characters and I'm not sure if this is intended or just a off-by-one error in systemd. Nevertheless, I choose 32 characters simply to bring it in par with the maximum user name length. For the NixOS assertion however, I use a maximum length of 31 to make sure that nobody accidentally creates services that contain group names that systemd considers invalid because of a length of 32 characters. Signed-off-by: aszlig Closes: #38548 Cc: @vcunat, @fpletz, @qknight --- nixos/modules/config/users-groups.nix | 2 +- pkgs/os-specific/linux/shadow/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 42d5d233f1c1..621ca36fb6b8 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -92,7 +92,7 @@ let group = mkOption { type = types.str; - apply = x: assert (builtins.stringLength x < 17 || abort "Group name '${x}' is longer than 16 characters which is not allowed!"); x; + apply = x: assert (builtins.stringLength x < 32 || abort "Group name '${x}' is longer than 31 characters which is not allowed!"); x; default = "nogroup"; description = "The user's primary group."; }; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index ca15571d1ede..3a76450a8308 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -60,8 +60,10 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog "; ''; - configureFlags = " --enable-man " - + stdenv.lib.optionalString (hostPlatform.libc != "glibc") " --disable-nscd "; + configureFlags = [ + "--enable-man" + "--with-group-name-max-length=32" + ] ++ stdenv.lib.optional (hostPlatform.libc != "glibc") "--disable-nscd"; preBuild = stdenv.lib.optionalString (hostPlatform.libc == "glibc") '' From 671e9bd3bf4a1e9ac56288f86e8d59db289911e5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 8 Apr 2018 19:59:38 -0400 Subject: [PATCH 1604/2743] 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 0e23e81cc09d25930dfc40fd5bc5269c2e2ec42b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 18 Jan 2018 15:26:15 +0800 Subject: [PATCH 1605/2743] unar: minor cleanups --- pkgs/tools/archivers/unar/default.nix | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 520742a1b3c7..1104548f77f8 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let pname = "unar"; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; version = "1.10.1"; src = fetchurl { @@ -10,23 +12,20 @@ stdenv.mkDerivation rec { sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0"; }; - buildInputs = [ - gnustep.make unzip gnustep.base bzip2.dev - zlib.dev icu.dev openssl.dev - ]; + buildInputs = [ gnustep.base bzip2 icu openssl zlib ]; + + nativeBuildInputs = [ gnustep.make unzip ]; + + enableParallelBuilding = true; postPatch = '' - substituteInPlace Makefile.linux \ - --replace "CC = gcc" "CC=cc" \ - --replace "CXX = g++" "CXX=c++" \ - --replace "OBJCC = gcc" "OBJCC=cc" \ - --replace "OBJCXX = g++" "OBJCXX=c++" - - substituteInPlace ../UniversalDetector/Makefile.linux \ - --replace "CC = gcc" "CC=cc" \ - --replace "CXX = g++" "CXX=c++" \ - --replace "OBJCC = gcc" "OBJCC=c" \ - --replace "OBJCXX = g++" "OBJCXX=c++" + for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do + substituteInPlace $f \ + --replace "CC = gcc" "CC=cc" \ + --replace "CXX = g++" "CXX=c++" \ + --replace "OBJCC = gcc" "OBJCC=cc" \ + --replace "OBJCXX = g++" "OBJCXX=c++" + done ''; makefile = "Makefile.linux"; @@ -34,17 +33,16 @@ stdenv.mkDerivation rec { sourceRoot = "./The Unarchiver/XADMaster"; installPhase = '' - mkdir -p $out/bin - cp lsar $out/bin - cp unar $out/bin + runHook preInstall - mkdir -p $out/share/man/man1 - cp ../Extra/lsar.1 $out/share/man/man1 - cp ../Extra/unar.1 $out/share/man/man1 + install -Dm755 -t $out/bin lsar unar + install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1 mkdir -p $out/etc/bash_completion.d cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar + + runHook postInstall ''; meta = with stdenv.lib; { @@ -55,7 +53,7 @@ stdenv.mkDerivation rec { zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, \ and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, \ Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ - ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. + ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; license = with licenses; [ lgpl21Plus ]; platforms = with platforms; linux; From 99483fbc4451f0d837bdb9dc0854040ab795865c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 18 Jan 2018 15:27:39 +0800 Subject: [PATCH 1606/2743] innoextract: support extraction of multi-file archives --- pkgs/tools/archivers/innoextract/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 0f6814d53c99..546e9a7aad98 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}: +{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python +, boost, lzma +, withGog ? false, unar ? null }: stdenv.mkDerivation rec { name = "innoextract-1.6"; @@ -8,14 +10,23 @@ stdenv.mkDerivation rec { sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6"; }; - buildInputs = [ python doxygen lzma boost ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ python lzma boost ]; + + nativeBuildInputs = [ cmake makeWrapper ]; + + enableParallelBuilding = true; + + # we need unar to for multi-archive extraction + postFixup = stdenv.lib.optionalString withGog '' + wrapProgram $out/bin/innoextract \ + --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]} + ''; meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; homepage = http://constexpr.org/innoextract/; - platforms = platforms.linux; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } From 69017e46ae0aa522242f9365ca7d71e98a406596 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Mon, 9 Apr 2018 18:42:50 +0800 Subject: [PATCH 1607/2743] ruby bundlerApp: Allow passing gemConfig through to bundlerEnv --- pkgs/development/ruby-modules/bundler-app/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 99d1dd64dc4f..c8f61389ad3f 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -26,12 +26,13 @@ , allowSubstitutes ? false , meta ? {} , postBuild ? "" +, gemConfig ? null }@args: let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" ] + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults in runCommand basicEnv.name cmdArgs '' From 16bc4ffc85bae319673c3c74a22fa342e8d46da1 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Mon, 9 Apr 2018 18:45:48 +0800 Subject: [PATCH 1608/2743] asciidoctor: 1.5.6.1 -> 1.5.6.2, also add mathematical and coderay `asciidoctor-mathematical` requires a few system dependencies to compile, and some of these are not linked correctly into the resulting shared object, so these are handled manually. `asciidoctor-mathematical` and `coderay` are necessary to compile the vulkan specification documentation. --- pkgs/tools/typesetting/asciidoctor/Gemfile | 2 + .../typesetting/asciidoctor/Gemfile.lock | 81 +++++---- .../tools/typesetting/asciidoctor/default.nix | 35 +++- pkgs/tools/typesetting/asciidoctor/gemset.nix | 154 ++++++++++++------ 4 files changed, 191 insertions(+), 81 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile index 92abd4f5cf2b..54509c601e36 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile @@ -4,4 +4,6 @@ gem 'asciidoctor-diagram' gem 'asciidoctor-bespoke' gem 'asciidoctor-pdf' gem 'asciidoctor-latex' +gem 'asciidoctor-mathematical' +gem 'coderay' gem 'pygments.rb' diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 25800ed3a1ca..6c52a2c416a1 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -1,82 +1,93 @@ GEM remote: https://rubygems.org/ specs: - Ascii85 (1.0.2) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + Ascii85 (1.0.3) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) afm (0.2.2) - asciidoctor (1.5.6.1) + asciidoctor (1.5.6.2) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) thread_safe (~> 0.3.5) - asciidoctor-diagram (1.5.4) + asciidoctor-diagram (1.5.9) asciidoctor (~> 1.5.0) asciidoctor-latex (1.5.0.17.dev) asciidoctor (~> 1.5, >= 1.5.2) htmlentities (~> 4.3) opal (~> 0.6.3) + asciidoctor-mathematical (0.2.2) + asciidoctor (~> 1.5, >= 1.5.0) + mathematical (~> 1.5, >= 1.5.8) + ruby-enum (~> 0.4) asciidoctor-pdf (1.5.0.alpha.16) asciidoctor (>= 1.5.0) - prawn (>= 1.3.0, < 3.0.0) - prawn-icon (= 1.2.0) - prawn-svg (>= 0.21.0, < 0.26.0) + prawn (>= 1.3.0, < 2.3.0) + prawn-icon (= 1.3.0) + prawn-svg (>= 0.21.0, < 0.28.0) prawn-table (= 0.2.2) - prawn-templates (= 0.0.3) + prawn-templates (>= 0.0.3, <= 0.1.1) safe_yaml (~> 1.0.4) - thread_safe (~> 0.3.5) + thread_safe (~> 0.3.6) treetop (= 1.5.3) - concurrent-ruby (1.0.4) - css_parser (1.4.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + css_parser (1.6.0) addressable hashery (2.1.2) htmlentities (4.3.4) - json (2.0.3) - multi_json (1.12.1) + i18n (1.0.0) + concurrent-ruby (~> 1.0) + json (2.1.0) + mathematical (1.6.11) + ruby-enum (~> 0.4) + multi_json (1.13.1) opal (0.6.3) source_map sprockets - pdf-core (0.6.1) - pdf-reader (1.4.1) + pdf-core (0.7.0) + pdf-reader (2.1.0) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk polyglot (0.3.5) - prawn (2.1.0) - pdf-core (~> 0.6.1) - ttfunk (~> 1.4.0) - prawn-icon (1.2.0) + prawn (2.2.2) + pdf-core (~> 0.7.0) + ttfunk (~> 1.5) + prawn-icon (1.3.0) prawn (>= 1.1.0, < 3.0.0) - prawn-svg (0.25.2) + prawn-svg (0.27.1) css_parser (~> 1.3) prawn (>= 0.11.1, < 3) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - prawn-templates (0.0.3) - pdf-reader (~> 1.3) - prawn (>= 0.15.0) - public_suffix (2.0.5) - pygments.rb (1.1.1) + prawn-templates (0.1.1) + pdf-reader (~> 2.0) + prawn (~> 2.2) + public_suffix (3.0.2) + pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.1) + rack (2.0.4) + ruby-enum (0.7.2) + i18n ruby-rc4 (0.1.5) safe_yaml (1.0.4) - slim (3.0.7) - temple (~> 0.7.6) + slim (3.0.9) + temple (>= 0.7.6, < 0.9) tilt (>= 1.3.3, < 2.1) source_map (3.0.1) json sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - temple (0.7.7) - thread_safe (0.3.5) - tilt (2.0.6) + temple (0.8.0) + thread_safe (0.3.6) + tilt (2.0.8) treetop (1.5.3) polyglot (~> 0.3) - ttfunk (1.4.0) + ttfunk (1.5.1) PLATFORMS ruby @@ -86,8 +97,10 @@ DEPENDENCIES asciidoctor-bespoke asciidoctor-diagram asciidoctor-latex + asciidoctor-mathematical asciidoctor-pdf + coderay pygments.rb BUNDLED WITH - 1.13.6 + 1.14.6 diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 02b57ee3a13b..29fd62f7adcc 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, bundlerApp, ruby, curl }: +{ stdenv, lib, bundlerApp, ruby, curl + # Dependencies of the 'mathematical' package +, cmake, bison, flex, glib, pkgconfig, cairo +, pango, gdk_pixbuf, libxml2, python3 +}: bundlerApp { inherit ruby; @@ -11,8 +15,37 @@ bundlerApp { "asciidoctor-latex" "asciidoctor-pdf" "asciidoctor-safe" + "asciidoctor-mathematical" ]; + gemConfig = { + mathematical = attrs: { + buildInputs = [ + cmake + bison + flex + glib + pkgconfig + cairo + pango + gdk_pixbuf + libxml2 + python3 + ]; + + # The ruby build script takes care of this + dontUseCmakeConfigure = true; + + # For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here + postFixup = '' + soPath="$out/lib/ruby/gems/2.4.0/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" + patchelf \ + --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(patchelf --print-rpath "$soPath")" \ + "$soPath" + ''; + }; + }; + meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; homepage = http://asciidoctor.org/; diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 43011b22b76a..4ae146d289ba 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -1,11 +1,12 @@ { addressable = { + dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.2"; }; afm = { source = { @@ -18,20 +19,21 @@ Ascii85 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q"; + sha256 = "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "c4371c419306d69152809eb896c291ca09969dc26ca34be36f4eab82914fceca"; + sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f"; type = "gem"; }; - version = "1.5.6.1"; + version = "1.5.6.2"; }; asciidoctor-bespoke = { + dependencies = ["asciidoctor" "slim" "thread_safe"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1awy933sswxvi2hxpll3rh9phxcvmqhrbb91m6ibjchnf7qsl3zk"; @@ -40,14 +42,16 @@ version = "1.0.0.alpha.1"; }; asciidoctor-diagram = { + dependencies = ["asciidoctor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kqlij2yc84zqxmb39bqi9pihapgac7gxyzrwm4kxfnmfdqmxrk"; + sha256 = "0rj02i00d9hkzqzzrk5al9rn8yv5x0wsnrv9y6j4k8rfylm69c1r"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.9"; }; asciidoctor-latex = { + dependencies = ["asciidoctor" "htmlentities" "opal"]; source = { remotes = ["https://rubygems.org"]; sha256 = "02qvn1ngp4s9y22vk23zzssd4w1bpyk84akjwiq6nqn8im6s4awz"; @@ -55,29 +59,48 @@ }; version = "1.5.0.17.dev"; }; - asciidoctor-pdf = { + asciidoctor-mathematical = { + dependencies = ["asciidoctor" "mathematical" "ruby-enum"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f6b2a1533577dfba218de5dd886771447e4d1cb670b81d2c3bf3a180e6029a1"; + sha256 = "18igbvs70dnlrzgl62jcc0vfxhlb4r7v9bq3qf1v80l17lvq1x8f"; + type = "gem"; + }; + version = "0.2.2"; + }; + asciidoctor-pdf = { + dependencies = ["asciidoctor" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1899c071hfmzqg9822v7rg8y8iqlfy3dhpfy32ignzap6cajlsqg"; type = "gem"; }; version = "1.5.0.alpha.16"; }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; css_parser = { + dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aqv5ds1109s0g76ybvvaff41a71i03fjy0ix6272r8n0gdnjc3f"; + sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; type = "gem"; }; - version = "1.4.8"; + version = "1.6.0"; }; hashery = { source = { @@ -95,23 +118,42 @@ }; version = "4.3.4"; }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "191c2xzlvn42sb8dz6gjy0qaigri4chfvflg3d4k6n58flm0yp65"; + type = "gem"; + }; + version = "1.0.0"; + }; json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; + }; + mathematical = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xkr613hmzbhmm6zv92zlcjyfp0a6i2b3q3hg24lmj4j5l85p21"; + type = "gem"; + }; + version = "1.6.11"; }; multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; opal = { + dependencies = ["source_map" "sprockets"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0dmdxhmg43ibd4bsldssslsz8870hzknwcxiv9l1838lh6hd390k"; @@ -122,18 +164,19 @@ pdf-core = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1s0h0kkddkivgpf7k1jni9nzqxw09d9bgcsvyga407ixbiipkgfy"; + sha256 = "19llwch2wfg51glb0kff0drfp3n6nb9vim4zlvzckxysksvxpby1"; type = "gem"; }; - version = "0.6.1"; + version = "0.7.0"; }; pdf-reader = { + dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ivmgm73jjk3hv7896mgld5ki8jhxdvksw766rqxp6i863y9v4jq"; + sha256 = "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45"; type = "gem"; }; - version = "1.4.1"; + version = "2.1.0"; }; polyglot = { source = { @@ -144,30 +187,34 @@ version = "0.3.5"; }; prawn = { + dependencies = ["pdf-core" "ttfunk"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18f99v3r0jzym38s68hr0y8anrilv98shmsdf763ascd0gc5dj2n"; + sha256 = "1qdjf1v6sfl44g3rqxlg8k4jrzkwaxgvh2l4xws97a8f3xv4na4m"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.2"; }; prawn-icon = { + dependencies = ["prawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "101npavqvv5w44vgphlkqn3gdawxmsnd4j8bk6lzbxz7niqgaqny"; + sha256 = "1pz8n7ajkfmflw05dib2l9qkzkfzwwbzx63qcvjr14k1dnbpx7qk"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; prawn-svg = { + dependencies = ["css_parser" "prawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19zc7i6jxycs9m00frvv9g3x98sgzsyb1xf1xnn3h1ki574ibnip"; + sha256 = "0fykcs10q2j6h04riav1kzrw77mga6gh1rxbh7q0ab6gkr0wamzx"; type = "gem"; }; - version = "0.25.2"; + version = "0.27.1"; }; prawn-table = { + dependencies = ["prawn"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1nxd6qmxqwl850icp18wjh5k0s3amxcajdrkjyzpfgq0kvilcv9k"; @@ -176,36 +223,47 @@ version = "0.2.2"; }; prawn-templates = { + dependencies = ["pdf-reader" "prawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d14sq01c5zn0ywzazwcz6lkk235za36km53wqbf1bqabdb1ls10"; + sha256 = "1gs894sj9zdlwx59h3rk4p0l3y8r18p22zhnfiyx9lngsa56gcrj"; type = "gem"; }; - version = "0.0.3"; + version = "0.1.1"; }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.2"; }; "pygments.rb" = { + dependencies = ["multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g0ipgxqfw0vf2md3s8sqf8y7m5lxqza2gwnr05z3vrf1nc6v6hk"; + sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "053bqbrxr5gjw5k3rrmh6i35s83kgdycxv292lid072vpwrq1xv1"; + sha256 = "1mfriw2r2913dv8qf3p87n7yal3qfsrs478x2qz106v8vhmxa017"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.4"; + }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; }; ruby-rc4 = { source = { @@ -224,14 +282,16 @@ version = "1.0.4"; }; slim = { + dependencies = ["temple" "tilt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "122hmc2kn3g151m8c41imadw29mghnsjwyzj8wav5zb1q69y4iqp"; + sha256 = "0zwz083xsbnlrma1pfkzrqc1fqm90fidn915vlifvkzl5fs43pvl"; type = "gem"; }; - version = "3.0.7"; + version = "3.0.9"; }; source_map = { + dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0fviv92glr51v2zqy4i5jzi3hzpvjrcwyrxddcfr84ki65zb7pkv"; @@ -240,6 +300,7 @@ version = "3.0.1"; }; sprockets = { + dependencies = ["concurrent-ruby" "rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar"; @@ -250,28 +311,29 @@ temple = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6"; + sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; type = "gem"; }; - version = "0.7.7"; + version = "0.8.0"; }; thread_safe = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qsyzq2k7blyp1rph56xczwfqi8gplns2whswyr67mdfzdi60vvm"; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.8"; }; treetop = { + dependencies = ["polyglot"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0wpl5z33796nz2ah44waflrd1girbra281d9i3m9nz4ylg1ljg5b"; @@ -282,9 +344,9 @@ ttfunk = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1k725rji58i0qx5xwf7p9d07cmhmjixqkdvhg1wk3rpp1753cf1j"; + sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; } From f8cbdd53550c09d7cfa6717cd5eeaeec5e4b6870 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Mon, 9 Apr 2018 14:25:29 +0300 Subject: [PATCH 1609/2743] 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 1610/2743] 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 db1ac62e452d80405f8769e01d0c54525e13fd7c Mon Sep 17 00:00:00 2001 From: "Jonathan C. Otsuka" Date: Mon, 9 Apr 2018 08:41:56 -0500 Subject: [PATCH 1611/2743] update erlangR20 from 20.3.1 to 20.3.2 --- pkgs/development/interpreters/erlang/R20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 7757039a4a15..42aaed0b6590 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl }: mkDerivation rec { - version = "20.3.1"; - sha256 = "13qh3an98qm477zr1dvcklbhar001cikp177295llcqpchamgzx3"; + version = "20.3.2"; + sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' From 48bc430dea3a5ad7c89edb28d4aa19fe25a78124 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 9 Apr 2018 15:17:42 +0100 Subject: [PATCH 1612/2743] jupyterlab: fix JUPYTERLAB_DIR lookup without this option jupyterlab will look into the system python installation directories --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 6e942a6286fa..4cf69a1114e7 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { notebook ]; + makeWrapperArgs = [ + "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" + ]; + # Depends on npm doCheck = false; From a73cdc7333db7b95fef8c7b94b5ffa5430097266 Mon Sep 17 00:00:00 2001 From: Sondre Nilsen Date: Mon, 9 Apr 2018 16:58:06 +0200 Subject: [PATCH 1613/2743] 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 1614/2743] 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 1615/2743] 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 9a182f57c50e44dd84b52de0eb49d8fd27cb1ac0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 1 Apr 2018 18:33:10 +0200 Subject: [PATCH 1616/2743] bepasty: make it a package again this fixes running bepasty with gunicorn, which is needed for services.bepasty --- pkgs/tools/misc/bepasty/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index ee2680da0066..f69f654cda3d 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -4,7 +4,10 @@ with python.pkgs; -buildPythonApplication rec { +#We need to use buildPythonPackage here to get the PYTHONPATH build correctly. +#This is needed for services.bepasty +#https://github.com/NixOS/nixpkgs/pull/38300 +buildPythonPackage rec { pname = "bepasty"; version = "0.4.0"; name = "${pname}-${version}"; From 99dc5f4ab0e3ddae4bc27150d8f41a1fdb08eca2 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 24 Sep 2017 17:28:16 -0400 Subject: [PATCH 1617/2743] 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 1618/2743] 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 1619/2743] 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 1620/2743] 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 1621/2743] 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 1622/2743] 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 1623/2743] 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 1624/2743] 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 1625/2743] 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 1626/2743] 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 1627/2743] 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 1628/2743] 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 1629/2743] 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 1630/2743] 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 1631/2743] 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 1632/2743] 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 1633/2743] 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 e51405db3e5d5e89e1a9dd8251ef00df0f771913 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:23:54 -0500 Subject: [PATCH 1634/2743] antlr: supports darwin --- pkgs/development/tools/parsing/antlr/2.7.7.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 23141185f68e..017ef20e81c6 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { walk parse trees. ''; homepage = http://www.antlr.org/; - platforms = platforms.linux; + platforms = platforms.unix; }; } From a77de9552942bded66c2dcfce61512b72c52651c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:24:21 -0500 Subject: [PATCH 1635/2743] xcbuild: add framework product --- pkgs/development/tools/xcbuild/platform.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index d0836daf6135..a36c4f4bf806 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -258,6 +258,27 @@ let }; PackageTypes = [ "com.apple.package-type.wrapper.application" ]; } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework"; + Name = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + }; + PackageTypes = [ "com.apple.package-type.wrapper" ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } ]; in From 7c1e39746d2570005877142908a10d693018ad56 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:24:50 -0500 Subject: [PATCH 1636/2743] xcbuild: set SYMROOT and OBJROOT --- pkgs/development/tools/xcbuild/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index c3b26a6ac796..70100c196973 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -5,7 +5,7 @@ xcbuildBuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates $xcbuildFlags build runHook postBuild } From 65562e4cddab2c28511d81bf5dd56a4bf767a8f9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:27:14 -0500 Subject: [PATCH 1637/2743] treewide: change install references for xcbuild now build directory is "Products/Release/" --- .../darwin/apple-source-releases/adv_cmds/xcode.nix | 2 +- .../darwin/apple-source-releases/basic_cmds/default.nix | 2 +- .../darwin/apple-source-releases/developer_cmds/default.nix | 2 +- .../darwin/apple-source-releases/file_cmds/default.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix | 4 ++-- .../darwin/apple-source-releases/network_cmds/default.nix | 2 +- .../darwin/apple-source-releases/shell_cmds/default.nix | 2 +- pkgs/tools/misc/contacts/default.nix | 2 +- pkgs/tools/security/pinentry-mac/default.nix | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index a3d4099399b3..1d5c0defcbfd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -34,7 +34,7 @@ appleDerivation { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install adv_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1 8; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 9e8b78e57d6c..b52ec3306dc4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -14,7 +14,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install basic_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index 67fbf83496ed..1f35e3008b3b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -11,7 +11,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install developer_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 8346ca7a9a76..47a587966b44 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -19,7 +19,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install file_cmds-*/Build/Products/Release/* $out/bin + install Products/Release/* $out/bin for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix index 860a74f61f7f..2c75f3966dbf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -18,8 +18,8 @@ appleDerivation { installPhase = '' mkdir -p $out/lib $out/include - cp libutil-*/Build/Products/Release/*.dylib $out/lib - cp libutil-*/Build/Products/Release/*.h $out/include + cp Products/Release/*.dylib $out/lib + cp Products/Release/*.h $out/include # TODO: figure out how to get this to be right the first time around install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index dc7edface9a0..23777c941576 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -19,7 +19,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install network_cmds-*/Build/Products/Release/* $out/bin/ + install Products/Release/* $out/bin/ for n in 1 5; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index 4f527acc950c..8ce916feb38a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -29,7 +29,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/usr/bin - install shell_cmds-*/Build/Products/Release/* $out/usr/bin + install Products/Release/* $out/usr/bin export DSTROOT=$out export SRCROOT=$PWD diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index d146cd93343e..47a74e84b55a 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ./contacts-*/Build/Products/Default/contacts $out/bin + cp Products/Default/contacts $out/bin ''; ## FIXME: the framework setup hook isn't adding these correctly diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix index 074d71c08308..2be8550fb4cc 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry-mac/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications - mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications + mv Products/Release/pinentry-mac.app $out/Applications ''; passthru = { From c3ce4ee7232ceb81e810d016b4fd8279aeb79bf9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:28:06 -0500 Subject: [PATCH 1638/2743] pbzx: init at 1.0.2 --- pkgs/tools/compression/pbzx/default.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/compression/pbzx/default.nix diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix new file mode 100644 index 000000000000..bbba21f2b34d --- /dev/null +++ b/pkgs/tools/compression/pbzx/default.nix @@ -0,0 +1,27 @@ +{stdenv, lib, fetchFromGitHub, lzma, xar}: + +stdenv.mkDerivation rec { + pname = "pbzx"; + version = "1.0.2"; + name = "${pname}-${version}"; + src = fetchFromGitHub { + owner = "NiklasRosenstein"; + repo = "pbzx"; + rev = "v${version}"; + sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; + }; + buildInputs = [ lzma xar ]; + buildPhase = '' + cc pbzx.c -llzma -lxar -o pbzx + ''; + installPhase = '' + mkdir -p $out/bin + cp pbzx $out/bin + ''; + meta = with lib; { + description = "Stream parser of Apple's pbzx compression format."; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = [ maintainers.matthewbauer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03018649317b..83e282d1002a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1344,6 +1344,8 @@ with pkgs; patdiff = callPackage ../tools/misc/patdiff { }; + pbzx = callPackage ../tools/compression/pbzx { }; + playerctl = callPackage ../tools/audio/playerctl { }; ps_mem = callPackage ../tools/system/ps_mem { }; From 72f8df946578a531de480bd353cba8260049a2c2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:29:08 -0500 Subject: [PATCH 1639/2743] swift-corelibs: init moves swift-corelibs-corefoundation to own dir also adds libdispatch --- .../corefoundation.nix} | 0 pkgs/os-specific/darwin/swift-corelibs/default.nix | 8 ++++++++ .../darwin/swift-corelibs/libdispatch.nix | 12 ++++++++++++ pkgs/top-level/darwin-packages.nix | 4 ++-- 4 files changed, 22 insertions(+), 2 deletions(-) rename pkgs/os-specific/darwin/{swift-corefoundation/default.nix => swift-corelibs/corefoundation.nix} (100%) create mode 100644 pkgs/os-specific/darwin/swift-corelibs/default.nix create mode 100644 pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix similarity index 100% rename from pkgs/os-specific/darwin/swift-corefoundation/default.nix rename to pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix new file mode 100644 index 000000000000..fdc97304528d --- /dev/null +++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix @@ -0,0 +1,8 @@ +{callPackage, stdenv, darwin, xcbuild}: + +rec { + corefoundation = callPackage ./corefoundation.nix {}; + libdispatch = callPackage ./libdispatch.nix { + inherit (darwin) apple_sdk_sierra xnu; + }; +} diff --git a/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix new file mode 100644 index 000000000000..bd143b6071ba --- /dev/null +++ b/pkgs/os-specific/darwin/swift-corelibs/libdispatch.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchFromGitHub, cmake, apple_sdk_sierra, xnu-new }: + +stdenv.mkDerivation rec { + name = "swift-corelibs-libdispatch"; + src = fetchFromGitHub { + owner = "apple"; + repo = name; + rev = "f83b5a498bad8e9ff8916183cf6e8ccf677c346b"; + sha256 = "1czkyyc9llq2mnqfp19mzcfsxzas0y8zrk0gr5hg60acna6jkz2l"; + }; + buildInputs = [ cmake apple_sdk_sierra.sdk xnu-new ]; +} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 1f8039010d7b..f1854bf60eae 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -57,12 +57,12 @@ in stubs = callPackages ../os-specific/darwin/stubs { }; - swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { }; - trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; }; usr-include = callPackage ../os-specific/darwin/usr-include { }; xcode = callPackage ../os-specific/darwin/xcode { }; + swift-corelibs = callPackages ../os-specific/darwin/swift-corelibs { }; + }) From d625fece188feb5c58dc857af1cb64d5be24d03e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:40:24 -0500 Subject: [PATCH 1640/2743] CoreSymbolication: init --- .../darwin/CoreSymbolication/default.nix | 19 +++++++++++++++++++ pkgs/top-level/darwin-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/os-specific/darwin/CoreSymbolication/default.nix diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix new file mode 100644 index 000000000000..aa73c7f86c40 --- /dev/null +++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -0,0 +1,19 @@ +{ fetchFromGitHub, stdenv }: + +# Reverse engineered CoreSymbolication to make dtrace buildable + +stdenv.mkDerivation rec { + name = "CoreSymbolication"; + + src = fetchFromGitHub { + repo = name; + owner = "matthewbauer"; + rev = "671fcb66c82eac1827f3f53dc4cc4e9b1b94da0a"; + sha256 = "0qpw46gwgjxiwqqjxksb8yghp2q8dwad6hzaf4zl82xpvk9n5ahj"; + }; + + installPhase = '' + mkdir -p $out/include + cp -r CoreSymbolication $out/include + ''; +} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index f1854bf60eae..55b8fc9238be 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -63,6 +63,8 @@ in xcode = callPackage ../os-specific/darwin/xcode { }; + CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; + swift-corelibs = callPackages ../os-specific/darwin/swift-corelibs { }; }) From 0b833261727ff8c36e3c51eab8f522747198429a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:41:15 -0500 Subject: [PATCH 1641/2743] darling: init --- pkgs/os-specific/darwin/darling/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/darwin-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/os-specific/darwin/darling/default.nix diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix new file mode 100644 index 000000000000..8c94b2d878dd --- /dev/null +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -0,0 +1,34 @@ +{stdenv, lib, fetchFromGitHub, cmake, bison, flex}: + +stdenv.mkDerivation rec { + pname = "darling"; + name = pname; + + src = fetchFromGitHub { + repo = pname; + owner = "darlinghq"; + rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b"; + sha256 = "1mkcnzy1cfpwghgvb9pszhy9jy6534y8krw8inwl9fqfd0w019wz"; + }; + + # only packaging sandbox for now + buildPhase = '' + cc -c src/sandbox/sandbox.c -o src/sandbox/sandbox.o + cc -dynamiclib -flat_namespace src/sandbox/sandbox.o -o libsystem_sandbox.dylib + ''; + + installPhase = '' + mkdir -p $out/lib + cp -rL src/sandbox/include/ $out/ + cp libsystem_sandbox.dylib $out/lib/ + ''; + + # buildInputs = [ cmake bison flex ]; + + meta = with lib; { + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.gpl3; + description = "Darwin/macOS emulation layer for Linux"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 55b8fc9238be..d1d5aa470bca 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -67,4 +67,6 @@ in swift-corelibs = callPackages ../os-specific/darwin/swift-corelibs { }; + darling = callPackage ../os-specific/darwin/darling/default.nix { }; + }) From 4a515ed306c24de0ec32acbfeb2c9882601f2a1c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 00:43:07 -0500 Subject: [PATCH 1642/2743] dtrace: add xcode drv darwin.dtrace-xcode contains the dtrace bin --- .../darwin/apple-source-releases/default.nix | 3 +- .../apple-source-releases/dtrace/xcode.nix | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index cca729016c25..c796ca05105c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -201,7 +201,8 @@ let configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {}; Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; - dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; + dtrace = applePackage "dtrace" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; + dtrace-xcode = applePackage "dtrace/xcode.nix" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix new file mode 100644 index 000000000000..3fb31fda166e --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix @@ -0,0 +1,35 @@ +{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling }: + +appleDerivation { + buildInputs = [ xcbuild CoreSymbolication xnu bison flex darling ]; + NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers"; + NIX_LDFLAGS = "-L./Products/Release"; + xcbuildFlags = "-target dtrace"; + + # hack to handle xcbuild's broken lex handling + preBuild = '' + cd libdtrace + yacc -d dt_grammar.y + flex -l -d dt_lex.l + cd .. + + substituteInPlace dtrace.xcodeproj/project.pbxproj \ + --replace '6EBC9800099BFBBF0001019C /* dt_grammar.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; name = dt_grammar.y; path = libdtrace/dt_grammar.y; sourceTree = ""; };' '6EBC9800099BFBBF0001019C /* y.tab.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = y.tab.c; path = libdtrace/y.tab.c; sourceTree = ""; };' \ + --replace '6EBC9808099BFBBF0001019C /* dt_lex.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; name = dt_lex.l; path = libdtrace/dt_lex.l; sourceTree = ""; };' '6EBC9808099BFBBF0001019C /* lex.yy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lex.yy.c; path = libdtrace/lex.yy.c; sourceTree = ""; };' + ''; + + # xcbuild doesn't support install + installPhase = '' + mkdir -p $out + + cp -r Products/Release/usr $out + mv $out/usr/* $out + rmdir $out/usr + + mkdir $out/lib + cp Products/Release/*.dylib $out/lib + + mkdir $out/bin + cp Products/Release/dtrace $out/bin + ''; +} From c468b30ede20dae73cd4add7b1503eea6dae51cc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 22:40:59 -0500 Subject: [PATCH 1643/2743] libsecurity_utilities: fixup --- .../apple-source-releases/libsecurity_utilities/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index bb55fd48d8b2..e811c4c11a82 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -4,9 +4,12 @@ appleDerivation { libauto libobjc IOKit + ]; + propagatedBuildInputs = [ sqlite apple_sdk.frameworks.PCSC ]; + NIX_LDFLAGS = "-framework PCSC"; patchPhase = '' substituteInPlace lib/errors.h --replace \ '' \ From 71b53c0cfe6aa3ddd9bf0cb2c7124cf0f1243c32 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 22:42:03 -0500 Subject: [PATCH 1644/2743] libsecurity_codesigning: init --- .../libsecurity_codesigning/default.nix | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix index c5ba9cc8d7ef..2a05855bd521 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix @@ -1,7 +1,33 @@ -{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }: +{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities +, Security, xnu, xar, antlr, libsecurityd, apple_sdk +, dtrace-xcode, osx_private_sdk }: appleDerivation { - buildInputs = [ - libsecurity_utilities - libsecurity_cdsa_utilities - ]; -} \ No newline at end of file + buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities dtrace-xcode + Security xar antlr libsecurityd ]; + NIX_CFLAGS_COMPILE = "-Iinclude -I${xnu}/Library/Frameworks/System.framework/Headers"; + patchPhase = '' + substituteInPlace lib/policydb.cpp \ + --replace "new MutableDictionary::MutableDictionary()" NULL + substituteInPlace lib/xpcengine.h \ + --replace "#include " "" + substituteInPlace lib/policyengine.cpp \ + --replace "#include " "" + + rm lib/policyengine.cpp lib/quarantine++.cpp lib/codedirectory.cpp lib/xpcengine.cpp + ''; + preBuild = '' + mkdir -p include + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/usr/include/quarantine.h include + mkdir -p include/CoreServices/ + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/CoreServices.framework/PrivateHeaders/*.h include/CoreServices/ + + unpackFile ${Security.src} + mkdir -p include/securityd_client + cp Security-*/libsecurityd/lib/*.h include/securityd_client + mkdir -p include/xpc + cp ${apple_sdk.sdk}/include/xpc/*.h include/xpc + + sed -i '1i #define bool int' lib/security_codesigning.d + dtrace -h -C -s lib/security_codesigning.d -o codesigning_dtrace.h + ''; +} From 77ac9c50dce15b681d368b508d88b8b6c8440d15 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 22:42:50 -0500 Subject: [PATCH 1645/2743] security_systemkeychain: init Fixes #37838 --- .../darwin/apple-source-releases/default.nix | 3 ++ .../security_systemkeychain/default.nix | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index c796ca05105c..7ceeab9526ce 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -53,6 +53,7 @@ let ICU = "531.48"; libdispatch = "442.1.4"; Security = "57031.40.6"; + security_systemkeychain = "55202"; IOAudioFamily = "203.3"; IOFireWireFamily = "458"; @@ -244,6 +245,8 @@ let shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {}; + security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {}; + libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; libsecurity_apple_file_dl = libsecPackage "libsecurity_apple_file_dl" "osx-10.7.5" "1dfqani3n135i3iqmafc1k9awmz6s0a78zifhk15rx5a8ps870bl" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix new file mode 100644 index 000000000000..1a0208ef3a08 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix @@ -0,0 +1,31 @@ +{ appleDerivation, xcbuild, Security +, libsecurity_codesigning, libsecurity_utilities, libsecurity_cdsa_utilities +, xnu, osx_private_sdk, pcsclite}: + +appleDerivation { + buildInputs = [ xcbuild Security libsecurity_utilities + libsecurity_cdsa_utilities libsecurity_codesigning + pcsclite ]; + + NIX_LDFLAGS = "-lpcsclite"; + + # can't build the whole thing + xcbuildFlags = "-target codesign"; + + preBuild = '' + mkdir -p include/Security + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/PrivateHeaders/*.h include/Security + cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/Headers/*.h include/Security + + unpackFile ${xnu.src} + mkdir -p include/sys + cp -r xnu-*/bsd/sys/codesign.h include/sys/codesign.h + ''; + + NIX_CFLAGS_COMPILE = "-Iinclude"; + + installPhase = '' + mkdir -p $out/bin + cp Products/Release/codesign $out/bin/codesign + ''; +} From 524b606f16ac59e1877e2e62994b7752c0b7206a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 9 Apr 2018 20:29:03 -0400 Subject: [PATCH 1646/2743] 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 1647/2743] 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 cb3f5a2d9c38d51fd9b4382dbdc8b3a895988b71 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 10 Apr 2018 11:34:24 +0800 Subject: [PATCH 1648/2743] asciidoctor: Use an explicit path to patchelf Hopefully fixing the Darwin build --- pkgs/tools/typesetting/asciidoctor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 29fd62f7adcc..90ef7d4e0e60 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerApp, ruby, curl # Dependencies of the 'mathematical' package , cmake, bison, flex, glib, pkgconfig, cairo -, pango, gdk_pixbuf, libxml2, python3 +, pango, gdk_pixbuf, libxml2, python3, patchelf }: bundlerApp { @@ -39,8 +39,8 @@ bundlerApp { # For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here postFixup = '' soPath="$out/lib/ruby/gems/2.4.0/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" - patchelf \ - --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(patchelf --print-rpath "$soPath")" \ + ${patchelf}/bin/patchelf \ + --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \ "$soPath" ''; }; From 12fa2f9fd37eaf0c12de0d2ef75e93a05d9788a4 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 9 Apr 2018 23:52:18 -0400 Subject: [PATCH 1649/2743] 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 ea1a167dd6c200c97014786cce00e9cfee7214d3 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 10 Apr 2018 08:47:09 +0100 Subject: [PATCH 1650/2743] openclonk: 7.0 -> 8.1 --- pkgs/games/openclonk/default.nix | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index d3fb8c7bc58e..e4bcef29878c 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng, - SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline, - libxkbcommon, epoxy, at-spi2-core, dbus, libxml2, - enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther +{ stdenv, fetchurl, cmake, pkgconfig +, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal +, freealut, readline, gcc-unwrapped +, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: let @@ -10,32 +10,38 @@ let sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; }; in stdenv.mkDerivation rec { - version = "7.0"; + version = "8.1"; name = "openclonk-${version}"; src = fetchurl { - url = "http://www.openclonk.org/builds/release/7.0/openclonk-${version}-src.tar.bz2"; - sha256 = "0ch71dqaaalg744pc1gvg6sj2yp2kgvy2m4yh6l7ljkpf8fj66mw"; + url = "http://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; + sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; }; postInstall = '' mv -v $out/games/openclonk $out/bin/ '' + stdenv.lib.optionalString enableSoundtrack '' - cp -v ${soundtrack_src} $out/share/games/openclonk/Music.ocg + ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ - cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL - SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp - pkgconfig gtest gmock readline epoxy at-spi2-core dbus libxml2 + SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut + readline ]; + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; + + cmakeBuildType = "RelWithDebInfo"; + meta = with stdenv.lib; { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; - homepage = http://openclonk.org; + homepage = https://www.openclonk.org; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; - platforms = platforms.all; + maintainers = with maintainers; [ lheckemann ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } From 8c6d838853271bc7bb1be720d8ec9089dd57d868 Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 10 Apr 2018 12:30:31 +0100 Subject: [PATCH 1651/2743] pythonPackages.progressbar231: init at 2.3.1 --- .../python-modules/progressbar231/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/progressbar231/default.nix diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix new file mode 100644 index 000000000000..f98259617545 --- /dev/null +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "progressbar231"; + version = "2.3.1"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0j0ifxk87xz3wkyacxaiqygghn27wwz6y5pj9k8j2yq7n33fbdam"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar231; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ce9bde2c97d..6096497a6f77 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11480,6 +11480,8 @@ in { progressbar2 = callPackage ../development/python-modules/progressbar2 { }; + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; From 10863b0aa35da98cb217285b4805ec2c38e59894 Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 10 Apr 2018 12:31:22 +0100 Subject: [PATCH 1652/2743] pythonPackages.progressbar33: init at 2.4 --- .../python-modules/progressbar33/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/progressbar33/default.nix diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix new file mode 100644 index 000000000000..f3b94436d452 --- /dev/null +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "progressbar33"; + version = "2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zvf6zs5hzrc03p9nfs4p16vhilqikycvv1yk0pxn8s07fdhvzji"; + }; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar33; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6096497a6f77..2ff548d561b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11482,6 +11482,8 @@ in { progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; From 0b919d47657af0f0cfe60cdd1c2a1c379242c4cd Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 10 Apr 2018 12:33:07 +0100 Subject: [PATCH 1653/2743] pythonPackages.bitmath: init at 1.3.1.2 --- .../python-modules/bitmath/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/bitmath/default.nix diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix new file mode 100644 index 000000000000..bb2e60468861 --- /dev/null +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: + +buildPythonPackage rec { + pname = "bitmath"; + version = "1.3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k8d1wmxqjc8cqzaixpxf45k6dl1kqhblr0g4wyjl0qa18q8wasd"; + }; + + checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; + + meta = with stdenv.lib; { + description = "Module for representing and manipulating file sizes with different prefix"; + homepage = https://github.com/tbielawa/bitmath; + license = licenses.mit; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ff548d561b8..062729f12b72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1003,6 +1003,8 @@ in { binwalk = self.binwalk_fun { }; binwalk-full = self.binwalk_fun { visualizationSupport = true; pyqtgraph = self.pyqtgraph; }; + bitmath = callPackage ../development/python-modules/bitmath { }; + caldavclientlibrary-asynk = buildPythonPackage rec { version = "asynkdev"; name = "caldavclientlibrary-asynk-${version}"; From f92dc58c7137606fc1b919133f9219218ab3bf5a Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 10 Apr 2018 21:14:20 +0900 Subject: [PATCH 1654/2743] flashplayer: 29.0.0.113 -> 29.0.0.140 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 07bc2bbc5f0f..f0862aebafe5 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "29.0.0.113"; + version = "29.0.0.140"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1ix86jv4ckn5pcj37fgx4mncqjyvabdvwxp9zs9frdfbyx740izr"; + sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 7d69c03ea366..162dd88054c7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "29.0.0.113"; + version = "29.0.0.140"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0" + "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p" else - "0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7" + "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh" else if arch == "x86_64" then - "18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4" + "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7" else - "06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy"; + "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index fead4cb9fad6..42d7aa2f56f0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "29.0.0.113"; + version = "29.0.0.140"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc" + "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5" else - "17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348"; + "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl"; }; nativeBuildInputs = [ unzip ]; From a4035fbae1fe2ffb58b3e040a4e697c8a2fc3d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Apr 2018 17:44:08 +0100 Subject: [PATCH 1655/2743] Revert "dbus-glib: 0.108 -> 0.110" This reverts commit 2dac22719b9d14c0bd761d6609653d2584d53f79. cc @pbogdan fails actually to build: https://github.com/NixOS/nixpkgs/pull/38582#issuecomment-380107299 --- pkgs/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 5d78e084e983..4d27552d7351 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.110"; + name = "dbus-glib-0.108"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w"; + sha256 = "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z"; }; outputs = [ "out" "dev" "devdoc" ]; From f4b5e1045878c97e03df21e2b9f50bb243a44441 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 09:53:04 -0700 Subject: [PATCH 1656/2743] 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 1657/2743] 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 eea252a1fdfec83e941a144d5454a32e72e8c10f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 10:06:28 -0700 Subject: [PATCH 1658/2743] strace: 4.21 -> 4.22 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/strace/versions. These checks were done: - built on NixOS - ran ‘/nix/store/x7d4g7rvf9z43xjz7mc8c4nzwphghjj7-strace-4.22/bin/strace -h’ got 0 exit code - ran ‘/nix/store/x7d4g7rvf9z43xjz7mc8c4nzwphghjj7-strace-4.22/bin/strace-log-merge -h’ got 0 exit code - ran ‘/nix/store/x7d4g7rvf9z43xjz7mc8c4nzwphghjj7-strace-4.22/bin/strace-log-merge --help’ got 0 exit code - ran ‘/nix/store/x7d4g7rvf9z43xjz7mc8c4nzwphghjj7-strace-4.22/bin/strace-log-merge help’ got 0 exit code - found 4.22 with grep in /nix/store/x7d4g7rvf9z43xjz7mc8c4nzwphghjj7-strace-4.22 - directory tree listing: https://gist.github.com/4c8ab8738133d11c611ae7290d25d6fc --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index f5da3f9daa4d..fce2fa4fa4b4 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.21"; + version = "4.22"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw"; + sha256 = "17dkpnsjxmys1ydidm9wcvc3wscsz44fmlxw3dclspn9cj9d1306"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From ec0495c0323833e4e8a238ea7e0e1a7713b288d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 10:27:18 -0700 Subject: [PATCH 1659/2743] 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 1660/2743] 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 1661/2743] 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 1662/2743] 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 1663/2743] 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 1664/2743] 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 6e066027f53e08ad7cd18ea91f11f881367b469a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 14:51:55 -0700 Subject: [PATCH 1665/2743] offlineimap: 7.1.5 -> 7.2.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/offlineimap/versions. These checks were done: - built on NixOS - ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/.offlineimap-wrapped -h’ got 0 exit code - ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/.offlineimap-wrapped --help’ got 0 exit code - ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/.offlineimap-wrapped --version’ and found version 7.2.0 - ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/offlineimap -h’ got 0 exit code - ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/offlineimap --help’ got 0 exit code - ran ‘/nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0/bin/offlineimap --version’ and found version 7.2.0 - found 7.2.0 with grep in /nix/store/q1a1p40fy8bhrd28f0fdikqmv7c1vmbl-offlineimap-7.2.0 - directory tree listing: https://gist.github.com/7a051af944742639c585d06d827dabea --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 86a029bcb3de..c1d00dba2b46 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.5"; + version = "7.2.0"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0qm5vhzm8hkab2zs2l8ffg754wkws2nyd4pwb332v3zckf11flzd"; + sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb"; }; postPatch = '' From a0fb38174d4d00d5397d9bd27b78d962567a0e6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 16:07:15 -0700 Subject: [PATCH 1666/2743] ncmpc: 0.29 -> 0.30 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/ncmpc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2cwvc3ps7jd9bkrdkgkmgn48wdk7yyv4-ncmpc-0.30/bin/ncmpc --help’ got 0 exit code - found 0.30 with grep in /nix/store/2cwvc3ps7jd9bkrdkgkmgn48wdk7yyv4-ncmpc-0.30 - directory tree listing: https://gist.github.com/07b8bd46db7e01426ba82a0e1dd2b0d0 --- pkgs/applications/audio/ncmpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 93e909fc604b..5bd2c9045f2a 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q"; + sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624"; }; buildInputs = [ glib ncurses mpd_clientlib ]; From c26f4405247badc6ca33ba7bca43677f78b9d26f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 16:33:08 -0700 Subject: [PATCH 1667/2743] 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 3d406695484a375caa6b0487890ca683609bc080 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 16:35:38 -0700 Subject: [PATCH 1668/2743] liquibase: 3.5.5 -> 3.6.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/liquibase/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.6.0 with grep in /nix/store/q0h0dm35qda3vls6axin875ky93n0idg-liquibase-3.6.0 - directory tree listing: https://gist.github.com/d7568f9f2cd317086e4b519f4749b8d8 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 394169c9cc9d..df9addcad3cb 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.5.5"; + version = "3.6.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "1ipjbzdb32xigm0vg6zzjnbx9n248rrkr324n5igp53nxbvgf3fs"; + sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb"; }; buildInputs = [ jre makeWrapper ]; From 6214e1d82badc3518be0fe05c9d044497db837c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 16:58:22 -0700 Subject: [PATCH 1669/2743] 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 c3f3bc386923c6f2f727dbe8c666ae043dad0e3c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 21:12:44 -0500 Subject: [PATCH 1670/2743] openpam: init at 20170430 --- pkgs/development/libraries/openpam/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/openpam/default.nix diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix new file mode 100644 index 000000000000..187f86133756 --- /dev/null +++ b/pkgs/development/libraries/openpam/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, lib }: + +stdenv.mkDerivation rec { + name = "openpam-${version}"; + version = "20170430"; + + src = fetchurl { + url = "mirror://sourceforge/openpam/openpam/Resedacea/${name}.tar.gz"; + sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; + }; + + meta = { + homepage = https://www.openpam.org; + description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..c6ed910c569b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13840,13 +13840,17 @@ with pkgs; gogoclient = callPackage ../os-specific/linux/gogoclient { }; + linux-pam = callPackage ../os-specific/linux/pam { }; + nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; + openpam = callPackage ../development/libraries/openpam { }; + pagemon = callPackage ../os-specific/linux/pagemon { }; - pam = callPackage ../os-specific/linux/pam { }; + pam = if stdenv.isLinux then linux-pam else openpam; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) From ec4910d9af7851af1a44450d80eda9a020697464 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 21:14:56 -0500 Subject: [PATCH 1671/2743] openbsm: init at 1.1 --- .../development/libraries/openbsm/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/openbsm/default.nix diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix new file mode 100644 index 000000000000..a6e62cea9d7e --- /dev/null +++ b/pkgs/development/libraries/openbsm/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "openbsm"; + name = "${pname}-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] name)}"; + sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; + }; + + meta = { + homepage = http://www.openbsm.org/; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ed910c569b..7fa67493d0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13848,6 +13848,8 @@ with pkgs; openpam = callPackage ../development/libraries/openpam { }; + openbsm = callPackage ../development/libraries/openbsm { }; + pagemon = callPackage ../os-specific/linux/pagemon { }; pam = if stdenv.isLinux then linux-pam else openpam; From dd4fd74f91b7fd273b0925feb4c4e192244a2017 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Apr 2018 21:15:28 -0500 Subject: [PATCH 1672/2743] system_cmds: build more commands Now includes getconf --- .../system_cmds/default.nix | 111 ++++++++++++++---- 1 file changed, 89 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 2247ef3ddd2f..2579b0b6a0a6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,37 +1,104 @@ -{ stdenv, appleDerivation, xcbuild }: +{ stdenv, appleDerivation, xcbuild, lib, hostPlatform +, Librpcsvc, apple_sdk, pam, CF, openbsm }: appleDerivation rec { # xcbuild fails with: # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + # see issue facebook/xcbuild#188 # buildInputs = [ xcbuild ]; - # # temporary install phase until xcodebuild has "install" support - # installPhase = '' - # mkdir -p $out/bin/ - # install system_cmds-*/Build/Products/Release/* $out/bin/ + buildInputs = [ Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF + apple_sdk.frameworks.IOKit openbsm ]; + # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" + # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" + # + lib.optionalString hostPlatform.isArm "-D__arm__"; + NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" + "-DDAEMON_GID=1" + "-DDEFAULT_AT_QUEUE=\'a\'" + "-DDEFAULT_BATCH_QUEUE=\'b\'" + "-DPERM_PATH=\"/usr/lib/cron/\"" + "-DOPEN_DIRECTORY" + "-DNO_DIRECT_RPC" + "-DAPPLE_GETCONF_UNDERSCORE" + "-DAPPLE_GETCONF_SPEC" + "-DUSE_PAM" + "-DUSE_BSM_AUDIT" + "-D_PW_NAME_LEN=MAXLOGNAME" + "-D_PW_YPTOKEN=\"__YP!\"" + "-DAHZV1=64 " + "-DAU_SESSION_FLAG_HAS_TTY=0x4000" + "-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000" + ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ "; - # for n in 1 5 8; do - # mkdir -p $out/share/man/man$n - # install */*.$n $out/share/man/man$n - # done - # ''; + patchPhase = '' + substituteInPlace login.tproj/login.c \ + --replace bsm/audit_session.h bsm/audit.h + substituteInPlace login.tproj/login_audit.c \ + --replace bsm/audit_session.h bsm/audit.h + ''; - # For now we just build sysctl because that's all I need... Please open a - # PR if you need any other utils before we fix the xcodebuild. - buildPhase = "cc sysctl.tproj/sysctl.c -o sysctl"; + buildPhase = '' + for dir in *.tproj; do + name=$(basename $dir) + name=''${name%.tproj} - installPhase = - '' - mkdir -p $out/bin - install sysctl $out/bin - for n in 5 8; do - mkdir -p $out/share/man/man$n - install sysctl.tproj/*.$n $out/share/man/man$n + CFLAGS="" + case $name in + arch) CFLAGS="-framework CoreFoundation";; + atrun) CFLAGS="-Iat.tproj";; + chkpasswd) + CFLAGS="-framework OpenDirectory -framework CoreFoundation -lpam";; + getconf) + for f in getconf.tproj/*.gperf; do + cfile=''${f%.gperf}.c + LC_ALL=C awk -f getconf.tproj/fake-gperf.awk $f > $cfile + done + ;; + iostat) CFLAGS="-framework IOKit -framework CoreFoundation";; + login) CFLAGS="-lbsm -lpam";; + nvram) CFLAGS="-framework CoreFoundation -framework IOKit";; + sadc) CFLAGS="-framework IOKit -framework CoreFoundation";; + sar) CFLAGS="-Isadc.tproj";; + esac + + echo "Building $name" + + case $name in + + # These are all broken currently. + arch) continue;; + chpass) continue;; + dirhelper) continue;; + dynamic_pager) continue;; + fs_usage) continue;; + latency) continue;; + pagesize) continue;; + passwd) continue;; + reboot) continue;; + sc_usage) continue;; + shutdown) continue;; + trace) continue;; + + *) cc $dir/*.c -I''${dir} $CFLAGS -o $name ;; + esac + done + ''; + + installPhase = '' + for dir in *.tproj; do + name=$(basename $dir) + name=''${name%.tproj} + [ -x $name ] && install -D $name $out/bin/$name + for n in 1 2 3 4 5 6 7 8 9; do + for f in $dir/*.$n; do + install -D $f $out/share/man/man$n/$(basename $f) + done done - ''; + done + ''; meta = { platforms = stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy matthewbauer ]; }; } From 2e855dc6b0cd88767a8a5df2faff9e66e1cd7f18 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 11 Apr 2018 10:16:28 +0800 Subject: [PATCH 1673/2743] kdeconnect: 1.2.1 -> 1.3.0 --- pkgs/applications/misc/kdeconnect/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index fe2503625938..0d02dbba69eb 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -15,22 +15,23 @@ , qtx11extras , sshfs , makeWrapper +, kwayland }: stdenv.mkDerivation rec { pname = "kdeconnect"; - version = "1.2.1"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-v${version}.tar.xz"; - sha256 = "01v432p9ylwss9gl6fvby8954bnjd91dni5jk1i44vv7x26yn8zg"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; + sha256 = "0gzv55hks6j37pf7d18l40n1q6j8b74j9qg3v44p8sp0gnglwkcm"; }; buildInputs = [ libfakekey libXtst ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications - qca-qt5 qtx11extras makeWrapper + qca-qt5 qtx11extras makeWrapper kwayland ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From 6016d3703d2eaf82a3a413e4fd9a91930eb0e246 Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Sun, 18 Mar 2018 16:22:53 +0800 Subject: [PATCH 1674/2743] racket: fix LD_LIBRARY_PATH --- pkgs/development/interpreters/racket/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index e3aa3e8a6f5c..32d24fa88356 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}"; + wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}"; done ''; From 29a319dd6eb85060be18afd99d1bdd0d5cbbdc3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 21:08:54 -0700 Subject: [PATCH 1675/2743] 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 1676/2743] 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 a1c7d09564611692f07e3d71888a1ef9282c4857 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 21:20:12 -0700 Subject: [PATCH 1677/2743] ipmiutil: 3.0.8 -> 3.0.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ipmiutil/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/07c1ae6261a326cebbed6e5e7d24f23b --- pkgs/tools/system/ipmiutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index fdefb508fe51..6b206ea8761a 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.8"; + version = "3.0.9"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0pqi63v9l95px1k0dh68gmbd4pbbpwy0pcg6nr5bi0zy898if135"; + sha256 = "0j4lsfdj2bk1b1vw9l00zv1g4jan05p09szqbzxgqqw2lpnca4i7"; }; buildInputs = [ openssl ]; From 11db1186234578b094abfc936d15b8edc889988f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 11 Apr 2018 00:16:17 -0500 Subject: [PATCH 1678/2743] pigz: fix on darwin --- pkgs/tools/compression/pigz/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 3c2f7f81c1c2..732aa691d4a9 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux; + makeFlags = [ "CC=cc" ]; + doCheck = stdenv.isLinux; checkTarget = "tests"; installPhase = From edf31cf5f11b31a113eaeaff6270291beb2bdf3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 22:44:46 -0700 Subject: [PATCH 1679/2743] apache-jena-fuseki: 3.6.0 -> 3.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/apache-jena-fuseki/versions. These checks were done: - built on NixOS - ran ‘/nix/store/rvqwm2782sknhyqm8xf84k7lpr12l4fn-apache-jena-fuseki-3.7.0/bin/fuseki-server -h’ got 0 exit code - ran ‘/nix/store/rvqwm2782sknhyqm8xf84k7lpr12l4fn-apache-jena-fuseki-3.7.0/bin/fuseki-server --help’ got 0 exit code - ran ‘/nix/store/rvqwm2782sknhyqm8xf84k7lpr12l4fn-apache-jena-fuseki-3.7.0/bin/fuseki-server -v’ and found version 3.7.0 - found 3.7.0 with grep in /nix/store/rvqwm2782sknhyqm8xf84k7lpr12l4fn-apache-jena-fuseki-3.7.0 - directory tree listing: https://gist.github.com/83a0018e4eafbea41f4af26e953edc95 --- pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 0e2b4029e48a..bd291356b436 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.6.0"; + version = "3.7.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "0wmhfr1jlk34cimpz7gvfbi4bh8ki02acbmwdksnkal61f2dxj8q"; + sha256 = "1824rvdrs9yhjinac2vkvkxvns8bfdvy91k5ghzzk0nrdcj31pmr"; }; buildInputs = [ makeWrapper From 8564ceac8dd55bd93ca980d6ef915fc7221a005c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:12:46 -0700 Subject: [PATCH 1680/2743] 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 4ae2488e80e71c41b2aaa98e82e7d37b5df19eaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:20:33 -0700 Subject: [PATCH 1681/2743] grpc: 1.10.0 -> 1.10.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/grpc/versions. These checks were done: - built on NixOS - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables -h’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables --help’ got 0 exit code - ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables help’ got 0 exit code - found 1.10.1 with grep in /nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1 - directory tree listing: https://gist.github.com/dc70d4a21aaa0b79ffe8dca6d80841f0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 9f9166e43c9f..fc1f186a219e 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.10.0"; + version = "1.10.1"; name = "grpc-${version}"; src = fetchurl { url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; - sha256 = "0wngrb44bpryrvrnx5y1ncrhi2097qla929wqjwvs0razbk3v9rr"; + sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; From 7344356fa0a09daa3d24ba4b6d4222700bf5218c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 23:31:01 -0700 Subject: [PATCH 1682/2743] 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 1683/2743] 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 1684/2743] 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 1685/2743] 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 1686/2743] 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 e4fd05449ede28da9672e4b96021fb2a7a949f3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Apr 2018 09:51:06 +0200 Subject: [PATCH 1687/2743] git: revert "2.16.2 -> 2.17.0" This reverts commit 5d65b4ebeb6b2294654b3562fb15d7fa94751522, because it broke git-add. See https://github.com/NixOS/nixpkgs/pull/38636#issuecomment-380182555 for details. --- .../git-and-tools/git/default.nix | 4 ++-- .../git-and-tools/git/docbook2texi.patch | 16 ++++++++-------- .../git/git-send-email-honor-PATH.patch | 8 +++++--- .../git-and-tools/git/git-sh-i18n.patch | 8 ++++---- .../git-and-tools/git/symlinks-in-bin.patch | 8 ++++---- 5 files changed, 23 insertions(+), 21 deletions(-) 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 93c56a626db7..e545cb33befe 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.17.0"; + version = "2.16.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; + sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch index ab5bb3c3a6c7..bf36b2d321f3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch +++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch @@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi', and (2) make sure `gitman.info' isn't produced since it's broken (duplicate node names). -diff --git a/Documentation/Makefile b/Documentation/Makefile ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -122,7 +122,7 @@ +diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile +--- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200 ++++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200 +@@ -101,7 +101,7 @@ MAKEINFO = makeinfo INSTALL_INFO = install-info -DOCBOOK2X_TEXI = docbook2x-texi +DOCBOOK2X_TEXI = docbook2texi DBLATEX = dblatex - ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex - DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty -@@ -240,7 +240,7 @@ + ifndef PERL_PATH + PERL_PATH = /usr/bin/perl +@@ -205,7 +205,7 @@ man5: $(DOC_MAN5) man7: $(DOC_MAN7) @@ -23,7 +23,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile pdf: user-manual.pdf -@@ -256,10 +256,9 @@ +@@ -221,10 +221,9 @@ install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 6b93d061a3be..9a484262b7b2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,20 +1,22 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt +index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. +@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration - option; the built-in default is to search for `sendmail` in - `/usr/sbin`, `/usr/lib` and $PATH if such program is -+ option; the built-in default is to search in $PATH if such program is ++ option; the built-in default is to search in $PATH if such program is available, falling back to `localhost` otherwise. --smtp-server-port=:: diff --git a/git-send-email.perl b/git-send-email.perl +index edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -944,8 +944,7 @@ if (defined $reply_to) { +@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { } if (!defined $smtp_server) { diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 216c0e56b44c..97f50064bc3f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison --elif test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary +-elif test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch index 0a581a61d46d..29d537db25f9 100644 --- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -1,7 +1,7 @@ -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -2609,8 +2609,7 @@ +diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile +--- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200 ++++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200 +@@ -2319,8 +2319,7 @@ { test "$$bindir/" = "$$execdir/" || \ for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ $(RM) "$$execdir/$$p" && \ From 65e18bd38fcbf631b799a21bbb86083ac35516d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:12:34 -0700 Subject: [PATCH 1688/2743] 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 1689/2743] 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 ef59554f072c8f19a0641ab57b08074d5799f00b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:26:30 -0700 Subject: [PATCH 1690/2743] copyq: 3.3.0 -> 3.3.1 (#38739) 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/CopyQ/versions. These checks were done: - built on NixOS - ran ‘/nix/store/zdlh8alw6fa0kc0q41rn32i1cbf6azmp-CopyQ-3.3.1/bin/copyq -h’ got 0 exit code - ran ‘/nix/store/zdlh8alw6fa0kc0q41rn32i1cbf6azmp-CopyQ-3.3.1/bin/copyq --help’ got 0 exit code - ran ‘/nix/store/zdlh8alw6fa0kc0q41rn32i1cbf6azmp-CopyQ-3.3.1/bin/copyq help’ got 0 exit code - found 3.3.1 with grep in /nix/store/zdlh8alw6fa0kc0q41rn32i1cbf6azmp-CopyQ-3.3.1 - directory tree listing: https://gist.github.com/985883e2caceb579cd9a6b4cf413c51d --- pkgs/applications/misc/copyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 45bd417abb4f..75a402ba2319 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0j46h87ifinkydi0m725p422m9svk3dpcz8dnrci4mxx0inn6qs3"; + sha256 = "1jjb979dwdnkjca95yxzapbjpd6hr97hxz7sn614whvdv4vvpnyc"; }; nativeBuildInputs = [ cmake ]; From f180c93b9560ce383e8995f1e3b4606eee4cd5c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:33:03 -0700 Subject: [PATCH 1691/2743] 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 241bfef3108a59074b8fd2099e6ae4f4f9834af5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:36:45 -0700 Subject: [PATCH 1692/2743] lr: 1.2 -> 1.3 (#38714) 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/lr/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ls109sv311n7wqw85kbkqcdwrsqrlca9-lr-1.3/bin/lr -h’ got 0 exit code - directory tree listing: https://gist.github.com/9c7fdd1add06970cc80d3e523d0f4e02 --- pkgs/tools/system/lr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 0149f1d91b61..8fac35fbe431 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lr-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1536d723dm50gxgpf8i9yij8mr0csh662ljhs5bmz0945jwfbx4n"; + sha256 = "0g4iqz8ddv7dsrfhx0828bmc16ff8qp8xh5ya9f0n5qj4zh4cn35"; }; makeFlags = "PREFIX=$(out)"; From 03cf4bf6d0a7d3e9ec8428357685140f74a291c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:43:59 -0700 Subject: [PATCH 1693/2743] smtube: 18.1.0 -> 18.3.0 (#38700) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/smtube/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 18.3.0 with grep in /nix/store/samlqqmdzqcfz0a31vfxhg4vhsj79f19-smtube-18.3.0 - directory tree listing: https://gist.github.com/e311aa1d900f0a6f815cf352c2f601a3 --- pkgs/applications/video/smtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 406d49c99391..32610d08f339 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "18.1.0"; + version = "18.3.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "1sw2b89ricxfbmgbzsp9f89n0gwh9dbnii6lr9gcccs8djpp1ad1"; + sha256 = "05r7xmzc7i95nwzgcn7p0kwlhybryf7f0dpadgdnbz6xinz9a0mb"; }; makeFlags = [ From 617c26df84d5670574864a9ccad0eaf8708bd86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Apr 2018 10:47:38 +0200 Subject: [PATCH 1694/2743] home-assistant: 0.65.5 -> 0.66.1 (#38681) --- .../home-assistant/component-packages.nix | 23 +++++++++++-------- pkgs/servers/home-assistant/default.nix | 23 ++++++++++--------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 852b210ba159..94dee4c87240 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,13 +2,12 @@ # Do not edit! { - version = "0.65.5"; + version = "0.66.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; "alarm_control_panel.concord232" = ps: with ps; [ ]; - "alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.nx584" = ps: with ps; [ ]; "alarm_control_panel.simplisafe" = ps: with ps; [ ]; @@ -46,7 +45,7 @@ "climate.daikin" = ps: with ps; [ ]; "climate.econet" = ps: with ps; [ ]; "climate.ephember" = ps: with ps; [ ]; - "climate.eq3btsmart" = ps: with ps; [ ]; + "climate.eq3btsmart" = ps: with ps; [ construct ]; "climate.flexit" = ps: with ps; [ ]; "climate.heatmiser" = ps: with ps; [ ]; "climate.honeywell" = ps: with ps; [ ]; @@ -97,7 +96,7 @@ "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; - "fan.xiaomi_miio" = ps: with ps; [ ]; + "fan.xiaomi_miio" = ps: with ps; [ construct ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "frontend" = ps: with ps; [ ]; @@ -108,6 +107,7 @@ "hive" = ps: with ps; [ ]; "homekit" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; + "homematicip_cloud" = ps: with ps; [ ]; "http" = ps: with ps; [ aiohttp-cors ]; "hue" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ ]; @@ -145,7 +145,7 @@ "light.sensehat" = ps: with ps; [ ]; "light.tikteck" = ps: with ps; [ ]; "light.tplink" = ps: with ps; [ ]; - "light.xiaomi_miio" = ps: with ps; [ ]; + "light.xiaomi_miio" = ps: with ps; [ construct ]; "light.yeelight" = ps: with ps; [ ]; "light.yeelightsunflower" = ps: with ps; [ ]; "light.zengge" = ps: with ps; [ ]; @@ -239,6 +239,7 @@ "notify.sendgrid" = ps: with ps; [ ]; "notify.simplepush" = ps: with ps; [ ]; "notify.slack" = ps: with ps; [ ]; + "notify.stride" = ps: with ps; [ ]; "notify.twitter" = ps: with ps; [ ]; "notify.webostv" = ps: with ps; [ ]; "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; @@ -256,7 +257,7 @@ "remember_the_milk" = ps: with ps; [ httplib2 ]; "remote.harmony" = ps: with ps; [ ]; "remote.itach" = ps: with ps; [ ]; - "remote.xiaomi_miio" = ps: with ps; [ ]; + "remote.xiaomi_miio" = ps: with ps; [ construct ]; "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; @@ -289,7 +290,7 @@ "sensor.dsmr" = ps: with ps; [ ]; "sensor.dweet" = ps: with ps; [ ]; "sensor.ebox" = ps: with ps; [ ]; - "sensor.eddystone_temperature" = ps: with ps; [ ]; + "sensor.eddystone_temperature" = ps: with ps; [ construct ]; "sensor.eliqonline" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; @@ -298,6 +299,7 @@ "sensor.fido" = ps: with ps; [ ]; "sensor.fitbit" = ps: with ps; [ ]; "sensor.fixer" = ps: with ps; [ ]; + "sensor.foobot" = ps: with ps; [ ]; "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "sensor.gearbest" = ps: with ps; [ ]; @@ -357,6 +359,7 @@ "sensor.steam_online" = ps: with ps; [ ]; "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; "sensor.swiss_public_transport" = ps: with ps; [ ]; + "sensor.syncthru" = ps: with ps; [ ]; "sensor.synologydsm" = ps: with ps; [ ]; "sensor.systemmonitor" = ps: with ps; [ psutil ]; "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; @@ -374,6 +377,7 @@ "sensor.waqi" = ps: with ps; [ ]; "sensor.whois" = ps: with ps; [ ]; "sensor.xbox_live" = ps: with ps; [ ]; + "sensor.xiaomi_miio" = ps: with ps; [ construct ]; "sensor.yahoo_finance" = ps: with ps; [ ]; "sensor.yr" = ps: with ps; [ xmltodict ]; "sensor.yweather" = ps: with ps; [ yahooweather ]; @@ -404,8 +408,9 @@ "switch.thinkingcleaner" = ps: with ps; [ ]; "switch.tplink" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; + "switch.vesync" = ps: with ps; [ ]; "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; - "switch.xiaomi_miio" = ps: with ps; [ ]; + "switch.xiaomi_miio" = ps: with ps; [ construct ]; "tado" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; "telegram_bot" = ps: with ps; [ python-telegram-bot ]; @@ -426,7 +431,7 @@ "upnp" = ps: with ps; [ miniupnpc ]; "usps" = ps: with ps; [ ]; "vacuum.roomba" = ps: with ps; [ ]; - "vacuum.xiaomi_miio" = ps: with ps; [ ]; + "vacuum.xiaomi_miio" = ps: with ps; [ construct ]; "velbus" = ps: with ps; [ ]; "velux" = ps: with ps; [ ]; "vera" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 389d572254f3..04d0ba66486f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -8,17 +8,17 @@ let py = python3.override { packageOverrides = self: super: { aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.0.6"; + version = "3.0.9"; src = oldAttrs.src.override { inherit version; - sha256 = "5b588d21b454aaeaf2debf3c4a37f0752fb91a5c15b621deca7e8c49316154fe"; + sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b"; }; }); pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { - version = "3.3.1"; + version = "3.4.2"; src = oldAttrs.src.override { inherit version; - sha256 = "14zbnbn53yvrpv79ch6n02myq9b4winjkaykzi356sfqb7f3d16g"; + sha256 = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5"; }; }); voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { @@ -29,17 +29,17 @@ let }; }); astral = super.astral.overridePythonAttrs (oldAttrs: rec { - version = "1.5"; + version = "1.6"; src = oldAttrs.src.override { inherit version; - sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6"; + sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083"; }; }); async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0"; + version = "2.0.1"; src = oldAttrs.src.override { inherit version; - sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566"; + sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; }; }); hass-frontend = super.callPackage ./frontend.nix { }; @@ -58,7 +58,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.65.5"; + hassVersion = "0.66.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 = "1jd44y3f31926g08h2zykp9hnigh6yms38mqn3i5gcl01n1n368k"; + sha256 = "16yz5mfzpfms22f8linw1k3wjp3jpwj270vy2rc893x9bzsppfl0"; }; propagatedBuildInputs = [ @@ -91,7 +91,8 @@ in with py.pkgs; buildPythonApplication rec { # The components' dependencies are not included, so they cannot be tested py.test --ignore tests/components # Some basic components should be tested however - py.test \ + # test_not_log_password fails because nothing is logged at all + py.test -k "not test_not_log_password" \ tests/components/{group,http} \ tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; From a63ee3c35672a694a06293e734fffade1b866a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 11 Apr 2018 10:50:23 +0200 Subject: [PATCH 1695/2743] python3.pkgs.pyhomematic: 0.1.40 -> 0.1.41 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 90616c09269a..18e477dbd814 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.40"; + version = "0.1.41"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "0rflfak505cgc69594yc9chz5mblqvc2d7bbbfcddzhlhs5qcsq2"; + sha256 = "01j6y2ypi7a8ffnkqd8j8vnpszza2cxqpiqbnk1dwbg9w9pwwq53"; }; # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 From ad0045db87f997c02eb0e5e317f61601c7b31882 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 01:54:38 -0700 Subject: [PATCH 1696/2743] 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 1697/2743] 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 1698/2743] 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 1699/2743] 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 d10a7f0b26b138c81943eb7ec57fa94a10db35d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Apr 2018 11:49:53 +0200 Subject: [PATCH 1700/2743] LTS Haskell 11.4 --- .../configuration-hackage2nix.yaml | 78 ++++++++++--------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 82dab3ac0a8f..7b982cb7781b 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.3 + # LTS Haskell 11.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -140,7 +140,7 @@ default-package-overrides: - auto-update ==0.1.4 - avwx ==0.3.0.2 - axiom ==0.4.6 - - b9 ==0.5.41 + - b9 ==0.5.43 - backprop ==0.1.5.0 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 @@ -162,7 +162,7 @@ default-package-overrides: - bencode ==0.6.0.0 - bento ==0.1.0 - between ==0.11.0.0 - - bhoogle ==0.1.2.5 + - bhoogle ==0.1.2.6 - bibtex ==0.1.0.6 - bifunctors ==5.5.2 - bimap ==0.3.3 @@ -200,8 +200,8 @@ default-package-overrides: - bit-stream ==0.1.0.2 - bitx-bitcoin ==0.12.0.0 - blake2 ==0.2.0 - - blas-carray ==0.0.1 - - blas-ffi ==0.0.1 + - blas-carray ==0.0.1.1 + - blas-ffi ==0.0.1.1 - blas-hs ==0.1.1.0 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 @@ -214,7 +214,7 @@ default-package-overrides: - blosum ==0.1.1.4 - bmp ==1.2.6.3 - bno055-haskell ==0.1.0 - - boltzmann-samplers ==0.1.0.0 + - boltzmann-samplers ==0.1.1.0 - bookkeeping ==0.2.1.4 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 @@ -243,7 +243,7 @@ default-package-overrides: - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 - - bytes ==0.15.3 + - bytes ==0.15.4 - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.1.0 - bytestring-conversion ==0.3.1 @@ -259,7 +259,7 @@ default-package-overrides: - cabal-file-th ==0.2.4 - cabal-rpm ==0.12.2 - cabal-toolkit ==0.0.5 - - cache ==0.1.0.1 + - cache ==0.1.1.0 - cairo ==0.13.4.2 - calendar-recycling ==0.0 - call-stack ==0.1.0 @@ -269,7 +269,7 @@ default-package-overrides: - cased ==0.1.0.0 - case-insensitive ==1.2.0.11 - cases ==0.1.3.2 - - casing ==0.1.2.1 + - casing ==0.1.4.0 - cassava ==0.5.1.0 - cassava-conduit ==0.4.0.2 - cassava-records ==0.1.0.4 @@ -344,6 +344,7 @@ default-package-overrides: - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 + - composition-prelude ==1.3.0.8 - compressed ==3.11 - concise ==0.1.0.1 - concurrency ==1.4.0.2 @@ -476,7 +477,7 @@ default-package-overrides: - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - dependent-sum-template ==0.0.0.6 - - deque ==0.2 + - deque ==0.2.1 - deriving-compat ==0.4.1 - descriptive ==0.9.4 - dhall ==1.11.1 @@ -652,7 +653,7 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==0.1.5.2 - fold-debounce ==0.2.0.7 - - fold-debounce-conduit ==0.2.0.0 + - fold-debounce-conduit ==0.2.0.1 - foldl ==1.3.7 - folds ==0.7.4 - follow-file ==0.0.2 @@ -759,7 +760,7 @@ default-package-overrides: - Glob ==0.9.2 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 - - gloss-accelerate ==2.0.0.0 + - gloss-accelerate ==2.0.0.1 - gloss-algorithms ==1.11.1.1 - gloss-raster ==1.11.1.1 - gloss-raster-accelerate ==2.0.0.0 @@ -913,7 +914,7 @@ default-package-overrides: - hpack ==0.27.0 - hpc-coveralls ==1.0.10 - HPDF ==1.4.10 - - hpio ==0.9.0.5 + - hpio ==0.9.0.6 - hpp ==0.5.2 - hpqtypes ==1.5.2.0 - hquantlib ==0.0.4.0 @@ -969,7 +970,7 @@ default-package-overrides: - hsyslog ==5.0.1 - hsyslog-udp ==0.2.2 - htaglib ==1.1.1 - - HTF ==0.13.2.2 + - HTF ==0.13.2.4 - html ==1.0.1.2 - html-conduit ==1.3.0 - html-email-validate ==0.2.0.0 @@ -1003,7 +1004,7 @@ default-package-overrides: - hw-fingertree ==0.1.0.1 - hw-fingertree-strict ==0.1.0.3 - hw-hedgehog ==0.1.0.1 - - hw-hspec-hedgehog ==0.1.0.2 + - hw-hspec-hedgehog ==0.1.0.3 - hw-int ==0.0.0.3 - hw-json ==0.6.0.0 - hw-mquery ==0.1.0.1 @@ -1111,7 +1112,7 @@ default-package-overrides: - json-builder ==0.3 - json-rpc-generic ==0.2.1.3 - json-schema ==0.7.4.1 - - json-stream ==0.4.2.2 + - json-stream ==0.4.2.3 - JuicyPixels ==3.2.9.5 - JuicyPixels-extra ==0.3.0 - JuicyPixels-scale-dct ==0.1.1.2 @@ -1146,8 +1147,9 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - lapack-carray ==0.0.1 - - lapack-ffi ==0.0.1 + - language-puppet ==1.3.17 + - lapack-carray ==0.0.2 + - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.0.1 - large-hashable ==0.1.0.4 - largeword ==1.2.5 @@ -1169,7 +1171,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 - - lentil ==1.0.10.1 + - lentil ==1.0.11.3 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.1 - libffi ==0.1 @@ -1215,7 +1217,7 @@ default-package-overrides: - logging-facade-syslog ==1 - logict ==0.6.0.2 - log-postgres ==0.7.0.2 - - log-warper ==1.8.10.1 + - log-warper ==1.8.11 - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.3 @@ -1297,7 +1299,7 @@ default-package-overrides: - mockery ==0.3.5 - model ==0.4.4 - modern-uri ==0.2.1.0 - - modify-fasta ==0.8.2.3 + - modify-fasta ==0.8.3.0 - moesocks ==1.0.0.44 - mole ==0.0.6 - monad-control ==1.0.2.3 @@ -1333,7 +1335,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.2 + - monoid-extras ==0.4.3 - monoid-subclasses ==0.4.6 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.8.1 @@ -1370,7 +1372,7 @@ default-package-overrides: - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.1 - - netlib-carray ==0.0.1 + - netlib-carray ==0.0.1.1 - netlib-ffi ==0.0.1 - netpbm ==1.0.2 - nettle ==0.2.0 @@ -1555,7 +1557,7 @@ default-package-overrides: - pomaps ==0.0.0.3 - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - - posix-paths ==0.2.1.4 + - posix-paths ==0.2.1.5 - postgresql-binary ==0.12.1 - postgresql-libpq ==0.9.4.1 - postgresql-schema ==0.1.14 @@ -1624,7 +1626,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.11.1.2 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.3 + - pusher-http-haskell ==1.5.1.4 - pwstore-fast ==2.4.4 - qchas ==1.1.0.0 - qm-interpolated-string ==0.3.0.0 @@ -1638,7 +1640,7 @@ default-package-overrides: - quickcheck-instances ==0.3.18 - quickcheck-io ==0.2.0 - quickcheck-properties ==0.1 - - quickcheck-simple ==0.1.0.2 + - quickcheck-simple ==0.1.0.3 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.3.1 - quickcheck-text ==0.1.2.1 @@ -1748,14 +1750,14 @@ default-package-overrides: - say ==0.1.0.0 - sbp ==2.3.13 - sbv ==7.5 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 - schematic ==0.4.2.0 - scientific ==0.3.5.3 - - scotty ==0.11.0 + - scotty ==0.11.1 - scrypt ==0.5.0 - sdl2 ==2.4.0.1 - sdl2-gfx ==0.2 @@ -1789,7 +1791,7 @@ default-package-overrides: - servant-exceptions ==0.1.1 - servant-foreign ==0.11.1 - servant-generic ==0.1.0.1 - - servant-github-webhook ==0.4.0.0 + - servant-github-webhook ==0.4.1.0 - servant-js ==0.9.3.2 - servant-JuicyPixels ==0.3.0.3 - servant-kotlin ==0.1.1.0 @@ -1817,7 +1819,7 @@ default-package-overrides: - set-monad ==0.2.0.0 - sets ==0.0.5.2 - SHA ==1.6.4.4 - - shake ==0.16.3 + - shake ==0.16.4 - shake-language-c ==0.11.0 - shakespeare ==2.0.15 - shelltestrunner ==1.9 @@ -1920,7 +1922,7 @@ default-package-overrides: - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.19.1 - streaming ==0.2.1.0 - - streaming-bytestring ==0.1.5 + - streaming-bytestring ==0.1.6 - streaming-commons ==0.1.19 - streamly ==0.1.2 - streamproc ==1.6.2 @@ -2052,7 +2054,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-to-exp ==0.0.1.1 - th-utilities ==0.2.0.1 - - tibetan-utils ==0.1.1.4 + - tibetan-utils ==0.1.1.5 - tidal ==0.9.6 - tidal-midi ==0.9.5.2 - tile ==0.3.0.0 @@ -2060,9 +2062,9 @@ default-package-overrides: - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - - time-locale-compat ==0.1.1.3 + - time-locale-compat ==0.1.1.4 - time-locale-vietnamese ==1.0.0.0 - - timemap ==0.0.6 + - timemap ==0.0.7 - time-parsers ==0.1.2.0 - timerep ==2.0.0.2 - timespan ==0.3.0.0 @@ -2113,7 +2115,7 @@ default-package-overrides: - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - typelits-witnesses ==0.3.0.2 - - type-of-html ==1.3.3.2 + - type-of-html ==1.3.4.0 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 @@ -2130,14 +2132,14 @@ default-package-overrides: - unfoldable-restricted ==0.0.3 - unicode ==0.0.1 - unicode-show ==0.1.0.2 - - unicode-transforms ==0.3.3 + - unicode-transforms ==0.3.4 - unification-fd ==0.10.0.1 - union ==0.1.1.2 - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.7.2 - unique ==0 + - Unique ==0.4.7.2 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2227,7 +2229,7 @@ default-package-overrides: - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - wai-middleware-rollbar ==0.10.0 - - wai-middleware-static ==0.8.1 + - wai-middleware-static ==0.8.2 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 - wai-route ==0.3.1.2 From 531e1eb1e6e7b20e8110b50f19d01f2fe6af2ea4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Apr 2018 02:31:02 +0200 Subject: [PATCH 1701/2743] 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/b35023f435e7713e5053d3dcd16691e3aff48227. --- .../haskell-modules/hackage-packages.nix | 2060 +++++++++-------- 1 file changed, 1035 insertions(+), 1025 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ad52aac16264..a28a0b7674aa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6108,6 +6108,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GLFW-b_1_4_8_4" = callPackage + ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "GLFW-b"; + version = "1.4.8.4"; + sha256 = "1xww650q80ii9f80v9kpz56lwgd1cirvhqjdca1vq9xs8k30hfd0"; + libraryHaskellDepends = [ base bindings-GLFW deepseq ]; + testHaskellDepends = [ + base bindings-GLFW deepseq HUnit test-framework + test-framework-hunit + ]; + description = "Bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GLFW-b-demo" = callPackage ({ mkDerivation, base, GLFW-b, mtl, OpenGL, pretty, stm , transformers @@ -8710,39 +8728,6 @@ self: { }) {}; "HTF" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base64-bytestring, bytestring, containers, cpphs, Diff, directory - , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl - , old-time, pretty, process, QuickCheck, random, regex-compat - , template-haskell, temporary, text, time, unix - , unordered-containers, vector, xmlgen - }: - mkDerivation { - pname = "HTF"; - version = "0.13.2.2"; - sha256 = "1fn3w53rylaqmkhwi801phiwlkl7yp9mnj79dbwfb6b6g5mrzd0x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring bytestring containers cpphs Diff - directory haskell-src HUnit lifted-base monad-control mtl old-time - pretty process QuickCheck random regex-compat text time unix vector - xmlgen - ]; - executableHaskellDepends = [ - array base cpphs directory HUnit mtl old-time random text - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath HUnit mtl - process random regex-compat template-haskell temporary text - unordered-containers - ]; - homepage = "https://github.com/skogsbaer/HTF/"; - description = "The Haskell Test Framework"; - license = "LGPL"; - }) {}; - - "HTF_0_13_2_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, bytestring, containers, cpphs, Diff, directory , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl @@ -8773,7 +8758,6 @@ self: { homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HTTP" = callPackage @@ -13798,13 +13782,18 @@ self: { }) {}; "Octree" = callPackage - ({ mkDerivation, AC-Vector, base, QuickCheck }: + ({ mkDerivation, base, criterion, deepseq, ghc-prim, lens, linear + , QuickCheck + }: mkDerivation { pname = "Octree"; - version = "0.5.4.4"; - sha256 = "0a5mikif0pd2ps5na2wahbl4l0259sdgih34m417j6a24qr1skjs"; - libraryHaskellDepends = [ AC-Vector base QuickCheck ]; - testHaskellDepends = [ AC-Vector base QuickCheck ]; + version = "0.6.0.0"; + sha256 = "1inyjclxx856gxrxdph649s5kdy2xf0lwr8g57rkqnpqpmprj797"; + libraryHaskellDepends = [ base deepseq lens linear QuickCheck ]; + testHaskellDepends = [ base deepseq lens linear QuickCheck ]; + benchmarkHaskellDepends = [ + base criterion deepseq ghc-prim lens linear QuickCheck + ]; homepage = "https://github.com/mgajda/octree"; description = "Simple unbalanced Octree for storing data about 3D points"; license = stdenv.lib.licenses.bsd3; @@ -22291,8 +22280,8 @@ self: { pname = "aeson-compat"; version = "0.3.7.1"; sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r"; - revision = "2"; - editedCabalFile = "0pwa5r0nkc9c80ky3iqki6hvcd5ifw2rd6yj27h66r3jyk2h2qhz"; + revision = "3"; + editedCabalFile = "1smql0v6b9f4pb3jnrm8kspyq2ygvznk1wkhzp0x7bjd7psrnmy9"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -22661,6 +22650,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-pretty_0_8_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , cmdargs, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-pretty"; + version = "0.8.7"; + sha256 = "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-qq" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim , haskell-src-meta, hspec, parsec, scientific, template-haskell @@ -30361,8 +30373,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.9.0.2"; - sha256 = "02j6118i48mrw41c2pj8yc5xkvyw97fw0g1hpvplmy40djjd0qah"; + version = "2.10.0.2"; + sha256 = "1rafsa2xc47hgkn6hwyr5bph21xl16i8ajl14pkckwhrs21bk255"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -31563,6 +31575,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 { + pname = "aws-cloudfront-signed-cookies"; + version = "0.1.0.1"; + sha256 = "0321c5pjd6bhvnnn8zzqk23fb14jl89vj1frvikb65iw9f60v7dl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson asn1-encoding asn1-types base base64-bytestring bytestring + cookie cryptonite optparse-applicative pem text time + unordered-containers vector + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/typeclasses/aws-cloudfront-signed-cookies"; + description = "Generate signed cookies for AWS CloudFront"; + license = stdenv.lib.licenses.mit; + }) {}; + "aws-cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, RSA, time @@ -32290,38 +32325,6 @@ self: { }) {}; "b9" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes - , bytestring, conduit, conduit-extra, ConfigFile, directory - , filepath, free, hashable, hspec, hspec-expectations, mtl - , optparse-applicative, parallel, parsec, pretty, pretty-show - , process, QuickCheck, random, syb, template, text, time - , transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "b9"; - version = "0.5.41"; - sha256 = "1m9fj1x30gl7agzcpklyi6sql8fs7qzpamkp16yihaxas54216ga"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bifunctors binary boxes bytestring conduit - conduit-extra ConfigFile directory filepath free hashable mtl - parallel parsec pretty pretty-show process QuickCheck random syb - template text time transformers unordered-containers vector yaml - ]; - executableHaskellDepends = [ - base bytestring directory 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; - }) {}; - - "b9_0_5_43" = callPackage ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes , bytestring, conduit, conduit-extra, ConfigFile, directory , filepath, free, hashable, hspec, hspec-expectations, lens, mtl @@ -32352,7 +32355,6 @@ self: { 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 @@ -32426,6 +32428,30 @@ self: { 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 + , vector + }: + mkDerivation { + pname = "backprop"; + version = "0.1.5.1"; + sha256 = "1jii5nwnkh44jxxyfkgm14695ah7p3rpbydcgj84g5ijmhdnmks0"; + libraryHaskellDepends = [ + base binary 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -32890,12 +32916,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "base-compat_0_10_0" = callPackage + "base-compat_0_10_1" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "base-compat"; - version = "0.10.0"; - sha256 = "0s46gkixvnafc9rj7sqn4m6bl0457myhn8lp65d5s579zrj8y43i"; + version = "0.10.1"; + sha256 = "0vdv28qylnpqhq6jnhiqvnc0rmbrb0dvnsfdvp094sm7sj9j3v5j"; libraryHaskellDepends = [ base unix ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; @@ -32908,8 +32934,8 @@ self: { }: mkDerivation { pname = "base-compat-batteries"; - version = "0.10.0"; - sha256 = "0zyhl2yfycwcgvf8kh8g3y8zkp21b0wd4nnhvgjdcw11gn6nb26x"; + version = "0.10.1"; + sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm"; libraryHaskellDepends = [ base base-compat ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -33145,8 +33171,8 @@ self: { pname = "base64-bytestring-type"; version = "1"; sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; - revision = "1"; - editedCabalFile = "06glza5pqw1s3xpk8va36q1b1bfcirkkrcq9pfd8x12lhjjnsxxr"; + revision = "2"; + editedCabalFile = "02ywscryrrh6xwfi0gl4qvxy36jzy7i8y2jsv6mma2av2abr9ms7"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable QuickCheck text @@ -33597,8 +33623,8 @@ self: { }: mkDerivation { pname = "bdcs"; - version = "0.2.4"; - sha256 = "1s8kbvyc73lpc634snmrb9dxmji0pj526ynnjqb4k3knia3qb3sn"; + version = "0.3.0"; + sha256 = "1sx5kcb85gyd59lkyjn0wq6nakz68mkwi33n4hwizzw9n9ijllv0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33616,8 +33642,8 @@ self: { libraryPkgconfigDepends = [ ostree ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cond conduit content-store - directory filepath monad-loops mtl network-uri persistent-sqlite - process regex-pcre text time + directory filepath monad-logger monad-loops mtl network-uri + persistent-sqlite process regex-pcre text time ]; testHaskellDepends = [ aeson base bytestring codec-rpm cond conduit conduit-combinators @@ -33704,8 +33730,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.7.0.0"; - sha256 = "1qpgcr5a1r7ck0mxh70akz32zb4vm30is2dpsxgcdza5zshmnvcb"; + version = "0.7.1.0"; + sha256 = "1k4b8a1p9ky6w5b8iwlx7pm57sdy9mj5mxinsazawc0ss3760bjh"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri tagged text time vector-sized @@ -33723,16 +33749,16 @@ 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, vector + , time, unordered-containers, uuid, vector }: mkDerivation { pname = "beam-migrate"; - version = "0.2.0.0"; - sha256 = "17c1wh2ygbjlr8hrm0vnk2130kmzy795sswp7wyqkjjhfp4rzyzb"; + version = "0.3.0.0"; + sha256 = "05j051l8zpyzdzm8w9087wj5c6yxv6mmy05asvlw2jhcjxx3j23b"; 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 vector + pqueue pretty scientific text time unordered-containers uuid vector ]; homepage = "https://travis.athougies.net/projects/beam.html"; description = "SQL DDL support and migrations support library for Beam"; @@ -33740,22 +33766,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-postgres" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring + , case-insensitive, conduit, free, hashable, haskell-src-exts + , lifted-base, monad-control, mtl, network-uri, postgresql-libpq + , postgresql-simple, scientific, text, time, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "beam-postgres"; + version = "0.3.1.0"; + sha256 = "1nv7r50b4khx1ski5c64dywphzbn1x9xx9hp8b8zfh88i05b5jf6"; + libraryHaskellDepends = [ + aeson base beam-core beam-migrate bytestring case-insensitive + conduit free hashable haskell-src-exts lifted-base monad-control + mtl network-uri postgresql-libpq postgresql-simple scientific text + time unordered-containers uuid vector + ]; + homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres"; + description = "Connection layer between beam and postgres"; + license = stdenv.lib.licenses.mit; + }) {}; + "beam-sqlite" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate , bytestring, dlist, free, hashable, mtl, network-uri, scientific - , sqlite-simple, text, time + , sqlite-simple, text, time, unix }: mkDerivation { pname = "beam-sqlite"; - version = "0.2.0.0"; - sha256 = "0a0z5nrgrc3m7c4b81avjnkf2y5i30z5yws0jrsw5gg2b682v0ry"; + version = "0.3.1.0"; + sha256 = "1frbic90nwxk8mr8s1agvx5s1v5aqfnr7sijb602spdz4hhsqsvy"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free - hashable mtl network-uri scientific sqlite-simple text time + hashable mtl network-uri scientific sqlite-simple text time unix ]; homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-sqlite/"; description = "Beam driver for SQLite"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34253,26 +34301,6 @@ self: { }) {}; "bhoogle" = callPackage - ({ mkDerivation, base, brick, bytestring, containers, directory - , filepath, hoogle, lens, process, protolude, text, time, vector - , vty - }: - mkDerivation { - pname = "bhoogle"; - version = "0.1.2.5"; - sha256 = "16i5gf8iv0l10zira8wi9lgbz0q1f7lxp35ml9yz4j8cihn7z7ji"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick bytestring containers directory filepath hoogle lens - process protolude text time vector vty - ]; - homepage = "https://github.com/andrevdm/bhoogle#readme"; - description = "Simple terminal GUI for local hoogle"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bhoogle_0_1_2_6" = callPackage ({ mkDerivation, base, brick, bytestring, containers, directory , filepath, hoogle, lens, process, protolude, text, time, vector , vty @@ -34290,7 +34318,6 @@ self: { homepage = "https://github.com/andrevdm/bhoogle#readme"; description = "Simple terminal GUI for local hoogle"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bibdb" = callPackage @@ -35264,6 +35291,32 @@ self: { inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; + "bindings-GLFW_3_2_1_0" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 + , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr + , libXxf86vm, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.2.1.0"; + sha256 = "1sbbms17yyrv5cmf584bc5k4bh8l2vrrhkz2693nyhkadvjxiavb"; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ + libGL libX11 libXcursor libXext libXfixes libXi libXinerama + libXrandr libXxf86vm + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXxf86vm;}; + "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: mkDerivation { @@ -37243,24 +37296,6 @@ self: { }) {}; "blas-carray" = callPackage - ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi - , storable-complex, transformers - }: - mkDerivation { - pname = "blas-carray"; - version = "0.0.1"; - sha256 = "02gljz0bmjrq6fwi4jikzqmqiydkyxvlk429y3my67zfkcvzr0sg"; - libraryHaskellDepends = [ - base blas-ffi carray netlib-carray netlib-ffi storable-complex - transformers - ]; - homepage = "http://hub.darcs.net/thielema/blas-carray/"; - description = "Auto-generated interface to Fortran BLAS via CArrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "blas-carray_0_0_1_1" = callPackage ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi , storable-complex, transformers }: @@ -37279,20 +37314,6 @@ self: { }) {}; "blas-ffi" = callPackage - ({ mkDerivation, base, blas, netlib-ffi }: - mkDerivation { - pname = "blas-ffi"; - version = "0.0.1"; - sha256 = "09glhrs7q2wpm0sm66vkdr28nhsz41js8ziny578db2ys2dpwbxz"; - libraryHaskellDepends = [ base netlib-ffi ]; - libraryPkgconfigDepends = [ blas ]; - homepage = "http://hub.darcs.net/thielema/blas-ffi/"; - description = "Auto-generated interface to Fortran BLAS"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) blas;}; - - "blas-ffi_0_0_1_1" = callPackage ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { pname = "blas-ffi"; @@ -37572,6 +37593,25 @@ self: { 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 + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.2.1"; + sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -38204,26 +38244,6 @@ self: { }) {}; "boltzmann-samplers" = callPackage - ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 - , MonadRandom, mtl, QuickCheck, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "boltzmann-samplers"; - version = "0.1.0.0"; - sha256 = "0gw8d4xrwr9xs9k7dflm12xpkn6k0yn41myvzqzj4c6bhdd0c1sp"; - revision = "2"; - editedCabalFile = "0mmjxyy9pxrrxdrpkl06c2dk980b4z6pvkg5zj3fl56avg3l4q26"; - libraryHaskellDepends = [ - ad base containers hashable hmatrix ieee754 MonadRandom mtl - QuickCheck transformers unordered-containers vector - ]; - homepage = "https://github.com/Lysxia/boltzmann-samplers#readme"; - description = "Uniform random generators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "boltzmann-samplers_0_1_1_0" = callPackage ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 , MonadRandom, mtl, QuickCheck, transformers, unordered-containers , vector @@ -38239,7 +38259,6 @@ self: { homepage = "https://github.com/Lysxia/boltzmann-samplers#readme"; description = "Uniform random generators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bond" = callPackage @@ -38657,12 +38676,18 @@ self: { }) {}; "boring" = callPackage - ({ mkDerivation, adjunctions, base, tagged, transformers }: + ({ mkDerivation, adjunctions, base, base-compat, constraints, fin + , generics-sop, streams, tagged, transformers, transformers-compat + , vec + }: mkDerivation { pname = "boring"; - version = "0"; - sha256 = "11m8dfjwl9xyhvdblr6rhv7d9vrgayznzvaksdsq0qc8s30f1m0j"; - libraryHaskellDepends = [ adjunctions base tagged transformers ]; + version = "0.1"; + sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk"; + libraryHaskellDepends = [ + adjunctions base base-compat constraints fin generics-sop streams + tagged transformers transformers-compat vec + ]; homepage = "https://github.com/phadej/boring"; description = "Boring and Absurd types"; license = stdenv.lib.licenses.bsd3; @@ -38955,8 +38980,8 @@ self: { }: mkDerivation { pname = "brainheck"; - version = "0.1.0.6"; - sha256 = "0dldvr0k0pglw6c6jwafkd2d9afx0626kgiia1v5wblrfgf438w1"; + version = "0.1.0.7"; + sha256 = "17x5jyamc4863glxxdp7qdpnma7kinc67230snyplz2xzifpxq7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40141,8 +40166,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "0.2.1"; - sha256 = "1hnmy3yhaf5ajr5hwx06s838s5nwnyz4jgl7wsyf189yzjs6m0kj"; + version = "0.3.0"; + sha256 = "04y99mgcgaqpzryc921nqlggfamk0jnrqv482r0hpcdf9in533bc"; libraryHaskellDepends = [ base containers lens parameterized-utils prettyclass QuickCheck random @@ -40241,30 +40266,6 @@ self: { }) {}; "bytes" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest - , cereal, containers, directory, doctest, filepath, hashable, mtl - , scientific, text, time, transformers, transformers-compat - , unordered-containers, void - }: - mkDerivation { - pname = "bytes"; - version = "0.15.3"; - sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q"; - revision = "4"; - editedCabalFile = "1w0hmrlxbki1cd5685y40w4jhjbrk6if7jgikxxvl4dzlbl5ksaq"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base binary bytestring cereal containers hashable mtl scientific - text time transformers transformers-compat unordered-containers - void - ]; - testHaskellDepends = [ base directory doctest filepath ]; - homepage = "https://github.com/ekmett/bytes"; - description = "Sharing code for serialization between binary and cereal"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bytes_0_15_4" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest , cereal, containers, directory, doctest, filepath, hashable, mtl , scientific, text, time, transformers, transformers-compat @@ -40284,7 +40285,6 @@ self: { homepage = "https://github.com/ekmett/bytes"; description = "Sharing code for serialization between binary and cereal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "byteset" = callPackage @@ -42091,23 +42091,6 @@ self: { }) {cabocha = null;}; "cache" = callPackage - ({ mkDerivation, base, clock, hashable, hspec, stm, transformers - , unordered-containers - }: - mkDerivation { - pname = "cache"; - version = "0.1.0.1"; - sha256 = "0bv7s9lffhggh0z5ad03ryqzq6bcqga1zg4c6f57i7hh9q8161qd"; - libraryHaskellDepends = [ - base clock hashable stm transformers unordered-containers - ]; - testHaskellDepends = [ base clock hspec stm transformers ]; - homepage = "https://github.com/hverr/haskell-cache"; - description = "An in-memory key/value store with expiration support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cache_0_1_1_0" = callPackage ({ mkDerivation, base, clock, hashable, hspec, stm, transformers , unordered-containers }: @@ -42122,7 +42105,6 @@ self: { homepage = "https://github.com/hverr/haskell-cache#readme"; description = "An in-memory key/value store with expiration support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached-io" = callPackage @@ -43280,17 +43262,6 @@ self: { }) {}; "casing" = callPackage - ({ mkDerivation, base, split }: - mkDerivation { - pname = "casing"; - version = "0.1.2.1"; - sha256 = "0f56060n78jy7f6mm14h2g9w48cgsxrjixm65x3mm4a2xpkg5gx8"; - libraryHaskellDepends = [ base split ]; - description = "Convert between various source code casing conventions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "casing_0_1_4_0" = callPackage ({ mkDerivation, base, split, tasty, tasty-hunit }: mkDerivation { pname = "casing"; @@ -43300,7 +43271,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook" = callPackage @@ -43743,14 +43713,15 @@ self: { }) {}; "catamorphism" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { pname = "catamorphism"; - version = "0.6.0.0"; - sha256 = "0y1p6xayf4n6y41hmcrxg1zc0xm07vgirvipcm5zj7d5bphddn07"; + version = "0.6.1.1"; + sha256 = "1bpmi4k7dfwjkg9qr70gj4y6z87jaa0q11v91wgffdmw84r341vp"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/frerich/catamorphism"; - description = "A package exposing a helper function for generating catamorphisms"; + description = "Exposes a Template Haskell function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44829,28 +44800,29 @@ self: { ({ mkDerivation, base, colour, data-default, diagrams-lib , diagrams-svg, doctest, foldl, formatting, generic-lens , generic-lens-labels, lens, linear, mwc-probability, mwc-random - , numhask, numhask-histogram, numhask-range, palette, primitive - , protolude, scientific, svg-builder, SVGFonts, tasty, tasty-hspec - , text, time + , numhask, numhask-histogram, numhask-prelude, numhask-range + , palette, primitive, protolude, scientific, svg-builder, SVGFonts + , tasty, tasty-hspec, text, time }: mkDerivation { pname = "chart-unit"; - version = "0.6.1.0"; - sha256 = "07aiw8n7b23k9n1g4inpmdbkmmahl7vdvqr575rc7n0bnwwfyvi0"; + version = "0.6.2.0"; + sha256 = "0y6xha20ckj0n0yih1zwwhyp55q1jcdmq06caid9biji8nkahzb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour data-default diagrams-lib diagrams-svg foldl formatting - generic-lens lens linear numhask numhask-range palette protolude - scientific svg-builder SVGFonts text time + generic-lens lens linear numhask numhask-prelude numhask-range + palette protolude scientific svg-builder SVGFonts text time ]; executableHaskellDepends = [ base diagrams-lib formatting generic-lens-labels lens - mwc-probability mwc-random numhask numhask-histogram numhask-range - primitive protolude text time + mwc-probability mwc-random numhask numhask-histogram + numhask-prelude numhask-range primitive protolude text time ]; testHaskellDepends = [ - base doctest numhask numhask-range tasty tasty-hspec + base doctest numhask numhask-prelude numhask-range tasty + tasty-hspec ]; homepage = "https://github.com/tonyday567/chart-unit#readme"; description = "Native haskell charts"; @@ -47102,11 +47074,11 @@ self: { }: mkDerivation { pname = "clif"; - version = "0.1.0.0"; - sha256 = "1inrhmrajl9y9vbbv5fh1m72a985j9k82vxmz9948k37hwvx6faw"; + version = "0.1.1.0"; + sha256 = "08mamsaycd2k2sjz08sg808yd153hhw9gfi4170448xl8icadkx5"; libraryHaskellDepends = [ base containers QuickCheck ]; testHaskellDepends = [ - base containers QuickCheck tasty tasty-quickcheck tasty-th + base containers tasty tasty-quickcheck tasty-th ]; benchmarkHaskellDepends = [ base time ]; description = "A Clifford algebra number type for Haskell"; @@ -51847,8 +51819,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "constrictor"; - version = "0.1.0.1"; - sha256 = "05km6cxk5c9k2m22x6379jnlvcxr9j6m52y3xqvjjvxkps2ppc9c"; + version = "0.1.0.2"; + sha256 = "13g8cks2bzwb0ndbak91b5k1n22i0hgza4l8i52fqhzs4addaxs3"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/chessai/constrictor.git"; description = "strict versions of many things in base"; @@ -52157,12 +52129,11 @@ self: { ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.7"; - sha256 = "04cg0xb634c915mx83vx1vh3l898i27pz309nz6h4jikp99skcs9"; + version = "0.1.0.8"; + sha256 = "1izjdvm65zj960dcgg8xamg6ysfhn04qjxb9q7mpgzg8yi6f326c"; libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://hub.darcs.net/vmchale/continued-fraction#readme"; description = "Types and functions for working with continued fractions in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -60706,18 +60677,6 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "deque"; - version = "0.2"; - sha256 = "0miy1m3lmifrmlsnnmx6djcwq5nb4ar951f2i1bb6n1c94i8sxl6"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/nikita-volkov/deque"; - description = "Double-ended queue"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deque_0_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "deque"; @@ -60727,7 +60686,6 @@ self: { homepage = "https://github.com/nikita-volkov/deque"; description = "Double-ended queue"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dequeue" = callPackage @@ -61652,8 +61610,8 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.4.0.1"; - sha256 = "0k951bi3b2n33lbjym87l0hcm8v2ww5w2cwfgdmjy8yl4gz1jyff"; + version = "1.4.1"; + sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -62951,12 +62909,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_2_1" = callPackage + "directory_1_3_2_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.2.1"; - sha256 = "1hr5hvpycjkzl8cwn29xwcggf6xfgz189a57i7aahbdb8bbxzwk5"; + version = "1.3.2.2"; + sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -67861,6 +67819,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-statsd_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, network, text, time + , unordered-containers + }: + mkDerivation { + pname = "ekg-statsd"; + version = "0.2.3.0"; + sha256 = "05lakyb0sp6g8nziy6jzk2l19v2371cdnih6pp6myyj6iflx9smf"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-wai" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json , filepath, http-types, network, text, time, transformers @@ -67880,6 +67855,26 @@ self: { 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 + }: + mkDerivation { + pname = "ekg-wai"; + version = "0.1.0.3"; + sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "electrum-mnemonic" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck }: mkDerivation { @@ -69637,20 +69632,22 @@ self: { }) {}; "error-context" = callPackage - ({ mkDerivation, base, exceptions, monad-logger, mtl, resourcet - , safe-exceptions, tasty, tasty-hunit, text, unliftio-core + ({ mkDerivation, aeson, base, bytestring, exceptions, katip + , monad-logger, mtl, resourcet, safe-exceptions, tasty, tasty-hunit + , text, unliftio-core, unordered-containers }: mkDerivation { pname = "error-context"; - version = "0.1.2.0"; - sha256 = "0p07lvwa7rvrrlsyx3qjnh5q8z4p0r9nspgi03qwmi8vjkhy0pr8"; + version = "0.2.0.1"; + sha256 = "033z3niag5hf9dynjxdrg6v9s6f05hpndknfs7xlgkwrrgq3gmnb"; libraryHaskellDepends = [ - base exceptions monad-logger mtl resourcet safe-exceptions text - unliftio-core + aeson base bytestring exceptions katip monad-logger mtl resourcet + safe-exceptions text unliftio-core unordered-containers ]; testHaskellDepends = [ - base exceptions monad-logger mtl resourcet safe-exceptions tasty - tasty-hunit text unliftio-core + aeson base bytestring exceptions katip monad-logger mtl resourcet + safe-exceptions tasty tasty-hunit text unliftio-core + unordered-containers ]; homepage = "https://github.com/mtesseract/error-context#readme"; description = "Provides API for enriching errors with contexts"; @@ -69819,6 +69816,8 @@ self: { pname = "ersatz"; version = "0.4.2"; sha256 = "1rr46awz0rbzg0i6424rnrykcwkgwxfzgx5d5qmva4y41l62vkxf"; + revision = "1"; + editedCabalFile = "098i7593rlc81618y1cz6bmsp2y0vlimz8hnqlzja4m8mclfsbx2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72417,8 +72416,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.3.6"; - sha256 = "1crs7ymdvizb0s0i3didi429b3wym01iinm7ryy3z6i198ls1pga"; + version = "0.3.3.7"; + sha256 = "13kcqs7z5vwafvs5d1h14brry0dmijld0c8vz2wmaqr6ijjx86a6"; setupHaskellDepends = [ ats-pkg base Cabal ]; libraryHaskellDepends = [ base composition-prelude gmpint ]; librarySystemDepends = [ numbertheory ]; @@ -74268,8 +74267,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.3.1"; - sha256 = "1pnqb816syl8j03wfk1p96vqlb64xkl45cxlkmqsriwi4ar0svw1"; + version = "0.6.3.2"; + sha256 = "0nx16b6nvzvzwrwrbyzjm7dh2ilk3vbrwr6r9m2c62ll1k99100v"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale @@ -75120,6 +75119,8 @@ self: { pname = "fixplate"; version = "0.1.7"; sha256 = "0brll5vkb3341l5iblrc1r50jzg8q6ycvbqvrc9jnj2nc86mslay"; + revision = "1"; + editedCabalFile = "0ynmm06iblqsyzfc068sdvmlpll8zwyccwkdlji3nf535biv56hb"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck @@ -75955,24 +75956,24 @@ self: { }) {}; "fluid-idl" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, errors - , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl - , random, safe-exceptions, scientific, text, text-conversions - , unordered-containers, vector + ({ mkDerivation, aeson, base, blaze-markup, bytestring, containers + , errors, exceptions, hspec, lifted-async, monad-control + , monad-logger, mtl, random, safe-exceptions, scientific, text + , text-conversions, unordered-containers, vector }: mkDerivation { pname = "fluid-idl"; - version = "0.0.5"; - sha256 = "1yv4qslqa335r6bwjpll45lz8y6pj3m8cvjzlc2xadg05m2yy89w"; + version = "0.0.6"; + sha256 = "06zdwvjdgv401h5gf3zagvxd01r20pldv327ag3d8clwvg51sgnr"; libraryHaskellDepends = [ - aeson base bytestring containers errors exceptions lifted-async - monad-control monad-logger mtl random safe-exceptions scientific - text text-conversions unordered-containers vector + aeson base blaze-markup bytestring containers errors exceptions + lifted-async monad-control monad-logger mtl random safe-exceptions + scientific text text-conversions unordered-containers vector ]; testHaskellDepends = [ aeson base containers hspec scientific text vector ]; - description = "Fluid | The Programmatic IDL"; + description = "Code-generated, Auto-versioned, & Smart Web APIs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76153,26 +76154,6 @@ self: { }) {}; "fold-debounce-conduit" = callPackage - ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet - , stm, transformers, transformers-base - }: - mkDerivation { - pname = "fold-debounce-conduit"; - version = "0.2.0.0"; - sha256 = "0ba42cxcjr7llsx42qmzg6kc497c35rkm4ndm114p0nf1mijn8nr"; - libraryHaskellDepends = [ - base conduit fold-debounce resourcet stm transformers - transformers-base - ]; - testHaskellDepends = [ - base conduit hspec resourcet stm transformers - ]; - homepage = "https://github.com/debug-ito/fold-debounce-conduit"; - description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fold-debounce-conduit_0_2_0_1" = callPackage ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet , stm, transformers, transformers-base }: @@ -76190,7 +76171,6 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce-conduit"; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl" = callPackage @@ -78173,6 +78153,8 @@ self: { pname = "fsnotify"; version = "0.2.1.1"; sha256 = "146wsblhfwnbclzffxk6m43bqap3sgw332gs67030z6h5ab7anhp"; + revision = "1"; + editedCabalFile = "0kag32lqkjmv03bycf6ip2vd6vzpcpq4iqs6ivyjh93v40252xxp"; libraryHaskellDepends = [ async base containers directory filepath hinotify text time unix-compat @@ -80272,8 +80254,10 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "generic-trie"; - version = "0.3.0.2"; - sha256 = "1sgqmc81m7fivla96lx2a8qqm8vg5jczqsaajblf0ygdjmg9lc9q"; + version = "0.3.1"; + sha256 = "1x7f5bp7d13g737198l43y2mf9mzngg9vmhyh1yaxg8xfpzc3anh"; + revision = "1"; + editedCabalFile = "0rr6fncm17ff7z9jdb90gvd03smd8vlhmhzf5b9hzms7s2scnvh6"; libraryHaskellDepends = [ base containers transformers ]; homepage = "http://github.com/glguy/tries"; description = "A map, where the keys may be complex structured data"; @@ -80360,6 +80344,8 @@ self: { pname = "generics-sop"; version = "0.3.2.0"; sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; + revision = "1"; + editedCabalFile = "1cijsc0chx04i8v1n8zhlkd00dmrjq2pcpiw0y9126vmnxw5l90l"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -81437,6 +81423,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-core-smallstep" = callPackage + ({ mkDerivation, base, ghc, ghc-paths }: + mkDerivation { + pname = "ghc-core-smallstep"; + version = "0.1.0.1"; + sha256 = "1yz0qzy1h5134sbmhrk7gn192fcw729bnzdkqf5wh8vh9a396l21"; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ base ghc ghc-paths ]; + description = "A small-step semantics for Core"; + license = stdenv.lib.licenses.mit; + }) {}; + "ghc-datasize" = callPackage ({ mkDerivation, base, deepseq, ghc-heap-view }: mkDerivation { @@ -83162,10 +83160,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.5.0"; - sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv"; - revision = "2"; - editedCabalFile = "0cv2ca8skkz4gfnw7xxy9ppcxcr9d97rnxr1jj5ii7nki9njb693"; + version = "0.3.6.1"; + sha256 = "0qa1ig3z44p47badin0v3rnwilck05659jnk7xcvh2pjhmjmpclw"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -83392,8 +83388,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.15"; - sha256 = "1imgkbqfkdf7vbx4x170qnnyivy7jdn4hcj428wv3996ff5pjqa6"; + version = "2.4.16"; + sha256 = "01qsq8hy974j8i35spac1iyc46jrl4p0nnlx666nlxqa08a1f438"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -83750,18 +83746,18 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus - , directory, disk-free-space, dlist, dns, edit-distance, esqueleto - , exceptions, fdo-notify, feed, filepath, free, git, gnupg - , hinotify, hslogger, http-client, http-conduit, http-types, IfElse - , lsof, magic, memory, monad-control, monad-logger, mountpoints - , mtl, network, network-info, network-multicast, network-uri - , old-locale, openssh, optparse-applicative, path-pieces, perl - , persistent, persistent-sqlite, persistent-template, process - , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore - , sandi, securemem, shakespeare, socks, split, stm, stm-chans - , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , clientsession, concurrent-output, conduit, containers, crypto-api + , cryptonite, curl, data-default, DAV, dbus, directory + , disk-free-space, dlist, dns, edit-distance, esqueleto, exceptions + , fdo-notify, feed, filepath, free, git, gnupg, hinotify, hslogger + , http-client, http-conduit, http-types, IfElse, lsof, magic + , memory, monad-control, monad-logger, mountpoints, mtl, network + , network-info, network-multicast, network-uri, old-locale, openssh + , optparse-applicative, path-pieces, perl, persistent + , persistent-sqlite, persistent-template, process, QuickCheck + , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi + , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup + , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core @@ -83769,8 +83765,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180316"; - sha256 = "0wdsyiiswki4m9hv5j65rhivqn8g01smrhj0s19fz2rbvpcfn5cb"; + version = "6.20180409"; + sha256 = "05cwyh3x432k3czrd59py0jsvl3qjg8ky7nc0rxkw6pbzwpgcb8c"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -83785,20 +83781,20 @@ self: { ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - conduit-extra containers crypto-api cryptonite data-default DAV - dbus directory disk-free-space dlist dns edit-distance esqueleto - exceptions fdo-notify feed filepath free hinotify hslogger - http-client http-conduit http-types IfElse magic memory - monad-control monad-logger mountpoints mtl network network-info - network-multicast network-uri old-locale optparse-applicative - path-pieces persistent persistent-sqlite persistent-template - process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi - securemem shakespeare socks split stm stm-chans tagsoup tasty - tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time - torrent transformers unix unix-compat unordered-containers - utf8-string uuid vector wai wai-extra warp warp-tls yesod - yesod-core yesod-form yesod-static + case-insensitive clientsession concurrent-output conduit containers + crypto-api cryptonite data-default DAV dbus directory + disk-free-space dlist dns edit-distance esqueleto exceptions + fdo-notify feed filepath free hinotify hslogger http-client + http-conduit http-types IfElse magic memory monad-control + monad-logger mountpoints mtl network network-info network-multicast + network-uri old-locale optparse-applicative path-pieces persistent + persistent-sqlite persistent-template process QuickCheck random + regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare + socks split stm stm-chans tagsoup tasty tasty-hunit + tasty-quickcheck tasty-rerun template-haskell text time torrent + transformers unix unix-compat unordered-containers utf8-string uuid + vector wai wai-extra warp warp-tls yesod yesod-core yesod-form + yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -84200,8 +84196,8 @@ self: { pname = "github"; version = "0.19"; sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph"; - revision = "1"; - editedCabalFile = "0f6frc80nkwxjp8p0mr6x6x0jd9vvwi0aw0a8yfsk7lxvd4lr6cs"; + revision = "2"; + editedCabalFile = "0ib40npsrwd92mgiqv5rqv21dnhmdh5x6ql84i8ivz8vs2a43hqq"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -85333,19 +85329,6 @@ self: { }) {}; "gloss-accelerate" = callPackage - ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: - mkDerivation { - pname = "gloss-accelerate"; - version = "2.0.0.0"; - sha256 = "1hfiy2j7850yisbakz5nadr6l9k5maqq5mvg1xhak9jj1k1ji9if"; - revision = "1"; - editedCabalFile = "1arsf3j8b59qr5z5sy5sxx5mdddagjginrqs3jb9lpj1s3c3672b"; - libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; - description = "Extras to interface Gloss and Accelerate"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gloss-accelerate_2_0_0_1" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { pname = "gloss-accelerate"; @@ -85354,7 +85337,6 @@ self: { libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-algorithms" = callPackage @@ -85746,8 +85728,8 @@ self: { ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.5"; - sha256 = "1xi840k962nz3mkf48sc08z4lbdmx8rmix00gzxywyjyia33zg3r"; + version = "0.1.0.7"; + sha256 = "1p0iqsvx85ycd5xab73k5aaj796kqanbkjfmivslb6i6ibix02v9"; libraryHaskellDepends = [ base recursion-schemes ]; librarySystemDepends = [ gmp ]; homepage = "https://github.com/vmchale/gmpint#readme"; @@ -85815,8 +85797,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.30"; - sha256 = "1cjfhpza7mhfywx09rf2qzglqwyss3ndk9sqn0vwvpv4c2wvglaq"; + version = "0.3.31"; + sha256 = "0raqapwms5c160n1nqjvmnzqxhimjd1aa8ji9jgb5iv37gfalv8z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87749,6 +87731,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "google-oauth2-jwt_0_3_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.3.0"; + sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj"; + libraryHaskellDepends = [ + base base64-bytestring bytestring HsOpenSSL RSA text unix-time + ]; + homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; + description = "Get a signed JWT for Google Service Accounts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-search" = callPackage ({ mkDerivation, base, free, nats, text, time }: mkDerivation { @@ -89256,8 +89255,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.1.0.0"; - sha256 = "0krmn6gbf50q8w9gm041zangfsc1c738ajahzg65hcclkca2iq4c"; + version = "0.1.1.0"; + sha256 = "1mf1fgp1i3pxayhgkc4jmx3fjx3s16vcn9n2jbg750d6nif6yyxi"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers unordered-containers @@ -89274,14 +89273,14 @@ self: { "greskell-core" = callPackage ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec - , QuickCheck, scientific, text, unordered-containers + , QuickCheck, scientific, semigroups, text, unordered-containers }: mkDerivation { pname = "greskell-core"; - version = "0.1.0.0"; - sha256 = "1s8hwfp4vfyj5zb8kfvk7ahi5crbf6jwsjk2g188nf7gzy76mf6v"; + version = "0.1.1.0"; + sha256 = "0in0ilj337zm00qg0qxcmiai8xvlni5vz4sz0h0dmc3pmg57zmh0"; libraryHaskellDepends = [ - aeson base scientific text unordered-containers + aeson base scientific semigroups text unordered-containers ]; testHaskellDepends = [ aeson base doctest doctest-discover hspec QuickCheck text @@ -90056,8 +90055,8 @@ self: { ({ mkDerivation, base, glib, gtk3, x11 }: mkDerivation { pname = "gtk-traymanager"; - version = "1.0.0"; - sha256 = "1sg2f8pmnh2xrnra8dx46q9jfy32dlbrmk2hamam8g3i5qsvd0f7"; + version = "1.0.1"; + sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di"; libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ x11 ]; homepage = "http://github.com/travitch/gtk-traymanager"; @@ -92325,8 +92324,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.6.1"; - sha256 = "1fh9gg8yq0k5a54bk754kcbrmna0v66c7wnmd9z20f46wl3cdygs"; + version = "1.6.2"; + sha256 = "0nkq1qlhpd6gmrj75vik51a4fndn6sy3vwx2nk91vmdd7ml2f0v8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96725,8 +96724,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-sc"; - version = "0.1.0.5"; - sha256 = "15ja2h0flp73f017r1ylr8fmksd3v76v68x8whv37bgy3mrqznx9"; + version = "0.1.0.6"; + sha256 = "1bfkwladavard87pnnr2nigs214hb3k4j3mki0ffd5zfxldb2ncv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts ]; @@ -97841,8 +97840,8 @@ self: { }: mkDerivation { pname = "haskey"; - version = "0.2.0.1"; - sha256 = "07q7kp07ipq20v3ag49j3ca116p48yn3pn5im5p101l8372hj58n"; + version = "0.3.0.1"; + sha256 = "1v5af0pd015d7ccdi0f2wc3gb60xy4j59kzngx6wh6dljkxrcga7"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath focus haskey-btree list-t lz4 mtl semigroups stm stm-containers @@ -97868,8 +97867,8 @@ self: { }: mkDerivation { pname = "haskey-btree"; - version = "0.2.0.1"; - sha256 = "025g1sa41fa29v69hpbghabq2irkb498a6b48bgp0nb8m3cmz2ls"; + version = "0.3.0.0"; + sha256 = "0nj6jhigzgjac45cg0qjbjamn152n7rvir5clkwj5yraisd7sf4h"; libraryHaskellDepends = [ base binary bytestring containers hashable mtl semigroups text transformers vector @@ -97890,8 +97889,8 @@ self: { }: mkDerivation { pname = "haskey-mtl"; - version = "0.2.0.0"; - sha256 = "1n3j4avydrr2w0sa0zjsc2jvmr9fmyxz5s54y6zam40a2cg2wc2l"; + version = "0.3.0.0"; + sha256 = "0jc2wa41gmx01ccb7svv91llncm47adb2g6winm513k23bvk8028"; libraryHaskellDepends = [ base exceptions haskey haskey-btree mtl transformers ]; @@ -100695,8 +100694,8 @@ self: { }: mkDerivation { pname = "hedgehog-gen-json"; - version = "0.2.0"; - sha256 = "1irr4lniz5s176r6fnhd7sjnxbs627yif1yd8nd8jrq9p1rwc5jm"; + version = "0.3.0"; + sha256 = "09b362v9cdl9jwrx0hyb7hhf2krg3rhrsgssz4dl3sjz3y2a8i1h"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude regex-genex scientific text time timerep tz unordered-containers @@ -100707,7 +100706,7 @@ self: { regex-genex regex-pcre scientific tasty tasty-hedgehog text time timerep tz unordered-containers vector ]; - homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; + homepage = "https://github.com/amrhassan/haskell-hedgehog-gen-json"; description = "JSON generators for Hedgehog"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -100942,7 +100941,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "heist_1_0_1_3" = callPackage + "heist_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder , blaze-html, bytestring, containers, criterion, directory , directory-tree, dlist, filepath, hashable, HUnit, lens @@ -100953,8 +100952,8 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.0.1.3"; - sha256 = "0gy1s30sv9g1ybazh2md7scr1z2lqixl374h108zfp6f66iq450z"; + version = "1.1"; + sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -102582,25 +102581,24 @@ self: { "hgis" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart - , Chart-cairo, Chart-diagrams, colour, composition + , Chart-cairo, Chart-diagrams, colour, composition-prelude , data-binary-ieee754, data-default, directory, filepath, hspec - , lens, monad-loops, optparse-applicative, transformers + , lens, monad-loops, optparse-applicative }: mkDerivation { pname = "hgis"; - version = "0.1.3.7"; - sha256 = "0c6xk4zf80pqjasyl7n5i2k3iy9l3xzkv2glmamm5scz9kyzdbvr"; + version = "0.1.3.8"; + sha256 = "10lqv0v4lnah22qwlyh1ixhcvl0abs9brlpddw0a24xdym4j0xhf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo - Chart-diagrams colour composition data-binary-ieee754 data-default - directory filepath lens monad-loops optparse-applicative - transformers + Chart-diagrams colour composition-prelude data-binary-ieee754 + data-default directory filepath lens monad-loops + optparse-applicative ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/vmchale/hgis#readme"; description = "Package and command-line for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -103459,6 +103457,8 @@ self: { pname = "hinotify"; version = "0.3.9"; sha256 = "16fzql0s34my9k1ib4rdjf9fhhijkmmbrvi148f865m51160wj7j"; + revision = "1"; + editedCabalFile = "0df5pak0586626k3ryzg2lb26ys562l3i94jr9vpa0krs8iia209"; libraryHaskellDepends = [ async base containers directory unix ]; testHaskellDepends = [ base directory ]; homepage = "https://github.com/kolmodin/hinotify.git"; @@ -103466,6 +103466,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_3_10" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.3.10"; + sha256 = "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg"; + revision = "1"; + editedCabalFile = "07z0n5rvki3w0kjr190bwv7sq8p3myspv8999ilz9rlsqf5a0324"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + homepage = "https://github.com/kolmodin/hinotify.git"; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -104418,10 +104436,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.3"; - sha256 = "0fm5y2qyrg661q7y23f5abg78rbwz4jqkvlar8ns8wz9qwbml0ix"; - revision = "1"; - editedCabalFile = "09dvjyl9irq0cc8k4nwxdkjvj13dwk1n5lij7ykka6a658y9gzp5"; + version = "1.3.4"; + sha256 = "1dii629ynrb04q4hmli6zxpz1ylkw0rm1vf8jrrcm81drvdxw6qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107491,8 +107507,8 @@ self: { }: mkDerivation { pname = "hpath"; - version = "0.8.1"; - sha256 = "0k1g27lnm2c61wva03gh5qrjpc26xh6alxkv8xx36miw06fz88hv"; + version = "0.9.0"; + sha256 = "1d0f58xvqpr5d9n3n8wpy5x59mfh57al4bvpllfmb6a6dm514k4d"; libraryHaskellDepends = [ base bytestring deepseq exceptions hspec IfElse simple-sendfile unix unix-bytestring utf8-string word8 @@ -107611,36 +107627,6 @@ self: { }) {}; "hpio" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , doctest, exceptions, filepath, hspec, monad-control, monad-logger - , mtl, optparse-applicative, protolude, QuickCheck, text - , transformers, transformers-base, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; - version = "0.9.0.5"; - sha256 = "0k1n2la7c5ld13nr0j2hc1ia2i9gy4aacs2cna4rkmcnyamgg38i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory exceptions filepath - monad-control monad-logger mtl protolude QuickCheck text - transformers transformers-base unix unix-bytestring - ]; - executableHaskellDepends = [ - async base exceptions mtl optparse-applicative protolude text - transformers - ]; - testHaskellDepends = [ - base containers directory doctest exceptions filepath hspec - protolude QuickCheck - ]; - homepage = "https://github.com/quixoftic/hpio#readme"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpio_0_9_0_6" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , doctest, exceptions, filepath, hspec, monad-control, monad-logger , mtl, optparse-applicative, protolude, QuickCheck, text @@ -107668,7 +107654,6 @@ self: { homepage = "https://github.com/quixoftic/hpio#readme"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -113299,6 +113284,36 @@ self: { 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 + , 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.1"; + sha256 = "0nbq3xklz5nfc4k50qj413q2acwcbs0g5am4pncbjhiamgqc6lc2"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -113914,8 +113929,8 @@ self: { }: mkDerivation { pname = "http2-client"; - version = "0.7.0.0"; - sha256 = "1grcb4mbqx8dkdwal3pldfyasnlghdkzcrksl0hvj7xg8bqjs2n5"; + version = "0.8.0.0"; + sha256 = "1c9nn6b9fs30prrkalx7n7i4a4a5ss53ky4x2nba4vcq4rgipch3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114815,19 +114830,6 @@ self: { }) {}; "hw-hspec-hedgehog" = callPackage - ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: - mkDerivation { - pname = "hw-hspec-hedgehog"; - version = "0.1.0.2"; - sha256 = "1rafrpys347qc60van79y55n13pjdhdx64j495g4hhvyzf32az67"; - libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; - testHaskellDepends = [ base hedgehog hspec ]; - homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme"; - description = "Interoperability between hspec and hedgehog"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-hspec-hedgehog_0_1_0_3" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: mkDerivation { pname = "hw-hspec-hedgehog"; @@ -114838,7 +114840,6 @@ self: { homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme"; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage @@ -114934,19 +114935,19 @@ self: { "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache , containers, errors, hashable, hspec, http-client, http-types, mtl - , pure-zlib, QuickCheck, semigroups, servant, servant-client, text - , transformers, unordered-containers + , pure-zlib, QuickCheck, semigroups, servant, servant-client + , tagged, text, transformers, unordered-containers }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.3.0"; - sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa"; + version = "1.4.0"; + sha256 = "19lk0vyrl6hcd8f053yh7m1hym2hqs9srhjq9isq19s8nqgpijc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable http-client http-types mtl pure-zlib semigroups servant - servant-client text transformers unordered-containers + servant-client tagged text transformers unordered-containers ]; testHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable @@ -115124,6 +115125,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-rankselect_0_11_0_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, deepseq + , directory, hedgehog, hspec, hw-balancedparens, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap + , QuickCheck, resourcet, vector + }: + mkDerivation { + pname = "hw-rankselect"; + version = "0.11.0.0"; + sha256 = "0sywcqzrrxmlwgg4glj8fm8fn4n1a33f20lmj9bvchzh20gg340c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base + vector + ]; + executableHaskellDepends = [ + base directory hw-bits hw-prim hw-rankselect-base mmap vector + ]; + testHaskellDepends = [ + base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog + hw-prim hw-rankselect-base mmap QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion directory hw-bits hw-prim + hw-rankselect-base mmap resourcet vector + ]; + homepage = "http://github.com/haskell-works/hw-rankselect#readme"; + description = "Rank-select"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-rankselect-base" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim , hw-string-parse, QuickCheck, safe, vector @@ -118267,6 +118301,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "incremental" = callPackage + ({ mkDerivation, base, containers, deepseq, semigroups }: + mkDerivation { + pname = "incremental"; + version = "0"; + sha256 = "01fvc963gln6svash9cf9v2wbfnssh4j5r49l6y23zmnmqnzxs8x"; + libraryHaskellDepends = [ base containers deepseq semigroups ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/fumieval/incremental#readme"; + description = "incremental update library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "incremental-computing" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers , deepseq, dlist, fingertree, order-maintenance, QuickCheck @@ -119089,8 +119136,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "5"; - editedCabalFile = "13m83jdnxxykkc8fi2fa5qmy2mpsg3w9yphbl8cxdhmj8566pr7c"; + revision = "6"; + editedCabalFile = "0dna826vhnal6m213llszn68phjs27pd43f7s8wdhdmjdx1nzk72"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -121898,8 +121945,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.4"; - sha256 = "0bqvxnysynpznhibwlcmcg849psjm0q158mh50w0bcwa7jx6v441"; + version = "0.5.5"; + sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121910,7 +121957,7 @@ self: { executableHaskellDepends = [ base boxes directory filepath ]; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -123343,8 +123390,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "4"; - editedCabalFile = "1vdfhhbk020bpdg6x8lx21w5aykzzfk9k119cd4px9hm6r77grcy"; + revision = "5"; + editedCabalFile = "0fi7cij476s4lhjpi7m1yp9p30qv7pyv0hlcj30kd0zq74nwwrdz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123466,27 +123513,6 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hspec - , QuickCheck, quickcheck-unicode, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "json-stream"; - version = "0.4.2.2"; - sha256 = "14savrbhxb7pxxphfhh6z5fh5xqfxrnk9j7g0268dl2hpnzx4rvh"; - libraryHaskellDepends = [ - aeson base bytestring scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring directory hspec QuickCheck quickcheck-unicode - scientific text unordered-containers vector - ]; - homepage = "https://github.com/ondrap/json-stream"; - description = "Incremental applicative JSON parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "json-stream_0_4_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hspec , QuickCheck, quickcheck-unicode, scientific, text , unordered-containers, vector @@ -123505,7 +123531,6 @@ self: { homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-togo" = callPackage @@ -127175,8 +127200,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.5"; - sha256 = "13slgzdcgdbibxnk4nk6xgkvhsz2f87m6xj0mz5ccmjfb35hv63d"; + version = "1.2.0.6"; + sha256 = "0g1yq11pml5pkpszbzdqkhj172v9zyw8mbf9bl97p883p55p0nxa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -127919,6 +127944,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "language-oberon" = callPackage + ({ mkDerivation, base, containers, directory, either, filepath + , grammatical-parsers, optparse-applicative, parsers, prettyprinter + , rank2classes, repr-tree-syb, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "language-oberon"; + version = "0.1.1"; + sha256 = "0b63yryiaw4fr793qif2bq64fcx4ml3yi8wgkz1rg77j0nnga2vs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory either filepath grammatical-parsers + parsers prettyprinter rank2classes text + ]; + executableHaskellDepends = [ + base containers either filepath grammatical-parsers + optparse-applicative prettyprinter rank2classes repr-tree-syb text + ]; + testHaskellDepends = [ + base directory either filepath tasty tasty-hunit + ]; + homepage = "https://github.com/blamario/language-oberon"; + description = "Parser and pretty-printer for the Oberon programming language"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "language-objc" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, newtype, pretty, process, syb @@ -128287,24 +128339,6 @@ self: { }) {}; "lapack-carray" = callPackage - ({ mkDerivation, base, carray, lapack-ffi, netlib-carray - , netlib-ffi, storable-complex, transformers - }: - mkDerivation { - pname = "lapack-carray"; - version = "0.0.1"; - sha256 = "0f6d9g69a64wwyanwdq2ny3ga2ci0g2hingxv3w52w0xisx00apj"; - libraryHaskellDepends = [ - base carray lapack-ffi netlib-carray netlib-ffi storable-complex - transformers - ]; - homepage = "http://hub.darcs.net/thielema/lapack-carray/"; - description = "Auto-generated interface to Fortran LAPACK via CArrays"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "lapack-carray_0_0_2" = callPackage ({ mkDerivation, base, carray, lapack-ffi, netlib-carray , netlib-ffi, storable-complex, transformers }: @@ -128323,20 +128357,6 @@ self: { }) {}; "lapack-ffi" = callPackage - ({ mkDerivation, base, liblapack, netlib-ffi }: - mkDerivation { - pname = "lapack-ffi"; - version = "0.0.1"; - sha256 = "1bxp1lb0nwbc8xswxd2p0l30mfjq5xa1bwy9pkgpp3anww84l0bh"; - libraryHaskellDepends = [ base netlib-ffi ]; - libraryPkgconfigDepends = [ liblapack ]; - homepage = "http://hub.darcs.net/thielema/lapack-ffi/"; - description = "Auto-generated interface to Fortran LAPACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) liblapack;}; - - "lapack-ffi_0_0_2" = callPackage ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { pname = "lapack-ffi"; @@ -129818,33 +129838,6 @@ self: { }) {}; "lentil" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip - , filepath, hspec, natural-sort, optparse-applicative, parsec - , pipes, regex-tdfa, semigroups, terminal-progress-bar, text - , transformers - }: - mkDerivation { - pname = "lentil"; - version = "1.0.10.1"; - sha256 = "04hr5q48da5clfvypwb9fii6si19kda12ncyx10rp2fni50sshrl"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath natural-sort - optparse-applicative parsec pipes regex-tdfa semigroups - terminal-progress-bar text transformers - ]; - testHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath hspec - natural-sort optparse-applicative parsec pipes regex-tdfa - semigroups terminal-progress-bar text transformers - ]; - homepage = "http://www.ariis.it/static/articles/lentil/page.html"; - description = "frugal issue tracker"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "lentil_1_0_11_3" = callPackage ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip , filepath, hspec, natural-sort, optparse-applicative, parsec , pipes, regex-tdfa, semigroups, terminal-progress-bar, text @@ -129869,7 +129862,6 @@ self: { homepage = "http://www.ariis.it/static/articles/lentil/page.html"; description = "frugal issue tracker"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz" = callPackage @@ -131400,8 +131392,8 @@ self: { pname = "linear"; version = "1.20.7"; sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; - revision = "3"; - editedCabalFile = "0y7gjzrwhfsbr4vh10qkky563jiwr60cp0yx019adabvx6sf7yil"; + revision = "4"; + editedCabalFile = "11fxa2bqpyf99iv2b3yzi9z17y0r70afqij52lmifsyzr24zizv3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -132960,6 +132952,8 @@ self: { pname = "llvm-hs"; version = "6.0.0"; sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd"; + revision = "1"; + editedCabalFile = "1apyscxr48g37qw15wmqb98si8gcnx8cky6bj68ai3jfjfphbjly"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -133486,6 +133480,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "loch-th_0_2_2" = callPackage + ({ mkDerivation, base, pretty, template-haskell }: + mkDerivation { + pname = "loch-th"; + version = "0.2.2"; + sha256 = "1hvdkcyrlnv65q8x8h0441x30wr9bbfbg3961xd3fy9an5r961fc"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lock-file" = callPackage ({ mkDerivation, base, data-default-class, directory, exceptions , filepath, HUnit, tagged-exception-core, test-framework @@ -133747,42 +133754,6 @@ self: { }) {}; "log-warper" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, containers - , data-default, deepseq, directory, filepath, fmt, hspec - , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens - , microlens-mtl, microlens-platform, mmorph, monad-control - , monad-loops, mtl, o-clock, QuickCheck, text, time, transformers - , transformers-base, universum, unix, unordered-containers, vector - , yaml - }: - mkDerivation { - pname = "log-warper"; - version = "1.8.10.1"; - sha256 = "0chwqn8pdlfhlixl3z9a6gvx86vxmq92v325z0fsamwzb7hhcf52"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base containers deepseq directory filepath fmt - lifted-async microlens-platform mmorph monad-control monad-loops - mtl o-clock text time transformers transformers-base universum unix - unordered-containers vector yaml - ]; - executableHaskellDepends = [ - base markdown-unlit microlens monad-control mtl o-clock text - universum yaml - ]; - testHaskellDepends = [ - async base data-default directory filepath hspec HUnit - microlens-mtl QuickCheck universum unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://github.com/serokell/log-warper"; - description = "Flexible, configurable, monadic and pretty logging"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "log-warper_1_8_11" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers , data-default, deepseq, directory, filepath, fmt, hspec , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens @@ -137413,6 +137384,26 @@ 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 @@ -137432,6 +137423,24 @@ self: { 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 + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.2.0"; + sha256 = "02va411j1alsja009xms30x0zhwansjiy81djz2za06ghyg4f6a1"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -141222,31 +141231,6 @@ self: { }) {}; "modify-fasta" = callPackage - ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative - , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split - , text, text-show - }: - mkDerivation { - pname = "modify-fasta"; - version = "0.8.2.3"; - sha256 = "0pj6qymvz1b7rm5i1p2vys7ayp6p6pp8m8f3giahrccp9zg0gvnw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers fasta regex-tdfa regex-tdfa-text split text - text-show - ]; - executableHaskellDepends = [ - base containers fasta mtl optparse-applicative pipes pipes-text - semigroups split text - ]; - homepage = "https://github.com/GregorySchwartz/modify-fasta"; - description = "Modify fasta (and CLIP) files in several optional ways"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "modify-fasta_0_8_3_0" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split , text, text-show, transformers @@ -142509,12 +142493,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-time_0_3_0_0" = callPackage + "monad-time_0_3_1_0" = callPackage ({ mkDerivation, base, mtl, time }: mkDerivation { pname = "monad-time"; - version = "0.3.0.0"; - sha256 = "0adl246zrj2ryxx9b0a0c0d5gia1am21k0i0m3k2dwivhypdyq81"; + version = "0.3.1.0"; + sha256 = "0z30c0k5bqlz86vwajnm6kj26i09zx6dzqwd00z6ba8hqyzm1x0a"; libraryHaskellDepends = [ base mtl time ]; testHaskellDepends = [ base mtl time ]; homepage = "https://github.com/scrive/monad-time"; @@ -143175,25 +143159,23 @@ self: { }: mkDerivation { pname = "monoid-extras"; - version = "0.4.2"; - sha256 = "07r86ip6jfa2ka84dpilap01g1pg8r5bqz2nk7js6mlnbh2lxzqk"; - revision = "2"; - editedCabalFile = "04h78r48rg2ppi53869vb8y226g135fxgy9ryi1v08nqsiqi1vvw"; + 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_3" = callPackage + "monoid-extras_0_4_4" = callPackage ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups }: mkDerivation { pname = "monoid-extras"; - version = "0.4.3"; - sha256 = "1c2zdsyq0iyagzp9y64j75nxvpbjr5y3fdg8cd1pkfqgms977qsr"; - revision = "1"; - editedCabalFile = "08961ibwiqks8qw5cwpkzpz3acrlrd48l2sl1qny96gycaslzrps"; + version = "0.4.4"; + sha256 = "1ik88ilg5zjrajqllg3zjp92bz8mhvrc8q9mx6llkwry5k3avsfx"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; @@ -143698,22 +143680,23 @@ self: { }) {}; "movie-monad" = callPackage - ({ mkDerivation, base, filepath, gi-gdk, gi-gdkpixbuf, gi-glib - , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi - , haskell-gi-base, MissingH, network-uri, process, system-fileio - , system-filepath, text, time + ({ mkDerivation, base, bytestring, filepath, gi-gdk, gi-gdkpixbuf + , gi-glib, gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi + , haskell-gi-base, haskell-gi-overloading, MissingH, network-uri + , process, system-fileio, system-filepath, text, time }: mkDerivation { pname = "movie-monad"; - version = "0.0.4.0"; - sha256 = "0wdnf8gm3h7ykdmnwc7jw1y0rs27izzh1kz2gkgi3g2dyllh7sq3"; + version = "0.0.5.0"; + sha256 = "02hqkgz3855d3lgvyq6nyqm70x5c0ycfzvw6pxndhv8ly5i61nby"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gst - gi-gstvideo gi-gtk haskell-gi haskell-gi-base MissingH network-uri - process system-fileio system-filepath text time + base bytestring filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gst gi-gstvideo gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading MissingH network-uri process system-fileio + system-filepath text time ]; homepage = "https://github.com/lettier/movie-monad"; description = "Plays videos using GStreamer and GTK+"; @@ -147322,18 +147305,6 @@ self: { }) {}; "netlib-carray" = callPackage - ({ mkDerivation, base, carray, netlib-ffi, transformers }: - mkDerivation { - pname = "netlib-carray"; - version = "0.0.1"; - sha256 = "061cn2k8in7j0izbar7xj86ksls8a1zxyf3ngkg19dwwjwfvn4yh"; - libraryHaskellDepends = [ base carray netlib-ffi transformers ]; - homepage = "http://hub.darcs.net/thielema/netlib-carray/"; - description = "Helper modules for CArray wrappers to BLAS and LAPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "netlib-carray_0_0_1_1" = callPackage ({ mkDerivation, base, carray, netlib-ffi, transformers }: mkDerivation { pname = "netlib-carray"; @@ -147343,7 +147314,6 @@ self: { homepage = "http://hub.darcs.net/thielema/netlib-carray/"; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netlib-ffi" = callPackage @@ -147647,6 +147617,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "netwire-input-glfw_0_0_10" = callPackage + ({ mkDerivation, base, containers, deepseq, GLFW-b, mtl + , netwire-input, stm + }: + mkDerivation { + pname = "netwire-input-glfw"; + version = "0.0.10"; + sha256 = "1r186xwr5lycs0snr8amvyxvbq2l5jd9p20v8n12zyjm60kmi90y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers deepseq 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netwire-input-javascript" = callPackage ({ mkDerivation, base, containers, ghcjs-base, netwire , netwire-input, transformers @@ -147799,8 +147788,8 @@ self: { }: mkDerivation { pname = "network-api-support"; - version = "0.3.2"; - sha256 = "1wzigwxdql9v6m9kwvnlgaachkr0rk9ldghnazrkkxba8di5kpsi"; + version = "0.3.3"; + sha256 = "1dp9fp907sc1r0mshby18vlbkji9bggikbycjbdlb6mzg7mjmiav"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls @@ -148985,8 +148974,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.3.0"; - sha256 = "1x4na14387sr26lnjmxdnk8gl41pfi4xq3r5a37yl45l4gdhr5hs"; + version = "1.4.0"; + sha256 = "16gs4wmv8qd8zlm2clsd2h4gcj8fsad6s926nspnbyznbmsbg6p2"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -150670,8 +150659,8 @@ self: { }: mkDerivation { pname = "numhask-histogram"; - version = "0.1.0.0"; - sha256 = "1ql07s8l9ci4k69y8g7x4227z5shdi5y8crqxqv45m6xcafhrv46"; + version = "0.1.1.0"; + sha256 = "18xnkwmf7bwnj2ldj20afg38ykpzdnpg773pgj9af9yzk40vpd28"; libraryHaskellDepends = [ base containers foldl numhask-prelude numhask-range tdigest ]; @@ -150718,14 +150707,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "numhask-range_0_2_0_0" = callPackage + "numhask-range_0_2_1_0" = callPackage ({ mkDerivation, adjunctions, base, distributive, doctest , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty }: mkDerivation { pname = "numhask-range"; - version = "0.2.0.0"; - sha256 = "16al3f6w7g3616baz2xqp7pxlhzikchkr0l7qn7qif827qxmwgrz"; + version = "0.2.1.0"; + sha256 = "1i6kpx0jdr0q2lp19m0aqfd73wsi1dm6qhl1w9x8wp4px12j4caz"; libraryHaskellDepends = [ adjunctions base distributive numhask-prelude protolude QuickCheck semigroupoids @@ -151980,25 +151969,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "online_0_2_2_0" = callPackage - ({ mkDerivation, base, doctest, foldl, formatting, numhask-prelude - , optparse-generic, perf, protolude, scientific, tasty, tdigest - , text, vector, vector-algorithms + "online_0_2_3_0" = callPackage + ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude + , tasty, tdigest, vector, vector-algorithms }: mkDerivation { pname = "online"; - version = "0.2.2.0"; - sha256 = "0k51wjj6ik7r65gp1kzkq1n7y8yxjiracs8i1yx2slz9jnfasgy5"; - isLibrary = true; - isExecutable = true; + version = "0.2.3.0"; + sha256 = "04yh51gdmb2nycsxjrfzkb07byxdmn1n9wrk7wv7nh3ki7jxi15d"; libraryHaskellDepends = [ base foldl numhask-prelude protolude tdigest vector vector-algorithms ]; - executableHaskellDepends = [ - base foldl formatting numhask-prelude optparse-generic perf - protolude scientific tdigest text - ]; testHaskellDepends = [ base doctest protolude tasty ]; homepage = "https://github.com/tonyday567/online#readme"; description = "online statistics"; @@ -154932,6 +154914,8 @@ self: { pname = "pandoc-types"; version = "1.17.4.2"; sha256 = "1jiy4siyfcf4z0m0kn0z58cbrsvggavlxljrcb4srwblih55xqap"; + revision = "1"; + editedCabalFile = "0izgzjfl7l4fb6xd5iqcy5zca4m1vzvr5xqgccw45vkm8q3arqnf"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -156708,13 +156692,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-extra_0_1_0" = callPackage + "path-extra_0_1_1" = callPackage ({ mkDerivation, base, path }: mkDerivation { pname = "path-extra"; - version = "0.1.0"; - sha256 = "0y6lx93xj6lnlwgvv8lwifnwkniz3grcgp8ic92pshpqcxyd90a4"; + version = "0.1.1"; + sha256 = "0dyhazqz8gz6fk79v76j9kw7bj001njdvc0b3wpl6an3dqw8hy9j"; libraryHaskellDepends = [ base path ]; + homepage = "https://github.com/athanclark/path-extra#readme"; description = "Some extensions to Chris Done's path library, for use with urlpath and attoparsec-uri"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -158537,13 +158522,14 @@ self: { "persistent-sqlite_2_6_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale - , persistent, persistent-template, resource-pool, resourcet + , persistent, persistent-template, resource-pool, resourcet, sqlite , temporary, text, time, transformers, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; version = "2.6.4"; sha256 = "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm"; + configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158551,6 +158537,7 @@ self: { monad-logger old-locale persistent resource-pool resourcet text time transformers unordered-containers ]; + librarySystemDepends = [ sqlite ]; testHaskellDepends = [ base hspec persistent persistent-template temporary text time transformers @@ -158560,18 +158547,19 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; + }) {inherit (pkgs) sqlite;}; "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, temporary, text - , time, transformers, unliftio-core, unordered-containers + , persistent-template, resource-pool, resourcet, sqlite, temporary + , text, time, transformers, unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; version = "2.8.1.2"; sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g"; + configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158579,6 +158567,7 @@ self: { old-locale persistent resource-pool resourcet text time transformers unliftio-core unordered-containers ]; + librarySystemDepends = [ sqlite ]; testHaskellDepends = [ base hspec persistent persistent-template temporary text time transformers @@ -158587,7 +158576,7 @@ self: { description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; + }) {inherit (pkgs) sqlite;}; "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers @@ -161625,6 +161614,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plural" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec }: + mkDerivation { + pname = "plural"; + version = "0.0.1"; + sha256 = "15hbvr565qvm608241xnx8sicspl2200jqbxd138a14qfi5aplc0"; + libraryHaskellDepends = [ base bytestring containers ]; + testHaskellDepends = [ base hspec ]; + description = "Pluralize"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ply-loader" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, directory , filepath, lens, linear, parallel-io, transformers, vector @@ -162328,6 +162329,31 @@ self: { 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 + }: + mkDerivation { + pname = "pomaps"; + version = "0.0.0.4"; + sha256 = "0mjfzj2j8b6337ivvnry7ylrw5g1ajxpqqzar1wmscm73ybr0xbn"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pomodoro" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath , heredoc, libnotify, network, process, time, unix, wx, wxcore @@ -162583,8 +162609,8 @@ self: { }: mkDerivation { pname = "poppler"; - version = "0.14.1"; - sha256 = "1djx8qj68md11kdgcljd7mq3bidw6ynh9mwfxm9bj7kr2h57lmsv"; + version = "0.14.2"; + sha256 = "17q8br6w9v7vcz8ricvlrhhaw0ngka9w0i0jazr7m1j0dv1m4xsf"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -162804,25 +162830,6 @@ self: { }) {}; "posix-paths" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, doctest - , filepath, HUnit, process, QuickCheck, unix - }: - mkDerivation { - pname = "posix-paths"; - version = "0.2.1.4"; - sha256 = "0axaq7249nmg17b0qx9374xhgb7wzfdaa6pkriq218h4jnfiq1r6"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring doctest HUnit QuickCheck unix - ]; - benchmarkHaskellDepends = [ - base bytestring criterion directory filepath process unix - ]; - description = "POSIX filepath/directory functionality"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "posix-paths_0_2_1_5" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, doctest , filepath, HUnit, process, QuickCheck, unix }: @@ -162839,7 +162846,6 @@ self: { ]; description = "POSIX filepath/directory functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "posix-pty" = callPackage @@ -164244,8 +164250,8 @@ self: { ({ mkDerivation, base, hspec, regex-pcre-builtin }: mkDerivation { pname = "prefix-expression"; - version = "1.2.5"; - sha256 = "0z1s74iw87qkfaa7v8a3m91w2phmkp02yiz5xk8w2w4jz72x3x0b"; + version = "1.2.6"; + sha256 = "0brw6rrykfsg67ckcfs3d5x4n7m8c6vbnh9hqrk1iq9whlz6vpwy"; libraryHaskellDepends = [ base regex-pcre-builtin ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/VonFry/prefix-expression"; @@ -167825,31 +167831,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "1.5.1.3"; - sha256 = "0a8q16l6yv5azwbp4c8bmw78yd9kmkvyn6s5qsras4x9r1j4fq1m"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_1_5_1_4" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-types, memory , QuickCheck, scientific, text, time, transformers @@ -167872,7 +167853,6 @@ self: { homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -168349,23 +168329,22 @@ self: { }) {}; "qr-imager" = callPackage - ({ mkDerivation, aeson, base, bytestring, cryptonite, directory + ({ mkDerivation, base, binary, bytestring, cryptonite, directory , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode - , microlens, optparse-applicative, process, split, vector + , microlens, process, split, vector }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.7"; - sha256 = "1l0xf77nkx8kv9xc07xlpg09b76isr3c8k7i03lfa3dgn9s6lh7l"; + version = "2.0.0.0"; + sha256 = "01886bwkap8qk39iihlyrfa9g8cw6sicrynwk7r24nd5ib60csc3"; libraryHaskellDepends = [ - aeson base bytestring cryptonite directory haskell-qrencode - jose-jwt JuicyPixels microlens optparse-applicative process split - vector + base binary bytestring cryptonite directory haskell-qrencode + jose-jwt JuicyPixels microlens process split vector ]; libraryPkgconfigDepends = [ libqrencode ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/vmchale/QRImager#readme"; - description = "Library to generate QR codes from bytestrings and objects"; + description = "Library to generate images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libqrencode;}; @@ -169189,17 +169168,6 @@ self: { }) {}; "quickcheck-simple" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "quickcheck-simple"; - version = "0.1.0.2"; - sha256 = "0p1ky7sj42crn9sas9d2cs5cwz03wsk20p55x2wgmlj5rmpr5mla"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Test properties and default-mains for QuickCheck"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-simple_0_1_0_3" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; @@ -169208,7 +169176,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-special" = callPackage @@ -171047,8 +171014,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.0.6"; - sha256 = "0ph0kcf8rzn99j6c98786x0kdvbxpi355kqzxj0ia5748jk7ds0m"; + version = "4.0.7"; + sha256 = "1ry5z8dc8hqq5sqxjz23mssk4symnl98zrm77hnfsfapx7jg8b8x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175505,6 +175472,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_2_1" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.1"; + sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + 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 ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -177906,8 +177891,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.14"; - sha256 = "1ypwxlfmlhx3zjmgi24y5mriprk9wjnc14l0lry38j4ml11glcsd"; + version = "0.2.15"; + sha256 = "0si1cj5py2dwcdxwy2yix9bbfmx7gysbdshy5ql38r963yjdhfxs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177920,10 +177905,10 @@ self: { ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty - tasty-hunit tasty-quickcheck word24 + tasty-hunit tasty-quickcheck text word24 ]; homepage = "http://github.com/swift-nav/librtcm"; - description = "RTCM Library"; + description = "Haskell bindings for RTCM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180231,34 +180216,6 @@ self: { }) {}; "scotty" = callPackage - ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, data-default-class, directory, fail, hspec - , hspec-wai, http-types, lifted-base, monad-control, mtl, nats - , network, regex-compat, text, transformers, transformers-base - , transformers-compat, wai, wai-extra, warp - }: - mkDerivation { - pname = "scotty"; - version = "0.11.0"; - sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "10"; - editedCabalFile = "0y0ll3nn3n6n1ry2mvqm1g28a688hpba8kaw30m17p7fnv0m7368"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class fail http-types monad-control mtl nats network - regex-compat text transformers transformers-base - transformers-compat wai wai-extra warp - ]; - testHaskellDepends = [ - async base data-default-class directory hspec hspec-wai http-types - lifted-base network text wai - ]; - homepage = "https://github.com/scotty-web/scotty"; - description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scotty_0_11_1" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring , case-insensitive, data-default-class, directory, exceptions, fail , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types @@ -180284,7 +180241,6 @@ self: { homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-binding-play" = callPackage @@ -181811,6 +181767,28 @@ 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 + }: + mkDerivation { + pname = "sensu-run"; + version = "0.4.0.5"; + sha256 = "0mmpfxc4vzcz1714fgskbjkrfb9bxh6wjcpd66cwbkb9d8nsa0f7"; + 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 + ]; + homepage = "https://github.com/maoe/sensu-run#readme"; + description = "A tool to send command execution results to Sensu"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sentence-jp" = callPackage ({ mkDerivation, base, mecab, random-shuffle, text, transformers }: mkDerivation { @@ -183149,29 +183127,6 @@ self: { }) {}; "servant-github-webhook" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, github, github-webhooks, http-types, memory, servant - , servant-server, string-conversions, text, unordered-containers - , wai, warp - }: - mkDerivation { - pname = "servant-github-webhook"; - version = "0.4.0.0"; - sha256 = "0j18bms75z2p746g5p7kqsn95c80ilrss4nmfhymn2rwgiimdhnr"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite github - github-webhooks http-types memory servant servant-server - string-conversions text unordered-containers wai - ]; - testHaskellDepends = [ - aeson base bytestring servant-server text wai warp - ]; - homepage = "https://github.com/tsani/servant-github-webhook"; - description = "Servant combinators to facilitate writing GitHub webhooks"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servant-github-webhook_0_4_1_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, github, github-webhooks, http-types, memory, servant , servant-server, string-conversions, text, transformers @@ -183192,7 +183147,6 @@ self: { homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -184963,22 +184917,26 @@ self: { }) {}; "shadowsocks" = callPackage - ({ mkDerivation, aeson, async, base, binary, bytestring - , conduit-combinators, conduit-extra, containers, cryptohash - , HsOpenSSL, HUnit, iproute, network, optparse-applicative, process + ({ mkDerivation, aeson, async, base, binary, bytestring, conduit + , conduit-extra, containers, cryptohash, directory, HsOpenSSL + , HUnit, iproute, network, optparse-applicative, process , streaming-commons, unordered-containers }: mkDerivation { pname = "shadowsocks"; - version = "1.20151028"; - sha256 = "0z43hlgzklynb0y9b6bz2qmr2590v5nfp241i8b3rq7flb5lhlmp"; - isLibrary = false; + version = "1.20180408"; + sha256 = "19yn788j58i4h2bfi7rxy4a9h9q8ppp7bg2yln6ni563wa6x52p2"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring conduit containers cryptohash + directory HsOpenSSL iproute network optparse-applicative + unordered-containers + ]; executableHaskellDepends = [ - aeson async base binary bytestring conduit-combinators - conduit-extra containers cryptohash HsOpenSSL iproute network - optparse-applicative streaming-commons unordered-containers + async base bytestring conduit conduit-extra network + streaming-commons ]; testHaskellDepends = [ base binary bytestring containers cryptohash HUnit process @@ -185028,39 +184986,6 @@ self: { }) {}; "shake" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, hashable, js-flot, js-jquery, primitive, process - , QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "shake"; - version = "0.16.3"; - sha256 = "11rgb0lh8q6alr13in7156dwr44rag0ldynbd5wmlg7073q2g8zc"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - executableHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process random time transformers unix - unordered-containers utf8-string - ]; - testHaskellDepends = [ - base binary bytestring deepseq directory extra filepath hashable - js-flot js-jquery primitive process QuickCheck random time - transformers unix unordered-containers utf8-string - ]; - homepage = "http://shakebuild.com"; - description = "Build system library, like Make, but more accurate dependencies"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shake_0_16_4" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory , extra, filepath, hashable, js-flot, js-jquery, primitive, process , QuickCheck, random, time, transformers, unix @@ -185091,7 +185016,6 @@ self: { homepage = "https://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-ats" = callPackage @@ -185101,8 +185025,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.6.0.2"; - sha256 = "0imvw9bivp2dzs4086c481w7ss7z8dvphn0l163dkyzxdw8xgkzl"; + version = "1.8.0.0"; + sha256 = "0p29bwh3jfjhy1x795irkwdq6qbmihh3sxgznfrwfz7pxwfx6nb7"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats microlens microlens-th shake shake-ext text @@ -185856,14 +185780,19 @@ self: { "shimmer" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, haskeline - , text, vector + , text }: mkDerivation { pname = "shimmer"; - version = "0.1.2"; - sha256 = "0d4jllvqkswhxmjczvj2pcfwgdsd8xpvjx60pvw7m06jwslh99dl"; + version = "0.1.3.1"; + sha256 = "04hj31pw04xzhpicblc7mvqrwbs7gf00hps7bffymk2xx4v6xfl7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers filepath haskeline text vector + base bytestring containers filepath haskeline text + ]; + executableHaskellDepends = [ + base bytestring containers filepath haskeline text ]; description = "The Reflective Lambda Machine"; license = stdenv.lib.licenses.mit; @@ -191403,8 +191332,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.1.2"; - sha256 = "05n95zq4lxj98xp7rqh7rlpv3ybkfgbb4x3jczgjkfxfn3caycxl"; + version = "0.0.1.3"; + sha256 = "1n1zwhkvhypjmfmk2lqg1dlpw6x720mxd9giggklywhac1brdnzy"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -191703,10 +191632,8 @@ self: { }: mkDerivation { pname = "species"; - version = "0.4"; - sha256 = "04n9lrh058n66175drw3vsn57fd64j8wmn9wdchfb0557yqcjcmn"; - revision = "1"; - editedCabalFile = "0j69s6gpq0bzv42hkalz3nw35q07m5agdcs8kxv11s62jcm6idrs"; + version = "0.4.0.1"; + sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -194122,6 +194049,8 @@ self: { pname = "static-canvas"; version = "0.2.0.3"; sha256 = "0jfp3nk9flzjw0qjkbh7rk7q0g6dsmgqb2xwrfmg5pnf13gj821p"; + revision = "1"; + editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7"; libraryHaskellDepends = [ base double-conversion free mtl text ]; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; @@ -195636,28 +195565,6 @@ self: { }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl - , resourcet, smallcheck, streaming, tasty, tasty-smallcheck - , transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; - version = "0.1.5"; - sha256 = "0ih7ngqbign834i7z1hlqb0g0f3gphgrz6n8sdj81h36vmm6yd8j"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions mmorph mtl resourcet streaming - transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring smallcheck streaming tasty tasty-smallcheck - transformers - ]; - homepage = "https://github.com/haskell-streaming/streaming-bytestring"; - description = "effectful byte steams, or: bytestring io done right"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_1_6" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, smallcheck, streaming, tasty, tasty-smallcheck , transformers, transformers-base @@ -195677,7 +195584,6 @@ self: { homepage = "https://github.com/haskell-streaming/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -199529,8 +199435,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.8.0.0"; - sha256 = "0lr2jddm4qsfhl77sx837vva1rpnaf9a45a8wfc57xqrspapjhlz"; + version = "0.8.0.1"; + sha256 = "12glh66b7ih6zxhry1s1a9pbc2arpz0m4z1hvx3r3ji8s87i18kh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199701,8 +199607,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "1.0.0"; - sha256 = "1n2hxryh8l1ym498ckba1nf9533zpsxscvbriiwxixdr27mgk6zy"; + version = "1.0.1"; + sha256 = "1agx7q73h8x53cl8i408yifrr80fbm47pwn46mi6abcp61s92chn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -201490,6 +201396,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "teardown_0_4_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, criterion, rio, tasty + , tasty-hunit, typed-process, unliftio + }: + mkDerivation { + pname = "teardown"; + version = "0.4.0.0"; + sha256 = "0y2ihw74fnnygzp22nyy7285d3rcp6kw2gjkzys82blwrbdwdlsk"; + libraryHaskellDepends = [ + ansi-wl-pprint base rio typed-process unliftio + ]; + testHaskellDepends = [ + base rio tasty tasty-hunit typed-process unliftio + ]; + benchmarkHaskellDepends = [ + base criterion rio typed-process unliftio + ]; + homepage = "https://github.com/roman/Haskell-teardown#readme"; + description = "Build composable components for your application with clear teardown semantics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "teeth" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201960,6 +201889,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "temporary_1_3" = callPackage + ({ mkDerivation, base, base-compat, directory, exceptions, filepath + , random, tasty, tasty-hunit, transformers, unix + }: + mkDerivation { + pname = "temporary"; + version = "1.3"; + sha256 = "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c"; + libraryHaskellDepends = [ + base directory exceptions filepath random transformers unix + ]; + testHaskellDepends = [ + base base-compat directory filepath tasty tasty-hunit unix + ]; + homepage = "https://github.com/feuerbach/temporary"; + description = "Portable temporary file and directory support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "temporary-rc" = callPackage ({ mkDerivation, base, directory, exceptions, filepath , transformers, unix @@ -205406,26 +205355,6 @@ self: { }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; "tibetan-utils" = callPackage - ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec - , megaparsec, text, text-show - }: - mkDerivation { - pname = "tibetan-utils"; - version = "0.1.1.4"; - sha256 = "0xr31py60q915a8qg590c55mjprf7w5w4cdlcjg1gz6wqq9kdjam"; - libraryHaskellDepends = [ - base composition either megaparsec text text-show - ]; - testHaskellDepends = [ - base hspec hspec-megaparsec megaparsec text - ]; - homepage = "https://github.com/vmchale/tibetan-utils#readme"; - description = "Parse and display tibetan numerals"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tibetan-utils_0_1_1_5" = callPackage ({ mkDerivation, base, composition-prelude, either, hspec , hspec-megaparsec, megaparsec, text, text-show }: @@ -205534,6 +205463,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_0_9_7" = callPackage + ({ mkDerivation, base, colour, containers, hashable, hosc + , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit + , text, time, websockets + }: + mkDerivation { + pname = "tidal"; + version = "0.9.7"; + sha256 = "1b9005f9jf9pbiq5hwvqx4cw9c8hb8ygcpnb7qks4h5q6pf7yw6i"; + libraryHaskellDepends = [ + base colour containers hashable hosc mersenne-random-pure64 mtl + parsec safe text time websockets + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://tidalcycles.org/"; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -205857,18 +205806,6 @@ self: { }) {}; "time-locale-compat" = callPackage - ({ mkDerivation, base, old-locale, time }: - mkDerivation { - pname = "time-locale-compat"; - version = "0.1.1.3"; - sha256 = "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i"; - libraryHaskellDepends = [ base old-locale time ]; - homepage = "https://github.com/khibino/haskell-time-locale-compat"; - description = "Compatibility of TimeLocale between old-locale and time-1.5"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-locale-compat_0_1_1_4" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { pname = "time-locale-compat"; @@ -205878,7 +205815,6 @@ self: { homepage = "https://github.com/khibino/haskell-time-locale-compat"; description = "Compatibile module for time-format locale"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-locale-vietnamese" = callPackage @@ -206209,35 +206145,6 @@ self: { }) {}; "timemap" = callPackage - ({ mkDerivation, base, containers, criterion, focus, hashable - , list-t, QuickCheck, quickcheck-instances, stm, stm-containers - , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers - }: - mkDerivation { - pname = "timemap"; - version = "0.0.6"; - sha256 = "00bg1b0fplnahwsv7bx63v90hq9w0idpf7s9wqhvl3fdjs9nl5zp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers focus hashable list-t stm stm-containers time - unordered-containers - ]; - testHaskellDepends = [ - base containers focus hashable list-t QuickCheck - quickcheck-instances stm stm-containers tasty tasty-hunit - tasty-quickcheck time unordered-containers - ]; - benchmarkHaskellDepends = [ - base containers criterion focus hashable list-t stm stm-containers - time unordered-containers - ]; - description = "A mutable hashmap, implicitly indexed by UTCTime"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "timemap_0_0_7" = callPackage ({ mkDerivation, base, containers, criterion, focus, hashable , list-t, QuickCheck, quickcheck-instances, stm, stm-containers , tasty, tasty-quickcheck, time, unordered-containers @@ -210773,27 +210680,6 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq - , double-conversion, ghc-prim, hspec, QuickCheck, random, text - , weigh - }: - mkDerivation { - pname = "type-of-html"; - version = "1.3.3.2"; - sha256 = "0ah3j0r1yrqyrsg9blg0yxffjrikrlvi77d1cq368qmx3rnn5rnh"; - libraryHaskellDepends = [ - base bytestring double-conversion ghc-prim text - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion deepseq random text weigh - ]; - homepage = "https://github.com/knupfer/type-of-html"; - description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-of-html_1_3_4_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck , random, temporary, text, weigh @@ -210813,7 +210699,6 @@ self: { homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-operators" = callPackage @@ -211830,8 +211715,8 @@ self: { }: mkDerivation { pname = "unagi-bloomfilter"; - version = "0.1.1.0"; - sha256 = "03ssvfcn2a6bwpifajrvd2bncb2ikim2zwg56xbjihn0hg2dinsc"; + version = "0.1.1.2"; + sha256 = "0i1dz2cb8ikgbqan8kg6gwnyyn3sp2g182xkx8anj6lxqjnzcckf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212313,28 +212198,6 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq - , filepath, getopt-generics, optparse-applicative, path, path-io - , QuickCheck, split, text - }: - mkDerivation { - pname = "unicode-transforms"; - version = "0.3.3"; - sha256 = "04ga6dhsz9x279w3ik2sjphgmr8s6y0wd0bpg37ymn5mxp68lx2r"; - libraryHaskellDepends = [ base bitarray bytestring text ]; - testHaskellDepends = [ - base deepseq getopt-generics QuickCheck split text - ]; - benchmarkHaskellDepends = [ - base criterion deepseq filepath optparse-applicative path path-io - text - ]; - homepage = "http://github.com/harendra-kumar/unicode-transforms"; - description = "Unicode normalization"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode-transforms_0_3_4" = callPackage ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath , gauge, getopt-generics, optparse-applicative, path, path-io , QuickCheck, split, text @@ -212353,7 +212216,6 @@ self: { homepage = "http://github.com/harendra-kumar/unicode-transforms"; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicoder" = callPackage @@ -213150,6 +213012,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio-pool" = callPackage + ({ mkDerivation, base, resource-pool, time, transformers + , unliftio-core + }: + mkDerivation { + pname = "unliftio-pool"; + version = "0.1.0.0"; + sha256 = "13l0shpg0hmfp5n4rqfd6vl2x820w3558msy915qacbxfqvjis4x"; + libraryHaskellDepends = [ + base resource-pool time transformers unliftio-core + ]; + description = "Data.Pool generalized to MonadUnliftIO."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unlit" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -213940,6 +213817,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "urlpath_8_1_0" = callPackage + ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph + , monad-control, monad-control-aligned, monad-logger, mtl + , path-extra, resourcet, split, strict, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "urlpath"; + version = "8.1.0"; + sha256 = "0gv5mjhhmxq5zppda431vddpcl138qglxiyksj588d4zzg3kd8iy"; + libraryHaskellDepends = [ + attoparsec-uri base exceptions mmorph monad-control + monad-control-aligned monad-logger mtl path-extra resourcet split + strict text transformers transformers-base vector + ]; + homepage = "https://github.com/athanclark/urlpath#readme"; + description = "Painfully simple URL deployment"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "urn" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -215882,6 +215780,8 @@ self: { pname = "vector-sized"; version = "0.6.1.0"; sha256 = "08bqyvkxs2bbbm5ljsymj178iiqp6izzbchlzav7hmwmj893wvjd"; + revision = "1"; + editedCabalFile = "0lcm7gdzqnp5v0rfd9f611yspa493j4azdj3gzy71398z3zda5w4"; libraryHaskellDepends = [ base deepseq finite-typelits vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -218283,29 +218183,6 @@ self: { }) {}; "wai-middleware-static" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptonite - , directory, expiring-cache-map, filepath, hpc-coveralls - , http-types, memory, mime-types, mtl, old-locale, semigroups, text - , time, wai - }: - mkDerivation { - pname = "wai-middleware-static"; - version = "0.8.1"; - sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; - revision = "5"; - editedCabalFile = "1lb4whil5x1arjb3503x8j9i3wmf678ii1dx0paqqx7dchs6cfwl"; - libraryHaskellDepends = [ - base bytestring containers cryptonite directory expiring-cache-map - filepath http-types memory mime-types mtl old-locale semigroups - text time wai - ]; - testHaskellDepends = [ base hpc-coveralls ]; - homepage = "https://github.com/scotty-web/wai-middleware-static"; - description = "WAI middleware that serves requests to static files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-middleware-static_0_8_2" = callPackage ({ mkDerivation, base, bytestring, containers, cryptonite , directory, expiring-cache-map, filepath, http-types, memory , mime-types, mtl, old-locale, semigroups, text, time, wai @@ -218322,7 +218199,6 @@ self: { homepage = "https://github.com/scotty-web/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-static-caching" = callPackage @@ -220690,6 +220566,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind_0_1_2_0" = callPackage + ({ mkDerivation, base, containers, hspec, microlens, QuickCheck + , semigroups, stm, text, transformers + }: + mkDerivation { + pname = "wild-bind"; + version = "0.1.2.0"; + sha256 = "0c1nb713p11pd89ykwz76i60sk437q9cy48bingiiig1g9dfg3p6"; + libraryHaskellDepends = [ + base containers semigroups 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wild-bind-indicator" = callPackage ({ mkDerivation, base, containers, gtk, text, transformers , wild-bind @@ -220745,6 +220641,27 @@ self: { 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 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.2"; + sha256 = "0vf6jm5gw76hcrwrqmfrq8niwh4z5p2wg0j0rh74wn9vbs6cm8cl"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wilton-ffi" = callPackage ({ mkDerivation, aeson, base, bytestring }: mkDerivation { @@ -225626,6 +225543,37 @@ self: { 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 + , 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.3"; + sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -226216,6 +226164,47 @@ self: { 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 + , 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.3"; + sha256 = "0k2gwnbrpwwbna03bbi53fppgyn7x5g9167jyjcfyjb8qfn4pwxg"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -229558,6 +229547,27 @@ self: { 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 + }: + mkDerivation { + pname = "ztail"; + version = "1.2.0.2"; + sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ From 120a7ffb55526da01e81c782e0fae70c6560fe01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Apr 2018 10:18:12 +0200 Subject: [PATCH 1702/2743] hackage-db: update snapshot --- 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 b359f9ce7a60..781f57610e0b 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/3f7d88041d19d251bca6330e9008175875c0ed4a.tar.gz"; - sha256 = "18aymxbm7zhmh8jciq2p1hjdfwq5g31s5mmw3lqwaviigcisq22a"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b35023f435e7713e5053d3dcd16691e3aff48227.tar.gz"; + sha256 = "1mnh1bhr8caszxrl44l3iig8kshq7djibnmy0sx0q7inj260xcs7"; } From 726ee1dbb8fcca6a71998a0e828b09f5a2c00944 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Apr 2018 10:35:38 +0200 Subject: [PATCH 1703/2743] git-annex: update sha256 hash for the new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6d33dfd940b9..bf489d623943 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -82,7 +82,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0qi5wpsvw6g8xrri1pr0401370acs5sg75myr0h5mjad6pvqc667"; + sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); From 3f78f4c64ef6db0e8885ee5ce85a72a169923429 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 02:32:47 -0700 Subject: [PATCH 1704/2743] 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 309b483116a177e337eff5ef7e5406e349e3d8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 11 Apr 2018 10:43:38 +0100 Subject: [PATCH 1705/2743] radare2: 2.4.0 -> 2.5.0 --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index d70332749d98..844267b7adb8 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.5.0"; name = "radare2-${version}"; src = fetchFromGitHub { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { capstone = fetchgit { url = "https://github.com/aquynh/capstone.git"; rev = cs_tip; - sha256 = "1b126npshdbwh5y7rafmb9w4dzlvxsf4ca6bx4zs2y7kbk48jyn8"; + sha256 = "19vfgdfykmi3cfs4x1acxy0gnwggjjc8qq46pybqvcksbi11nw1k"; leaveDotGit = true; }; in '' From c44cd4c2e3a03c089eb930e68b621e741b2fd219 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 11 Apr 2018 05:59:21 -0400 Subject: [PATCH 1706/2743] elpa-packages: 2018-04-11 --- .../editors/emacs-modes/elpa-generated.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b550f31ff99b..6b05e9fe28b1 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -713,10 +713,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.5"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.5.tar"; - sha256 = "1apsb08ml50nacqa6i86zwa2xxdfqry380bksp16zv63cj86b67g"; + url = "https://elpa.gnu.org/packages/ebdb-0.5.2.tar"; + sha256 = "09ff6kf74r6hg3m6lryrjr2rrczm9h702jpkap71xrj0fk4zfb5c"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -768,10 +768,10 @@ el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.6.3.tar"; - sha256 = "1yd8qlq95fb5qfmg3m16i9d5nsmkkgr12q0981r5ng06pc0j4al6"; + url = "https://elpa.gnu.org/packages/el-search-1.6.5.tar"; + sha256 = "1iw13ifyrga2r2xz63zhjxiy541jy4p2rp3a8fgb22sjw1zi8n7w"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -931,10 +931,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.4.1.tar"; - sha256 = "0080jcr10xvvf2rl7ar01c6zmzd0pafrs6w2l8v4cwwapyhv0dcd"; + url = "https://elpa.gnu.org/packages/gited-0.4.3.tar"; + sha256 = "07sjrh7900v5gkjzac2hh05ygywp6k4803ikc3wj3x22yrc9l8bx"; }; packageRequires = [ cl-lib emacs ]; meta = { From 58fb81f3588e313c1a65f68b20ff7a228399439b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 11 Apr 2018 05:57:58 -0400 Subject: [PATCH 1707/2743] org-packages: 2018-04-11 --- .../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 4af93ceb0bc5..2cf2c50bf714 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 = "20180402"; + version = "20180409"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180402.tar"; - sha256 = "0gb8hh26jzjqy262ll8jl3ym0cpw6s17id2gizv5qvw18knxs751"; + url = "https://orgmode.org/elpa/org-20180409.tar"; + sha256 = "0vnyh30pqnpfwmkm2gmidw00mgrwsbvxmjv40yhrv7144392iisl"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180402"; + version = "20180409"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180402.tar"; - sha256 = "09q5nr0ka7z719mi626wj5d51bcvdb08gk4zf94dzpks0gsqiikr"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180409.tar"; + sha256 = "18zb6vx06gwxgy85a5fmvjwb8fqb4cn74n1mfk64p3acnsnwikkg"; }; packageRequires = []; meta = { From e66b6427649b39df897f1b0ac9bbcf7aa96c31ea Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 11 Apr 2018 06:05:03 -0400 Subject: [PATCH 1708/2743] melpa-stable-packages: 2018-04-11 Removals: - fm : purged from emacsmirror - fold-dwim : purged from emacsmirror - hl-sexp : purged from emacsmirror - osx-plist : purged from emacsmirror --- .../emacs-modes/melpa-stable-generated.nix | 382 +++++++++--------- 1 file changed, 191 insertions(+), 191 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 83f6a56da0af..7302bc1d7550 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -2408,6 +2408,27 @@ license = lib.licenses.free; }; }) {}; + banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "banner-comment"; + version = "2.5"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52"; + sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "banner-comment"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; @@ -3608,12 +3629,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.1"; + version = "4.7.0beta2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56"; - sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7"; + rev = "c0bd6a27e138911560f43dc75d5fde2ade4d6cfe"; + sha256 = "0z08mpvfa5jvbdxkx9wlarn1zpp01aaxasmy63cz452jr8zg0nll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -4233,6 +4254,27 @@ license = lib.licenses.free; }; }) {}; + citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }: + melpaBuild { + pname = "citeproc"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "6d68f52ebd150e035b33dcaa59d9e2aceab69b84"; + sha256 = "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "citeproc"; + }; + packageRequires = [ dash emacs f queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; @@ -5514,12 +5556,12 @@ company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; @@ -6522,12 +6564,12 @@ daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "daemons"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "cbowdon"; repo = "daemons.el"; - rev = "75b54be70a909282b20c872b5f01d30e18e19f84"; - sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c"; + rev = "9e6868e2559ea7d70fbad8c419798124f406cc40"; + sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; @@ -7236,12 +7278,12 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "8144c013d46c55b0471f31cdc3b5ead303286cbf"; - sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; @@ -8250,12 +8292,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "easy-hugo"; - version = "3.2.23"; + version = "3.2.24"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "161354d0f06e2cdbe63610fb11880ae54e050181"; - sha256 = "12dxb0kzb02h6zal65n6bviy3zdkqjfbzsf7ncsbbmq8f1xrajmc"; + rev = "fbcd7dfd737e6ec90f7bee6a911ff66e86577a64"; + sha256 = "1yabqf8mksadfab7pfk87a3yimda3x6la2kvrxf76kbzbl23h3dx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -8271,12 +8313,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "1.6.12"; + version = "1.6.13"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "faeff895ab2aa0ee9c6df18046817e8a3f0b62a1"; - sha256 = "1dp1r16rr5gqbh3aw900v2jz146c3qnlbjf5k75fazdglkbnagxk"; + rev = "742366a2eb8bdb3d91e108e701ca8a1e83084671"; + sha256 = "1i3pxg5mskbk2zmcavbd78sr9l45qqcjjfp3p0i8q5kbm9zjr5fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -9140,12 +9182,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; - sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -9840,12 +9882,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.13"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; - sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; + rev = "ccc0090ba1ebaad6bd3b079d6d810e9a051218b3"; + sha256 = "1jy7zc26ypwl46ag26gbspbn7p4lf3jxgb34l8blqzk8qn8fxz0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -10777,22 +10819,22 @@ license = lib.licenses.free; }; }) {}; - eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773"; - sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33"; + rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec"; + sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; name = "eslintd-fix"; }; - packageRequires = []; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/eslintd-fix"; license = lib.licenses.free; @@ -11344,22 +11386,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 = "3.1.3"; + version = "3.2.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "41d43709210711c07de69497c5f7db646b7e7a96"; - sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; + rev = "8f6fafcce901a7a588f946b26d2e21c65e36e843"; + sha256 = "0pldzwvkic9ikrgzrvmcaq6y0yjplxinvyh61iqlgw2k7k8jld1f"; }; 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; @@ -12047,12 +12089,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.4.5"; + version = "1.0"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "4a79230739cfaa607f39fbfe53339692b83c3933"; - sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8"; + rev = "a2bdda95f840c15240975c32b66d4d1e0682a1e1"; + sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -12358,6 +12400,27 @@ license = lib.licenses.free; }; }) {}; + fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + version = "0.9"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "e819fca19a138ae67201220e41fe1d4384fb2a42"; + sha256 = "102aalb7bfvjgf1klqsx6mn5a4vfjq63kwn7wqs9cmlib1mp8vnf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "fill-function-arguments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "finalize"; @@ -12403,12 +12466,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.6.0"; + version = "5.6.4"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "ad6c8fce30ac927b4c2297894b6436e1cf724501"; - sha256 = "1mq544h03laphwvcff2qaxdbb7krmnw1vxmnc9jchz8ascx2x28n"; + rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361"; + sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -13208,12 +13271,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; - sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -13334,12 +13397,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "0.7.1"; + version = "0.8"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "bb814165f12ad25d93f6c224502887c89089e750"; - sha256 = "14g3ia2nr12068rq1695lz5xnm30x8ngbcq1pxqf0pmaka4akf8l"; + rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7"; + sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -14024,27 +14087,6 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "1.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "6266840de17ac396dd7275a71da72cd5120c35a6"; - sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fn"; @@ -14087,27 +14129,6 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fold-dwim"; - version = "1.2"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fold-dwim"; - rev = "4764b0246a722d37eb8ec9f204ffaccaad1755d0"; - sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fold-dwim"; - license = lib.licenses.free; - }; - }) {}; fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: melpaBuild { pname = "fold-dwim-org"; @@ -14518,12 +14539,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "631c493b97b3e2f928892fb25fa29daca4927f83"; - sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68"; + rev = "7b3af8ea3d4985682464bfeb174376da8f90c5da"; + sha256 = "02q6gc7wj02vmxnhh58a6yy5wdjhd2fmk935dh70dl3fs0yqr52p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -17319,12 +17340,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; - sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; + rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28"; + sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -17655,12 +17676,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3dda0089ace4696cd5cfd397d5f5710fd3374e69"; - sha256 = "1r7jwp3l0n77zxvsl3h0rf4jff2ah0kpn3cgxyinl98js95w8fgy"; + rev = "d5b9404176c41b16dffe522d45d08bdc7cb60e28"; + sha256 = "0mr5jllsargsbw6xrqpacxi40nx472sd5qhbaf5a6ydc6l1qyqyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -18768,12 +18789,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3"; - sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz"; + rev = "f1aeafd3de4d434fb89b9f65b863c9a53a7d2feb"; + sha256 = "194f2in1k4g9fm66q63ayqmrg5shj807nq4phmkgfm02p1hj7v5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -19332,27 +19353,6 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; @@ -21098,12 +21098,12 @@ ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: melpaBuild { pname = "ivy-mpdel"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mpdel"; repo = "ivy-mpdel"; - rev = "271673afc60fdb78052cbee390f2f4e6db0f83ec"; - sha256 = "02ijq7z3j3hzaazpgdf38n02w1yid2702nc7n46bg0zs2dl10p53"; + rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; + sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; @@ -21978,12 +21978,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "8a229fcd1d73876920a063f0eba906a5080275a7"; - sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911"; + rev = "0a80628e083db6e9d4b4af73be5d917d7d667330"; + sha256 = "1brb0l39xkl19h9xslvmms9vcziygfp244xs5r3n4dqn43c7rr68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -24289,12 +24289,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; - sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; + rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788"; + sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -24939,12 +24939,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "da23ef64d4848636e47a026259526575381bd164"; - sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -25820,12 +25820,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; - sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -25967,12 +25967,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "d5e839692a1273b128003eaed543318e7e5965a7"; - sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz"; + rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660"; + sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -26132,11 +26132,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.26"; + version = "0.26.1"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583"; - sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f"; + rev = "ea690a44d1a5af3da496b0d9482471cbd9623231"; + sha256 = "0c9ihkwg2p2sq1zkribbc4k60sl5zdi3sgcy0v2amydsk5kkfy3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -27336,6 +27336,27 @@ license = lib.licenses.free; }; }) {}; + org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-index"; + version = "5.8.7"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "2cbd9da2c7a6e4039e32665675370ae4e2b8e6cb"; + sha256 = "10gm329bnbzjr8d0syw90iniann46mb5mirviy9r2q9w6xqjkbd0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "org-index"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "org-jira"; @@ -27357,22 +27378,22 @@ license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.13.0"; + version = "1.13.3"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "5fddd231b9848f09daab3f0928e4d6e570b15174"; - sha256 = "1xl5nkndvlxv5in6x2lq9lkvafqh7zwyyzr6vrcdp1wv4qb207m2"; + rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800"; + sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; name = "org-journal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; @@ -27811,12 +27832,12 @@ org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "8ea4456b0ca5642fff5868e54fe23f3b5109a579"; - sha256 = "0zh1vb6q8xwaawizv9rq86ahpvxsmrjrzhgh6k4xv6rx8k7k1i7g"; + rev = "ab4ad93a23e5402b5276c061945872dd6d586e75"; + sha256 = "07j4gyw22372nlfbaf94w6a7pza01zp6ivsg9iq2hcnx5pniv7hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -28342,27 +28363,6 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; @@ -30990,22 +30990,22 @@ license = lib.licenses.free; }; }) {}; - psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc"; - sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53"; + rev = "c48b0574e1477437b4427e78d018f858b49fd0ff"; + sha256 = "1ffgnkdvrryc84cw1m5k37zx22dd5l7z882zgfh1p3dfzh8rqpqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a"; name = "psession"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ async cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/psession"; license = lib.licenses.free; @@ -32560,12 +32560,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "562ac6fd6291f828ee6116db62982c77ddd52956"; - sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw"; + rev = "63226e8c93e55538855c9b24bfa03c86dc23b79d"; + sha256 = "1zzh2cf6lsrsh6nzlcfxqs4il9dw5fc70x5apvrvp08mpqdzcj1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -33295,12 +33295,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "b44b6d346604f8d1ef9b9180be359ce1e601a298"; - sha256 = "0ggk60l132qgscgqbx4fdhzx6nlv2k7gbrjapkdl15slz2kyq03d"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -34889,12 +34889,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; - sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; + rev = "d0ff4dea49540f37301d869f2797fca2492f55d5"; + sha256 = "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -36168,12 +36168,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "557b1eb96479cc6c73b9b7d509dd60b0ee71934d"; - sha256 = "01r8754ckbzsvlmnbpwpx2j33q693cmg5a59i5d77adn24ssk4f4"; + rev = "fff67d190440fb076104f0f52d55a5e098207e31"; + sha256 = "0ia4nnyhk84dkahsan8l8dslmqiv0afs5abc1w2fnql7zhsiac6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -36882,12 +36882,12 @@ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "tidal"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; - sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98"; + sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; From be8c2c003c9a6f3b61bec00afe16a015ff6d213d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 11 Apr 2018 06:07:52 -0400 Subject: [PATCH 1709/2743] melpa-packages: 2018-04-11 Removals: - escreen : purged from emacsmirror - fm : purged from emacsmirror - fold-dwim : purged from emacsmirror - hl-sexp : purged from emacsmirror - ldap-mode : purged from emacsmirror - list-register : purged from emacsmirror - osx-plist : purged from emacsmirror - psvn : purged from emacsmirror - quack : purged from emacsmirror - vkill : purged from emacsmirror - x-dict : purged from emacsmirror - xterm-frobs : purged from emacsmirror - xterm-title : purged from emacsmirror --- .../editors/emacs-modes/melpa-generated.nix | 1687 ++++++++--------- 1 file changed, 833 insertions(+), 854 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 2a1a5cd320c3..a1e079b57283 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -673,12 +673,12 @@ ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-octave"; - version = "20171122.943"; + version = "20180405.2034"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; - rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138"; - sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4"; + rev = "fe0f931f2024f43de3c4fff4b1ace672413adeae"; + sha256 = "1yj5fapbp79k88k1cxrmmf91fb0j6s4s7f2dhk2afcf7z83mqkwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave"; @@ -1531,12 +1531,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20180122.1242"; + version = "20180403.38"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "103d34c83fe77e46a6976dcaba3db678199e0c9c"; - sha256 = "1nbk768d8iqjf1mx956497hbjfxar144h3m3sd298byc54z8bvmf"; + rev = "667d9c7848c723eb392ab9bacae07966da3e3504"; + sha256 = "04nrl7kg5pprfdxjbqjyh7vw0vs22bplhhpaf30v3hw7k7nkc0ky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -2673,12 +2673,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20180119.533"; + version = "20180408.844"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "7279cc6bdba7bfcb53ca8f5471631ae8dc3918b3"; - sha256 = "1nmi2ykwbswj6qv2s38518nijmlhjd2jvhabybqs8smc152g58sw"; + rev = "8bb64e398897d1cc000fc295c5157b4ad1a7bd5b"; + sha256 = "04384akcxirvfcl5rb07hj5xaw2crsgnhbnwyh1dkmy56qak60a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -3534,12 +3534,12 @@ auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170916.1304"; + version = "20180408.310"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92"; - sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8"; + rev = "e2628408d4e67e1b1714cf7682cff9405e735c81"; + sha256 = "1cj4a6yay02gvi04lyhnfb7gws8jrappprnv36mcqlq053202wij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -3786,12 +3786,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20180205.2254"; + version = "20180406.2220"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "1a119d0b52f0755fa14ad4d8c6e00e2e720b7732"; - sha256 = "1im1bvrcy9163414328yfmsz2hb0whqxnd6wpmh8hvh6vpbmwaj7"; + rev = "6abf91ecdaeb16a3a5529b0d5abef9756da1f68c"; + sha256 = "0hvg8yp7prfl1n71lkyr9l43f3zm1zsh8n2mh26rmdw2chippr4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; @@ -3933,12 +3933,12 @@ aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "aws-snippets"; - version = "20180213.835"; + version = "20180410.845"; src = fetchFromGitHub { owner = "baron42bba"; repo = "aws-snippets"; - rev = "619c9a401f873042e45547e8cf57f23d0c8947e4"; - sha256 = "19yrdsn76vscqgxmapxn3gv6nrxp7i20p37anylmjss3xkvblxn9"; + rev = "a2ebae582a8c8a5f5f16dbc42ecd2ded9d70fca8"; + sha256 = "08mbi5g321n4ir7a7ggxmh7qpl8pr06pg4rcsk8pklylvkf89k2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; @@ -4146,6 +4146,27 @@ license = lib.licenses.free; }; }) {}; + banner-comment = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "banner-comment"; + version = "20180403.1438"; + src = fetchFromGitHub { + owner = "WJCFerguson"; + repo = "banner-comment"; + rev = "9b1c9a94f8b6789c890a7e7eedd6f60ad5aa4d52"; + sha256 = "02wsnmzbb60d4a8bsb5kywdwcfsqb6chcchs5v2d0s3sacakbmnl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb69f15cb6be38a86abf4d15450a29c9a819068/recipes/banner-comment"; + sha256 = "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc"; + name = "banner-comment"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/banner-comment"; + license = lib.licenses.free; + }; + }) {}; bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bar-cursor"; @@ -4781,8 +4802,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "8118551aaf0472900cdfdc13449b55b33ab56289"; - sha256 = "153cch134c6rvqfcpikidlpxcbxk8nys2ig1xxpbn9ncn4fqkaf3"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; @@ -5131,6 +5152,27 @@ license = lib.licenses.free; }; }) {}; + blacken = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "blacken"; + version = "20180402.435"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "blacken"; + rev = "528527c832710aa1ceeb4c42ef85b5a37d2e213a"; + sha256 = "1my234bsv5db99hhr66n2yhh3knvv4xwg7q05y408qbhrcf3ya5l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken"; + sha256 = "16lbs76jkhcq0vg09x1n8mrd4pgz5bdjsprr9260xr7g3dx8xacc"; + name = "blacken"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/blacken"; + license = lib.licenses.free; + }; + }) {}; blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blgrep"; @@ -6603,12 +6645,12 @@ call-graph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hierarchy, ivy, lib, melpaBuild, tree-mode }: melpaBuild { pname = "call-graph"; - version = "20180327.2003"; + version = "20180403.2002"; src = fetchFromGitHub { owner = "beacoder"; repo = "call-graph"; - rev = "f000f7f620eff965bf289216f66cfb27ddb1815d"; - sha256 = "1qgfz6v4yaa7c9cn82jqkh0s1mmzyr5zlrxd6g4hiv4f1pvf0is2"; + rev = "31bfac00f33b8494fcf6c18a210dd7ed4b81a21d"; + sha256 = "00ajq1xkm9hmk92vrnvmgkrs65jlx1rl1hxghf9id4gx09yy011s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; @@ -6670,8 +6712,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "8767cbafb1390685d08f294496492b97996468a3"; - sha256 = "0by86qm6pic3d0iqqdswhdlgicg7nxmh3mqwn0pz38dwfa57rqky"; + rev = "4609ceb9d69ac274b447eadf7b70599f7426a97c"; + sha256 = "05frlvxf4dz27d50h6jdgbkfdz1g3lgy1nx2n0ci1sp9yi5n3gm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7068,8 +7110,8 @@ src = fetchFromGitHub { owner = "andre-r"; repo = "centered-cursor-mode.el"; - rev = "75b479ffbfc5e3fed25d86a72afa2f1d2dcbd4b5"; - sha256 = "0xsnnjql7am94imr8v5aps2azlcvqn9lgq33cnwnwz6y8ffszmpf"; + rev = "00fb47d227f9e211ec1c58161a501a1550c3a60d"; + sha256 = "0yd78k28dp139a889q5nh8fdbc59jl227anasg5695bz8bkzavd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; @@ -7173,8 +7215,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "fb827edc6fd0baa6502f5655dd743e59b71ff395"; - sha256 = "03aiqvzr9qmqsi9h9yjjqbvr9d7wchip9hmadhadr62cb43c9bc7"; + rev = "94d364a917682a7331c6543bf551a6541b848cf2"; + sha256 = "12fynh61l7aza3p4r9ag04r912lzh5pspn4rsacvlsz0ypgk325v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7778,12 +7820,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180331.1751"; + version = "20180402.2126"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "c4f164329c96c03b0002a40f088163d05093d988"; - sha256 = "08fp9ys8clilm4my1jxpjzglbz1qijrjh71h0sjr2a4g0kzb071n"; + rev = "918789346ec9b06991050e5be13e70641b6add47"; + sha256 = "0z9d4ijky0pcqvdkqi9xmcl8zzvr8j0s6zbrkg934mnjhqgp6jc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8006,6 +8048,27 @@ license = lib.licenses.free; }; }) {}; + citeproc = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, queue, s, string-inflection }: + melpaBuild { + pname = "citeproc"; + version = "20180325.2358"; + src = fetchFromGitHub { + owner = "andras-simonyi"; + repo = "citeproc-el"; + rev = "b15e3cadbcbbe777b809a32859e341e2ef212c13"; + sha256 = "1axl3b31ylp8y2vsf853j8d8wb1wsizwi605qfxj5aj8xafbgbb5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20aa56e9a4809cee1082224b1b4e65921a48bda1/recipes/citeproc"; + sha256 = "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq"; + name = "citeproc"; + }; + packageRequires = [ dash emacs f queue s string-inflection ]; + meta = { + homepage = "https://melpa.org/#/citeproc"; + license = lib.licenses.free; + }; + }) {}; cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; @@ -8261,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 = "20180330.213"; + version = "20180406.633"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "b2304321c36275c54fea40560af470f9dc8de31f"; - sha256 = "0d4kvwmkqxz9vwrz0gy1z5037jqhvganh3cbrlgp7ljdzk97c6sr"; + rev = "ab081b26b92f6a1c7ebe8fb7ff9803d46b07ae84"; + sha256 = "0srp9xxln9hai1pdvc53jixridzrrz6i6xsn3f96knr46abhhdp0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8672,12 +8735,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20180320.413"; + version = "20180408.1140"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "5dea1e8e002f26fb43aedbed11b83dc80071b771"; - sha256 = "06nad57cp9wgyj3xfdah6hjhfffgqcblw5nz2pa0ay86kmwxcac1"; + rev = "a584f5397df72b565a63ec53b26e93aa07e14773"; + sha256 = "0hrala1rjn9n7my56la6vd06hzdsq4ccnrlajnir6h60r4k7fvj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8697,8 +8760,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "323d6b4c75baa450fe12f8609cd8f9db2260b1db"; - sha256 = "0bsgrbnm8vg8mzkb8p93ba8ss5cg5hkwrag5a6wa4r2ya05ww6gl"; + rev = "7eecf8ca50247faefe4f854aa075331f9d2dbe15"; + sha256 = "17xx5hgv2zk96i1v4r5hy9dgbbzyx7z38rk7jhzqa47g6bmxgvjy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9621,6 +9684,27 @@ license = lib.licenses.free; }; }) {}; + company-box = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-box"; + version = "20180410.334"; + src = fetchFromGitHub { + owner = "sebastiencs"; + repo = "company-box"; + rev = "1b8399075f64ccefd61bd974c2735641817da4ca"; + sha256 = "0aw33q7qscn0vkpii7ipl9pn6gw2ii3rsh303x2igwm9yav0v92l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa432efc9be5e3ae8f91154a6718cdbd100bab6f/recipes/company-box"; + sha256 = "1kn4xv17rwmw31466lvjhb1hhfxsslnm4227n82s70lyswcjrinh"; + name = "company-box"; + }; + packageRequires = [ company dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/company-box"; + license = lib.licenses.free; + }; + }) {}; company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-c-headers"; @@ -10265,8 +10349,8 @@ src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad"; + sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/company-pollen"; @@ -10411,22 +10495,22 @@ license = lib.licenses.free; }; }) {}; - company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, solidity-mode }: melpaBuild { pname = "company-solidity"; - version = "20180328.1656"; + version = "20180407.1344"; src = fetchFromGitHub { owner = "ssmolkin1"; repo = "company-solidity"; - rev = "0d15727a29adaeb87ce30459053bf434c9d8b6d0"; - sha256 = "1rg7x6px3pzckzyivg7x2ml6r18c6anbjrk9y6xxsxmy5wvbml37"; + rev = "32bfe4c8fe282c30ebf4f5cf1f9285f151c8e6d4"; + sha256 = "0qgvxpij5zwwvdqzi2yf2f52vgmky4xwz9v4smrkcx29k88ivlg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6"; name = "company-solidity"; }; - packageRequires = [ cl-lib company ]; + packageRequires = [ cl-lib company solidity-mode ]; meta = { homepage = "https://melpa.org/#/company-solidity"; license = lib.licenses.free; @@ -10561,12 +10645,12 @@ company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; - version = "20171111.1049"; + version = "20180402.455"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; - rev = "935c65de0411ebbcb4f2223f31e756e093eaae07"; - sha256 = "0kw0fc1lg7qd23fx26y9m543sql32n1dlvr4rg7bmq6im7dwz4hy"; + rev = "f0cc9187c9c34f72ad71f5649a69c74f996bae9a"; + sha256 = "1xcwwcy2866vzaqgn7hrl7j8k48mk74i4shm40v7ybacws47s9nr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web"; @@ -11065,12 +11149,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180328.1326"; + version = "20180409.1120"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; + sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11338,12 +11422,12 @@ cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cov"; - version = "20170405.1508"; + version = "20180407.1546"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; - sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; + rev = "222d3e51f86a76a976872ff2a2bc6d3188f4ff96"; + sha256 = "1r8igz8gcb5vb4mpvlnkgzbpzc86xx5cqy9kb3dzbgvd9pn6h2lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; @@ -11993,8 +12077,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "7f3c7a7cfe60f98da46e6958bec62bac4675ccd2"; - sha256 = "096523m3spfqw72zp2rzcf1b54997yzs7qxwvr3awhicah1z6mv0"; + rev = "bf8253f482917e390fe8b44ceaf308405afeefc6"; + sha256 = "1ff4gq1bjm0j1wi58lsv5fazkjcq4ay01n4k55nhd34pgk0rbnv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -12245,8 +12329,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "d52624db23a1b13aad75691c8ad3e9b0a1b34439"; - sha256 = "1fyxsvl1qr8i3n92ydkn5b3iw6xk2hsp6rbchjhgymx4g45zx4n0"; + rev = "73e83c248c0055e85c5d517aaf01db3f63560b53"; + sha256 = "07hgqcy5zcvmwbvbpsggyj59lgqkq7fbiqsyk237dpgbprjmhncw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12280,22 +12364,22 @@ license = lib.licenses.free; }; }) {}; - d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + d-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "20180215.727"; + version = "20180409.1043"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "8d0ed0460189d0e91fa454866c1ed7b9b36f99e2"; - sha256 = "0pdg6s10vcr95r2azin1svkdgn8grlgwi4di30d0f3vcq8jmmfhi"; + rev = "09745ba713e08a02fd81c01824aefa6731992a6f"; + sha256 = "0l1rpdfjhwbhzrs1z54s57j4zahx62mym9rdld0rb41ph3k4l49q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2"; name = "d-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/d-mode"; license = lib.licenses.free; @@ -12346,12 +12430,12 @@ daemons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "daemons"; - version = "20180310.1147"; + version = "20180408.301"; src = fetchFromGitHub { owner = "cbowdon"; repo = "daemons.el"; - rev = "75b54be70a909282b20c872b5f01d30e18e19f84"; - sha256 = "0jv1i66b035yvj2mj83ihylk6vv7skljnr6kxa15zzj4daw9462c"; + rev = "9e6868e2559ea7d70fbad8c419798124f406cc40"; + sha256 = "00ijgm22ck76gw0x79krl05yy0m8a502yfakazfy5xhpn1zi6ab7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; @@ -13207,12 +13291,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20170628.1503"; + version = "20180403.2032"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "1e8b42ff6479fa541eeec5699b4727af136d40da"; - sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6"; + rev = "4f74e6f1bb6519587303e20fe59470853b1a0352"; + sha256 = "15j4f7jjjhrcjycxwzqnwqhm3fyvjnisd41k5lw13dnhbmp1gzx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -13333,12 +13417,12 @@ dhall-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dhall-mode"; - version = "20171204.1327"; + version = "20180409.1255"; src = fetchFromGitHub { owner = "psibi"; repo = "dhall-mode"; - rev = "bc6aec777594beeac6ba4c6dbfb1c889341589c9"; - sha256 = "0vfkdj1fyykmylh6gg9igpiylb2n7bd4iqq1gl5mdqid8gsv4sgl"; + rev = "7c9bbb7c1f8ca7f700b45c26a64ca8e0143543ae"; + sha256 = "12swhpsl86pi21smvggqszn1wl71wrw15x7nybcmfgjb4d403716"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; @@ -13693,8 +13777,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13714,8 +13798,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13794,12 +13878,12 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "20170413.747"; + version = "20180402.2308"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; - rev = "f55b69e5cd1d45699a0f37468ac8e20fa7a0cff6"; - sha256 = "193mf90d5vds8hswkxasda267ifr6w55vn4pph15lkbmp33wa50n"; + rev = "903d7a736d240ef7352989a4e5d0ff9129c2ee3c"; + sha256 = "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a0ddc10b11772d72a473e8d24ab4641bf4239a4/recipes/dired-fdclone"; @@ -13840,8 +13924,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13861,8 +13945,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13987,8 +14071,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -14008,8 +14092,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -14050,8 +14134,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -14067,12 +14151,12 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20171229.753"; + version = "20180401.1506"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -14134,8 +14218,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; - sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; + rev = "89af4f12ce4a0692c9c9824eacf56875ca86cb36"; + sha256 = "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14235,12 +14319,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20180307.748"; + version = "20180410.203"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "78bb6894348b1d958aa8947837db4b3bceaa55bb"; - sha256 = "1i37pylq6gh9144vhf0lxqnkzcwqhaq7vm18f64qajvcv3rj5s84"; + rev = "bb0de5e8f662c3f522b931c6e2c2340e4ed682af"; + sha256 = "1mk35k0iiyxk5s8ymcx94fhyz188i8r51r73vnndm868g86yslzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14759,12 +14843,12 @@ djangonaut = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, pythonic, s }: melpaBuild { pname = "djangonaut"; - version = "20180325.429"; + version = "20180403.302"; src = fetchFromGitHub { owner = "proofit404"; repo = "djangonaut"; - rev = "7be5cb25bee8a9410d5c95139704620c68fd6efa"; - sha256 = "1vpj5g7x688y3qzhv6566rkgwdzi0qi1pgj4xqv0059a29i9z4yz"; + rev = "501ecb3cd927975a19ed8beeacb326e01715b78c"; + sha256 = "1h47skyx9yfcgvj5k53h3c40am191dwjw5hyq9jgmc3fkg2dr95j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c/recipes/djangonaut"; @@ -14948,12 +15032,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20180222.717"; + version = "20180405.2353"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "ec2b07255e273639ff76303778661f81c5b74000"; - sha256 = "0nlf3rw9xa9hggqkw6nxfswbqlnsgbliz9z652kp7c9hfikfmcsj"; + rev = "551ae639d84711acb705939a5b90f25bc01b5838"; + sha256 = "1748j4w9nzbw70vq5q2261fphpnz4a64hl1yn1yswa5rcm325i0p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -15040,12 +15124,12 @@ dockerfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "dockerfile-mode"; - version = "20171124.1647"; + version = "20180410.936"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "4ab78f678e9ee40c7c5729dc8f1f5c1a847be2e7"; - sha256 = "0dc3pfqf6nrwnqsiyn49l0pgq7rm31kciwsqagnrjnc85nnbpf9m"; + rev = "818e6946fcf2d58438ab78ea06761a372cc5435a"; + sha256 = "0mqb09jcqi74hbn7869gng85sac38mc1hylzcwh7d5qlsyl9dg08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -15837,12 +15921,12 @@ e2ansi = callPackage ({ face-explorer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2ansi"; - version = "20180327.1323"; + version = "20180403.1215"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "e2ansi"; - rev = "e7f8512c2c6be2b1c4cc22f00d41d073562c2249"; - sha256 = "1q4ld4qk230yglqfmgl9dg45kn1252yfrw8pjhm1m361pypcnlw8"; + rev = "f886e687d50ff58063a92d40623f2400fa913af0"; + sha256 = "0wg16hdmhbhll0ffp2hrqmr12ddai2s6gql52q6pz9k3lw6v0d5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e/recipes/e2ansi"; @@ -16089,12 +16173,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "easy-hugo"; - version = "20180326.2215"; + version = "20180403.439"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "161354d0f06e2cdbe63610fb11880ae54e050181"; - sha256 = "12dxb0kzb02h6zal65n6bviy3zdkqjfbzsf7ncsbbmq8f1xrajmc"; + rev = "97733f78e034fd955df7871c1cf92627e329a0ea"; + sha256 = "10y5h8mj4c81mlyna801wc6ygxyix41d0hzlvvs9pja34i5zljmh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16110,12 +16194,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "20180327.342"; + version = "20180402.9"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "faeff895ab2aa0ee9c6df18046817e8a3f0b62a1"; - sha256 = "1dp1r16rr5gqbh3aw900v2jz146c3qnlbjf5k75fazdglkbnagxk"; + rev = "742366a2eb8bdb3d91e108e701ca8a1e83084671"; + sha256 = "1i3pxg5mskbk2zmcavbd78sr9l45qqcjjfp3p0i8q5kbm9zjr5fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -16660,8 +16744,8 @@ src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "f01f5775760d73a8b0975d8caf009c3b1e7b2229"; - sha256 = "1rri1h1ilhmyspp8krbqh2qz4f4wigmxk8kwvg39pr4mmma3dz4f"; + rev = "e1f86b4ff0b8b872a121287bde4875a7c3c4f8e2"; + sha256 = "0vxahv098bh3bk8iphj7nvvajf31mc5yr9l1fzs127qvy2x62b0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16698,12 +16782,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20180329.2148"; + version = "20180408.2210"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "f316d65a0f565aceb06c39926c20ab5533399eed"; - sha256 = "17kx6x7yw951gg0fnjr18ihdxg2yvpmbirqn6gdc83yz3i3gm0kf"; + rev = "35e94de8223c407901548989cf4c9547ba692ffa"; + sha256 = "16d8njpvcsc845mbjyzjskkdgbvcy7m4lvy87sl14fznb12fims6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16899,8 +16983,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "94b0e8e2066f3910d8630f9152c7618e8654fb96"; - sha256 = "0z9g2qqn3dxw79qv93jsl7jpn05fxd2mafxwg3yb8hnd8xlnb7jy"; + rev = "1a95b2b6709842e6586594c08337c1e7237a9eed"; + sha256 = "0cd495wvnys6jj6s7k67mgwbrmc8203yya4j0xixhpffhq1m2km3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16977,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 = "20180311.1029"; + version = "20180404.1847"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "115c16eb9f38447790a75c71e67036c5f4be15e0"; - sha256 = "112wnfhn468gfgac1vhclm6lycsp904wmf60akcng71fqgvyzcda"; + rev = "94d7c7820da3e22791707b2fe797941646a7c610"; + sha256 = "01mybxcfm34hxwkmh6wms8s4vidfny2s052786g1jlq3ny1g9afd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17054,8 +17138,8 @@ src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "7601c4492fd3d896bf6ef6624f4bfad2c25bd57d"; - sha256 = "17cs6lzkvwqn3qnz31dd2r6lpvmsrib75ryi1dsd8m2f1z5f1pwh"; + rev = "dac78aa9fd1979a0c6caccbe3698cad5f0e32d9f"; + sha256 = "099lkldwxnw7ghpj42z07i1bv7jz8438xq7mv4vz6s2d6qwc07lq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17645,12 +17729,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "20180330.344"; + version = "20180409.813"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "12283230ffa5849e688350d7895f4c33c5f6d817"; - sha256 = "034m1vrnbp0pw7nd2jq2l6cj7ffmb6np7n793l75284xnvayih7g"; + rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec"; + sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -17729,12 +17813,12 @@ elisp-def = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elisp-def"; - version = "20180331.1213"; + version = "20180410.224"; src = fetchFromGitHub { owner = "Wilfred"; repo = "elisp-def"; - rev = "7a9eb5a54d08a97394a36948071e6985cd25dabf"; - sha256 = "1pqv8fn94g57wy85fn72jfny61wfgrfmwr5s06g310g27bd3ram9"; + rev = "ff0730b8110f776862b29bf0b66e396fab2aaafb"; + sha256 = "1zdbb1mgmb8hkzsmp6l4mv61831bw8ybfsfcwalnvrw5fvfwpaik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def"; @@ -18170,12 +18254,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180330.350"; + version = "20180406.217"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "17ea784c95b04df2cc78b17102a076b02cf89134"; - sha256 = "0gckilh50n7y7mfhadxlamks1136h3f4fa2670xmmm6mzxamn9wn"; + rev = "e3028393e6cf744ec902120e37bd92e0f32ea4ef"; + sha256 = "1fd4zj4sqnipbwjybbp1rk65g60n8w20xg3if9nhky47nwwjanyx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18787,11 +18871,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20180328.753"; + version = "20180409.2121"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "ffd8c0e8a7649d4e3a0d4f9d65e114346145a2de"; - sha256 = "0ijhwvkngkgg0npz5rnzynpx60rshizw8lpf137lvqx5b07ianr9"; + rev = "c90a7535ff1e6552274adf3a48b777316ff8d897"; + sha256 = "0yvp0l2l3h9h879fxjml3nyg7swq47xdwk4hiigqk4fx7cxi9rs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18891,12 +18975,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20180210.310"; + version = "20180409.1503"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "6d526fe618c3cebf7fbc5f0d3f0a225de16a76c7"; - sha256 = "0jq67lngpz7iqwqfsl95r5p26cnnq7ldcj534nm86hwm6jfij564"; + rev = "ccc0090ba1ebaad6bd3b079d6d810e9a051218b3"; + sha256 = "1jy7zc26ypwl46ag26gbspbn7p4lf3jxgb34l8blqzk8qn8fxz0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -19239,12 +19323,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20180331.256"; + version = "20180403.1251"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "7f892339f8bb48b1dc86f3d36ab47b65cf28f8c7"; - sha256 = "1l1fr215z83v417lnbbf7z68fjbzf3k9c7d8cyzh0zijyp8y1dpw"; + rev = "fd50e71913e4dc714f71020701ab398a18b524b6"; + sha256 = "0al8bbhfjxqh40hkpiaziz5vsfy2m5saj7wcvs6xivz1ph5ass0b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -19645,12 +19729,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20180206.941"; + version = "20180407.1545"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "9f4d7b93a3c7e12ac935b50943177923a8c01d22"; - sha256 = "0dd2v91rp3lai10258bszpd9wsa1lvx08xspsnijv64axh73yf7r"; + rev = "4ad26a06c8faf106172a0f8e472c677adca60542"; + sha256 = "0280pijlnm071c2lh9z55w1xzgphfjq4zbl29r7igscy7q5dc60z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -20006,8 +20090,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "f99860259ee557851acc865519a315f04d1d4d51"; - sha256 = "02vba3597wlxv7jf8samds6pp2x3z0w39nh2jnszfnqgqwl16b8d"; + rev = "6a38655668542cebb60d5e13078b599abb3f0ec6"; + sha256 = "11ramwyy6qhqc0a6dq1n4kqzcx9r5fgshxak6d632z2f5pw504dq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20086,11 +20170,11 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20180208.935"; + version = "20180406.150"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "e0cd3c21292e4a80fa8a9648981b61e62a996e80"; - sha256 = "0i6962j2k6qmdlrw2m5jv2pyxvciyawd954q462nv64cddaa5581"; + rev = "fdf3ba7bf9f12281f1dccdae4d12449605ae4aec"; + sha256 = "0jsg4a9bf70kvpjjgs0rgdzqvwmlip91cpbhw14c2gaza48d36lf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -20211,12 +20295,12 @@ esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esa"; - version = "20170427.845"; + version = "20180403.825"; src = fetchFromGitHub { owner = "nabinno"; repo = "esa.el"; - rev = "8bd011cd1861113f54ad155d3c62725e1dcd37e7"; - sha256 = "1a5mrz3m0gy5r7dcw31s488jgfhrp4axcnsmma40q2x3harp0hsk"; + rev = "417e0ac55abe9b17e0b7165d0df26bc018aff42e"; + sha256 = "0hib8q9fslvw02i1y19z78fv6yy88q09lhfdfmbdyn6yal21855q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esa"; @@ -20229,27 +20313,6 @@ license = lib.licenses.free; }; }) {}; - escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "escreen"; - version = "20170613.1534"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "escreen"; - rev = "153dc05b2b7e6e2d4cbd7b6cbe8b10d6a70f73f3"; - sha256 = "0xz3dkvgrbgv91dxgdfcir9zld5qsqpzrmp4q6fxqa548advn9ak"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c64c21a42fd8436bd60e490980ad4ed824b212d1/recipes/escreen"; - sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54"; - name = "escreen"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/escreen"; - license = lib.licenses.free; - }; - }) {}; esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-autosuggest"; @@ -20526,12 +20589,12 @@ eslintd-fix = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20171128.453"; + version = "20180407.911"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "3efb041c9ad0116e745efaede7f7972bc2179a72"; - sha256 = "16siwr2d930kifdhzgbyiszphp6i5ggbyi76ya6gkzy6wh1s9b56"; + rev = "97e8aa9b106e3e4b3a44c775ca972bdd2feda9ec"; + sha256 = "1g6bv58m1052x2f5ffs17ryyqv0ay8vii5bwqs7dyfhlpppsn6c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -20631,12 +20694,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180401.319"; + version = "20180410.447"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "6d0dafab3ac7a97e530d4082f874dcc24b558a68"; - sha256 = "1919sdjhkrj66r1bn9nyccj20s3b5wa8p63avk1mgyyfa3a1bnza"; + rev = "9da8612e3b3e382916d6e36a99fbbb097f4bedf5"; + sha256 = "1rkmvdl9hxvhm2q30vgn4bnifdz7kff3brkf393229b2n8k9rjws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20988,12 +21051,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20180320.1359"; + version = "20180408.1423"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "fe3ae258901ba9b16e6d051427e1c0bd5e588e48"; - sha256 = "1wazvyrpsf0j5v04fsjzqkff906jvhvp8a9bbr5d8qmn4l103qdc"; + rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670"; + sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -21135,12 +21198,12 @@ evil-collection = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180331.1020"; + version = "20180409.2045"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-collection"; - rev = "2ebc7a93c6376188d4d86347dddbbba942457bb3"; - sha256 = "19avjdm9ddxgipggg46kwbqpjmz39dpai7kx9xdk3ba4dhkcz5ic"; + rev = "7afd9e5cfcdd68da738b6d812dab2ba394eec68f"; + sha256 = "0iaab4n4n53gqrn5rjrzcb1jq4zvhp95whl207xvddhf1b48dlvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection"; @@ -21576,12 +21639,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20180313.931"; + version = "20180410.804"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "69dfa5a06e8a4024803223b9873ea5d591a97294"; - sha256 = "1kd09z4qxcanvxnawhczwp3y61kn4gnaaji9chqrny633r8j64jk"; + rev = "9bd91561e7d0bfe3198d0860bae1785a543f2eee"; + sha256 = "1jhna9lyic4c28kcdhbqid6gyv9gawznf2ga470vnfnyghd4f757"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -21723,12 +21786,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20171206.441"; + version = "20180408.630"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "41d43709210711c07de69497c5f7db646b7e7a96"; - sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14"; + rev = "912a967fe5f3391c2a02d86b7522a89dae2d5274"; + sha256 = "1mz9h4cfwd5n6gy3wxs5w87svxn4n13qsr8cqc8ck9y9bsxf4ppw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -22126,8 +22189,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "fe3ae258901ba9b16e6d051427e1c0bd5e588e48"; - sha256 = "1wazvyrpsf0j5v04fsjzqkff906jvhvp8a9bbr5d8qmn4l103qdc"; + rev = "49ebf2dce325bc7fe0941dc4112226c291ff9670"; + sha256 = "0vjbyh77d4z9ahk0w8fmb4fdd98hq19ijy11b1y4n029yl1yrwvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22399,8 +22462,8 @@ src = fetchFromGitHub { owner = "ninrod"; repo = "exato"; - rev = "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6"; - sha256 = "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm"; + rev = "88266fa7fcfbef704032f671b94f756f2f98bd4f"; + sha256 = "0nmm7pvs81429a4zpal6aidfd1n58yavv3skscrav5r0wnlbz773"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato"; @@ -22420,8 +22483,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "4d0af1274797ce61f5d8c209339d5b9cdc49aca6"; - sha256 = "1h45vxyw0pa99fldnvca96rz1w1hl7mrgx5m51rknxascfvk6fqx"; + rev = "54ea2f9c3c81d18b96e4d33c4c547e02eee420dc"; + sha256 = "193d9wf8x1cl1q5bzpdm9508a37m6nwlsjzn2mxbiqkb8p9psj73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -22738,12 +22801,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20180208.628"; + version = "20180410.621"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "8891dc05b54c0ea848ee3bf7b42e759f73c1bb1a"; - sha256 = "1wi1qqzf630ffz0kkk12f81jmm8ii7cckf1wds3phpb67msn5ial"; + rev = "0e9067db5de334b8f4371896230eed617f236918"; + sha256 = "1z0m3pzhyif1rx8g4gzg1wfdqdkxdaahjjq8hx2fj4k4l16bia99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -23299,6 +23362,27 @@ license = lib.licenses.free; }; }) {}; + fill-function-arguments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fill-function-arguments"; + version = "20180331.1023"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "fill-function-arguments"; + rev = "50ea2e4ec943993f54ef72a5deccd62dad5bb7a4"; + sha256 = "0s6kw87p1w3xwk354lbj5br07x0l63x3dcgfcxcvmy7k820f0iq6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b78eab67517b19516e5d265018afcbff0acfa9ec/recipes/fill-function-arguments"; + sha256 = "1gigzzz2csl3a55jmjx391a5k3ymixnwpblsn0pfgkkk4p3674q0"; + name = "fill-function-arguments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/fill-function-arguments"; + license = lib.licenses.free; + }; + }) {}; fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fillcode"; @@ -23365,12 +23449,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20180331.546"; + version = "20180405.713"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "ad6c8fce30ac927b4c2297894b6436e1cf724501"; - sha256 = "1mq544h03laphwvcff2qaxdbb7krmnw1vxmnc9jchz8ascx2x28n"; + rev = "5691beb79f78c6a0ef1a18460df9fd1571ec3361"; + sha256 = "0mvli1r7ml596y6v9qsip76j78f58q6jnwb18j8c7rngsrg08rc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23754,8 +23838,8 @@ src = fetchFromGitHub { owner = "mschuldt"; repo = "flame"; - rev = "2cfb860a483197e92a4c20d7b9b055d586e76fe0"; - sha256 = "1h6mm2zjv03y2d6dv4gq7iaz6r2glgcljzgmi6m4jp6flvyqh09g"; + rev = "a749b2a77b87e505572d0f1f5d59fac76348bb73"; + sha256 = "1l9jbzavyi75li64jqfs000s1m8iw9xvsv8mg0bw1div6bc7vq7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7a14c14368de722855286c088020a5657f7cf8b/recipes/flame"; @@ -24841,12 +24925,12 @@ flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-gradle"; - version = "20180322.2332"; + version = "20180403.33"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-gradle"; - rev = "28f6d78330334ba58f209af79cc5d699e6557f42"; - sha256 = "1lhcizpkn2sih4m01mlgp3aln8jmx7r7jk5iv636268qmvq9ff8d"; + rev = "a14b45183e50993e8b28a4c57ad5db82b789faef"; + sha256 = "1n3i0fh0rvy29gykqamxayfbbv5jy3h6l375pw4ckydcqlp0dgxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle"; @@ -24946,12 +25030,12 @@ flycheck-jest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-jest"; - version = "20180307.1"; + version = "20180409.1718"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-jest"; - rev = "2f524e275338e46edb9c1c9ab543020f9031b030"; - sha256 = "1ipr1yyk5vf2i8q7923r18a216sgf759x5f6j5776jcjkhp98c98"; + rev = "370efb30f0856eb83abcbe50ecdf85842e95138d"; + sha256 = "0xjj1z9svzgrmk12r85iqcj5awal8ik5xfhf02s2iwknwqssx065"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31e2ac9de5f28ee9d847097cdeb60afa99476a51/recipes/flycheck-jest"; @@ -25219,12 +25303,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20171231.453"; + version = "20180410.422"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; - sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; + rev = "f4a76ac199b67ff383ab5e70434c9b98b48c92d5"; + sha256 = "0ryanx4vmy9jwqjnwvma6dm136y4fh227cyhz206km6595bbn3nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -25450,12 +25534,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20180328.1126"; + version = "20180402.1039"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "6996cfa743ae0f2d76a24eaa1d0e1201fb04e72b"; - sha256 = "16phmjs6h3iygz3h6wdmp6cmd4ckki685206l3wanmppsp91s4jy"; + rev = "facb6e6cff7baaf38cf4e76a3e27a508225fc3f7"; + sha256 = "061iahihq348ncbx9zh8ihca6j2fkc1nygk5f7v2q4j2g7kmfv8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -25657,6 +25741,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-tcl = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-tcl"; + version = "20180327.559"; + src = fetchFromGitHub { + owner = "nwidger"; + repo = "flycheck-tcl"; + rev = "7ca23f4673e178b9f5dcc8a82b86cf05b15d7236"; + sha256 = "17mmj0yx7d7cwyq35ll1lw4j0yyha172375apvanrkpgpzjpnvrq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fafc86df6c15348711f16302bb86c0ee08c08454/recipes/flycheck-tcl"; + sha256 = "0rmc7rk0n4mgk11jgza1dn1nkjyi7rqs79d3p0cj1081znyj56f3"; + name = "flycheck-tcl"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-tcl"; + license = lib.licenses.free; + }; + }) {}; flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; @@ -26462,8 +26567,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -26483,8 +26588,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -26504,8 +26609,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -26525,8 +26630,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a8ac817f7b646d8ba761b64e1b2f65d0a9ebd277"; - sha256 = "1xqjj4ff811w205f1qs9zd68h6nsbh60pj6mhv2w4kpf3hmmj310"; + rev = "6a3392859531c36091a656fedcaebc0f995dbca5"; + sha256 = "138y5zmqwrac0r32z14adz8gs047wlqikn4bzkyl0blnlr1fkhnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -26581,27 +26686,6 @@ license = lib.licenses.free; }; }) {}; - fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fm"; - version = "20130126.1618"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fm"; - rev = "555bcebdf47ea3b1d9d1e152af7237b9daa62d59"; - sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e4a74b87c05b408433545a2236000ac081af36bf/recipes/fm"; - sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f"; - name = "fm"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fm"; - license = lib.licenses.free; - }; - }) {}; fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fm-bookmarks"; @@ -26707,27 +26791,6 @@ license = lib.licenses.free; }; }) {}; - fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "fold-dwim"; - version = "20140208.837"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "fold-dwim"; - rev = "c46f4bb2ce91b4e307136320e72c28dd50b6cd8b"; - sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fold-dwim"; - sha256 = "1c8sh6i453jpfhwaqdvlqibnb9lmzfd7q6bvnk1b1q0df7igl53d"; - name = "fold-dwim"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fold-dwim"; - license = lib.licenses.free; - }; - }) {}; fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: melpaBuild { pname = "fold-dwim-org"; @@ -26882,8 +26945,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "8118551aaf0472900cdfdc13449b55b33ab56289"; - sha256 = "153cch134c6rvqfcpikidlpxcbxk8nys2ig1xxpbn9ncn4fqkaf3"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -27067,12 +27130,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20180316.914"; + version = "20180410.732"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "8269066a9035fcf50eb835de3745a62c1cb96660"; - sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd"; + rev = "1efbdbba6cb52c8bc2e70ca2636935d2b1ea8d98"; + sha256 = "16hlywji8ny8b7dc6wq9vfxp6b1fbm1m4f3mzxgngs3gjv6vic82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -27155,8 +27218,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "4dbc6871d8220cb95d287dd35475725a1b7662ab"; - sha256 = "19y23jdfp9i950vl8ahywfh6gkf8cmy0nd3fk931xkx0x5kp64h9"; + rev = "0f42139a41e97bb0a2ebc320d41cec071c034ca0"; + sha256 = "0bfgqlfdjmxz8fq34ad9m6avja5z5pvw9cjxlfxd3k716ga1nc06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -27348,12 +27411,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20180319.2121"; + version = "20180324.2211"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "2b8c41cb18d2433bd2379522e1441c51eae0b5e0"; - sha256 = "1im2arr9885zx6j4njlj7ngmhmi1varnllxbw3xj37bl0abgcngi"; + rev = "9b948a4ff5d54b5f72c7b004146121ab7d1b9018"; + sha256 = "1r6dgi029hybsbkjbgb2bhsr4ashpfcx3x3sp3gb1ypg2nlck463"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -27528,8 +27591,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "59fb36049fc1de0db5557db2ceaace367c2f9da1"; - sha256 = "0pix26f019ny5yjnk838awk007z3rb56zviqk66c3bfwb8abj5md"; + rev = "d88bd11bc81a1f4d29a7b9d6890c59e5b6ee7b6f"; + sha256 = "1pgw7hnb8f3vjmzv9sayqqprq1sjmj0r1xfhrnixibybsps7bvlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27841,8 +27904,8 @@ src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "23bc15197dfed3773283b2cacbda47678635f22a"; - sha256 = "0cjb4lj9xbmw3g1mnghd2ig00d5gjksz1an8j12hkmydzj1psmdv"; + rev = "e496177c7ccdc0a36d4809113b1c1f366c1e39ab"; + sha256 = "14nka5jqakiq0i72s35b4ibnvfvd5jdsg2194ai4bh27k1sn9mpr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27858,12 +27921,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20180327.1753"; + version = "20180406.944"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "ce3bc12bd6b928310f7a13f855e5c86183d1e0c2"; - sha256 = "08jbmln6mpqc6xmf0d606baai25y26l67a68i2cfns09gk8k8pqi"; + rev = "d8fb9f69c9d66279316b096929454ebf242aa721"; + sha256 = "025dakpmp2232n15rjz6kbs0vn1gazi4qkaagkm8fra703sx4v4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -28152,12 +28215,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20180328.830"; + version = "20180409.1314"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "d5408b61322a8207a8362e0ebb421306ec582379"; - sha256 = "1pj9xfqd05i6y0fz4g7ba6jk7s86xj6j5ph6wfynwyz4w63zgw0d"; + rev = "21c9e94abcfa464db0dd475b26cff8059ada5798"; + sha256 = "1kx1s6p2z2jdqm8dr8jxba2iyj448cnx9m2p88749xfqjgy0nw6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; @@ -28404,12 +28467,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180401.314"; + version = "20180405.1137"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570c2a777ec222918492255463742d44a78befee"; - sha256 = "0741c3zd48ybfs67331hxj026lp7frzrzml0kzspbx2121d56yzh"; + rev = "fb2d481e8e4a7c8dac23b82e4a008747e4ce9fab"; + sha256 = "1dxbx5qhddx56k9146sm4f9nx8j0h0cy1afx1j5d6271rjb9nm49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28947,6 +29010,27 @@ license = lib.licenses.free; }; }) {}; + github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: + melpaBuild { + pname = "github-stars"; + version = "20180328.433"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "github-stars.el"; + rev = "15cbf15cdd3fbd2139b5c128a173bb8f6a4ef496"; + sha256 = "10hyjkdbf5b792vfm072g9wizkszwghxs2x5k1hi1q0c4gw5w518"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58df7d536f9711e10ecaa6e0a37b9ad255e8fca5/recipes/github-stars"; + sha256 = "1vljmrjid5xxmq5yfmsaq09js7zd75nmm4gd0kwm3lf71pb3lp6f"; + name = "github-stars"; + }; + packageRequires = [ emacs ghub ]; + meta = { + homepage = "https://melpa.org/#/github-stars"; + license = lib.licenses.free; + }; + }) {}; github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; @@ -28989,6 +29073,27 @@ license = lib.licenses.free; }; }) {}; + gitignore-templates = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gitignore-templates"; + version = "20180327.626"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitignore-templates.el"; + rev = "b0705b8de4cbdd631c64c4e0024d62ba4ad68052"; + sha256 = "1f0lcyw7yrdfmv0h8b87kz0pdrzhy28fzv688z4aaw964qn8jz0k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c9aa71eac2e68eb1925ed00a2c659c4375bd39c/recipes/gitignore-templates"; + sha256 = "17zx52pmpd4yqlnj39v7ym728i710mdl0by3lc8zk6ljfz77933w"; + name = "gitignore-templates"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gitignore-templates"; + license = lib.licenses.free; + }; + }) {}; gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; @@ -29143,8 +29248,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "d5408b61322a8207a8362e0ebb421306ec582379"; - sha256 = "1pj9xfqd05i6y0fz4g7ba6jk7s86xj6j5ph6wfynwyz4w63zgw0d"; + rev = "21c9e94abcfa464db0dd475b26cff8059ada5798"; + sha256 = "1kx1s6p2z2jdqm8dr8jxba2iyj448cnx9m2p88749xfqjgy0nw6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; @@ -30441,12 +30546,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20180129.905"; + version = "20180402.2025"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "1f0870fcda76974a214b4dd7df54df00d0ba0713"; - sha256 = "17zphy7kkwqiqc9zsrkfv4x63jqbz6vnxrx1snar987dk3iwpfph"; + rev = "e85222dd8ace4ed0e608da847b10843c8f19a677"; + sha256 = "0am2lkz50d5ics1hyxcrj16lcjzs0h0rkr1r8madqmdlrpzy1myn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30571,8 +30676,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "88e851a7685a4f6f65786f088423163ba33be84b"; - sha256 = "1ac4dbk890nq9w0slc17106b8rsavhh63rq0n9wplixl8i2ccr4g"; + rev = "e587fb73a94144ea6c8c48a615f55985eee493a5"; + sha256 = "1zqbq023wlynxdpr2qf1s2liidbwawc03bf67j0zhmvipq16hb3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -30893,12 +30998,12 @@ grep-context = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-context"; - version = "20180317.742"; + version = "20180409.1227"; src = fetchFromGitHub { owner = "mkcms"; repo = "grep-context"; - rev = "a17c57e66687a54e195e08afe776bdd60cb6c0a7"; - sha256 = "1nqfa6kjzjshww4hnwg1c0vcr90bdjihy3kmixq3c3jkvxg99b62"; + rev = "a13929bff6a25a09678bf8922d906acefbbd8e50"; + sha256 = "0sl5g8amgxjwj0q30nvrd141hwg9xg2gqy24d96qgxzybmb7y554"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637/recipes/grep-context"; @@ -30996,12 +31101,12 @@ groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20180326.303"; + version = "20180410.313"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "88e851a7685a4f6f65786f088423163ba33be84b"; - sha256 = "1ac4dbk890nq9w0slc17106b8rsavhh63rq0n9wplixl8i2ccr4g"; + rev = "e587fb73a94144ea6c8c48a615f55985eee493a5"; + sha256 = "1zqbq023wlynxdpr2qf1s2liidbwawc03bf67j0zhmvipq16hb3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -31206,12 +31311,12 @@ guix = callPackage ({ bui, dash, edit-indirect, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20180329.1312"; + version = "20180408.1232"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "62a50ea1bae7e90a622e9722269ebe449e01145a"; - sha256 = "09fhl2qzai6jc23nq4mnnf6dwhll1g7llxycb25cx4n79qr0db1q"; + rev = "90e028cc1f82b94614679cda2574a9d3efed2913"; + sha256 = "1l4bgfk5ir6n7k64jb3s7xplrayk7719gkl25lfcnd0i8r4ib638"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -31710,12 +31815,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20171022.26"; + version = "20180406.2222"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a"; - sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl"; + rev = "d71cca7f5ddc8178f5fe331563edcefe91cc0bcb"; + sha256 = "1amg9k50nw90b1dci6bylhrdkfmwminxcx3hlxxwvfvdgszfs2s4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -31981,12 +32086,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180331.2328"; + version = "20180410.1155"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "412e85cad7ed4073152b6e339d8e7c9247ddeba4"; - sha256 = "075v6ml40z0j1sblj5q7a7cqrlbvvh7rbwllmz8a7ghcan17n1x6"; + rev = "6ddc80a5ae303c275d60046358dfefc08f8f01d2"; + sha256 = "0af4ddrs70jn3v5ykr1vcymcd3ixmshqjrzicm0b1594ln535jp8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -32590,12 +32695,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180331.1241"; + version = "20180409.2054"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "412e85cad7ed4073152b6e339d8e7c9247ddeba4"; - sha256 = "075v6ml40z0j1sblj5q7a7cqrlbvvh7rbwllmz8a7ghcan17n1x6"; + rev = "6ddc80a5ae303c275d60046358dfefc08f8f01d2"; + sha256 = "0af4ddrs70jn3v5ykr1vcymcd3ixmshqjrzicm0b1594ln535jp8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32884,12 +32989,12 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20180328.2125"; + version = "20180405.2228"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "b564ed61f596db98b9e9cc68c97f0c058208b9c0"; - sha256 = "090iq5phlq5lgf7asqprra0pz1lhgdxqmyzd7kqlbjssd3wzaig8"; + rev = "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec"; + sha256 = "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -34270,12 +34375,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20180324.1632"; + version = "20180407.1842"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "9a4128ffdc96f36ba21f61cabeee1c4640a3d8ce"; - sha256 = "1parnynpdmxvz1plx852h7vja688lqc32yhi87g5fq4vyvms2877"; + rev = "213339b896eebff6d61778b2b1816301ab583081"; + sha256 = "1wjlm3i0ygcgy37nn1ljaxx9w7nw3pfczrmv5ibm2dyna88kafr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -34858,12 +34963,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "20180321.755"; + version = "20180408.555"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "e6ce15c5c83148279549c4d9aa16848c1b96cbb4"; - sha256 = "10fcg02cjcw83myv6vy2dpc2llp049q9wzxzb67g83jlry1zlz76"; + rev = "5f7b1ee2f521a2cafae6c762f8f25c08c5d6a016"; + sha256 = "0qf5fg5jxwyspficyk5vac4paaqkhzr9n77wy0rn0k3agjm9f2y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -35131,12 +35236,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180331.1143"; + version = "20180407.351"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "f2d6751c48d8318f93124e380f0beba5a1c802cb"; - sha256 = "180ws8d4ifyv3ycj5mci3lhipzybxp4r7g5siacqbkw3ns0cwksp"; + rev = "5e9f90776ddfa64e11823c98406362bfabc03a3c"; + sha256 = "1zwnh03ifkmq5r78m714yxha9d0j7bflb78f5jak58f3ympnms76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -35551,12 +35656,12 @@ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20170516.1355"; + version = "20180404.1216"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "b51744bde1287979f2d948f46501bd6ed0897f69"; - sha256 = "17xbd1kiww762dibws48gwn682g1bxy5rb7np5alqhiiw1l13wdw"; + rev = "a968436711520d4728c0b6c64279eb5eae7e0e5d"; + sha256 = "0cbdhxmd2a2pygnr4fb246dxyqggv2h8f5q2sflbq05jb81k5fal"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -36093,27 +36198,6 @@ license = lib.licenses.free; }; }) {}; - hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "hl-sexp"; - version = "20101130.443"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "hl-sexp"; - rev = "0606100422321c18db51ceda80f25cd7717c2e01"; - sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-sexp"; - sha256 = "109qzk39s5l30fmrfxhkx1y6ldbw9d5xnahwdvasc8fal5j6f1bm"; - name = "hl-sexp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-sexp"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; @@ -36323,6 +36407,27 @@ license = lib.licenses.free; }; }) {}; + horoscope = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "horoscope"; + version = "20180408.2341"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "horoscope.el"; + rev = "f4c683e991adce0a8f9023f15050f306f9b9a9ed"; + sha256 = "17k4j4q19l4ahxlzzic1jlbbh7l378j9vgnrcrvpm0lxa9ipclk0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/180248c19160940a208b32fa7a9660a838f68de5/recipes/horoscope"; + sha256 = "1y2nzhdl7ghi5l3iyzb04xics7gr5981jmb5z5y8y1z04xhqpfs6"; + name = "horoscope"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/horoscope"; + license = lib.licenses.free; + }; + }) {}; hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "hound"; @@ -36724,12 +36829,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20180308.2201"; + version = "20180410.1233"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "ca874a29eace152027f982b9720e3962c57a06b1"; - sha256 = "0s1z53v95dnygjp48gmny6a9wq4740rmsaa7p99hlvgqnksx0mzq"; + rev = "03322cf34d94ba99aa86f8b3fa213c81a5c185b7"; + sha256 = "1z8c7nsfcb2rfimyz7vz92ac56iwr2whkzaq62gn0q6cqcrzwcb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -38147,12 +38252,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20180307.1359"; + version = "20180410.457"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "e9db390fa273b02d4e637ab94244358792caead9"; - sha256 = "1cddcnmgdjdm9aqn5nr6g2p93rd4rb0xllyf7rimgf64xnqa96hm"; + rev = "3b758dff8a5153d6ad8c0d08385e5bcdd69232e4"; + sha256 = "1yv2nz8x7i0dv2g9485hqq8b5qq397fa5yxv5d8bn5msvj81vl6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -38189,12 +38294,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180316.1140"; + version = "20180402.1403"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "69137983d368af0dc76cfa2e9e33338b796df5f4"; - sha256 = "02admpcd7gc1zpxha2xcdydbwcr1gbc2z09dnh3yss7ddjzmgbr6"; + rev = "59868ff0433f7631c362ce25879bd4271d350ebc"; + sha256 = "1xh901krzwmvkj0rdq0hjbf41vsf92mr0w9vjb9ki660wnnjw8wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -38231,12 +38336,12 @@ inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-mongo"; - version = "20160815.216"; + version = "20180408.638"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "inf-mongo"; - rev = "649dc6ea8e468f1d8109568548eb222c71486dbf"; - sha256 = "19n0ddzgbqhbz3qjpvvw4nasrn2qvkczrdd8kk9h28v8xix5grzp"; + rev = "2e498d1c88bd1904eeec18ed06b1a0cf8bdc2a92"; + sha256 = "1m6skisj6r3fbxadpwwgf3a3934b2qvwb7zj975qksxq56ij0wkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b27d5354d4b30cc9dd3be730d79e5a5bc1f74/recipes/inf-mongo"; @@ -38567,12 +38672,12 @@ insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "insert-shebang"; - version = "20170825.438"; + version = "20180403.514"; src = fetchFromGitHub { owner = "psachin"; repo = "insert-shebang"; - rev = "adfa473f07443b231914d277c20a3419b30399b6"; - sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1"; + rev = "7bfea92ba1dae9d13d442e2f84f9fb6c05a0a9bd"; + sha256 = "01f2p58qsny7p9l6vrra0i2m2g1k05p39m0bzi906zm5awx7l0rr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; @@ -38692,12 +38797,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20180331.1851"; + version = "20180409.1854"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "b1d3715e2009cb59c6b35c8cfa3357831fe28d39"; - sha256 = "1yi1101709k3j3zmiw6hllmcfya6k04g03hk15v6h5ghc7sy4mq1"; + rev = "37af01509e55341ffcc81b56d1f30032a055d1e5"; + sha256 = "0fqm6r73lk2ysv2zif6mi7zkdzsxar8dxgc5g6j64426hp6jc5m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -39007,12 +39112,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20180308.1256"; + version = "20180408.429"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "847cf4e84f554fdcce49587747f0c18dae12b3ba"; - sha256 = "004b9av02q9165rfr6b3c7qfbry72s9bdkfs3n40f4fp25dcwq0q"; + rev = "94856c65ea9242aee5f57a66212ad12f5f39252b"; + sha256 = "1n6malmrxfzrzc9m44ycgp122x3hqkm6yhgiyna53z7bmx6whq70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -39301,12 +39406,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180326.1231"; + version = "20180402.1858"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; + sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -39452,8 +39557,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; + sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39490,12 +39595,12 @@ ivy-mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, libmpdel, melpaBuild, mpdel }: melpaBuild { pname = "ivy-mpdel"; - version = "20180319.757"; + version = "20180401.1207"; src = fetchFromGitHub { owner = "mpdel"; repo = "ivy-mpdel"; - rev = "6948fba6872b4f9b6cca9c73b968bd8cd5aae62f"; - sha256 = "152gmqjc4sq3210ckb974b7xqqc3admshgjnazgz32239v0l5gyk"; + rev = "f9f745792abfed85d535b4cb5b2a95f944bbad1d"; + sha256 = "1sxd9hny0n751irf87bab0g3ygq6j4g32gdy4yk27y3r00i9g4b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/ivy-mpdel"; @@ -39700,12 +39805,12 @@ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xref"; - version = "20180201.1919"; + version = "20180405.1721"; src = fetchFromGitHub { owner = "alexmurray"; repo = "ivy-xref"; - rev = "4d2c437b479733e4159a356c9909ed3e110403a1"; - sha256 = "19gzsphcmkzyihcijb0609ykv98ak24p3z4k0ifil5r40iss1d1n"; + rev = "5c21aa14c81df1b75a4c7090729a41f755b74916"; + sha256 = "0qw3yqbs340k4mv0wy42nrn7r1wx537ypnr2idrll4v8fppfz24n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; @@ -40538,12 +40643,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20180213.755"; + version = "20180407.1048"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "d1fca4613ec90c2c0b8241f4603eba733dd1ac73"; - sha256 = "0sgpl03dqm4lv081l3ff3xp38c39q5i2miyvpsqdjmgnixg3nm8c"; + rev = "72ea5e35e0a66c7275cf4fe4af25a619761653d7"; + sha256 = "0xgkmadbbs3zid11pn6silb25kyng424ikgx0wib48yzcra0kdw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -40790,12 +40895,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20180322.338"; + version = "20180410.201"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "7701772b2335d811361481bbb188da17afb9d0b8"; - sha256 = "10hl01rn8s2q2j2m66mzg3sdaqdl6ivqr9sr1rpv1fn41dy0dlqj"; + rev = "391e06c80e9197581c9d0b04edb5a65ffc149dcf"; + sha256 = "1w6pjhvcc8i7rmg85nxbnch3yxfcz81i7d1kdpbyra0i2ls7ikvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -41359,8 +41464,8 @@ src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; - rev = "67d516138172fd60782df94454b3d0bd247e84f3"; - sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs"; + rev = "292e07203c676361a1d918deb5acf2123cd70eaf"; + sha256 = "00rl5y7wra7kyp867ps2inx0vng9jrmym0sm4jhnk6pqj50c8i9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; @@ -41458,12 +41563,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180323.1118"; + version = "20180407.400"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "245a02265d06a499b600ef591fcfb9a7bf2c1b39"; - sha256 = "05b6q9cxwj8hdmkqbisd0p49z5n9dacxw3rcs9a8nww27frnxzx3"; + rev = "0a80628e083db6e9d4b4af73be5d917d7d667330"; + sha256 = "1brb0l39xkl19h9xslvmms9vcziygfp244xs5r3n4dqn43c7rr68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41987,8 +42092,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "86b6e19d8a02788fe8850b690bcecdff848f3c4e"; - sha256 = "1bgjfi6gddx2dwpisnvsig1j4zz9hdf83dy700jxy4gbsrn8d30m"; + rev = "d3d517dd236da48876742fec6881d8822ac356df"; + sha256 = "1pfwnly4s6xwc5ggan5pmr7hiq4z08wr2pb0iv9d4lvbjqm044c9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -42756,27 +42861,6 @@ license = lib.licenses.free; }; }) {}; - ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ldap-mode"; - version = "20091203.1015"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "ldap-mode"; - rev = "8761a835e90b990fb5fe70173ecdcd6f4b776cb0"; - sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/169243eedf4ee97fe01811a686f0798f2573fa0a/recipes/ldap-mode"; - sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq"; - name = "ldap-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ldap-mode"; - license = lib.licenses.free; - }; - }) {}; lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "lean-mode"; @@ -43137,12 +43221,12 @@ libmpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "libmpdel"; - version = "20180328.2353"; + version = "20180403.816"; src = fetchFromGitHub { owner = "mpdel"; repo = "libmpdel"; - rev = "abb748b6cb35de4652df80ce8539bfc63189619d"; - sha256 = "0ccqcn85131pywzga4644f0azxrsl5ay69m6jz27zzvshs7gzzjv"; + rev = "6e9b1bd6c3439c8e15be0f85eff94f95d1e987f6"; + sha256 = "03qcr2nc8x8h3cgb7fzk7r69b5fqpq63a3x8vd4fr6nps8bsb8gd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; @@ -43263,12 +43347,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20170923.855"; + version = "20180407.1440"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21"; - sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c"; + rev = "b350015ec4ebea9e84f73dcac808dd79b2882966"; + sha256 = "10gqpqq1xgjji7plljjkqzi0p63q65avjya0fsalrwvakzsx6xlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -43439,12 +43523,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180329.524"; + version = "20180405.1200"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "1ef2ad809922aff9ff4c50ea61c39dfd1c5dd7e0"; - sha256 = "055ckkikzgl7dwsp28h6qxbhxi0gxwg6r82g3w9y9xffjnsv2d3y"; + rev = "a7e1cf742e72199cc75aa5e1e686991ba4a23bc4"; + sha256 = "0qg85gz5akayvhb5fmn1qx7s9847gry4g20xcnq8llr839lq28dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43481,12 +43565,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20180327.1343"; + version = "20180408.1649"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "647de2c3fa3e4cabc791f6d40edcd243b23c4d53"; - sha256 = "0gqph6hbywkzikqxqfvb1fj12srns54jddhkvkrspi71s7g7cff4"; + rev = "083f5e5a9194081e90039c367b464aa896e9f91c"; + sha256 = "13z0r09h52nw3j9vzbfpbhl18s8hxyagmq2ni3d2s8s96b7kd939"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -43541,27 +43625,6 @@ license = lib.licenses.free; }; }) {}; - list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "list-register"; - version = "20091203.1015"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "list-register"; - rev = "f8bec5dc3765174de1089549947d9ca9a1cdbe5f"; - sha256 = "1pr7vmjmyildg44n7psg0zmj8a3kfsw5xmgh600fhs95wqxn3sag"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/list-register"; - sha256 = "0kza9xfhmxc8qia5yixx5z2y9j4wb1530rcvgxn545b903fs55kv"; - name = "list-register"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/list-register"; - license = lib.licenses.free; - }; - }) {}; list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-unicode-display"; @@ -44381,12 +44444,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20180203.52"; + version = "20180403.743"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "8df90bc27852da2cf05951870d94ce7920d8c09f"; - sha256 = "0pqk8p0z30p0j7lc5i2mvy7vmg8k5hphgwp4djhgm1ickm9pcx20"; + rev = "3f22586d23a9dbcb6fc9ab646cbe6fa25c912e07"; + sha256 = "1bfp61dbfji8ac40d4a1p38k5glclwbh1ahv2byvhkpf35qjzd0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -44402,12 +44465,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180330.2309"; + version = "20180408.1020"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "7dd173015d2c355e1dd2cc7a62ad75825e89e235"; - sha256 = "155n00m2bk4ayimn8nwn1ikzq53d2mda550k6z7cfw9il1bk9qkz"; + rev = "76ed991561435c8643990ea8c8b45b4210dfa5ec"; + sha256 = "18wzwplyfhr4skapsm9v3lslvxkn4ngih5pki7sw2swknkhfwzh8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -44465,12 +44528,12 @@ lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-python"; - version = "20171021.254"; + version = "20180404.819"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "035fed681ef18a774dcb82e361bd6b5b8778623f"; - sha256 = "0mhs7v1mc23h0rlcyinl3pf1qavjl4s6j5vrf9vc65sggsnw0x1d"; + rev = "e2fb53d191344dd73e26ffaaa4ac95cd6686dbd9"; + sha256 = "0s0w6sx7k7ys9i1w8zcf3hp9v3qzmcm4gl5pdnwr08ln73d3as9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -44507,12 +44570,12 @@ lsp-ui = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180330.1806"; + version = "20180410.1111"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "d4724353e87d5d79634d0d000aee15119899971a"; - sha256 = "1zbywpv3dypp0r4qksaj538nfv1ml25v0q2bi2m23yh29kfs2yi4"; + rev = "b8d0357c21bc9e9dde46e2c4e7e16d06ab6097b9"; + sha256 = "1xydm28092ci1nrrb3viv9nnl6imsmygchns6kigdglicc2wlby5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; @@ -44871,12 +44934,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180401.314"; + version = "20180410.1528"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "570c2a777ec222918492255463742d44a78befee"; - sha256 = "0741c3zd48ybfs67331hxj026lp7frzrzml0kzspbx2121d56yzh"; + rev = "fb2d481e8e4a7c8dac23b82e4a008747e4ce9fab"; + sha256 = "1dxbx5qhddx56k9146sm4f9nx8j0h0cy1afx1j5d6271rjb9nm49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; @@ -45216,12 +45279,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180330.1737"; + version = "20180410.1351"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "aeb554d9851dca009b7850843fbd0227fa33ab21"; - sha256 = "1yzfifdaaqpzngkdwf12951925vqx0rb1wih5s8r0lxdivw9w483"; + rev = "76b0156323c9953a8c6f36ff483a2d528d8df9bc"; + sha256 = "0xg0284ca7w1clfyrd7lhiick6izj00bi9zn0hdq01h9lifardxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -45363,12 +45426,12 @@ makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "makefile-executor"; - version = "20180315.632"; + version = "20180410.30"; src = fetchFromGitHub { owner = "thiderman"; repo = "makefile-executor.el"; - rev = "06b2efa4539c319ab36806b0bd8ea87e214aaa74"; - sha256 = "08rjj3bdnvmaxiwnys4cjd19wkkk06wv0l58hpn3c7vi077ps3cc"; + rev = "054c5460616d1903499d49190ac79074e9bd1c52"; + sha256 = "0axqm8hd2hz1a4qh02p7kyvrb0mab8iswpypij3q05s5yxidv1vv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; @@ -45552,12 +45615,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20180223.2121"; + version = "20180403.406"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "d44fd7e27c28f4cde7a739994744f3eecaab3b6f"; - sha256 = "16rlnzcwav4f66iib9ys7zb6lmxs4hn0cr035i9xp6a8rgxjgw21"; + rev = "f230c871de8aab1be7b7a9718cd930548a90baa8"; + sha256 = "1zqshxwbsyz60bag6dcabmx8a49nmnpad5kvpy1c6gvqhjr8axvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -46280,12 +46343,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20180218.538"; + version = "20180405.1845"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; - sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; + rev = "5479b42efe3ed504e3a0824e039e8365ebc0b788"; + sha256 = "1jn4cpd6y310c8kkk7w0lpchac0rd3f8ri3lmy369gi1sb2xsk94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -46620,8 +46683,8 @@ src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; - rev = "3c8d424a431abc0a19b456a8aa4fcdb739151f3d"; - sha256 = "0kp82xy6a8vkq5l0fcjw5f5yzg33ig28kc9zv1qs7a2czswnmydx"; + rev = "15681ddca9e96baab2983240125ed2aac5d9de27"; + sha256 = "02cyyd8hr7d9bmn3r8nbza3pb15hikmwhvjmlx1gh13iidjq5vmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; @@ -47077,12 +47140,12 @@ mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mixed-pitch"; - version = "20180314.1441"; + version = "20180410.917"; src = fetchFromGitHub { owner = "jabranham"; repo = "mixed-pitch"; - rev = "b76567bd0c55f72942e686b7de97a222d333b333"; - sha256 = "186s9ligb1b3hh54pdhfkvpzva5dkj87ydslyi3jjf7yrhvxgw9k"; + rev = "b6b1601c7a3eb9ab23e33192bc479bccc4dd5e7b"; + sha256 = "0g3mcbsjgcwg196ygj21i454ifyf0898r0xlkar1fqdl8lckb8zj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch"; @@ -47457,8 +47520,8 @@ version = "20180120.1514"; src = fetchgit { url = "https://git.daemons.it/drymer/molecule.el/"; - rev = "758dad6f5701c3a2e1146ba5895c08ef734a93d2"; - sha256 = "0syirvzjgbf1yvcvp00a19m4gi49yh1g95ba896mh741wrkilhb4"; + rev = "f3a1b19d2e0312bbb9ada00146994df84576abd2"; + sha256 = "0didxv3v3qnn3szxfnm1cmgpx0bhmjccdja3fhbhhdmp948904cy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7421b67dc51abf13bb028e467bb4c83f857a342e/recipes/molecule"; @@ -47600,12 +47663,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20180314.501"; + version = "20180402.221"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "da23ef64d4848636e47a026259526575381bd164"; - sha256 = "08py8dmwlqhc16fjcjf24dmpfbv2xpq8b0l43cx8f44f6791r2qf"; + rev = "1143c072f5153ae1a69807e5e8af163069b947d2"; + sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -47663,12 +47726,12 @@ moody = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moody"; - version = "20180321.750"; + version = "20180403.549"; src = fetchFromGitHub { owner = "tarsius"; repo = "moody"; - rev = "db27ba168503bd6e6c98c313e73699dc403a10aa"; - sha256 = "1y0zg0flcv3sawyqvwilh1ysvbn1bsnkn0b2n89lj00zyb5dj5z8"; + rev = "adf652f35cba1bb3d0f254e1905e2deeeb0fbdba"; + sha256 = "1zspq29n60r0kd9fy7d50zdypljigwcjb0qa5gkwiipnhpcnf9bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; @@ -48041,12 +48104,12 @@ mpdel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, libmpdel, melpaBuild }: melpaBuild { pname = "mpdel"; - version = "20180328.2359"; + version = "20180405.148"; src = fetchFromGitHub { owner = "mpdel"; repo = "mpdel"; - rev = "3786dd31a9f0a3355c967889323742cfe61f4141"; - sha256 = "0fqdhjmywyw9yd97glrw12j962kmq062djgz2ymv6kspy2g1xv9y"; + rev = "82f98b94d0bfcb48b8ed9985ef8bf9202c8917f7"; + sha256 = "1fhcf1mm7pjjy9nyjr3lkqhn0xsp8bpykzk2pxdzfkidb1ca47bf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; @@ -48439,12 +48502,12 @@ multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multiple-cursors"; - version = "20180320.747"; + version = "20180406.1350"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "0e49fecc18fc57e45398be886c91850b12abf112"; - sha256 = "007qpgd6z20wa581r2zycfjzgw5dq0fawrffk4h3spf1pmjvn8m3"; + rev = "75dd6bf83af4eff83dc22e278c47264c1a41cd66"; + sha256 = "0cw6xcc1m4r0gdqrlj5w6kbyjwqbhhpvrrr7p4b1mhd4c2a7lhiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -49278,12 +49341,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20170711.501"; + version = "20180406.456"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7"; - sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz"; + rev = "99d15e46beaf1e7d71e39a00cce810df1f33229d"; + sha256 = "07vsi07m5q070fvkqhz32qa2y7dgnyi1kggairimbiwbn98bh642"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -49571,12 +49634,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20180401.917"; + version = "20180410.307"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "49f1bed0cedcc901414fbd983c3859e9c6432342"; - sha256 = "090r2ldxql3v286gkkjvd6mrp1a0hkypm86kpsy5zd77bxz0gn3v"; + rev = "6b0c1ef6e6cec93b0d17a714406830edab8cb995"; + sha256 = "1h5c5fsg610mqi7m0ddnkvc0l4952hdjic3hpbnmjaicnhszdgfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -49596,8 +49659,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10"; - sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2"; + rev = "ca041d88f4d610332aa48c801342edfafb622ccb"; + sha256 = "05wipm7cvhyf1fsd5awi44yzndllfsmg0i3xzdmml545ypdimk3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -49634,12 +49697,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20180215.1331"; + version = "20180403.1741"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "0ac0271f6c8acdbfddfdbb1211a1972ae562ec17"; - sha256 = "157vy4xkvaqd76km47sh41wykbjmfrzvg40jxgppnalq9pjxfinp"; + rev = "cc23fd6a0e394aeeed603e2bfeb4a5ebc63db660"; + sha256 = "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -50054,8 +50117,8 @@ version = "20180324.1609"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "c117306f2dfcdf705ef3433962d227d1cb39eb90"; - sha256 = "1xkzy39b50xa6nzgbdkjcx0yivg6sw2pia39lli70bg76c13lc3a"; + rev = "5d510221d17862a252955d98046508bebcd14573"; + sha256 = "1pls4wny8f5pdfgmdg4c3cpsdy046hwmlaqlf90x5x9hp2jyibnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -50096,8 +50159,8 @@ src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "e7bb37334ca85ce0e3f5c980464f652266a11218"; - sha256 = "1lymf4ir9kja0dpifbx230cq3n1li25kcdn3x3bh8fskiil1pqm0"; + rev = "b4959103619d94a7a1d5fe1d9a15887fc2b12b8f"; + sha256 = "18kqw9c2a6si1q55r7w8mmwhqfnajdxvrv9dckwxkc4pbgpjkk8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -50497,12 +50560,12 @@ ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-async"; - version = "20171114.1936"; + version = "20180410.2058"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "99a6f24191cacb343d6090ecc8c1c67f768b2e22"; - sha256 = "1cw62nsdnmllpkn4mqi80vp6s17yf6an418gvr06z8cxqndw07h1"; + rev = "703159f106ba918ccd4e3c053eb887840aea8e5f"; + sha256 = "06aax8k3p9h49sdy47v73a851b6xwkvz97xgcrplhrpi2w77p7ll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -50601,12 +50664,12 @@ ob-clojurescript = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-clojurescript"; - version = "20180318.1519"; + version = "20180406.1128"; src = fetchFromGitLab { owner = "statonjr"; repo = "ob-clojurescript"; - rev = "f6771b692af7d7aa78990161d4ef843009b9ace4"; - sha256 = "0nca5hizg3p8f92dc330algf2ad6lf5m27n151095zd71fj3q187"; + rev = "17ee1558aa94c7b0246fd03f684884122806cfe7"; + sha256 = "1an4m7mpr345xw4fanyf2vznxm1dxbv35987caq1wq9039mzfaxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9ccc0d2d034944cb9688d5e184fa5df95f6b31/recipes/ob-clojurescript"; @@ -52227,12 +52290,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180319.353"; + version = "20180409.442"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "3749aa100569e9d32609aa8368f12ced4dc1f757"; - sha256 = "0mld8lalq9lkihfv0vr9qsihdav6anvamihlcg2d69kcg088yqgj"; + rev = "e2e696b8bf6209272a6675f3c878d96a9c8fe643"; + sha256 = "14zlbb6l4h6h8ff3fsdlrlxs6fq96iw8hrmd4dvdg847ys3gjbld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -52269,12 +52332,12 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20170615.724"; + version = "20180403.1336"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "07e6ccda6756754a115d567f2ad3a760514b731d"; - sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp"; + rev = "8d3492c27a09f437d2d94f2736c56d7652e87aa0"; + sha256 = "19q83xgbdabkidx26xvff1x7kixk2wllplnwfsy7kggdj9wqpm9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; @@ -52854,6 +52917,27 @@ license = lib.licenses.free; }; }) {}; + org-index = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-index"; + version = "20180410.811"; + src = fetchFromGitHub { + owner = "marcihm"; + repo = "org-index"; + rev = "e319abddbdb3f0dc5ff30d6df6baaa9194db3c8f"; + sha256 = "1qxmp60x8wyb5vd06r6vcx5raxs8hmxb0l2hfq0jpdpdrcjidzlw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index"; + sha256 = "1dp52xqrhby2xyi6p2d0ggp5irqsqwicp62ndg5wszyd33clxab5"; + name = "org-index"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-index"; + license = lib.licenses.free; + }; + }) {}; org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }: melpaBuild { pname = "org-iv"; @@ -52896,22 +52980,22 @@ license = lib.licenses.free; }; }) {}; - org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-journal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20180327.819"; + version = "20180402.536"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "d225d093e2e87574b67d79206764b6cf5cf7a00e"; - sha256 = "0c8bms5pypwk08cv8a6pchrxf5nx97sygpa4pmaxlvccsa45n8a2"; + rev = "f24d6c5e71954fd1a748e719b9b4b51f77879800"; + sha256 = "10cqri6k3lvsngwg060nj4n15ip54h3ldlyxgnknmp6wl0vjsjr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b"; name = "org-journal"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/org-journal"; license = lib.licenses.free; @@ -52920,12 +53004,12 @@ org-kanban = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-kanban"; - version = "20180313.1339"; + version = "20180410.1258"; src = fetchFromGitHub { owner = "gizmomogwai"; repo = "org-kanban"; - rev = "c240a1894b7ae4ed292657b4d3cf03db8274f451"; - sha256 = "12l9yb5dzhv9fgcl8nba5dh403bafx1klq2sw0n1v7zv82dic57i"; + rev = "d5f6c82c1f4072f5800b01b724ee980ea0373d0a"; + sha256 = "1xqx3iqv627wkpyz8b3frxgdm2y2zicfd5ansxw9yg2q7dxs6bff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; @@ -53004,12 +53088,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20180313.524"; + version = "20180407.1820"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "10098b001c3926f0fb128c85fc64d9016a195868"; - sha256 = "0xb37lg7rlgfwkhvwwsb9wv7k5yig8n8bnxq97hxrbx56dh70mhr"; + rev = "41ea9818b4e35555fac5d287a3f8bbf84c694005"; + sha256 = "148mw7wik58756k072p3frlb0hdy6sc2jsqgjzhp5pqsmd1chg7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -53563,12 +53647,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, htmlize, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20180330.1356"; + version = "20180409.813"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "85b8e0ac858ca2c37844e606a81bff428848adb4"; - sha256 = "1bbggn2kg7jw3bxmyyvr6bnlmiq0ylz76kyywfr8frbwic6g3rzc"; + rev = "57e14a9e1c91c47fc46eb63b51e0b6585dfec977"; + sha256 = "129g1yzx5qkmy4s44czmmdk5ffvv9kdn0kpxcky56ndsyvnkz35p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -53722,12 +53806,12 @@ org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; - version = "20180323.128"; + version = "20180402.237"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "8ea4456b0ca5642fff5868e54fe23f3b5109a579"; - sha256 = "0zh1vb6q8xwaawizv9rq86ahpvxsmrjrzhgh6k4xv6rx8k7k1i7g"; + rev = "0ce09a3c27f6ea862b6dd121cb16a192cee0e9c4"; + sha256 = "07hx4d8a2m7kj151zjc0920l6h0c0d7jgvravp2n5rgcb76yrlnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -54631,27 +54715,6 @@ license = lib.licenses.free; }; }) {}; - osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "osx-plist"; - version = "20101130.448"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "osx-plist"; - rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"; - sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f3686dc818bd12be247bad915c01736a95690041/recipes/osx-plist"; - sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8"; - name = "osx-plist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/osx-plist"; - license = lib.licenses.free; - }; - }) {}; osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; @@ -54715,6 +54778,27 @@ license = lib.licenses.free; }; }) {}; + other-emacs-eval = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "other-emacs-eval"; + version = "20180408.648"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "other-emacs-eval"; + rev = "8ace5acafef65daabf0c6619eff60733d7f5d792"; + sha256 = "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/75b6391726b0d5069e036930c2c5fa177c4e3422/recipes/other-emacs-eval"; + sha256 = "07sr5bb6x9w450cvfg32darg6jlwg11n7c1qhhk0ijcrnlsm09n7"; + name = "other-emacs-eval"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://melpa.org/#/other-emacs-eval"; + license = lib.licenses.free; + }; + }) {}; outline-magic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outline-magic"; @@ -55075,12 +55159,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180328.2041"; + version = "20180403.1111"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "ab0ccf2e8e0298d919d8dd497e2631376e1f1ca9"; - sha256 = "1wz34ip94kn4b6igbr9nph0nysqmfr2dg6ysxkk3xn9bpzms6gq4"; + rev = "3d91d3377e43dce981606a3b878563091e219c8b"; + sha256 = "0r3c532g8bswbdqjx12s1rgbw28w7ddq090j2dwlmwmqqh7w14vc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -55898,8 +55982,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "8118551aaf0472900cdfdc13449b55b33ab56289"; - sha256 = "153cch134c6rvqfcpikidlpxcbxk8nys2ig1xxpbn9ncn4fqkaf3"; + rev = "35424f7360f5110833b7a9f4f53907b9e222be85"; + sha256 = "1xi56c8f2wcmldr76ylrcqsy0wf75pv74b0455ki84fq1fk4n08s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -56186,12 +56270,12 @@ pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pasp-mode"; - version = "20170803.1301"; + version = "20180404.1000"; src = fetchFromGitHub { owner = "santifa"; repo = "pasp-mode"; - rev = "6511193677d6113fec1171f476c0db3be242ee15"; - sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg"; + rev = "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92"; + sha256 = "1ar4vws3izzmir7m870mccci620ns3c5j26dcmwaxavhgw45wcmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; @@ -57591,12 +57675,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180328.1051"; + version = "20180409.537"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "2c83fbe9af2ac07806e973ed6baa34582fb70f4e"; - sha256 = "18a8q4jfdz2hh1dswv069qzqh68d2qzal7mprj64kz17a1p62d3w"; + rev = "6de29235218ae2bc3d96523e454e952729a4490a"; + sha256 = "0gbg34z4rnr2gnqpk6jq8k4ajws0nniyp2001gfwalifcfqlpaq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57717,12 +57801,12 @@ pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pianobar"; - version = "20171117.1522"; + version = "20180409.1906"; src = fetchFromGitHub { owner = "agrif"; repo = "pianobar.el"; - rev = "68fe0ed839f6775535081b3ae0a946ccaf11234a"; - sha256 = "0ycwahbn7fny3slmh5xkfv7vk4qj95jydygdk6pzzx6drsdhnyza"; + rev = "9eb9b7fcb4790b11726302cbcec1b7951fbc8b0e"; + sha256 = "0y41hfml5l28i40fk279m6yngylkwrlv5wldhq3y1sp4ryahwl6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5659b4c7be20572aabe75caba866301393db012/recipes/pianobar"; @@ -57969,12 +58053,12 @@ pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pipenv"; - version = "20180222.359"; + version = "20180402.2127"; src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "364eaf1c823a28db97fe55e7fe85106107a23234"; - sha256 = "1f3xx606xvsmcc73mqml0w07xbkkm2xjirc4pfkb2883cfsk3fq1"; + rev = "8298daefee1b044c58390c861a6a70937cb0601b"; + sha256 = "0y084hqf0ylzayx8xbss08g5c87jg9sn1jcwy83g68cjyvxfn2k3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; @@ -58469,12 +58553,12 @@ pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; - version = "20170818.533"; + version = "20180402.1809"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; - rev = "26e4583311ebc472f7bba59a1189f04938f2c03e"; - sha256 = "04cf97mwkp5rw0dvnspdbrycywjdv4mljl6lbjhbvlijj745d5xm"; + rev = "3eb9430b9db90bc02e736e433eb86389f7655189"; + sha256 = "0k6a9zzdi02g677cc699llk04i06yb7ddnlnmxndap5jszfyqwfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api"; @@ -58584,12 +58668,12 @@ poet-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "poet-theme"; - version = "20180324.1909"; + version = "20180410.420"; src = fetchFromGitHub { owner = "kunalb"; repo = "poet"; - rev = "53e0ec4006d5b5d24f263e1cfd1c1154c47bac9e"; - sha256 = "1qizsg2mh8nx8wx5ibd2fnpdxxiq57b02vrcx71pnbdqi6fv7zr9"; + rev = "5bdc1fbe264a031706ce7a7bf012c50fe48b26c9"; + sha256 = "1xmi3155gssw06sfqfpdlki58j9bgfvsws1xhckb0x4y2qfjshin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme"; @@ -58668,12 +58752,12 @@ pollen-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pollen-mode"; - version = "20160808.2000"; + version = "20180404.612"; src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; - sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + rev = "df4eab5b490cb478a092e6bab6b07f9e2f9c6fad"; + sha256 = "0x8bnf0n109ard5zdmma04w0wv5jb1r7qh5smsa1kjvws98gnp57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/pollen-mode"; @@ -60011,12 +60095,12 @@ promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "promise"; - version = "20170215.2204"; + version = "20180409.252"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "d3cad4e1f7825404828cd9f5b887f18d3fd83c56"; - sha256 = "1cn1xcp6yfxp642yibknngf456v29s2qq3y8bsc67ydxjkr5w4gz"; + rev = "f623fa7466983fd1ba7034371f599434c03da723"; + sha256 = "1ffk5scab9whn27xz4wyik5vl235ngvhx30fd05abq97d6l7hndl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; @@ -60162,8 +60246,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "7bf47a6b5d10382a4b427677cf7ca9288f4e2833"; - sha256 = "1rmq32csqd5zxhw7v9c8hd08ylr84s2dgnci0xss73s5cfyrd0g3"; + rev = "320d56c833f835f40c56bdaf2a375768cdd1b334"; + sha256 = "0waqwqcwwv99rl0ays9maqv0y6l06vx6k8ygap21i69dn7mrj5nl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -60200,12 +60284,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20180101.1421"; + version = "20180404.215"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2"; - sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p"; + rev = "de22a50eb031d11c4771e62f8c705298bc5636d6"; + sha256 = "1sn2lw37382kl5d69c8wdghcr10cwwx7g5dgxgnmmfhspbkz6v95"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -60249,48 +60333,27 @@ license = lib.licenses.free; }; }) {}; - psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20180331.1138"; + version = "20180409.1056"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "1360c92372fc2cdb05a3a06dbabf311471cca460"; - sha256 = "02lksnjd6c4b2az09jhkhfcimld96cl8kdv75j39jvf4qdqhmrg8"; + rev = "faea8e5b3873a4c62a03c76a057cd0fd6fb0434e"; + sha256 = "1i1rjk72cwvfgxvqsiw2sqfwhsc8n4q89p94c96f3wm10rvlv7k2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a"; name = "psession"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ async cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/psession"; license = lib.licenses.free; }; }) {}; - psvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "psvn"; - version = "20151103.1042"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "psvn"; - rev = "23048d302858fc3a52c118652bd83491a4956410"; - sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3690f9af15a6470b76d953c349eed82833b79a7c/recipes/psvn"; - sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n"; - name = "psvn"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/psvn"; - license = lib.licenses.free; - }; - }) {}; psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; @@ -61031,8 +61094,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "955acfec0e51c7705960693ed077c0696dd91581"; - sha256 = "0d220lp9187shwvaqnq2306f6ajg9bdyn3vz9f4z8qz1ya6ris9j"; + rev = "39338dcb1c3b7b855db9688203ad2bfc8b8bf850"; + sha256 = "0z6am73an8jlsprqp4wi0wgpq0k9xbsq3c70l886v37cgbkmjmf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -61048,12 +61111,12 @@ pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pynt"; - version = "20180331.2118"; + version = "20180410.1715"; src = fetchFromGitHub { owner = "ebanner"; repo = "pynt"; - rev = "742ed8313088a29abcbd2d3fe74922823666e554"; - sha256 = "0fpnv6vv4blrfr6v4nrqvgcrq7c6w8jj67n0mskyp4a7p7l44qcy"; + rev = "313dd24248f26ee1257b8b20885c593d8fb19d58"; + sha256 = "05ik3807pv6g8rc66wyybwgnscjwgl2dn9yssn35rvb95cavqq77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; @@ -61328,12 +61391,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20180331.802"; + version = "20180407.746"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "ea3e28a4d6fe90d56c5d356161b0b2cb59529950"; - sha256 = "0cn8dksg429cb6vmm7pqrmxgckiw0zpxcx68bcm87pdnp7186f58"; + rev = "37265132a393ee1d176b0f72e258e2ab996d1ee0"; + sha256 = "0ma0k33bpq02jnrnhgqmxxa3wk457qb8rrk5an5yjfjnzqiz1sk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -61409,27 +61472,6 @@ license = lib.licenses.free; }; }) {}; - quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "quack"; - version = "20160410.207"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "quack"; - rev = "c1c8e448d295cc1b5752104a63a5759a9c5fdf6d"; - sha256 = "0vhzwr2adkprjibi3x4lnsvjxishysma7fhpwzgg28l21qjqc0nm"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cb571caa41ea51ebbfe952526785287d913d2836/recipes/quack"; - sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii"; - name = "quack"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/quack"; - license = lib.licenses.free; - }; - }) {}; quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; @@ -61458,8 +61500,8 @@ src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "260bad5748dc9b02ad4d98bfef755fa9abd07af2"; - sha256 = "0g48fkc8qf9dfr61qlxw5sf0cw03mpr6zl7sn4fjglf5rlx7kdzh"; + rev = "1e57420158c158275c5a098951aca25651a41bc7"; + sha256 = "1lnvzl9a7pa0v1jzcf6n4qik4swmsm99y7bz9cscmy6i1hcd35b5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -61706,12 +61748,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20180313.719"; + version = "20180401.1803"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "62c40b5a166f3d15d4ab82f5ccc0bbbd0fe90334"; - sha256 = "0v3myl2sfpk8b4n9xsnpwn37f7bzxyh99lm3ya1qj8p3qvmqszgv"; + rev = "aea74aceddf112cdfb918aa5ddb9842f0d56c744"; + sha256 = "0cqzj8qjcqwakikklx0yb193gyqvj5fvcr2acmlqzy8xwr0v65jd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -62472,8 +62514,8 @@ src = fetchFromGitHub { owner = "vic"; repo = "rebecca-theme"; - rev = "1fe3662d1b02caea96e9a780252b2c45f7a49b1d"; - sha256 = "0qcfnc9slhm4y2bpld0ckbv3wijr9y7h6555sy23z3dlmz7xs1wm"; + rev = "384f42481625327052af12e6a20e164765c20742"; + sha256 = "0bbary49c1c63qzg47nd4fqbvvm6y7xxbya50hf0d7pgv5b27n37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; @@ -62703,8 +62745,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "c28a1d98dcb4f766e19ba7ce78824ca57d022a7b"; - sha256 = "1kr6j75b428xr1pqy1ad0gqahh5dj5zh4pddc6rymr969yai02z0"; + rev = "8b9309f6344cddf9b5ef4b9c1fde9d910672e913"; + sha256 = "04n4nhxh3v8wjav67i1wl0qi626s2xpi001bn8qbxqipnfpidk9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -63475,12 +63517,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20180401.1308"; + version = "20180404.315"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "1d037789386ca626123cef6eab8b5ab467a8ca3b"; - sha256 = "18q55bx6wfmzvzxl97w38b5kk9ihblyk8p9g9q4d1xangsclqqzz"; + rev = "943226043dc9055b282d0c035fd1e1cbdd562b22"; + sha256 = "0hm25x1zym4xdc4w1ayn1an4nrg1qwyh12vb9sxas3fplapm500k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -63685,12 +63727,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20180314.845"; + version = "20180409.902"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0"; - sha256 = "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8"; + rev = "a0231e76808e94eb842c502fc9e10b53d3307ea8"; + sha256 = "0i6yzxfwyvbmfy1x5pymmjdli91ya6jgfq6wdjnwyrknbf6p76w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -64441,12 +64483,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20180227.51"; + version = "20180406.108"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "5968b951bd646c003f2825f31cdf9da94d6f1cae"; - sha256 = "1ai8r6dmlvaa702yr74dbph97kp5xar3h147ahpk3vj1gh5irvnr"; + rev = "03410e6a7a2b11e47e1fea3b7d9899c7df26435e"; + sha256 = "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -64777,12 +64819,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "20170509.1215"; + version = "20180404.1139"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "20a92323c3edc060c521aa93edab9dad47646b4f"; - sha256 = "0h0wn5c1n2y3cyslz3kbhksvwy1rnwvb1995949b6qkkzwf0cb4l"; + rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f"; + sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -64823,8 +64865,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "e7c0851d4023817b2a11df2583d6f406f3b58883"; - sha256 = "1rmjlgx83ck511ikahmn9xkg1qwakm0x3k7yzc2r5jkl40605833"; + rev = "9bd8e87da64ffbdb1a41763a92e7feaf78652010"; + sha256 = "1sasl3r7fx3vy8w636sx7ahih7w6ihwzhnczi2vyxf5hyf478js9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -65594,12 +65636,12 @@ sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-navigation"; - version = "20171215.1007"; + version = "20180408.919"; src = fetchFromGitHub { owner = "noctuid"; repo = "emacs-sentence-navigation"; - rev = "b2fc2de3aaf1e2e7fd12d6d75a5b6c4b23614022"; - sha256 = "0s7xqs3r9ygc6vcba8ghsd7rbrgy7dkis3y1d36ik4w5dqh9qlvi"; + rev = "7c5d2edeaed01196aec25031782e89adeaa089f0"; + sha256 = "15za4fg7c8fsih86wz1npyx6gdmw0xhizklfsyfh84416dsmgswp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation"; @@ -65615,12 +65657,12 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20180331.1939"; + version = "20180405.2124"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "237cea479c5635fda908c0229beada080ca6c17f"; - sha256 = "1dd8vvvkm6h1ljxv15v4mcsb9nxf0d4v5yk6wnpx185l2936gykc"; + rev = "d2d11fc296decf7701f5688d182527541ac2acf7"; + sha256 = "0vzn01jqkqgfhsn3knf5q5qxx75jd38c1lrk72cxq3yrl62c071v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/seoul256-theme"; @@ -66959,12 +67001,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20180315.253"; + version = "20180410.2035"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "b7e8aaee092a45ad96ea680a812cdb615463ad6e"; - sha256 = "1hlynbydgi194j9x2na66zdnf7i2r7iklyxly4jbq7jqqh1zybgr"; + rev = "411b1ec8385c431d2ad1a56525a981d8d63e1700"; + sha256 = "0ghnhcr9z7av9iwhdq1ww3fc0i11637xrri8l4w69dx3j435virg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -67190,12 +67232,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180221.1414"; + version = "20180410.1121"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "486bfbe95612bcdc0960c490207970a188e0fbb9"; - sha256 = "0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l"; + rev = "08609ed0dbce7848844dd39b1b875a295cef7821"; + sha256 = "1jm4nzq72zp2qwc16vlxknl2k9a6i5623dzyr9j4zrp92kajah6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -68323,12 +68365,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20180328.1608"; + version = "20180409.853"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "55049577992638a6c6c5e68ddc4bcbc6a9af7e60"; - sha256 = "0f6f3sry2ym2fivpn42r1dz2cy5hbdgb41p9qpmix0qyf31vh034"; + rev = "051128d7b7f217263c1aee5cb602338803d44ecb"; + sha256 = "1lfa1jbl5rfmvsk2cvsa5z4glvvg3qnhphksvkhinaha23369vhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -69380,12 +69422,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20180127.1301"; + version = "20180403.1638"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "31b2b41e33d315fff54ace8bc2234abc38adf7cc"; - sha256 = "02kw4h3hzpad39ir6y8cg8lnldd01cl0lm8p22kf4bf5f7f3sdlw"; + rev = "bd4f655adce484bfceee4bb816429b96bc35113f"; + sha256 = "0d3ppp4qs4n3rh0sla1x1kkrwl4fhlz1gvc9472vnlhva38ffxsn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -70512,12 +70554,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180326.919"; + version = "20180402.1857"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "f8cdaa7f3c733b88865650d10d9138bcb40a9ba8"; - sha256 = "0gfaj5ygjmvrmghyqghp7i6wf5abiayb28av4291plpyl0liz78h"; + rev = "9c3c3822b0786ee517d9f0afdaa82245e1d1b02b"; + sha256 = "1k4lzy0a0n501d8b7y0hvz7svn894ch2nrjf6fkdgyj2dgd9bj7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -70910,12 +70952,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20180331.1102"; + version = "20180405.1002"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "fff67d190440fb076104f0f52d55a5e098207e31"; - sha256 = "0ia4nnyhk84dkahsan8l8dslmqiv0afs5abc1w2fnql7zhsiac6q"; + rev = "1470962e6675574d740508e918831f002fdf2f3e"; + sha256 = "1lbqglk02rd96vn91bakcln3pnx580k1p5zhw8m0gxmrxxzylncs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -71263,6 +71305,27 @@ license = lib.licenses.free; }; }) {}; + taskpaper-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "taskpaper-mode"; + version = "20180410.255"; + src = fetchFromGitHub { + owner = "saf-dmitry"; + repo = "taskpaper-mode"; + rev = "62f2f72bc49643b0c5d0c1b4ab9802bf05abe3a2"; + sha256 = "0y8cxh45xwzlzaxyvhjiy5az9z08gggzdp6dm5ci9q23iqwlgb6p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; + sha256 = "0gayhzakiwlrkysmh24499pyzdfy3rmf8d68vamih7igxpl57gim"; + name = "taskpaper-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/taskpaper-mode"; + license = lib.licenses.free; + }; + }) {}; tawny-mode = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tawny-mode"; @@ -71434,12 +71497,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20180329.1924"; + version = "20180404.1614"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "220a1a4a89ca95be9ae1fab356b92296fff5b73a"; - sha256 = "0dkmysgqpmcqchhsng2lkgb3w2nb8cpnk2sk6330h5drhp61d35c"; + rev = "c9aca6ce030fac893793558c74a957e7bd0e6034"; + sha256 = "081mj24h301vljb0d8bn5d9ibrgm1im2r5slzadd699h4zyyldcc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -72194,8 +72257,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "8fb719efb1533e3a8038c155cbb209b492a29910"; - sha256 = "01pi4qh3a6m5j4j0sk5z7h7l7m19w82scm8x3kycdwkmfgn5fxsi"; + rev = "606f1ef31447526b908244933d5b716397a6bad8"; + sha256 = "0cjwfplna5y2f5wzaqn72iagy8n52fvjvhsajzn9r6yak0bgp7zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -72253,12 +72316,12 @@ tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "tidal"; - version = "20171207.1452"; + version = "20180410.1245"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406"; - sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg"; + rev = "ef658d3df0604f3dec955a150509ec1cc68fbd98"; + sha256 = "1ild1gnbcrw830b8d3byvqlmgm27609dgailmxgin6z7g1pg4r7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -72274,12 +72337,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20180327.2043"; + version = "20180404.957"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "0db094ba1748e3add4e152fa34d64b25eb07bdd2"; - sha256 = "113lg22aaagh3bbabxp65460cfwa9whjg3yzafd5n8azkinq8s6k"; + rev = "8e5db30596627ad250caab75cecf56c175f6542f"; + sha256 = "13zr8pzibpszw9rrizgkjxh9r72h7l1bw8mdk0grabdnjqzjimfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -73192,12 +73255,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180314.435"; + version = "20180410.1230"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs"; @@ -73217,8 +73280,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil"; @@ -73238,8 +73301,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "535e9131f1500b355b0c35a7a1118aaad56cce53"; - sha256 = "0i34lm9lbp5vw4r4hlp4iw7brhvaq075j64zlca152brbfpli1jm"; + rev = "51f4aeccdae03885cb118ac5a4894550172abe79"; + sha256 = "0kqd7zhhy0h52skvkyxjyrh23s2p4qrlf0bdgqi2xh8mqqxd4cq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-projectile"; @@ -73715,12 +73778,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20180326.434"; + version = "20180409.422"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "d8501770f6ebd50bbbaada2c65b19c85564c1d1e"; - sha256 = "0hhn3bf9msmp3gbcqpsij1sqwm0zsdxpjyjqaz1r997i4lrqw2r2"; + rev = "5350c45aec10bcdffe16ec9273d04298e576f1e1"; + sha256 = "0121gik1ksmwyx8lrr1pgpim0kyay189rg3cfa9l4hpwm425prp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -73967,12 +74030,12 @@ undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: melpaBuild { pname = "undercover"; - version = "20170502.912"; + version = "20180403.752"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "d947e6410a3b269c657645b499a413d90d4b69ca"; - sha256 = "0c4i8qfa6mzbnjmdk9zqgw324fxyjnq5dm6bmxfadsnvnhjmn7y5"; + rev = "3fc54ef92f0b4b7d26d962d6ed29a81d526a3a66"; + sha256 = "0iqj1a6nj1ka5ahcy4rrn7k427bs1ifv0v0i7gj79m7isjj15qc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; @@ -75112,12 +75175,12 @@ vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vertigo"; - version = "20160429.2105"; + version = "20180408.920"; src = fetchFromGitHub { owner = "noctuid"; repo = "vertigo.el"; - rev = "70b56a57c3a37735cc9e92ffaa6dc27c64437738"; - sha256 = "044vy6yi9yfk3h2gd3a718w50py02h1b5fr0i7a08rjlq4l3srka"; + rev = "117450dfad5d5ad45d40995cdf9a626cf9c2b136"; + sha256 = "1bxf2kzdj4xmy6wmajwvn40msp2q4szp25ylah49biw92dwi2bzw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3/recipes/vertigo"; @@ -75466,27 +75529,6 @@ license = lib.licenses.free; }; }) {}; - vkill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "vkill"; - version = "20091203.1022"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "vkill"; - rev = "8ffe640ed03ddcc23db1c74c76d1acbf25250ad9"; - sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1fe8711711d5c7e1dfdf81b8153a193e6940a16c/recipes/vkill"; - sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm"; - name = "vkill"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vkill"; - license = lib.licenses.free; - }; - }) {}; vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; @@ -75616,12 +75658,12 @@ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20180104.1611"; + version = "20180410.1157"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "b489a63dabe0f2fee2730121ecabb1b4f4c11761"; - sha256 = "09fkyyj0lg3q9q0874q0jpvx1h8rf26g96sn9a2xw0j3fl5ab1n4"; + rev = "eab311f535ac922086466dba3e6f0d428fcff3f2"; + sha256 = "0j7qbrx0z6kvm9r2swyb2khhn9gciq4yjxg199ckg7k5p8iqlzlq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -75804,12 +75846,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20180316.1534"; + version = "20180331.105"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "f0c8c4e55be6569c4c56a1d041f5c53769e4d5ac"; - sha256 = "11p5kqp16bvas26i0zgdazqhgz6jb6j612q032g6d4476yb8df26"; + rev = "afecc04e806c8338e553bdbdb716328fa9f2227a"; + sha256 = "1sf1mck6pk2xnlfcr4rh47brpgl6dsla7zir8lxpa0224dvy0bvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -76035,12 +76077,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180401.810"; + version = "20180407.300"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "1a61f347cc1ac3cf2a68f917b7100fdcb21b488c"; - sha256 = "1yswl44kgz34nn5r5z0wck85ilyniysql2pwc94pn32lpzypa4ah"; + rev = "5de834c8f47d1c5bb427c2c1113787b66010662d"; + sha256 = "1630x09kygsm25sgbqs5612almsq77w6cs51h9768hrnvq7xgvjw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -76203,12 +76245,12 @@ websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20171113.2045"; + version = "20180402.2042"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "7d2adf218743c52578c8e8fd5584a5e54732e256"; - sha256 = "0k8n710ip4av51n6l9ap1254qkifj987a6k86pgj3y6bw76ry08f"; + rev = "e9d148fbb6425c35dc7f76cccdec70aba7fafacf"; + sha256 = "1gyp67sdi4pwrzdkgslnd9l0sjw7nbkqlh7j4zi423yrb5zxh4wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -76627,8 +76669,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "900cf8213df6e58bdd3244b446ea02c67b7555d8"; - sha256 = "1yn2hadcpcsgnf0wy7x8zcfw97c90dpp2ipdml176191vz41n7nb"; + rev = "aafd8a262599571f2de06e3aa75933d8a09e2d35"; + sha256 = "0663631mxw4mrzlb144fbvry6yffg9hic9jbns147zfgvsp1xcf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -77004,8 +77046,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "d04938232934"; - sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; + rev = "a3afe66da141"; + sha256 = "1qfhac73cbdvz1ghk9l2r1q5f1wf8msy3z8sig6pi1jawk5wb0sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -77252,12 +77294,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20180316.926"; + version = "20180408.36"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "543bfe21727c0ea96ee0c1022ed334103c0acdf0"; - sha256 = "0ia74ijp6cdhxjfygvjb5kx36iyakbdws9lsz20761xlp8vw0dfq"; + rev = "90f0e5f7a596ead7fc3b5106684ab118ee857340"; + sha256 = "1yfvknn4nbc6qig0pa4gks1085l91v79cg8hjg7776plz0cwmn08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -77522,27 +77564,6 @@ license = lib.licenses.free; }; }) {}; - x-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "x-dict"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "x-dict"; - rev = "920b2430bff9fb8c4bb7944aa358622545c00cee"; - sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0567fcc7b7aff08094095292fb701da3be8403c3/recipes/x-dict"; - sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc"; - name = "x-dict"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/x-dict"; - license = lib.licenses.free; - }; - }) {}; x-path-walker = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "x-path-walker"; @@ -77609,12 +77630,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20180219.2311"; + version = "20180405.1521"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "cf452fd0f2e742812a4c69e41cb5403f22b0a16a"; - sha256 = "1wjj3sj90az5y4a7cy0pblwxi0xbj5gg72jdr9wbm95si582vk58"; + rev = "5b630c3a706d7b692e04e44c571ff9c1076be2c3"; + sha256 = "0di2pyd1b4a0lyz1xi260dha3n6wa8d4nlb59inaxcj4nfw7sv15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -77630,12 +77651,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20180328.1205"; + version = "20180402.2139"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "78d6c6d675804c601737e2cffc46d6663bb203b5"; - sha256 = "1p0irlff1qfkfqmcjj9l028x7a6d6dx72q732ix1mwb51vl3fb0b"; + rev = "95ec296ec6e059e0f802b919fcaeae521714fd68"; + sha256 = "19hjw9bcq2qsc0m47303r5r1nr144sbsrs0lwzzadxvfyfwpm1q4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; @@ -77672,12 +77693,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20180331.2108"; + version = "20180407.1510"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "4bb464eb0ea68cdd3f4c544371c876418b47107d"; - sha256 = "0i8q15rygavs336nfvbg4riwsgyk10s796qff3bmcxi7l0v8byzq"; + rev = "1cd2e0cf3f2e23f60d3c195e9bee04d94e728488"; + sha256 = "0l6bm60bv7n6sfy9v32h79hkz2s0wgmcz8lsivr2aaapaabkpvkd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -78152,27 +78173,6 @@ license = lib.licenses.free; }; }) {}; - xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-frobs"; - version = "20161207.1609"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-frobs"; - rev = "0832d588598dbf6bd8aa8e05c611d7c098c3f9d8"; - sha256 = "0snrylgv2d6r3d6nv05vqs6ng3sgrxkvqpx7m4ga2y7a1m5lmxkw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bb3be63b798967f5525cf118579a1cc756ee1a/recipes/xterm-frobs"; - sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf"; - name = "xterm-frobs"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-frobs"; - license = lib.licenses.free; - }; - }) {}; xterm-keybinder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "xterm-keybinder"; @@ -78194,27 +78194,6 @@ license = lib.licenses.free; }; }) {}; - xterm-title = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "xterm-title"; - version = "20091203.1023"; - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "xterm-title"; - rev = "b6ea73d297d191d48bba7dd1e2adc23bbdfa1c3c"; - sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bc25d156c8631b552a463f5088a99a3370166e03/recipes/xterm-title"; - sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6"; - name = "xterm-title"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/xterm-title"; - license = lib.licenses.free; - }; - }) {}; xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xtest"; @@ -78348,8 +78327,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "c2912e845d74a22436bdf720eb9bc543d0e0c45c"; - sha256 = "1swnr1nrlyd7ij4m05dvqwdfmpj41b3ibfqmb45qm073f27gvj65"; + rev = "673f033c05b4984f5159526db2d7f4a32dd57b6d"; + sha256 = "1iwmwff538zw95mlrq4jhwaikx2hs6jqcx94rypn6znymrfsf0hp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -78386,12 +78365,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20180212.1556"; + version = "20180408.2307"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "3fc5a33760b0bbb6e67adbce48ab3dc4ae34b847"; - sha256 = "1ijq7ay5lx77nibzqc1kih64v4bg4790as1zg26igp7ivg66l1m6"; + rev = "40067a10ac1360f0b9533f0bbbb2eea128e2574d"; + sha256 = "0v7646vdsbbhxh9ywsypq2ycdsrf6m7wv788qaircbjgn1pk4v7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -78638,12 +78617,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20180324.1124"; + version = "20180408.446"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "79fc648da3550ada25ec38cebe394c7e5ca8f7b9"; - sha256 = "0sdd021wdighn71mgb9ih4qa8i0msx8sg390kjhqgqfvg8xzrfd4"; + rev = "4bbe565b7c9c7286f7ac465f0cc79c3fe5796c0b"; + sha256 = "0rak66wmj0x4zmksckniamslvcaxsz0dgysrzv22jijmjjqpfd2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -79421,12 +79400,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20180215.1021"; + version = "20180409.1322"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "67a1d90595353ab57fd424651c567df9851b9494"; - sha256 = "01qv400zp4bdfah62l3ixkc3kvkwrjj5ngc36m6w783q0zmr105r"; + rev = "487957664cedc61d70feccc881092eef6746977b"; + sha256 = "1hvqx1dfh253iin59j9i1x85xfnhljgwsrvn9pq3lxfvy82zjlc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; @@ -79502,4 +79481,4 @@ license = lib.licenses.free; }; }) {}; - } + } \ No newline at end of file From 70298659d7931562356063d50e8349f49748def3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 11 Apr 2018 06:14:25 -0400 Subject: [PATCH 1710/2743] emacsPackagesNg: fix evaluation issues There were some overrides relating to packages that were removed, as well as some packages that still remained but depended on packages that were removed. --- .../editors/emacs-modes/melpa-generated.nix | 42 ------------------- .../editors/emacs-modes/melpa-packages.nix | 6 --- .../emacs-modes/melpa-stable-generated.nix | 21 ---------- .../emacs-modes/melpa-stable-packages.nix | 3 -- 4 files changed, 72 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index a1e079b57283..8fb655507d0a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -26791,27 +26791,6 @@ 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"; @@ -66326,27 +66305,6 @@ 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"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index d23c735aba47..86c81cc9721e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -94,9 +94,6 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; - # build timeout graphene = markBroken super.graphene; @@ -164,9 +161,6 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing package version - quack = markBroken super.quack; - # upstream issue: missing file header railgun = markBroken super.railgun; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 7302bc1d7550..791617c2122d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -14129,27 +14129,6 @@ 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"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index be01b125cb71..7592fdbcae11 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -96,9 +96,6 @@ self: # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; - # upstream issue: missing file header - fold-dwim = markBroken super.fold-dwim; - # build timeout graphene = markBroken super.graphene; From 6bd669f0f9b82e2be4890576fda0aba9fa365cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 11 Apr 2018 10:56:53 +0100 Subject: [PATCH 1711/2743] nix-review: 0.1.0 -> 0.1.2 --- 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 3dc452db3e26..2b813638a11a 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.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "1kafp3x95dklydy5224w0a292rd8pv30lz6z5ddk6y7zg3fsxrcr"; + sha256 = "06lj3q6405fw18fq1xg0bm52cwlwx94lx5hn4zpz3rxl5g49wiyz"; }; buildInputs = [ makeWrapper ]; From 136403655c15b830fff4f58fd90b3e1478c7ba30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Apr 2018 22:26:06 -0700 Subject: [PATCH 1712/2743] krita: 4.0.0 -> 4.0.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/krita/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.0.1 with grep in /nix/store/5n5zy1944sd00lablmvqcqyp4w1b2sy9-krita-4.0.1 - directory tree listing: https://gist.github.com/b46fb0156abdb69233c6f63121457b89 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 6eaa4727e811..5af0e627d7d8 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz"; + sha256 = "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From f09a0a8e43d7407aa871c5b8a7c2a403a0526053 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 10 Apr 2018 17:58:27 +0100 Subject: [PATCH 1713/2743] rust: drop obsolete patch (now included in upstream sources) --- pkgs/development/compilers/rust/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 3f189249ccad..d9a36273ce1d 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,5 +1,4 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl -, fetchpatch , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -23,11 +22,6 @@ in rec { patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch - # Adapted from https://github.com/rust-lang/rust/pull/47912 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/rust/raw/1bb4d24c060915c304c9a9f86a438388e599f9c6/f/0002-Use-a-range-to-identify-SIGSEGV-in-stack-guards.patch"; - sha256 = "16hc170qzzcb9lcabk0ln005zji2h1gq0knbr9avbbzlbg9jha2q"; - }) ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch # https://github.com/rust-lang/rust/issues/45410 ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; From 7427b58266b6a0b216c3782f9c11ad19261cd743 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 11 Apr 2018 15:09:51 +0200 Subject: [PATCH 1714/2743] Switch suckless.org URLs to https (cherry picked from commit 22f212537f475565f67a07b869f9cceea2022191) --- pkgs/applications/misc/dmenu/default.nix | 4 ++-- pkgs/applications/misc/st/default.nix | 2 +- pkgs/applications/misc/wmname/default.nix | 2 +- pkgs/applications/networking/irc/ii/default.nix | 2 +- pkgs/applications/networking/irc/sic/default.nix | 2 +- pkgs/applications/window-managers/dwm/default.nix | 2 +- pkgs/applications/window-managers/tabbed/default.nix | 4 ++-- pkgs/applications/window-managers/velox/dmenu.nix | 2 +- pkgs/applications/window-managers/velox/st.nix | 2 +- pkgs/development/libraries/farbfeld/default.nix | 2 +- pkgs/misc/screensavers/slock/default.nix | 6 +++--- pkgs/os-specific/linux/sinit/default.nix | 4 ++-- pkgs/tools/X11/sselp/default.nix | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index f8b175eb86a1..3b620fc0606c 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dmenu-4.8"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; + homepage = https://tools.suckless.org/dmenu; license = licenses.mit; maintainers = with maintainers; [ viric pSub ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index c7512a8ac271..3562a4f9b168 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "st-0.8.1"; src = fetchurl { - url = "http://dl.suckless.org/st/${name}.tar.gz"; + url = "https://dl.suckless.org/st/${name}.tar.gz"; sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4"; }; diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index fe0348cad211..68f6c4df1593 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "wmname-0.1"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index b4532c5470b8..4807f3419d15 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ii-1.8"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 975715ed7fcd..cf72bef62b17 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; src = fetchurl { - url = "http://dl.suckless.org/tools/sic-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; }; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 76352753db1d..f18afb935278 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://dl.suckless.org/dwm/${name}.tar.gz"; + url = "https://dl.suckless.org/dwm/${name}.tar.gz"; sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2"; }; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 279ba68eae8b..5e1098e97064 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "tabbed-20160425"; src = fetchgit { - url = http://git.suckless.org/tabbed; + url = https://git.suckless.org/tabbed; rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164"; sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://tools.suckless.org/tabbed; + homepage = https://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; maintainers = with maintainers; [ viric vrthra ]; diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix index 182a290e0eee..01360e5af0b3 100644 --- a/pkgs/applications/window-managers/velox/dmenu.nix +++ b/pkgs/applications/window-managers/velox/dmenu.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; + homepage = https://tools.suckless.org/dmenu; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/applications/window-managers/velox/st.nix b/pkgs/applications/window-managers/velox/st.nix index 49ce57469bd6..2d73df650463 100644 --- a/pkgs/applications/window-managers/velox/st.nix +++ b/pkgs/applications/window-managers/velox/st.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://st.suckless.org/; + homepage = https://st.suckless.org/; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index 3f309f06630b..8c45b275daae 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3"; src = fetchgit { - url = "http://git.suckless.org/farbfeld"; + url = "https://git.suckless.org/farbfeld"; rev = "refs/tags/${version}"; sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl"; }; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 6b310236de42..82ce4c20df8e 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, writeText , xproto, libX11, libXext, libXrandr # default header can be obtained from -# http://git.suckless.org/slock/tree/config.def.h +# https://git.suckless.org/slock/tree/config.def.h , conf ? null }: with stdenv.lib; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "slock-1.4"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/slock; + homepage = https://tools.suckless.org/slock; description = "Simple X display locker"; longDescription = '' Simple X display locker. This is the simplest X screen locker. diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 46abb6ccc662..32761970d81c 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -5,7 +5,7 @@ let baseName="sinit"; version="1.0"; name="${baseName}-${version}"; - url="http://git.suckless.org/sinit/"; + url="https://git.suckless.org/sinit/"; sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc"; rev = "refs/tags/v${version}"; }; @@ -32,6 +32,6 @@ stdenv.mkDerivation { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; homepage = https://tools.suckless.org/sinit; - downloadPage = "http://git.suckless.org/sinit"; + downloadPage = "https://git.suckless.org/sinit"; }; } diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 10b0dfff9bf8..2b58dd6c9115 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "sselp-${version}"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; }; From 67206c90a80e313867665482d86a015772394c0f Mon Sep 17 00:00:00 2001 From: davidak Date: Tue, 10 Apr 2018 06:28:02 +0200 Subject: [PATCH 1715/2743] dit: init at 0.4 --- pkgs/applications/editors/dit/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/dit/default.nix diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix new file mode 100644 index 000000000000..03c3c5d5eec6 --- /dev/null +++ b/pkgs/applications/editors/dit/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchurl, stdenv, coreutils, ncurses, lua }: + +stdenv.mkDerivation rec { + name = "dit-${version}"; + version = "0.4"; + + src = fetchurl { + url = "https://hisham.hm/dit/releases/${version}/${name}.tar.gz"; + sha256 = "0bwczbv7annbbpg7bgbsqd5kwypn81sza4v7v99fin94wwmcn784"; + }; + + buildInputs = [ coreutils ncurses lua ]; + + prePatch = '' + patchShebangs tools/GenHeaders + ''; + + # needs GNU tail for tail -r + postPatch = '' + substituteInPlace Prototypes.h --replace 'tail' "$(type -P tail)" + ''; + + meta = with stdenv.lib; { + description = "A console text editor for Unix that you already know how to use"; + homepage = https://hisham.hm/dit/; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03018649317b..48fa5a0123b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15213,6 +15213,8 @@ with pkgs; distrho = callPackage ../applications/audio/distrho {}; + dit = callPackage ../applications/editors/dit { }; + djvulibre = callPackage ../applications/misc/djvulibre { }; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; From 6dc287802a9ca43c5078b2787a7fb5d886076b3a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 11:49:43 +0200 Subject: [PATCH 1716/2743] gap: 4r8p3 -> 4r8p10 --- .../applications/science/math/gap/default.nix | 85 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 3d9e06527c9d..87071c0a7ae3 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,29 +1,80 @@ -{ stdenv, fetchurl, m4, gmp }: - -let - baseName = "gap"; - version = "4r8p3"; - - pkgVer = "2016_03_19-22_17"; -in +{ stdenv +, fetchurl +, fetchpatch +, m4 +, gmp +# don't remove any packages -- results in a ~1.3G size increase +# see https://github.com/NixOS/nixpkgs/pull/38754 for a discussion +, keepAllPackages ? true +}: stdenv.mkDerivation rec { - name = "${baseName}-${version}"; + pname = "gap"; + # https://www.gap-system.org/Releases/ + # newer versions (4.9.0) are available, but still considered beta (https://github.com/gap-system/gap/wiki/GAP-4.9-release-notes) + version = "4r8p10"; + pkgVer = "2018_01_15-13_02"; + name = "${pname}-${version}"; - src = fetchurl { - url = "ftp://ftp.gap-system.org/pub/gap/gap48/tar.gz/${baseName}${version}_${pkgVer}.tar.gz"; - sha256 = "1rmb0lj43avv456sjwb7ia3y0wwk5shlqylpkdwnnqpjnvjbnzv6"; + src = let + # 4r8p10 -> 48 + majorminor = stdenv.lib.replaceStrings ["r"] [""] ( + builtins.head (stdenv.lib.splitString "p" version) # 4r8p10 -> 4r8 + ); + in + fetchurl { + url = "https://www.gap-system.org/pub/gap/gap${majorminor}/tar.bz2/gap${version}_${pkgVer}.tar.bz2"; + sha256 = "0wzfdjnn6sfiaizbk5c7x44rhbfayis4lf57qbqqg84c7dqlwr6f"; }; + # remove all non-essential packages (which take up a lot of space) + preConfigure = stdenv.lib.optionalString (!keepAllPackages) '' + find pkg -type d -maxdepth 1 -mindepth 1 \ + -not -name 'GAPDoc-*' \ + -not -name 'autpgrp*' \ + -exec echo "Removing package {}" \; \ + -exec rm -r {} \; + ''; + configureFlags = [ "--with-gmp=system" ]; buildInputs = [ m4 gmp ]; - + + patches = [ + # fix infinite loop in writeandcheck() when writing an error message fails. + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/writeandcheck.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "1r1511x4kc2i2mbdq1b61rb6p3misvkf1v5qy3z6fmn6vqwziaz1"; + }) + ]; + + doCheck = true; + checkTarget = "testinstall"; + # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. + # tests are run twice, once with all packages loaded and once without + # checkTarget = "teststandard"; + + preCheck = '' + # gap tests check that the home directory exists + export HOME="$TMP/gap-home" + mkdir -p "$HOME" + ''; + + postCheck = '' + # The testsuite doesn't exit with a non-zero exit code on failure. + # It leaves its logs in dev/log however. + + # grep for error messages + if grep ^##### dev/log/*; then + exit 1 + fi + ''; + postBuild = '' pushd pkg bash ../bin/BuildPackages.sh popd ''; - + installPhase = '' mkdir -p "$out/bin" "$out/share/gap/" @@ -31,7 +82,7 @@ stdenv.mkDerivation rec { sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" - ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" + ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" ''; meta = with stdenv.lib; { @@ -42,6 +93,10 @@ stdenv.mkDerivation rec { chrisjefferson ]; platforms = platforms.all; + # keeping all packages increases the package size considerably, wchich + # is why a local build is preferable in that situation. The timeframe + # is reasonable and that way the binary cache doesn't get overloaded. + hydraPlatforms = stdenv.lib.optionals (!keepAllPackages) platforms; license = licenses.gpl2; homepage = http://gap-system.org/; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..ee6bc16fb04b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20195,6 +20195,8 @@ with pkgs; gap = callPackage ../applications/science/math/gap { }; + gap-minimal = lowPrio (gap.override { keepAllPackages = false; }); + geogebra = callPackage ../applications/science/math/geogebra { }; maxima = callPackage ../applications/science/math/maxima { From a7c51f1422da8aa7aa6f7b8db379bbdcbb2674c2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 11 Apr 2018 15:30:54 +0200 Subject: [PATCH 1717/2743] farbfeld: 3 -> 4 --- pkgs/development/libraries/farbfeld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index 8c45b275daae..7c0addea5e8b 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "farbfeld-${version}"; - version = "3"; + version = "4"; src = fetchgit { url = "https://git.suckless.org/farbfeld"; rev = "refs/tags/${version}"; - sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl"; + sha256 = "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870"; }; buildInputs = [ libpng libjpeg ]; From a60e17438ea38d048b690d4fa6c2c67053479463 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 10 Apr 2018 18:12:32 -0400 Subject: [PATCH 1718/2743] trezord: 1.2.1 -> 2.0.12 The old trezord is obsolete and no longer functions with Trezor's password manager app. --- nixos/modules/services/hardware/trezord.nix | 2 +- pkgs/servers/trezord/default.nix | 65 +++++---------------- pkgs/servers/trezord/dynamic-link.patch | 18 ------ 3 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 pkgs/servers/trezord/dynamic-link.patch diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 38d0a3a1d752..fa0496114684 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -38,7 +38,7 @@ in { path = []; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.trezord}/bin/trezord -f"; + ExecStart = "${pkgs.trezord}/bin/trezord-go"; User = "trezord"; }; }; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index bdc37b700e5d..a3c505646214 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,65 +1,26 @@ -{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp -, libusb1, libmicrohttpd -}: +{ stdenv, buildGoPackage, fetchFromGitHub }: -let - version = "1.2.1"; -in +buildGoPackage rec { + name = "trezord-go-${version}"; + version = "2.0.12"; -stdenv.mkDerivation rec { - name = "trezord-${version}"; + # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) + hardeningDisable = [ "fortify" ]; - src = fetchgit { - url = "https://github.com/trezor/trezord"; - rev = "refs/tags/v${version}"; - sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4"; - }; + goPackagePath = "github.com/trezor/trezord-go"; - common = fetchFromGitHub { - owner = "trezor"; - repo = "trezor-common"; - rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e"; - sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg"; + src = fetchFromGitHub { + owner = "trezor"; + repo = "trezord-go"; + rev = "v${version}"; + sha256 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6"; }; meta = with stdenv.lib; { - description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet"; + description = "TREZOR Communication Daemon aka TREZOR Bridge"; homepage = https://mytrezor.com; license = licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ]; platforms = platforms.linux; }; - - patches = [ ./dynamic-link.patch ]; - - nativeBuildInputs = [ - cmake - gcc - pkgconfig - ]; - - buildInputs = [ - curl - boost - protobuf - libusb1 - libmicrohttpd - jsoncpp - ]; - - preConfigure = '' - ( cd src/config - ln -s $common/protob/config.proto - protoc -I . --cpp_out=. config.proto - ) - ''; - - LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}"; - cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ]; - - installPhase = '' - mkdir -p $out/bin - cp trezord $out/bin - ''; } - diff --git a/pkgs/servers/trezord/dynamic-link.patch b/pkgs/servers/trezord/dynamic-link.patch deleted file mode 100644 index 0f1f448a3f79..000000000000 --- a/pkgs/servers/trezord/dynamic-link.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c0e2cf..0e3f4ac 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,13 +59,6 @@ target_link_libraries(trezord ${OS_LIBRARIES}) - find_package(CURL REQUIRED) - find_package(libmicrohttpd REQUIRED) - --# add static libs --if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -- set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") -- set(BUILD_SHARED_LIBS off) -- set(Boost_USE_STATIC_LIBS on) -- set(CMAKE_FIND_STATIC FIRST) --endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - find_package(Boost 1.53.0 REQUIRED - regex thread system unit_test_framework program_options chrono) - find_package(Protobuf 2.5.0 REQUIRED) From 81bd50ecb34045ff1d5ff85f12abdad7f6f5dcec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 07:15:35 -0700 Subject: [PATCH 1719/2743] 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 8b5744de44147cad6cc7bc884ad38f319d72866b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 07:21:31 -0700 Subject: [PATCH 1720/2743] babeld: 1.8.0 -> 1.8.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/babeld/versions. These checks were done: - built on NixOS - ran ‘/nix/store/j81blmvh73cbd6ymkg6z25gb9nx2ilks-babeld-1.8.1/bin/babeld -V’ and found version 1.8.1 - found 1.8.1 with grep in /nix/store/j81blmvh73cbd6ymkg6z25gb9nx2ilks-babeld-1.8.1 - directory tree listing: https://gist.github.com/9ced26cbfac7f25e450f058f63c0f209 --- pkgs/tools/networking/babeld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 69d36d363205..801863fb95a1 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.0"; + name = "babeld-1.8.1"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "0v2jkav2sb0rpx3fmi5chhii08lc92pxf306nyha2amq9wib3a0i"; + sha256 = "1gq6q1zly40ngs9wl3qa3yjvyb6zbqck82fp3n6w2bi9ymrrq94w"; }; preBuild = '' From 96f10e7e4955446246c60587a1e95a8b722f6570 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Wed, 11 Apr 2018 16:42:28 +0200 Subject: [PATCH 1721/2743] zfs.autoSnapshot: make `frequent` run every 15 mins fixes bug that there is 30 minutes between hh:45 and hh:15 every hour. --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 30c54ddd0e4e..50cf30cc48de 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -452,7 +452,7 @@ in }) snapshotNames); systemd.timers = let - timer = name: if name == "frequent" then "*:15,30,45" else name; + timer = name: if name == "frequent" then "*:0,15,30,45" else name; in builtins.listToAttrs (map (snapName: { name = "zfs-snapshot-${snapName}"; From fa3d0cef6746769a8ef90cc10a248ef622a31171 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 13:52:10 +0200 Subject: [PATCH 1722/2743] singular: 3.1.7 -> 4.1.1 --- .../science/math/singular/default.nix | 71 ++++++++++++++----- pkgs/development/libraries/flint/default.nix | 3 + pkgs/top-level/all-packages.nix | 8 +-- 3 files changed, 56 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8cd9355a0f63..882d481a7f98 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,23 +1,52 @@ { stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig -, asLibsingular ? false +, autoreconfHook +, flint +, ntl +, cddlib +, enableFactory ? true +, enableGfanlib ? true }: stdenv.mkDerivation rec { - name = "singular-${version}"; - version="3-1-7"; + name = "singular-${version}${patchVersion}"; + version = "4.1.1"; + patchVersion = "p1"; + urlVersion = builtins.replaceStrings [ "." ] [ "-" ] version; src = fetchurl { - url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/Singular-${version}.tar.gz"; - sha256 = "1j4mcpnwzdp3h4qspk6ww0m67rmx4s11cy17pvzbpf70lm0jzzh2"; + url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}${patchVersion}.tar.gz"; + sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1"; }; - buildInputs = [ gmp perl ncurses readline ]; - nativeBuildInputs = [ autoconf bison pkgconfig ]; + configureFlags = stdenv.lib.optionals enableFactory [ + "--enable-factory" + ] ++ stdenv.lib.optionals enableGfanlib [ + "--enable-gfanlib" + ]; + + postUnpack = '' + patchShebangs . + ''; + + # For reference (last checked on commit 75f460d): + # https://github.com/Singular/Sources/blob/spielwiese/doc/Building-Singular-from-source.md + # https://github.com/Singular/Sources/blob/spielwiese/doc/external-packages-dynamic-modules.md + buildInputs = [ + # necessary + gmp + # by upstream recommended but optional + ncurses + readline + ntl + flint + ] ++ stdenv.lib.optionals enableGfanlib [ + cddlib + ]; + nativeBuildInputs = [ autoconf bison perl pkgconfig autoreconfHook ]; preConfigure = '' find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' - ${stdenv.lib.optionalString asLibsingular ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DLIBSINGULAR"''} ''; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; @@ -27,17 +56,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out" - cp -r Singular/LIB "$out/LIB" - make install${stdenv.lib.optionalString asLibsingular "-libsingular"} + cp -r Singular/LIB "$out/lib" + make install - binaries="$(find "$out"/* \( -type f -o -type l \) -perm -111 \! -name '*.so' -maxdepth 1)" - ln -s "$out"/*/{include,lib} "$out" - mkdir -p "$out/bin" - for b in $binaries; do - bbn="$(basename "$b")" - echo -e '#! ${stdenv.shell}\n"'"$b"'" "$@"' > "$out/bin/$bbn" - chmod a+x "$out/bin/$bbn" - done + # Make sure patchelf picks up the right libraries + rm -rf libpolys factory resources omalloc Singular + ''; + + # simple test to make sure singular starts and finds its libraries + doInstallCheck = true; + installCheckPhase = '' + $out/bin/Singular -c 'LIB "freegb.lib"; exit;' + if [ $? -ne 0 ]; then + echo >&2 "Error loading the freegb library in Singular." + exit 1 + fi ''; enableParallelBuilding = true; @@ -47,7 +80,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = subtractLists platforms.i686 platforms.linux; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 - homepage = http://www.singular.uni-kl.de/index.php; + homepage = http://www.singular.uni-kl.de; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; }; } diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 2977293fefa5..67bf7503db98 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals withBlas [ openblas ]; + propagatedBuildInputs = [ + mpfr # flint.h includes mpfr.h + ]; configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..a4b92a161e5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20229,13 +20229,7 @@ with pkgs; inherit (gnome3) gtksourceview; }; - singular = callPackage ../applications/science/math/singular { - stdenv = overrideCC stdenv gcc5; - }; - libsingular = callPackage ../applications/science/math/singular { - asLibsingular = true; - stdenv = overrideCC stdenv gcc5; - }; + singular = callPackage ../applications/science/math/singular { }; scilab = callPackage ../applications/science/math/scilab { withXaw3d = false; From b7dbff3aacba142aafacf01d943f1e611669b0ef Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 11 Apr 2018 17:08:54 +0200 Subject: [PATCH 1723/2743] gap-minimal: fix ofBorg evaluation --- pkgs/applications/science/math/gap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 87071c0a7ae3..2927701dbd71 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { # keeping all packages increases the package size considerably, wchich # is why a local build is preferable in that situation. The timeframe # is reasonable and that way the binary cache doesn't get overloaded. - hydraPlatforms = stdenv.lib.optionals (!keepAllPackages) platforms; + hydraPlatforms = stdenv.lib.optionals (!keepAllPackages) meta.platforms; license = licenses.gpl2; homepage = http://gap-system.org/; }; From 35121b19734962f8b81187fdd70235f209f475f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 08:25:10 -0700 Subject: [PATCH 1724/2743] syncplay: 1.5.2 -> 1.5.3 (#38693) 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/syncplay/versions. These checks were done: - built on NixOS - ran ‘/nix/store/dfjzzxr9ih0cpmz3ls5xcmfaf2qrhmhh-syncplay-1.5.3/bin/.syncplay-server-wrapped -h’ got 0 exit code - ran ‘/nix/store/dfjzzxr9ih0cpmz3ls5xcmfaf2qrhmhh-syncplay-1.5.3/bin/.syncplay-server-wrapped --help’ got 0 exit code - ran ‘/nix/store/dfjzzxr9ih0cpmz3ls5xcmfaf2qrhmhh-syncplay-1.5.3/bin/syncplay-server -h’ got 0 exit code - ran ‘/nix/store/dfjzzxr9ih0cpmz3ls5xcmfaf2qrhmhh-syncplay-1.5.3/bin/syncplay-server --help’ got 0 exit code - found 1.5.3 with grep in /nix/store/dfjzzxr9ih0cpmz3ls5xcmfaf2qrhmhh-syncplay-1.5.3 - directory tree listing: https://gist.github.com/52097c8cbb187c4fb391af784f94d056 --- pkgs/applications/networking/syncplay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index e41671f23604..4eecf7f4a1f8 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.5.2"; + version = "1.5.3"; format = "other"; src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.5.2.tar.gz; - sha256 = "0a7lqq3y53ag5hzkkjpz61gfmglf3w1kpvyynhq2514fn9rnwsla"; + url = https://github.com/Syncplay/syncplay/archive/v1.5.3.tar.gz; + sha256 = "1yk0aajskhk6czpjshf9a9pzp3rafh5cgdcyyz8pwpk4ca9zyzfv"; }; propagatedBuildInputs = with python2Packages; [ pyside twisted ]; From 21943e06bfa68ac24c8882cba6687335c9533013 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 11 Apr 2018 17:25:47 +0200 Subject: [PATCH 1725/2743] pythonPackages.libais: 0.16 -> 0.17 (#37876) --- pkgs/development/python-modules/libais/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5d8c886e00bd..5261a7b65642 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,20 +1,19 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { pname = "libais"; - name = "${pname}-${version}"; - version = "0.16"; + version = "0.17"; - src = fetchurl { - url = "mirror://pypi/l/libais/${name}.tar.bz2"; - sha256 = "14dsh5k32ryszwdn6p45wrqp4ska6cc9qpm6lk5c5d1p4rc7wnhq"; + src = fetchPypi { + inherit pname version; + sha256 = "0pyka09h8nb0vlzh14npq4nxmzg1046lr3klgn97dsf5k0iflapb"; }; # data files missing doCheck = false; - buildInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytestcov coverage ]; propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { From a378389ac2fddee772f695d1f5ce04ed3a935bfb Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 11 Apr 2018 18:05:15 +0200 Subject: [PATCH 1726/2743] elan: 0.1.0 -> 0.3.0 --- pkgs/applications/science/logic/elan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d9d90b3574ca..52409344b562 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { name = "elan-${version}"; - version = "0.1.0"; + version = "0.3.0"; - cargoSha256 = "04cxwklfgz4q28grva52ws3lslaiq67fwqf6pglbzdrfbgdjjwb6"; + cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "065l9a1g974n8i44mz37sx88fl65h5hml611m4p81cy6av2x85sm"; + sha256 = "116v9v1v5a6fr6h4dgxzwczpy4pbf96cnx6nss6a5y8vbhx9c1mj"; }; nativeBuildInputs = [ pkgconfig ]; From 0901b3e195834269902b0979b49b9772c447ed08 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Apr 2018 12:02:06 -0400 Subject: [PATCH 1727/2743] Add setupcfg2nix and supporting infrastructure --- pkgs/build-support/build-setupcfg/default.nix | 23 +++++++++++++++++++ .../tools/setupcfg2nix/default.nix | 19 +++++++++++++++ pkgs/development/tools/setupcfg2nix/info.nix | 7 ++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 4 ++++ 5 files changed, 55 insertions(+) create mode 100644 pkgs/build-support/build-setupcfg/default.nix create mode 100644 pkgs/development/tools/setupcfg2nix/default.nix create mode 100644 pkgs/development/tools/setupcfg2nix/info.nix diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix new file mode 100644 index 000000000000..62dda59f1d52 --- /dev/null +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -0,0 +1,23 @@ +# Build a python package from info made available by setupcfg2nix. +# +# * src: The source of the package. +# * info: The package information generated by setupcfg2nix. +# * meta: Standard nixpkgs metadata. +# * application: Whether this package is a python library or an +# application which happens to be written in python. +pythonPackages: { src, info, meta ? {}, application ? false }: let + build = if application + then pythonPackages.buildPythonApplication + else pythonPackages.buildPythonPackage; +in build { + inherit (info) pname version; + + inherit src meta; + + nativeBuildInputs = map (p: pythonPackages.${p}) ( + (info.setup_requires or []) ++ + (info.tests_require or [])); + + propagatedBuildInputs = map (p: pythonPackages.${p}) + (info.install_requires or []); +} diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix new file mode 100644 index 000000000000..5d1f015e8052 --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -0,0 +1,19 @@ +{ buildSetupcfg, fetchFromGitHub, lib }: + +buildSetupcfg rec { + info = import ./info.nix; + src = fetchFromGitHub { + owner = "target"; + repo = "setupcfg2nix"; + rev = info.version; + sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6"; + }; + application = true; + meta = { + description = "Generate nix expressions from setup.cfg for a python package."; + homepage = https://github.com/target/setupcfg2nix; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix new file mode 100644 index 000000000000..b0d5873ed63c --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -0,0 +1,7 @@ +{ + pname = ''setupcfg2nix''; + version = ''1.1.0''; + install_requires = [ + ''setuptools'' + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba19ba5f21d0..422561d768a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7230,6 +7230,8 @@ with pkgs; pythonPackages = python3Packages; }; + setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; + # These pyside tools do not provide any Python modules and are meant to be here. # See ../development/python-modules/pyside/default.nix for details. pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7657ffc359d..80b1e63ecb87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -66,6 +66,9 @@ let toPythonModule = x: x; # Application does not provide modules. })); + # See build-setupcfg/default.nix for documentation. + buildSetupcfg = import ../build-support/build-setupcfg self; + graphiteVersion = "1.0.2"; fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: @@ -133,6 +136,7 @@ in { inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; + inherit buildSetupcfg; # helpers From 96512b979bc42be9d00522d0e22462c76b882e21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 09:33:52 -0700 Subject: [PATCH 1728/2743] bubblewrap: 0.2.0 -> 0.2.1 (#38770) 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/bubblewrap/versions. These checks were done: - built on NixOS - ran ‘/nix/store/k02fh24ypj5gzazl8qknff4wi7xn0hp6-bubblewrap-0.2.1/bin/bwrap --help’ got 0 exit code - ran ‘/nix/store/k02fh24ypj5gzazl8qknff4wi7xn0hp6-bubblewrap-0.2.1/bin/bwrap --version’ and found version 0.2.1 - found 0.2.1 with grep in /nix/store/k02fh24ypj5gzazl8qknff4wi7xn0hp6-bubblewrap-0.2.1 - directory tree listing: https://gist.github.com/9ee4cdd00b90b74f8599566d9ed1d5d0 --- pkgs/tools/admin/bubblewrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 4ccdbc204f0a..a5e0186fa2dc 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bubblewrap-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "0ahw30ngpclk3ssa81cb7ydc6a4xc5dpqn6kmxfpc9xr30vimdnc"; + sha256 = "1qhzwgpfsw66hcv5kqc7i4dbzhxr8drrqn3md4grcp7dn02wif2l"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; From 99ee7fd311ea32da1e00c566e1951a004846405e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 11 Apr 2018 19:08:22 +0200 Subject: [PATCH 1729/2743] elan: add leanchecker proxy --- pkgs/applications/science/logic/elan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 52409344b562..72b4ae2049ed 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg; do + for link in lean leanpkg leanchecker; do ln -s elan $link done popd From 7413eb8b492f213fb5b066684cec38e3f966fee7 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 9 Apr 2018 00:31:29 -0500 Subject: [PATCH 1730/2743] nixos/postgresql: remove ancient hack for postgres 8.4 Signed-off-by: Austin Seipp --- nixos/modules/services/databases/postgresql.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 0dcbfe2e47ac..f022e0863dfd 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -36,9 +36,6 @@ let ${cfg.extraConfig} ''; - pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4"; - - in { @@ -182,7 +179,7 @@ in services.postgresql.authentication = mkAfter '' # Generated file; do not edit! - local all all ident ${optionalString pre84 "sameuser"} + local all all ident host all all 127.0.0.1/32 md5 host all all ::1/128 md5 ''; From 5570fc142723dee464c998d5f586cde901588f06 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 11 Apr 2018 04:07:46 -0500 Subject: [PATCH 1731/2743] pg_repack: 1.4.0.1 -> 1.4.2 This allows pg_repack to be built against PostgreSQL 10.x. Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/pg_repack/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index 0a25b314506b..50c9c68bb5f7 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { - name = "pg_repack-${version}.1"; - version = "1.4.0"; - rev = "ver_${version}.1"; + name = "pg_repack-${version}"; + version = "1.4.2"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - inherit rev; - sha256 = "1ym2dlhgcizyy4p5dcfw7kadrq6g34pv3liyfx604irprzhw9k74"; + owner = "reorg"; + repo = "pg_repack"; + rev = "refs/tags/ver_${version}"; + sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q"; }; installPhase = '' From 23a1b1264ddc6369e385ebdfa612394017780a4e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 11 Apr 2018 14:01:07 -0400 Subject: [PATCH 1732/2743] 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 0a9f34ad2719195ae16ddfca55d2870b5cecc02a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Apr 2018 14:52:01 -0400 Subject: [PATCH 1733/2743] nixUnstable: Reinit at 2.0pre6137_e3cdcf89 --- pkgs/tools/package-management/nix/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 677c3896fc12..abc93c264fc0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli +, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , libseccomp, busybox-sandbox-shell , hostPlatform, buildPlatform @@ -35,7 +35,8 @@ let (aws-sdk-cpp.override { apis = ["s3"]; customMemoryManagement = false; - }); + }) + ++ lib.optional fromGit boost; propagatedBuildInputs = [ boehmgc ]; @@ -135,19 +136,16 @@ in rec { }; }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; - nixUnstable = nix; -/* nixUnstable = (lib.lowPrio (common rec { name = "nix-2.0${suffix}"; - suffix = "pre5968_a6c0b773"; + suffix = "pre6137_e3cdcf89"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a6c0b773b72d4e30690e01f1f1dcffc28f2d9ea1"; - sha256 = "0i8wcblcjw3291ba6ki4llw3fgm8ylp9q52kajkyr58dih537346"; + rev = "e3cdcf89b0ef42f81c9df5899776ea225f1ecae0"; + sha256 = "1s9w7ixc2qra3x9545f9a634654rvdqsf38jp9b7wr6xx6qqx60s"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; -*/ } From b84a8c06c647988cbb2e07e7f231cae6108966da Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Apr 2018 15:22:05 -0400 Subject: [PATCH 1734/2743] nix-plugins: 3.0.1 -> 4.0.1 --- pkgs/development/libraries/nix-plugins/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 8ccaf726e6b0..bf48997c2799 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 }: -let version = "3.0.1"; in +{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: +let version = "4.0.1"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,12 +7,12 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r"; + sha256 = "1v7wf9l1zjlvpy23v03q5lc8d16isqb7wv1nqry1jjm0bcva72jg"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ nix ]; + buildInputs = [ nix boost ]; meta = { description = "Collection of miscellaneous plugins for the nix expression language"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdcabc0f51e0..a16b2e5d58cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10686,7 +10686,9 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = nixUnstable; + }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; From b1fa009aa2a3c0a121b3920fb1c2e1d9e9ace6a5 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Wed, 11 Apr 2018 14:50:27 -0500 Subject: [PATCH 1735/2743] unix-tools: fixup hexdump hexdump needs utillinux --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 0d6e8d1c6c2d..8adb56f37f13 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -49,7 +49,7 @@ in rec { darwin = pkgs.getopt; }; hexdump = singleBinary "hexdump" { - linux = pkgs.procps; + linux = pkgs.utillinux; darwin = pkgs.darwin.shell_cmds; }; hostname = singleBinary "hostname" { From 9ae378cc42586ff28a00a8512a11002258819000 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 11 Apr 2018 22:12:14 +0200 Subject: [PATCH 1736/2743] haskellPackages.lzma: fix outdated patch --- .../haskell-modules/configuration-common.nix | 4 ++-- .../haskell-modules/patches/lzma-tests.patch | 18 ++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bf489d623943..7b4425869b17 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -508,7 +508,7 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; - # https://github.com/haskell-hvr/lzma/issues/8 + # https://github.com/haskell-hvr/lzma/pull/11 lzma = appendPatch super.lzma ./patches/lzma-tests.patch; # https://github.com/BNFC/bnfc/issues/140 @@ -1040,4 +1040,4 @@ self: super: { amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides; in { inherit amazonka amazonka-core amazonka-test; -}) \ No newline at end of file +}) diff --git a/pkgs/development/haskell-modules/patches/lzma-tests.patch b/pkgs/development/haskell-modules/patches/lzma-tests.patch index e4e327ab6bbc..db9e62ee3c5f 100644 --- a/pkgs/development/haskell-modules/patches/lzma-tests.patch +++ b/pkgs/development/haskell-modules/patches/lzma-tests.patch @@ -1,13 +1,11 @@ --- a/lzma.cabal +++ b/lzma.cabal -@@ -70,8 +70,8 @@ test-suite lzma-tests - , base - , bytestring +@@ -76,7 +76,7 @@ -- additional dependencies that require version bounds -- build-depends: HUnit >= 1.2 && <1.4 -- , QuickCheck >= 2.8 && <2.9 -+ build-depends: HUnit >= 1.2 && <2 -+ , QuickCheck >= 2.8 && <3 - , tasty >= 0.10 && <0.12 - , tasty-hunit == 0.9.* - , tasty-quickcheck >= 0.8.3.2 && < 0.9 + build-depends: HUnit >= 1.2 && <1.7 + , QuickCheck >= 2.8 && <2.11 +- , tasty >= 0.10 && <0.13 ++ , tasty >= 0.10 && <1.1 + , tasty-hunit >= 0.9 && <0.11 + , tasty-quickcheck >= 0.8.3.2 && <0.10 + From 32cf225ad9ba75bc08e499ba7d4aad0cc9c703ca Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 21:14:16 +0200 Subject: [PATCH 1737/2743] 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 9e73f92769cf7dd167da76adac2e03056e791ba5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 12 Apr 2018 00:09:03 +0200 Subject: [PATCH 1738/2743] android-studio,android-studio-preview: 3.1.0.16 -> 3.1.1.0 --- .../editors/android-studio/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d7baa7f7c71c..41f0e9914327 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -7,6 +7,11 @@ let }; inherit (gnome2) GConf gnome_vfs; }; + stableVersion = { + version = "3.1.1.0"; # "Android Studio 3.1.1" + build = "173.4697961"; + sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8"; + }; latestVersion = { version = "3.2.0.9"; # "Android Studio 3.2 Canary 10" build = "181.4705630"; @@ -18,12 +23,9 @@ in rec { # Attributes are named by the corresponding release channels - stable = mkStudio { + stable = mkStudio (stableVersion // { pname = "android-studio"; #pname = "android-studio-stable"; # TODO: Rename and provide symlink - version = "3.1.0.16"; # "Android Studio 3.1" - build = "173.4670197"; - sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy"; meta = with stdenv.lib; { description = "The Official IDE for Android (stable channel)"; @@ -36,20 +38,17 @@ in rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ primeos ]; }; - }; + }); - beta = mkStudio { + beta = mkStudio (stableVersion // { pname = "android-studio-preview"; #pname = "android-studio-beta"; # TODO: Rename and provide symlink - version = "3.1.0.16"; # "Android Studio 3.1" - build = "173.4670197"; - sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy"; meta = stable.meta // { description = "The Official IDE for Android (beta channel)"; homepage = https://developer.android.com/studio/preview/index.html; }; - }; + }); dev = mkStudio (latestVersion // { pname = "android-studio-dev"; From 74914dd075e19d8d18d0098ee60b5e0e95c9be22 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Apr 2018 18:41:39 -0400 Subject: [PATCH 1739/2743] nix-plugins: 4.0.1 -> 4.0.2 --- 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 bf48997c2799..c2c5858ca75a 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.1"; in +let version = "4.0.2"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "1v7wf9l1zjlvpy23v03q5lc8d16isqb7wv1nqry1jjm0bcva72jg"; + sha256 = "0cr1lz788rw7kxfs2acplhdl5cv8qrfh4kdqxi0p63ajnd303k8c"; }; nativeBuildInputs = [ cmake pkgconfig ]; From eb119b045a28c34d3d6dcd179a381bcb658c6977 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 22:53:59 +0200 Subject: [PATCH 1740/2743] maxima: add various fixes, re-add ecl support --- .../science/math/maxima/default.nix | 50 +++++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index d6d3b505e35b..c3eeddef6694 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null, -tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null +, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false }: let @@ -11,6 +11,7 @@ let (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); in stdenv.mkDerivation ({ + inherit version; name = "${name}-${version}"; src = fetchurl { @@ -18,8 +19,9 @@ stdenv.mkDerivation ({ sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s"; }; - buildInputs = stdenv.lib.filter (x: x != null) - [sbcl ecl texinfo perl python makeWrapper]; + buildInputs = stdenv.lib.filter (x: x != null) [ + sbcl ecl texinfo perl python makeWrapper + ]; postInstall = '' # Make sure that maxima can find its runtime dependencies. @@ -36,6 +38,39 @@ stdenv.mkDerivation ({ '') ; + patches = [ + # fix path to info dir (see https://trac.sagemath.org/ticket/11348) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; + }) + + # fix https://sourceforge.net/p/maxima/bugs/2596/ + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; + }) + + # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; + }) + + # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed) + # introduced in https://trac.sagemath.org/ticket/13364 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d"; + }) + ] ++ stdenv.lib.optionals ecl-fasl [ + # build fasl, needed for ECL support + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; + }) + ]; + # Failures in the regression test suite won't abort the build process. We run # the suite only so that potential errors show up in the build log. See also: # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. @@ -57,10 +92,5 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; - broken = ecl != null; }; -} // (stdenv.lib.optionalAttrs ecl-fasl { - preConfigure = '' - sed -e '/c::build-program "binary-ecl\/maxima"/i(c::build-fasl "binary-ecl\/maxima.fasl" :lisp-files obj :ld-flags (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" (find-package "MAXIMA"))))) (if (and x (not (string= x ""))) (list x))))' -i src/maxima.system - ''; -})) +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 199f6e878ff5..574c32dcf3de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20144,6 +20144,7 @@ with pkgs; }; maxima-ecl = callPackage ../applications/science/math/maxima { ecl = ecl_16_1_2; + ecl-fasl = true; sbcl = null; }; From 6b723642893fe946567db2df5a8b434514547486 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 11 Apr 2018 23:07:19 +0000 Subject: [PATCH 1741/2743] xfce4-13: fix build (propagatedNativeBuildInputs) Closes #37991. Should investigate that further, there may be other packages that are affected. --- pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix index 88ed804191ac..ab64acee0504 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix @@ -9,7 +9,7 @@ mkXfceDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - propagatedNativeBuildInputs = [ + propagatedBuildInputs = [ autoconf automake glib From 9a57536633c4adccaa23606263d6e5795a421b21 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 21:35:12 +0200 Subject: [PATCH 1742/2743] =?UTF-8?q?girara:=200.2.8=20=E2=86=92=200.2.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/girara/default.nix | 28 ++++++----------------- pkgs/top-level/all-packages.nix | 6 ----- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 184ab818b1c3..ab4159790de0 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,32 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses, libiconv, libintl -, withBuildColors ? true +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl }: -assert withBuildColors -> ncurses != null; - stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.8"; + version = "0.2.9"; src = fetchurl { - url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98"; + url = "http://pwmt.org/projects/girara/download/${name}.tar.xz"; + sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8"; }; - preConfigure = '' - substituteInPlace colors.mk \ - --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)' - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk gettext libintl libiconv ]; - - makeFlags = [ - "PREFIX=$(out)" - (if withBuildColors - then "TPUT=${ncurses.out}/bin/tput" - else "TPUT_AVAILABLE=0") - ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libintl libiconv ]; + propagatedBuildInputs = [ glib gtk ]; meta = with stdenv.lib; { homepage = https://pwmt.org/projects/girara/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a16b2e5d58cb..61675b8f974d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15873,12 +15873,6 @@ with pkgs; gtk = gtk3; }; - girara-light = callPackage ../applications/misc/girara { - gtk = gtk3; - withBuildColors = false; - ncurses = null; - }; - gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt; From 5d62f72b21d07f59b70ddd957a578a229dc088d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 21:39:19 +0200 Subject: [PATCH 1743/2743] =?UTF-8?q?zathura=5Fcore:=200.3.8=20=E2=86=92?= =?UTF-8?q?=200.3.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../misc/zathura/core/default.nix | 53 ++++---- pkgs/applications/misc/zathura/core/icon.xpm | 120 ------------------ 2 files changed, 22 insertions(+), 151 deletions(-) delete mode 100644 pkgs/applications/misc/zathura/core/icon.xpm diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 78d4d69e1263..84dc14451532 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig -, gtk, girara, ncurses, gettext, docutils -, file, sqlite, glib, texlive, libintl +{ stdenv, fetchurl, fetchpatch, meson, ninja, makeWrapper, pkgconfig +, appstream-glib, desktop-file-utils, python3 +, gtk, girara, ncurses, gettext, libxml2 +, file, sqlite, glib, texlive, libintl, libseccomp , gtk-mac-integration, synctexSupport ? true }: @@ -9,52 +10,42 @@ assert synctexSupport -> texlive != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "zathura-core-${version}"; - version = "0.3.8"; + name = "zathura-core-${version}"; + version = "0.3.9"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6"; + url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; + sha256 = "0z09kz92a2n8qqv3cy8bx5j5k612g2f9mmh4szqlc7yvi39aax1g"; }; - icon = ./icon.xpm; + patches = [ + (fetchpatch { + url = https://git.pwmt.org/pwmt/zathura/commit/4223464db68529f9a2064ed760fb7746b3c0df6b.patch; + sha256 = "004j68b7c8alxzyx0d80lr5i43cgh7lbqm5fx3d77ihci7hdmxnw"; + }) + ]; nativeBuildInputs = [ - pkgconfig libintl + meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx + gettext makeWrapper libxml2 ]; buildInputs = [ - file gtk girara - gettext makeWrapper sqlite glib + file gtk girara libintl libseccomp + sqlite glib ] ++ optional synctexSupport texlive.bin.core ++ optional stdenv.isDarwin [ gtk-mac-integration ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - makeFlags = [ - "PREFIX=$(out)" - "RSTTOMAN=${docutils}/bin/rst2man.py" - "VERBOSE=1" - "TPUT=${ncurses.out}/bin/tput" - (optionalString synctexSupport "WITH_SYNCTEX=1") - ]; - postInstall = '' wrapProgram "$out/bin/zathura" \ - --prefix PATH ":" "${makeBinPath [ file ]}" \ - --prefix XDG_CONFIG_DIRS ":" "$out/etc" - - install -Dm644 $icon $out/share/pixmaps/pwmt.xpm - mkdir -pv $out/etc - echo "set window-icon $out/share/pixmaps/pwmt.xpm" > $out/etc/zathurarc - echo "Icon=pwmt" >> $out/share/applications/zathura.desktop + --prefix PATH ":" "${makeBinPath [ file ]}" ''; meta = { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.unix; + license = licenses.zlib; + platforms = platforms.unix; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/misc/zathura/core/icon.xpm b/pkgs/applications/misc/zathura/core/icon.xpm deleted file mode 100644 index a863c5ddb090..000000000000 --- a/pkgs/applications/misc/zathura/core/icon.xpm +++ /dev/null @@ -1,120 +0,0 @@ -/* XPM */ -static char *freeimage[] = { -/* width height num_colors chars_per_pixel */ -"16 16 96 2", -/* colors */ -" c #1e1e1e", -" . c #222222", -" X c #212121", -" o c #535353", -" O c #a4a4a4", -" + c #202020", -" @ c #252525", -" # c #3c3c3c", -" $ c #292929", -" % c #979797", -" & c #cccccc", -" * c #303030", -" = c #1f1f1f", -" - c #494949", -" ; c #dddddd", -" : c #696969", -" > c #232323", -" , c #262626", -" < c #adadad", -" 1 c #bbbbbb", -" 2 c #1d1d1d", -" 3 c #1c1c1c", -" 4 c #5e5e5e", -" 5 c #e8e8e8", -" 6 c #9c9c9c", -" 7 c #242424", -" 8 c #b1b1b1", -" 9 c #b3b3b3", -" 0 c #090909", -" q c #161616", -" w c #131313", -" e c #4d4d4d", -" r c #dedede", -" t c #afafaf", -" y c #282828", -" u c #393939", -" i c #c4c4c4", -" p c #dcdcdc", -" a c #9a9a9a", -" s c #a2a2a2", -" d c #ababab", -" f c #313131", -" g c #a7a7a7", -" h c #e4e4e4", -" j c #f2f2f2", -" k c #eaeaea", -" l c #e2e2e2", -" z c #f0f0f0", -" x c #d5d5d5", -" c c #737373", -" v c #323232", -" b c #808080", -" n c #7a7a7a", -" m c #d3d3d3", -" M c #e5e5e5", -" N c #8a8a8a", -" B c #cbcbcb", -" V c #b5b5b5", -" C c #b9b9b9", -" Z c #272727", -" A c #b4b4b4", -" S c #bababa", -" D c #2d2d2d", -" F c #414141", -" G c #444444", -" H c #f4f4f4", -" J c #838383", -" K c #cfcfcf", -" L c #fafafa", -" P c #efefef", -" I c #e3e3e3", -" U c #8d8d8d", -" Y c #656565", -" T c #ffffff", -" R c #fbfbfb", -" E c #e9e9e9", -" W c #bdbdbd", -" Q c #e1e1e1", -" ! c #dfdfdf", -" ~ c #646464", -" ^ c #3a3a3a", -" / c #a1a1a1", -" ( c #999999", -" ) c #c0c0c0", -" _ c #3b3b3b", -" ` c #acacac", -" ' c #050505", -" ] c #151515", -" [ c #1b1b1b", -" { c #1a1a1a", -" } c #b2b2b2", -" | c #a5a5a5", -". c #c5c5c5", -".. c #a6a6a6", -".X c #bfbfbf", -".o c #747474", -/* pixels */ -" ", -" . . . X X X X . o O + X . . ", -" . . X @ # $ . @ % & * = . . ", -" . . - ; : > , < 1 2 X . . ", -" . . 3 4 5 6 7 7 8 9 0 q q 3 ", -" . + w e r t y u i p a s d 4 ", -" X f g h j k p l z z x g c v ", -" X f b n m M N c B V 3 , > X ", -" X X w V C $ Z A S + $ , . ", -" D F G u S H 1 J K L P I U @ ", -" Y T T T R E & W Q ! d g ~ 7 ", -" ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X ", -" + > 7 { A } 7 @ |. $ + . . ", -" X X X ].. 8 Z 7 n.X + X . . ", -" . . . { n.o 7 . @ y X X . . ", -" " -}; - From 19608d872fa889183b37cec34d0edc3a91ad2516 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 21:45:31 +0200 Subject: [PATCH 1744/2743] =?UTF-8?q?zathura=5Fpdf=5Fpoppler:=200.2.8=20?= =?UTF-8?q?=E2=86=92=200.2.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../misc/zathura/pdf-poppler/default.nix | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 215ebdd75640..663e798ee0b4 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,28 +1,21 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { - version = "0.2.8"; + version = "0.2.9"; name = "zathura-pdf-poppler-${version}"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y"; }; - nativeBuildInputs = [ pkgconfig zathura_core ]; + nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; buildInputs = [ poppler girara ]; - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-poppler/; description = "A zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by From 3a8cabfe0b7f6f2269b5e6cc9f1cec4b5b262663 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 21:52:26 +0200 Subject: [PATCH 1745/2743] =?UTF-8?q?zathura=5Fpdf=5Fmupdf:=200.3.2=20?= =?UTF-8?q?=E2=86=92=200.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../misc/zathura/pdf-mupdf/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 1ca7644f60f8..86fe453465a5 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,35 +1,28 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, +{ stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo, gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec, openjpeg, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.2"; + version = "0.3.3"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { - url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; - sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck"; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz"; + sha256 = "1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg + zathura_core girara mupdf cairo ] ++ stdenv.lib.optional stdenv.isDarwin [ gtk-mac-integration ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-pdf-mupdf/; description = "A zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by From 33662598b5438f0e8dd37a955e82d3ecf66d811c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 21:55:46 +0200 Subject: [PATCH 1746/2743] =?UTF-8?q?zathura=5Fdjvu:=200.2.7=20=E2=86=92?= =?UTF-8?q?=200.2.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../misc/zathura/djvu/default.nix | 23 ++++++------------- .../misc/zathura/djvu/gtkflags.patch | 23 ------------------- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/misc/zathura/djvu/gtkflags.patch diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index d280a10f6180..58985dced425 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,29 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.7"; + name = "zathura-djvu-0.2.8"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ djvulibre gettext zathura_core gtk girara ]; - patches = [ ./gtkflags.patch ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}' - string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - echo "''${makefileC1/$string1/$string2}" > Makefile - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with stdenv.lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-djvu/; description = "A zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the diff --git a/pkgs/applications/misc/zathura/djvu/gtkflags.patch b/pkgs/applications/misc/zathura/djvu/gtkflags.patch deleted file mode 100644 index 6e8819e60823..000000000000 --- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zathura-djvu-0.2.7.orig/config.mk 2017-12-21 14:20:24.000000000 +0100 -+++ zathura-djvu-0.2.7/config.mk 2017-12-31 00:41:02.580154770 +0100 -@@ -16,6 +16,9 @@ - DESKTOPPREFIX ?= ${PREFIX}/share/applications - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -34,8 +37,8 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} --LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} -+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB} - - # pre-processor flags - CPPFLAGS += -D_FILE_OFFSET_BITS=64 From 8a4793a5c82aaa194ae420cd17243ce6a630cd1c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Mar 2018 21:58:20 +0200 Subject: [PATCH 1747/2743] =?UTF-8?q?zathura=5Fps:=200.2.5=20=E2=86=92=200?= =?UTF-8?q?.2.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/zathura/ps/default.nix | 25 ++++++------------- .../misc/zathura/ps/gtkflags.patch | 23 ----------------- 2 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 pkgs/applications/misc/zathura/ps/gtkflags.patch diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index c324deb28e0a..07e4c5d715b7 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,29 +1,20 @@ -{ stdenv, lib, fetchurl, pkgconfig, gtk2, zathura_core, girara, libspectre, gettext }: +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.2.5"; + name = "zathura-ps-0.2.6"; src = fetchurl { - url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj"; + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libspectre gettext zathura_core gtk2 girara ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libspectre zathura_core girara ]; - patches = [ ./gtkflags.patch ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile) - makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' ) - echo "$makefileC2" > Makefile - echo "$makefileC2" - ''; - - makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura-ps/; description = "A zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the diff --git a/pkgs/applications/misc/zathura/ps/gtkflags.patch b/pkgs/applications/misc/zathura/ps/gtkflags.patch deleted file mode 100644 index 1464d2c8373b..000000000000 --- a/pkgs/applications/misc/zathura/ps/gtkflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zathura-ps-0.2.5.orig/config.mk 2017-12-21 14:21:17.000000000 +0100 -+++ zathura-ps-0.2.5/config.mk 2017-12-31 01:05:17.507268817 +0100 -@@ -16,6 +16,9 @@ - DESKTOPPREFIX ?= ${PREFIX}/share/applications - - # libs -+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) -+GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0) -+ - CAIRO_INC ?= $(shell pkg-config --cflags cairo) - CAIRO_LIB ?= $(shell pkg-config --libs cairo) - -@@ -34,8 +37,8 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} --LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB} -+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} -+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB} - - # compiler flags - CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) From 454ef678727bae0f18fb7614bcc52c5eb0fe42dd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Apr 2018 00:40:17 +0200 Subject: [PATCH 1748/2743] zathura_wrapper: fix module paths --- pkgs/applications/misc/zathura/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 2fd7d58e63ed..64f617782f2d 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -1,7 +1,7 @@ { symlinkJoin, lib, makeWrapper, zathura_core, plugins ? [] }: let - pluginsPath = lib.makeLibraryPath plugins; + pluginsPath = lib.makeSearchPath "lib/zathura" plugins; in symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; 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 1749/2743] 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 6a1198de7e77f3413156310c1dd1ace078745c8f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 29 Mar 2018 21:15:09 +0200 Subject: [PATCH 1750/2743] pythonPackages.mutagen: move to a separate file --- .../python-modules/mutagen/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------- 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/mutagen/default.nix diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix new file mode 100644 index 000000000000..5190c247f778 --- /dev/null +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pkgs +}: + +buildPythonPackage rec { + pname = "mutagen"; + version = "1.36"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp"; + }; + + checkInputs = [ + pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz + pkgs.glibcLocales pytest + ]; + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "Python multimedia tagging library"; + homepage = https://mutagen.readthedocs.io/; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80b1e63ecb87..2af65cab7bf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8136,26 +8136,7 @@ in { }; }; - mutagen = buildPythonPackage (rec { - name = "mutagen-1.36"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mutagen/${name}.tar.gz"; - sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp"; - }; - - # Needed for tests only - buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pytest - ]; - LC_ALL = "en_US.UTF-8"; - - meta = { - description = "Python multimedia tagging library"; - homepage = http://code.google.com/p/mutagen; - license = licenses.lgpl2; - }; - }); + mutagen = callPackage ../development/python-modules/mutagen { }; muttils = buildPythonPackage (rec { From 53fc399bbb44d39f0b436e0fda419a9f4fb5b828 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 29 Mar 2018 21:21:04 +0200 Subject: [PATCH 1751/2743] =?UTF-8?q?pythonPackages.mutagen:=201.36=20?= =?UTF-8?q?=E2=86=92=201.40.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/mutagen/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 5190c247f778..46658520cb58 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,28 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, hypothesis +, pycodestyle +, pyflakes , pytest , pkgs }: buildPythonPackage rec { pname = "mutagen"; - version = "1.36"; + version = "1.40.0"; src = fetchPypi { inherit pname version; - sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp"; + sha256 = "0ppfmpf60c78p4yp7in3f8y1l1fd34a38vw9swpg2fl6hz7c58mj"; }; checkInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pytest + pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis ]; LC_ALL = "en_US.UTF-8"; meta = with lib; { description = "Python multimedia tagging library"; homepage = https://mutagen.readthedocs.io/; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; }; } From d2ce3a9bda57111a8f96f60a2ffaa5ed848cc1a8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 30 Mar 2018 14:24:43 +0200 Subject: [PATCH 1752/2743] =?UTF-8?q?quodlibet:=203.9.1=20=E2=86=92=204.0.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/quodlibet/default.nix | 41 +++++++++++++------ pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index fd328669846f..972da4f773f6 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3, - tag ? "", +{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf, + tag ? "", xvfb_run, dbus, glibcLocales, glib, gobjectIntrospection, gst_all_1, withGstPlugins ? true, xineBackend ? false, xineLib, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, @@ -7,38 +7,53 @@ keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: let optionals = stdenv.lib.optionals; in -python2Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { name = "quodlibet${tag}-${version}"; - version = "3.9.1"; + version = "4.0.2"; # XXX, tests fail + # https://github.com/quodlibet/quodlibet/issues/2820 doCheck = false; src = fetchurl { url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591"; + sha256 = "072s983p3n84yl807pbdxsy5vrgs8jzzfl648gsri6kpwsp6w5fz"; }; nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; - # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps - buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] + checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; + + buildInputs = [ gnome3.defaultIconTheme libsoup glib gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); - propagatedBuildInputs = with python2Packages; - [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ] + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] ++ optionals withDbusPython [ dbus-python ] ++ optionals withPyInotify [ pyinotify ] ++ optionals withMusicBrainzNgs [ musicbrainzngs ] ++ optionals stdenv.isDarwin [ pyobjc ] ++ optionals withPahoMqtt [ paho-mqtt ]; - makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ]; + LC_ALL = "en_US.UTF-8"; - meta = { + checkPhase = '' + runHook preCheck + checkHomeDir=$(mktemp -d) + mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file + env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \ + HOME=$checkHomeDir \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + py.test + runHook postCheck + ''; + + preFixup = stdenv.lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; + + meta = with stdenv.lib; { description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Quod Libet is a GTK+-based audio player written in Python, using @@ -54,7 +69,7 @@ python2Packages.buildPythonApplication rec { & internet radio, and all major audio formats. ''; - maintainers = with stdenv.lib.maintainers; [ coroa sauyon ]; + maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61675b8f974d..97949add34bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17453,8 +17453,8 @@ with pkgs; quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; - quodlibet-full = callPackage ../applications/audio/quodlibet { - inherit (gnome2) gtksourceview; + quodlibet-full = quodlibet.override { + inherit (gnome3) gtksourceview webkitgtk; withDbusPython = true; withPyInotify = true; withMusicBrainzNgs = true; @@ -17462,7 +17462,6 @@ with pkgs; keybinder3 = keybinder3; libmodplug = libmodplug; kakasi = kakasi; - webkitgtk = webkitgtk24x-gtk3; libappindicator-gtk3 = libappindicator-gtk3; tag = "-full"; }; From 5107b3f7b3677352ceca168c63b3284e2a8b7d32 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 12 Apr 2018 04:07:20 +0300 Subject: [PATCH 1753/2743] sleekxmpp: fix SSL certificates checks --- 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 2af65cab7bf4..7e85e760d10c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8451,7 +8451,7 @@ in { name = "sleekxmpp-${version}"; version = "1.3.3"; - propagatedBuildInputs = with self; [ dnspython pyasn1 gevent ]; + propagatedBuildInputs = with self; [ dnspython pyasn1 pyasn1-modules gevent ]; checkInputs = [ pkgs.gnupg ]; checkPhase = "${python.interpreter} testall.py"; doCheck = false; # Tests failed all this time and upstream doesn't seem to care. From 2a6448202650988d0b7336d147826391bd10f7a9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Apr 2018 21:41:56 -0400 Subject: [PATCH 1754/2743] nix-plugins: 4.0.2 -> 4.0.3 --- 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 c2c5858ca75a..392d4daa0d1a 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.2"; in +let version = "4.0.3"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "0cr1lz788rw7kxfs2acplhdl5cv8qrfh4kdqxi0p63ajnd303k8c"; + sha256 = "0dkrrh94s3gvym7hhdqivxzphsjh0828c0y6w6a51xdpm8rlajzj"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 3b2d888d63d293fd2bc128631bf990107b2139e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Apr 2018 22:07:39 -0700 Subject: [PATCH 1755/2743] xtermcontrol: 3.3 -> 3.4 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/xtermcontrol/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2wr7vzki1v1d9za89c4hgsgbbn9j2gzr-xtermcontrol-3.4/bin/xtermcontrol -h’ got 0 exit code - ran ‘/nix/store/2wr7vzki1v1d9za89c4hgsgbbn9j2gzr-xtermcontrol-3.4/bin/xtermcontrol --help’ got 0 exit code - found 3.4 with grep in /nix/store/2wr7vzki1v1d9za89c4hgsgbbn9j2gzr-xtermcontrol-3.4 - directory tree listing: https://gist.github.com/d2f87e2d47bdfed0a5727db4c27c83b0 --- pkgs/applications/misc/xtermcontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index eae5240129a5..ae31ebd1ca7e 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; name = "xtermcontrol-${version}"; src = fetchurl { url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5"; + sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l"; }; meta = { From 281775bb1a0c24468f1ad961b4c53e0074db675e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Mar 2018 18:06:10 -0500 Subject: [PATCH 1756/2743] git: 2.16.2 -> 2.16.3 Cherry picked from 260194193c333a3d in staging as suggested by https://github.com/NixOS/nixpkgs/pull/38763#issuecomment-380504142. --- .../version-management/git-and-tools/git/default.nix | 4 ++-- .../git-and-tools/git/git-sh-i18n.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 38509dddeb8f..b336f72c7ac1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.2"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f..216c0e56b44c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh From 9358f60f94c0f41c426d23b2fd85295e4dcf1290 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 9 Apr 2018 13:43:20 -0400 Subject: [PATCH 1757/2743] taffybar: fix build Closes https://github.com/NixOS/nixpkgs/issues/38531. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/development/haskell-modules/configuration-nix.nix | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b4425869b17..a3efc1e373b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -882,9 +882,6 @@ self: super: { # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; - # Needs time<1.7 - taffybar = doJailbreak super.taffybar; - # Needs tasty-quickcheck ==0.8.*, which we don't have. cryptohash-sha256 = doJailbreak super.cryptohash-sha256; cryptohash-sha1 = doJailbreak super.cryptohash-sha1; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f336e8126f0e..ef1ebe881f54 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -144,6 +144,7 @@ self: super: builtins.intersectAttrs super { gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; + taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; }; # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; From 7c3475563b331dc75487126a42fe63ce50ed13d2 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Thu, 12 Apr 2018 15:55:46 +0800 Subject: [PATCH 1758/2743] 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 ba337a2d5cf7f2f787d218de84cca8257e911a49 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 00:58:26 -0700 Subject: [PATCH 1759/2743] riot-web: 0.13.5 -> 0.14.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/riot-web/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.14.0 with grep in /nix/store/rrr1riavdg8sysb7ksvfqwr9az3jvlbm-riot-web-0.14.0 - directory tree listing: https://gist.github.com/586766758d4a74da4f7c241391412e10 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index b47280d3b156..0d3342e66687 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.13.5"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6"; + sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; }; installPhase = '' From 81b2e4fc2595cd134c6801242408e01db5888cc6 Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Thu, 12 Apr 2018 10:10:05 +0200 Subject: [PATCH 1760/2743] lolcat: 90.8.8 -> 99.9.10 --- pkgs/tools/misc/lolcat/Gemfile.lock | 4 +++- pkgs/tools/misc/lolcat/gemset.nix | 14 +++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index a97f1eb9c871..1ef7e5527961 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,9 +1,11 @@ GEM remote: http://rubygems.org/ specs: - lolcat (90.8.8) + lolcat (99.9.10) + manpages (~> 0.6.1) paint (~> 2.0.0) trollop (~> 2.1.2) + manpages (0.6.1) paint (2.0.1) trollop (2.1.2) diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 6d0962780f4c..78677edcc34b 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -1,12 +1,20 @@ { lolcat = { - dependencies = ["paint" "trollop"]; + dependencies = ["manpages" "paint" "trollop"]; source = { remotes = ["http://rubygems.org"]; - sha256 = "1q031wq8wvp09llb39w0ql5k1zkblvkbmhlvrkc3ym832pibk06f"; + sha256 = "0fidwmgywkklxf2a4f4dl82b8mx4w4n73vqm6jqgyqd3nfmgysnl"; type = "gem"; }; - version = "90.8.8"; + version = "99.9.10"; + }; + manpages = { + source = { + remotes = ["http://rubygems.org"]; + sha256 = "11p6ilnfda6af15ks3xiz2pr0hkvdvadnk1xm4ahqlf84dld3fnd"; + type = "gem"; + }; + version = "0.6.1"; }; paint = { source = { From 48ee88c7f8fcd8c976a994ea360587f1b0ba0f06 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Apr 2018 07:02:39 +0000 Subject: [PATCH 1761/2743] ocamlPackages.js_of_ocaml-camlp4: add deriving support --- pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index b3a37e3f7608..3caeabaae78b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -1,5 +1,5 @@ { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler -, camlp4 +, camlp4, ocsigen_deriving }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib jbuilder camlp4 ]; + buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ]; buildPhase = "jbuilder build -p js_of_ocaml-camlp4"; } From 24827a58fbca47aba7c73f9164365bcbc7b8ffdb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 12 Apr 2018 11:34:36 +0300 Subject: [PATCH 1762/2743] python.pkgs.sleekxmpp: fix failure to verify a certificate --- pkgs/top-level/python-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e85e760d10c..63aa5a513ead 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8451,6 +8451,14 @@ in { name = "sleekxmpp-${version}"; version = "1.3.3"; + patches = [ + # Fix https://github.com/etingof/pyasn1/issues/112 + (pkgs.fetchpatch { + url = "https://github.com/kdschlosser/SleekXMPP/commit/597014ba5ca258763e96ee37729ac933c5af1602.patch"; + sha256 = "176v3f3pr0bx48wv1kf9jn2pwxdn7qpqyc2chwv1m8gbppsfaikf"; + }) + ]; + propagatedBuildInputs = with self; [ dnspython pyasn1 pyasn1-modules gevent ]; checkInputs = [ pkgs.gnupg ]; checkPhase = "${python.interpreter} testall.py"; From a9bc7b7c7350af40e47735cf8e4c4030514c2880 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Apr 2018 13:46:46 +0200 Subject: [PATCH 1763/2743] =?UTF-8?q?guake:=200.8.3=20=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/guake/default.nix | 92 ++++++++---------------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 32 insertions(+), 63 deletions(-) diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 0a2a17fc8fa0..778f273f8122 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,76 +1,46 @@ -/* Beware! -After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?", -which will have to be resolved manually, because I have not found a way to automate this, without being impure. - -If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store, -which then can be used in the following command to install the schemas file of Guake: -gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas - -It can be removed again by the following command: -gconftool-2 --recursive-unset /apps/guake -*/ -{ stdenv, fetchurl, lib -, pkgconfig, libtool, intltool, makeWrapper -, dbus, gtk2, gconf, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }: - -with lib; +{ stdenv, fetchFromGitHub, fetchpatch, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales +, gtk3, keybinder3, libnotify, libutempter, vte }: let - inherit (python2Packages) python; - inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ]; - pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); - in stdenv.mkDerivation rec { + version = "3.1.0"; +in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; - version = "0.8.3"; + format = "other"; - src = fetchurl { - url = "https://github.com/Guake/guake/archive/${version}.tar.gz"; - sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y"; + src = fetchFromGitHub { + owner = "Guake"; + repo = "guake"; + rev = version; + sha256 = "0wyis7vxfhwrpq5r72c58k7hqzbk0f5ilm1zffcmbryvy11abgmx"; }; - nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ]; - - buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]); - - propagatedUserEnvPkgs = [ gconf.out ]; - - patchPhase = '' - patchShebangs . - ''; - - configureScript = "./autogen.sh"; - - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--disable-schemas-install" + patches = [ + # https://github.com/Guake/guake/issues/1264 + (fetchpatch { + url = https://github.com/Guake/guake/commit/f289aa381bc5fffe83b1ba385c606a2e5cdc94a8.patch; + sha256 = "038niw44q14fs34nha1lz9vmxhf0l766ni8nsdxpid4crra2wjd3"; + }) ]; - installFlags = [ - # Configuring the installation to not install gconf schemas is not always supported, - # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases. - "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; + + buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; + + propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 ]; + + LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699 + + PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var + + makeFlags = [ + "prefix=$(out)" ]; - postInstall = '' - mkdir -p $out/share/gconf/schemas - cp data/guake.schemas $out/share/gconf/schemas + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") ''; - postFixup = '' - for bin in $out/bin/{guake,guake-prefs}; do - substituteInPlace $bin \ - --replace '/usr/bin/env python2' ${python.interpreter} - wrapProgram $bin \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ - --prefix PYTHONPATH : "$out/${python.sitePackages}:${pyPath}:$PYTHONPATH" - done - ''; - - meta = { + meta = with stdenv.lib; { description = "Drop-down terminal for GNOME"; homepage = http://guake-project.org; license = licenses.gpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97949add34bc..831575977a28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16050,8 +16050,7 @@ with pkgs; }; guake = callPackage ../applications/misc/guake { - gconf = gnome2.GConf; - vte = gnome2.vte.override { pythonSupport = true; }; + inherit (gnome3) vte; }; guitone = callPackage ../applications/version-management/guitone { From ab96418801c67e08442560834359909695502e08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 02:33:52 -0700 Subject: [PATCH 1764/2743] pick: 2.0.1 -> 2.0.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/pick/versions. These checks were done: - built on NixOS - ran ‘/nix/store/mr0512zhzbbarb99l6v31pgsw1f8k859-pick-2.0.2/bin/pick -h’ got 0 exit code - ran ‘/nix/store/mr0512zhzbbarb99l6v31pgsw1f8k859-pick-2.0.2/bin/pick -v’ and found version 2.0.2 - found 2.0.2 with grep in /nix/store/mr0512zhzbbarb99l6v31pgsw1f8k859-pick-2.0.2 - directory tree listing: https://gist.github.com/797cf336b38181f76cab1e08936713b1 --- pkgs/tools/misc/pick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 0afd28b3c91b..45b0da6f8db0 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "calleerlandsson"; repo = "pick"; rev = "v${version}"; - sha256 = "0ypawbzpw188rxgv8x044iib3a517j5grgqnxy035ax5zzjavsrr"; + sha256 = "0wm3220gqrwldiq0rjdraq5mw3i7d58zwzls8234sx9maf59h0k0"; }; buildInputs = [ ncurses ]; From c93579d0fa772c95c0298d4d838ef53bdd07982d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 7 Mar 2018 18:45:46 +0100 Subject: [PATCH 1765/2743] fflas-ffpack: enable checks, disable simd --- .../libraries/fflas-ffpack/default.nix | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index edea352ae2dd..82ece22b7c7d 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack}: +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack +, gmpxx +, optimize ? false # impure +}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fflas-ffpack"; @@ -9,9 +12,31 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + checkInputs = [ + gmpxx + ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; - configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack"; + configureFlags = [ + "--with-blas-libs=-lopenblas" + "--with-lapack-libs=-llapack" + ] ++ stdenv.lib.optionals (!optimize) [ + # disable SIMD instructions (which are enabled *when available* by default) + "--disable-sse" + "--disable-sse2" + "--disable-sse3" + "--disable-ssse3" + "--disable-sse41" + "--disable-sse42" + "--disable-avx" + "--disable-avx2" + "--disable-fma" + "--disable-fma4" + ]; + doCheck = true; meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; From 365f08378bd300940bb9b426cad1979a894ab919 Mon Sep 17 00:00:00 2001 From: Anton Latukha Date: Thu, 12 Apr 2018 12:50:28 +0300 Subject: [PATCH 1766/2743] handbrake: add FDK as option (#38809) --- pkgs/applications/video/handbrake/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 3e796275907c..1c97f9531f79 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -13,13 +13,13 @@ python2, pkgconfig, yasm, harfbuzz, zlib, autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, - libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, + libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, lame, ffmpeg, 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 + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, useFdk ? false, fdk_aac ? null }: stdenv.mkDerivation rec { @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi fontconfig freetype jansson zlib libass libiconv libsamplerate libxml2 bzip2 - libogg libopus libtheora libvorbis libdvdcss a52dec libmkv fdk_aac + libogg libopus libtheora libvorbis libdvdcss a52dec libmkv lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx ] ++ (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]); dontUseCmakeConfigure = true; @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - "--enable-fdk-aac" (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") + (if useFdk then "--enable-fdk-aac" else "") ]; NIX_LDFLAGS = [ From 156e910b6d2dc09923187574e1a33b08c7a69940 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 18:19:52 +0200 Subject: [PATCH 1767/2743] pythonPackages.cvxopt: 1.1.7 -> 1.1.9 Also adds support for the optional extensions glpk, gsl, fftw and enables tests. --- .../python-modules/cvxopt/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------ 2 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/cvxopt/default.nix diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix new file mode 100644 index 000000000000..be6f688f5032 --- /dev/null +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, openblasCompat # build segfaults with regular openblas +, suitesparse +, glpk ? null +, gsl ? null +, fftw ? null +, withGlpk ? true +, withGsl ? true +, withFftw ? true +}: + +buildPythonPackage rec { + pname = "cvxopt"; + version = "1.1.9"; + + disabled = isPyPy; # hangs at [translation:info] + + src = fetchPypi { + inherit pname version; + sha256 = "0gcqq8ymjxv8qa5ss2pdhsj5bahvdxa6h2rlpp51520mjxrpw5cg"; + }; + + # similar to Gsl, glpk, fftw there is also a dsdp interface + # but dsdp is not yet packaged in nixpkgs + preConfigure = '' + export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib + export CVXOPT_BLAS_LIB=openblas + export CVXOPT_LAPACK_LIB=openblas + export CVXOPT_SUITESPARSE_LIB_DIR=${suitesparse}/lib + export CVXOPT_SUITESPARSE_INC_DIR=${suitesparse}/include + '' + lib.optionalString withGsl '' + export CVXOPT_BUILD_GSL=1 + export CVXOPT_GSL_LIB_DIR=${gsl}/lib + export CVXOPT_GSL_INC_DIR=${gsl}/include + '' + lib.optionalString withGlpk '' + export CVXOPT_BUILD_GLPK=1 + export CVXOPT_GLPK_LIB_DIR=${glpk}/lib + export CVXOPT_GLPK_INC_DIR=${glpk}/include + '' + lib.optionalString withFftw '' + export CVXOPT_BUILD_FFTW=1 + export CVXOPT_FFTW_LIB_DIR=${fftw}/lib + export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include + ''; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = { + homepage = http://cvxopt.org/; + description = "Python Software for Convex Optimization"; + longDescription = '' + CVXOPT is a free software package for convex optimization based on the + Python programming language. It can be used with the interactive + Python interpreter, on the command line by executing Python scripts, + or integrated in other software via Python extension modules. Its main + purpose is to make the development of software for convex optimization + applications straightforward by building on Python's extensive + standard library and on the strengths of Python as a high-level + programming language. + ''; + maintainers = with lib.maintainers; [ edwtjo ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7657ffc359d..39a00d5e69e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1173,29 +1173,7 @@ in { cx_oracle = callPackage ../development/python-modules/cx_oracle {}; - cvxopt = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "cvxopt"; - version = "1.1.7"; - disabled = isPyPy; - src = pkgs.fetchurl { - url = "mirror://pypi/c/${pname}/${name}.tar.gz"; - sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97"; - }; - doCheck = false; - buildInputs = with pkgs; [ openblasCompat ]; - preConfigure = '' - export CVXOPT_BLAS_LIB_DIR=${pkgs.openblasCompat}/lib - export CVXOPT_BLAS_LIB=openblas - export CVXOPT_LAPACK_LIB=openblas - ''; - meta = { - homepage = "http://cvxopt.org/"; - description = "Python Software for Convex Optimization"; - maintainers = with maintainers; [ edwtjo ]; - license = licenses.gpl3Plus; - }; - }; + cvxopt = callPackage ../development/python-modules/cvxopt { }; cycler = callPackage ../development/python-modules/cycler { }; From 37a5ba321482773167c27c1ee035b41101bfa339 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 04:07:06 -0700 Subject: [PATCH 1768/2743] openvdb: 5.0.0 -> 5.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/openvdb/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.1.0 with grep in /nix/store/firif9xzzgizin13337znminprn0h2g1-openvdb-5.1.0 - directory tree listing: https://gist.github.com/ab56d3a535f58829ccdfb0187ff9afed --- pkgs/development/libraries/openvdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 8ed383c887bf..be28c84e3e42 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "162l1prgdyf571bgxc621gicl40b050ny64f0jmnhz0h5xq6sfrv"; + sha256 = "1als53dnbnwa66k16vy95h1rhpdzz6i80c0gc2g3i17qbasl6ni5"; }; outputs = [ "out" ]; From 49ed1229b66f1dbf84ce00e249b93fe88ec07af8 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 12 Apr 2018 11:23:52 +0000 Subject: [PATCH 1769/2743] exfat-utils, fuse_exfat -> exfat `exfat-utils' and `fuse_exfat' are both aliases of `exfat' --- nixos/modules/tasks/filesystems/exfat.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 963bc940b4fa..1527f993fdd4 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -5,7 +5,7 @@ with lib; { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { - system.fsPackages = [ pkgs.exfat-utils pkgs.fuse_exfat ]; + system.fsPackages = [ pkgs.exfat ]; }; } From 280b421cbb0187bb3655b2bef1e91d75c22b48f9 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 13:13:07 +0200 Subject: [PATCH 1770/2743] m4ri: init at 20140914 --- .../libraries/science/math/m4ri/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/science/math/m4ri/default.nix diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix new file mode 100644 index 000000000000..b9ee1e2a10d7 --- /dev/null +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromBitbucket +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "20140914"; + name = "m4ri-${version}"; + + src = fetchFromBitbucket { + owner = "malb"; + repo = "m4ri"; + rev = "release-${version}"; + sha256 = "0xfg6pffbn8r1s0y7bn9b8i55l00d41dkmhrpf7pwk53qa3achd3"; + }; + + doCheck = true; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://malb.bitbucket.io/m4ri/; + description = "Library to do fast arithmetic with dense matrices over F_2"; + 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 c9bbbbf396c5..169d353e241c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19845,6 +19845,8 @@ with pkgs; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; + m4ri = callPackage ../development/libraries/science/math/m4ri { }; + nasc = callPackage ../applications/science/math/nasc { }; openblas = callPackage ../development/libraries/science/math/openblas { }; From cd24ae7a1b8bb54f55d5ce067cb1ca2528e564e3 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Thu, 12 Apr 2018 04:24:21 -0700 Subject: [PATCH 1771/2743] purple-hangouts: 2017-10-08 -> 2018-03-28 (#38819) --- .../pidgin-plugins/purple-hangouts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 460143e35494..e304c139eea5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; - version = "2017-10-08"; + version = "2018-03-28"; src = fetchhg { url = "https://bitbucket.org/EionRobb/purple-hangouts/"; - rev = "5e769791d282a6e5ae4d94dc66a1ff9d6904ec9c"; - sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; + rev = "0e137e6bf9e95c5a0bd282f3ad4a5bd00a6968ab"; + sha256 = "04vjgz6qyd9ilv1c6n08r45vc683vxs1rgfwhh65pag6q4rbzlb9"; }; buildInputs = [ pidgin glib json-glib protobuf protobufc ]; From 7d625f6c0885eb368a2337fa50709e2fba418153 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 20:39:59 +0200 Subject: [PATCH 1772/2743] m4rie: init at 20150908 --- .../libraries/science/math/m4rie/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/science/math/m4rie/default.nix diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix new file mode 100644 index 000000000000..23fc03655cf3 --- /dev/null +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromBitbucket +, autoreconfHook +, m4ri +}: + +stdenv.mkDerivation rec { + version = "20150908"; + name = "m4rie-${version}"; + + src = fetchFromBitbucket { + owner = "malb"; + repo = "m4rie"; + rev = "release-${version}"; + sha256 = "0r8lv46qx5mkz5kp3ay2jnsp0mbhlqr5z2z220wdk73wdshcznss"; + }; + + doCheck = true; + + buildInputs = [ + m4ri + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://malb.bitbucket.io/m4rie/; + description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; + longDescription = '' + M4RIE is a library for fast arithmetic with dense matrices over small finite fields of even characteristic. + It uses the M4RI library, implementing the same operations over the finite field F2. + ''; + 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 f41c91e8bbeb..1b1f1ac818e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19783,6 +19783,8 @@ with pkgs; m4ri = callPackage ../development/libraries/science/math/m4ri { }; + m4rie = callPackage ../development/libraries/science/math/m4rie { }; + nasc = callPackage ../applications/science/math/nasc { }; openblas = callPackage ../development/libraries/science/math/openblas { }; From aa9bc1776736e2474aa349b6b495f3a4da4b1a1d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Apr 2018 07:44:02 -0400 Subject: [PATCH 1773/2743] linux: 4.16.1 -> 4.16.2 --- 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 eb219ce0e0ff..aa225c8e7c79 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.1"; + version = "4.16.2"; # 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 = "1hv00176njm4g9m1aj92lvhwqn75c46qwsglsmx95ivbr9qc58av"; + sha256 = "157q43px707nizqwzi5nk87c0nvdif9fbi751f71wpgfp3iiy2s7"; }; } // (args.argsOverride or {})) From a34de6c4a676a4226d2af60bef54be1aaa911a05 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Apr 2018 07:44:17 -0400 Subject: [PATCH 1774/2743] linux: 4.15.16 -> 4.15.17 --- 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 e58f44ea6a0b..63bfc79e62d2 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.16"; + version = "4.15.17"; # 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 = "00y5b00f90pq3il5jdzigx8k32i9ksrinavqa991xday5mcz5np7"; + sha256 = "1f20h22rrchvqd653a3ih8q6l13zl47bp6k2339x9ihq40rg5m9g"; }; } // (args.argsOverride or {})) From 766ecbb57ae096b83172b08b7b278dc757afe1a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 04:37:37 -0700 Subject: [PATCH 1775/2743] marp: 0.0.11 -> 0.0.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/marp/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.0.12 with grep in /nix/store/q8kib6qhxndj4hzscdzhgvnjkaxm4mbw-marp-0.0.12 - directory tree listing: https://gist.github.com/691bc668acd4e57a2cf187b6e1062f34 --- pkgs/applications/office/marp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index c5dc9198740f..7f6d93a11ae2 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "06kka6kxrj35w23n34in6ks3vax9arl756jg720jhfy14vavyk0f"; + sha256 = "0pljjkis9vb819d0akqmqnyakwgnvc3qqyg20yr13xms9a5iqv32"; }; sourceRoot = "."; From 2112768fe697c459b2e34d5b8ba1d61a5fbed975 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 12 Apr 2018 14:11:04 +0200 Subject: [PATCH 1776/2743] pythonPackages.cysignals: init at 1.6.9 (#38781) --- .../python-modules/cysignals/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/cysignals/default.nix diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix new file mode 100644 index 000000000000..c1fedecbff34 --- /dev/null +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, sphinx +}: + +buildPythonPackage rec { + pname = "cysignals"; + version = "1.6.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "003invnixqy1h4lb358vwrxykxzp15csaddkgq3pqqmswnva5908"; + }; + + hardeningDisable = [ + "fortify" + ]; + + # currently fails, probably because of formatting changes in gdb 8.0 + doCheck = false; + + preCheck = '' + # Make sure cysignals-CSI is in PATH + export PATH="$out/bin:$PATH" + ''; + + propagatedBuildInputs = [ + cython + ]; + + enableParallelBuilding = true; + + meta = { + description = "Interrupt and signal handling for Cython"; + homepage = https://github.com/sagemath/cysignals/; + maintainers = with lib.maintainers; [ timokau ]; + license = lib.licenses.lgpl3Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63aa5a513ead..8e90405cd2e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1203,6 +1203,8 @@ in { cycler = callPackage ../development/python-modules/cycler { }; + cysignals = callPackage ../development/python-modules/cysignals { }; + dlib = buildPythonPackage rec { inherit (pkgs.dlib) name src nativeBuildInputs meta; From 8a41729c5c0052d06c5f697f515eb13fa1214c72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 05:12:07 -0700 Subject: [PATCH 1777/2743] ncmpcpp: 0.8.1 -> 0.8.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/ncmpcpp/versions. These checks were done: - built on NixOS - ran ‘/nix/store/gaym98lkncirfi09qwv0g3n6jgnknzm8-ncmpcpp-0.8.2/bin/ncmpcpp --help’ got 0 exit code - found 0.8.2 with grep in /nix/store/gaym98lkncirfi09qwv0g3n6jgnknzm8-ncmpcpp-0.8.2 - directory tree listing: https://gist.github.com/bfab0afd2242f12a3754d3267a41b66f --- pkgs/applications/audio/ncmpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 10c3bb2a195d..87f5f94bb30b 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad"; + sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] From dea879f8df4778387dc88eb11f6ea0976fa82c27 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Thu, 12 Apr 2018 20:14:20 +0800 Subject: [PATCH 1778/2743] asciidoctor: Only run patchelf on Linux --- pkgs/tools/typesetting/asciidoctor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 90ef7d4e0e60..f8cfe44cbd73 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -37,7 +37,7 @@ bundlerApp { dontUseCmakeConfigure = true; # For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' soPath="$out/lib/ruby/gems/2.4.0/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" ${patchelf}/bin/patchelf \ --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \ From 2c7f4ff6c563132ba60c666fecf8e432de926359 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 05:32:24 -0700 Subject: [PATCH 1779/2743] miniupnpd: 2.0.20180222 -> 2.0.20180410 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/miniupnpd/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/c053a6e75e3997e1633a0c44709ca3a5 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index a9e67701eb03..129db56dc554 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180222"; + name = "miniupnpd-2.0.20180410"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1hdpyvz1z6crpa7as3srmbl64fx0k4wjra57jw7qaysdsb1b2kqr"; + sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq"; name = "${name}.tar.gz"; }; From 35049f9e61dd4e87413d137122cced4764f50f2f Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Thu, 12 Apr 2018 14:31:57 +0200 Subject: [PATCH 1780/2743] libsForQt5.qtstyleplugin-kvantum: 0.10.4 -> 0.10.6 also fixes #34854 and correct license to GPL3 --- .../libraries/qtstyleplugin-kvantum/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 5085d9bf5ef9..8667f272cf7d 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qtstyleplugin-kvantum-${version}"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; - rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; - sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + rev = "a6daa1a6df3c5d4abc7ea39ef7028ddea2addbf6"; + sha256 = "1zns4x95h0ydiwx8yw0bmyg4lc2sy7annmdrg66sx753x3177zxp"; }; nativeBuildInputs = [ qmake qttools ]; @@ -16,15 +16,16 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; - postInstall= '' - mkdir -p $out/$qtPluginPrefix/styles - mv $NIX_QT5_TMP/$qtPluginPrefix/styles/libkvantum.so $out/$qtPluginPrefix/styles/libkvantum.so + postPatch = '' + # Fix plugin dir + substituteInPlace style/style.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; meta = with stdenv.lib; { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; }; From 0953439983e648e3ca62c54b895c6f842a6426cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 06:31:33 -0700 Subject: [PATCH 1781/2743] ipset: 6.36 -> 6.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/ipset/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38/bin/ipset -h’ got 0 exit code - ran ‘/nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38/bin/ipset --help’ got 0 exit code - ran ‘/nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38/bin/ipset help’ got 0 exit code - found 6.38 with grep in /nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38 - directory tree listing: https://gist.github.com/0c86d4251a82d41c7e788e320f7013d0 --- pkgs/os-specific/linux/ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 68692019ca96..d736caa535d4 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-6.36"; + name = "ipset-6.38"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "03fk40v0rbiv2b9ciy3zk8yix163803xvpmdlyvrfzbcvj84l8i2"; + sha256 = "0i72wcljl0nkpmzc20jcch3hpphrm0qp4v4j4ajamq0zlddn5vyf"; }; nativeBuildInputs = [ pkgconfig ]; From de581b99cabc8af056aa718fd1585fdced58b757 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 12 Apr 2018 15:38:16 +0200 Subject: [PATCH 1782/2743] kernel: Fix running kernels *with* modules Pull request #38470 added support for running/building kernels without modules. This got merged in 38e04bbf29fe3b6af26b3505a42ce5871aeac17d but unfortunately while this works perfectly on kernels without modules it also makes sure that *every* kernel gets no modules. So all of our VM tests fail since that merge with something like this: machine# loading module loop... machine# modprobe: FATAL: Module loop not found in directory /lib/modules/4.14.33 machine# loading module vfat... machine# modprobe: FATAL: Module vfat not found in directory /lib/modules/4.14.33 machine# loading module nls_cp437... machine# modprobe: FATAL: Module nls_cp437 not found in directory /lib/modules/4.14.33 machine# loading module nls_iso8859-1... machine# modprobe: FATAL: Module nls_iso8859-1 not found in directory /lib/modules/4.14.33 machine# loading module fuse... machine# modprobe: FATAL: Module fuse not found in directory /lib/modules/4.14.33 machine# loading module dm_mod... machine# modprobe: FATAL: Module dm_mod not found in directory /lib/modules/4.14.33 I shortly tested this against the "misc" VM test and the test is working again. In the long term (and I currently don't have time for this) it would be better to also have a VM test which tests a kernel without modules. Signed-off-by: aszlig Cc: @roberth, @7c6f434c --- pkgs/build-support/kernel/modules-closure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 9a49d42cdc1a..5658094872c8 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -3,7 +3,7 @@ source $stdenv/setup # When no modules are built, the $out/lib/modules directory will not # exist. Because the rest of the script assumes it does exist, we # handle this special case first. -if ! test -d "$out/lib/modules"; then +if ! test -d "$kernel/lib/modules"; then if test -z "$rootModules" || test -n "$allowMissing"; then mkdir -p "$out" exit 0 From f386994413e07710d596a2d8a48c67aa6b5c9ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Apr 2018 00:08:59 +0100 Subject: [PATCH 1783/2743] coreclr: 2.0.0 -> 2.0.7 --- pkgs/development/compilers/coreclr/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 0681e8210a6a..3861501d3996 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { name = "coreclr-${version}"; - version = "2.0.0"; + version = "2.0.7"; src = fetchFromGitHub { owner = "dotnet"; repo = "coreclr"; rev = "v${version}"; - sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw"; + sha256 = "0pzkrfgqywhpijbx7j1v4lxa6270h6whymb64jdkp7yj56ipqh2n"; }; patches = [ @@ -34,12 +34,20 @@ stdenv.mkDerivation rec { url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch; sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; }) + (fetchpatch { + # clang 5 + url = https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch; + sha256 = "1w1lxw5ryvhq8m5m0kv880c4bh6y9xdgypkr76sqbh3v568yghzg"; + }) ]; - buildInputs = [ + nativeBuildInputs = [ which cmake clang + ]; + + buildInputs = [ llvmPackages.llvm llvmPackages.lldb libunwind @@ -68,7 +76,8 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ./build.sh $BuildArch $BuildType + # disable -Werror which can potentially breaks with every compiler upgrade + ./build.sh $BuildArch $BuildType cmakeargs "-DCLR_CMAKE_WARNINGS_ARE_ERRORS=OFF" runHook postBuild ''; From 341912425ede056f3373218363061c9651f2a806 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 06:54:42 -0700 Subject: [PATCH 1784/2743] knot-dns: 2.6.5 -> 2.6.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/knot-dns/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38/bin/ipset -h’ got 0 exit code - ran ‘/nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38/bin/ipset --help’ got 0 exit code - ran ‘/nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38/bin/ipset help’ got 0 exit code - found 2.6.6 in filename of file in /nix/store/p1k7d2y5aa4haxlkkn2jadviwvl5plcc-ipset-6.38 - directory tree listing: https://gist.github.com/f62ed14efd30650e1e05f1af8d5c2af4 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 0af077c455c9..de37aeaa590b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "33cd676706e2baeb37cf3879ccbc91a1e1cd1ee5d7a082adff4d1e753ce49d46"; + sha256 = "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci"; }; outputs = [ "bin" "out" "dev" ]; From a7f600b2c26e503efc56bd7fa2a2f0fe13386584 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 12 Apr 2018 16:02:52 +0200 Subject: [PATCH 1785/2743] rtkit: Add patch to fix format string errors During the last staging merge I assume that we turned on -Werror=format-security by default (haven't checked in-depth though), which actually is a good thing. This causes the rtkit build to now fail, so I took a patch from Debian to fix these issues. Signed-off-by: aszlig --- pkgs/os-specific/linux/rtkit/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 4fd716ab8db8..868dcc9a58ea 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc"; sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix"; }) + + # Fix format string errors due to -Werror=format-security + (fetchpatch { + url = "https://sources.debian.org/data/main/r/rtkit/0.11-6/debian/patches/0006-fix-format-strings.patch"; + sha256 = "09mr89lh16jvz6cqw00zmh0xk919bjfhjkvna1czwmafwy9p7kgp"; + }) ]; nativeBuildInputs = [ pkgconfig ]; From 9ac303c22590798f92e78d33ce58cbc6b7f0bc3f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 12 Apr 2018 16:15:13 +0200 Subject: [PATCH 1786/2743] gotop: init at 1.2.9 --- pkgs/tools/system/gotop/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/gotop/default.nix diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix new file mode 100644 index 000000000000..2244f5c90d37 --- /dev/null +++ b/pkgs/tools/system/gotop/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gotop-${version}"; + version = "1.2.9"; + + goPackagePath = "github.com/cjbassi/gotop"; + + src = fetchFromGitHub { + repo = "gotop"; + owner = "cjbassi"; + rev = version; + sha256 = "07s2f04yhc79vqr1gdh2v974kpn7flp4slnp99mavpa331lv9q8a"; + }; + + meta = with stdenv.lib; { + description = "A terminal based graphical activity monitor inspired by gtop and vtop"; + homepage = https://github.com/cjbassi/gotop; + license = licenses.agpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff147c496a69..2bc3fa35eb3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13769,6 +13769,8 @@ with pkgs; gotools = callPackage ../development/tools/gotools { }; + gotop = callPackage ../tools/system/gotop { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; From 492ca7be2b33ded0108a94a9e8b06e7f2d0590ed Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 12 Apr 2018 16:21:30 +0200 Subject: [PATCH 1787/2743] gnumake3: Fix build against glibc-2.27 This has already been patched against gnumake4 (519f0b8db2f91e73964375e) but we still have packages depending on gnumake3, so let's also apply the same patch to gnumake 3. Signed-off-by: aszlig Cc: @shlevy, @vcunat --- pkgs/development/tools/build-managers/gnumake/3.82/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 87897017f86a..94fa7e7201a3 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { ./construct-command-line.patch ./long-command-line.patch ./darwin-library_search-dylib.patch + + # Fix support for glibc 2.27's glob + ../4.2/glibc-2.27-glob.patch ]; patchFlags = "-p0"; From 28a74fa109c95d304fe936f7ab2f3b5a58282872 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 12 Apr 2018 16:27:01 +0200 Subject: [PATCH 1788/2743] jetty: 9.3.10.v20160621 -> 9.4.8.v20171121 --- pkgs/servers/http/jetty/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 98ca50c5bc4a..1e99aab24c60 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,19 +2,18 @@ stdenv.mkDerivation rec { name = "jetty-${version}"; - version = "9.3.10.v20160621"; - + version = "9.4.8.v20171121"; src = fetchurl { url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0xqv7bp82i95gikma70kyi91nlgsj5zabzg59ly9ga4mqf5y0zbz"; + sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mkdir -p $out - mv etc lib modules start.jar $out + mv etc lib modules start.ini start.jar $out ''; meta = { From 85c17d395885b247ecbd81a1f7b80ecd92456d91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 08:22:44 -0700 Subject: [PATCH 1789/2743] efivar: 34 -> 35 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/efivar/versions. These checks were done: - built on NixOS - ran ‘/nix/store/09zlj936d2jvjwdmj9c9f843fd86bcs3-efivar-35/bin/efivar -h’ got 0 exit code - ran ‘/nix/store/09zlj936d2jvjwdmj9c9f843fd86bcs3-efivar-35/bin/efivar --help’ got 0 exit code - ran ‘/nix/store/09zlj936d2jvjwdmj9c9f843fd86bcs3-efivar-35/bin/efivar help’ got 0 exit code - found 35 with grep in /nix/store/09zlj936d2jvjwdmj9c9f843fd86bcs3-efivar-35 - directory tree listing: https://gist.github.com/6f811428a47ee181fc412ef78ff64450 --- pkgs/tools/system/efivar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 7f20e8135011..458820440947 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0ycrdaz0ijkm3xb9fnwzhwi0pdj5c6s636wj4i6lbjbrijbzn4x5"; + sha256 = "0hc7l5z0hw5472bm6p4d9n24bbggv9lgw7px1hqrdkfjghqfnlxh"; }; nativeBuildInputs = [ pkgconfig ]; From f66be0a6c7baa79f6c4144a30591678be4ef2e20 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 12 Apr 2018 16:30:14 +0100 Subject: [PATCH 1790/2743] eq10q: fix build with glibc 2.27 --- pkgs/applications/audio/eq10q/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 3faeeb12d4c6..651604c71a11 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: +{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig +, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; version = "2.2"; @@ -10,6 +11,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + patches = [ + (fetchpatch { + # glibc 2.27 compatibility + url = https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch; + sha256 = "07b0wf6k4xqgigv4h095bzfaw8r218wa36r9w1817jcys13r6c5r"; + }) + ]; + installFlags = '' DESTDIR=$(out) ''; From 0812b5c588a91287b4a0fcd976d2c5367e69135b Mon Sep 17 00:00:00 2001 From: Yorick Date: Thu, 12 Apr 2018 17:35:16 +0200 Subject: [PATCH 1791/2743] postgresql-jdbc: 9.3-1100 -> 42.2.2 (#38854) --- pkgs/servers/sql/postgresql/jdbc/default.nix | 25 +++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 39b574ae96d1..62ebf6b44533 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, ant, jdk }: - -let version = "9.3-1100"; in +{ stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { name = "postgresql-jdbc-${version}"; + version = "42.2.2"; - src = fetchurl { - url = "http://jdbc.postgresql.org/download/postgresql-jdbc-${version}.src.tar.gz"; - sha256 = "0mbdzhzg4ws0i7ps98rg0q5n68lsrdm2klj7y7skaix0rpa57gp6"; + src = fetchMavenArtifact { + artifactId = "postgresql"; + groupId = "org.postgresql"; + sha256 = "0w7sfi1gmzqhyhr4iq9znv8hff41xwwqcblkyd9ph0m34r0555hr"; + inherit version; }; - buildInputs = [ ant jdk ]; + phases = [ "installPhase" ]; - buildPhase = "ant"; - - installPhase = - '' - mkdir -p $out/share/java - cp jars/*.jar $out/share/java - ''; + installPhase = '' + install -D $src/share/java/*_postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar + ''; meta = with stdenv.lib; { homepage = https://jdbc.postgresql.org/; From 2bb811c6a0a4817d3394f0887331485d95f1c25e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 12 Apr 2018 11:36:58 -0400 Subject: [PATCH 1792/2743] linux: 4.14.33 -> 4.14.34 --- 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 46486e0ff583..ba589b70b6b3 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.33"; + version = "4.14.34"; # 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 = "0c88p5vly63jsz62ff7971zl6vqzzbv5q519gi8z17ld66sf5063"; + sha256 = "1f9bl4qw61xw49y5xz1wyilg8gh0wv9k868fh8n3hp17hm66qavq"; }; } // (args.argsOverride or {})) From 441126c3dab9bedd6857d9173f4a53d0c5d8590a Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 12 Apr 2018 17:47:00 +0200 Subject: [PATCH 1793/2743] oauth2_proxy: 20160120 -> 20180325 --- pkgs/servers/oauth2_proxy/default.nix | 20 ++-- pkgs/servers/oauth2_proxy/deps.nix | 126 ++++++++++++++++++-------- 2 files changed, 100 insertions(+), 46 deletions(-) diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index b58fc342ded7..d9919005e39d 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -1,17 +1,25 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "oauth2_proxy-${version}"; - version = "20160120-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "10f47e325b782a60b8689653fa45360dee7fbf34"; + version = "20180325-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "a94b0a8b25e553f7333f7b84aeb89d9d18ec259b"; goPackagePath = "github.com/bitly/oauth2_proxy"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/bitly/oauth2_proxy"; - sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si"; + repo = "oauth2_proxy"; + owner = "bitly"; + sha256 = "07m258s9fxjsgixggw0d1zicd7l6l2rkm5mh3zdjdaj20sqcj217"; }; goDeps = ./deps.nix; + + meta = with lib; { + description = "A reverse proxy that provides authentication with Google, Github or other provider"; + homepage = https://github.com/bitly/oauth2_proxy/; + license = licenses.mit; + maintainers = [ maintainers.yorickvp ]; + }; } diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix index 37ddbbde64e2..435c7d127821 100644 --- a/pkgs/servers/oauth2_proxy/deps.nix +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -1,29 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { - goPackagePath = "gopkg.in/fsnotify.v1"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; - sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; - sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + url = "https://code.googlesource.com/gocloud"; + rev = "d27f27d9b3cf75c9901d9981f9af50bbfd9002da"; + sha256 = "18vdhkymm4cqh5fjyz0ia0bc2mpmarjk6w6zh9ydm2d4nkj36cm5"; }; } { @@ -31,8 +14,35 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; - sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "0c965951289cce37dec52ad1f34200fefc816777"; + sha256 = "0ys37wshd430dizzbg39x5mw55daih2q4qj5l9gr3qbmq9qdn0f3"; + }; + } + { + goPackagePath = "github.com/coreos/go-oidc"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-oidc"; + rev = "065b426bd41667456c1a924468f507673629c46b"; + sha256 = "10xhrh70rccgydi708dc9xl4ivmjnzhh1skd1ij6xl1i3x8lk3g6"; + }; + } + { + goPackagePath = "github.com/mbland/hmacauth"; + fetch = { + type = "git"; + url = "https://github.com/mbland/hmacauth"; + rev = "44256dfd4bfa7594cfa73587a464ca890e85971a"; + sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1"; }; } { @@ -40,26 +50,35 @@ fetch = { type = "git"; url = "https://github.com/mreiferson/go-options"; - rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; - sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + rev = "77551d20752b54535462404ad9d877ebdb26e53d"; + sha256 = "02c18zrx038gbas58l90xzsz9m5q3gpjprdcwmnvxsn0zvld0vpj"; }; } { - goPackagePath = "google.golang.org/api"; + goPackagePath = "github.com/pquerna/cachecontrol"; fetch = { type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; - sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + url = "https://github.com/pquerna/cachecontrol"; + rev = "525d0eb5f91d30e3b1548de401b7ef9ea6898520"; + sha256 = "13r6qz9pghy9fapps5h9mhblggnjq2nfxysvf2jp4scanc5vw2y3"; }; } { - goPackagePath = "google.golang.org/cloud"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "6335269abf9002cf5a84613c13cda6010842b834"; - sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + url = "https://go.googlesource.com/crypto"; + rev = "88942b9c40a4c9d203b82b3731787b672d6e809b"; + sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6078986fec03a1dcc236c34816c71b0e05018fda"; + sha256 = "0qbl17mzpq7anwyzy6hdvxqk7f6q2xlm6f9dknkwlszfd4id2fwb"; }; } { @@ -67,17 +86,44 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; - sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + rev = "fdc9e635145ae97e6c2cb777c48305600cf515cb"; + sha256 = "0pznj7pb2rjar005dvppimdynarm8smj6vnqz9wvd9fxyn0q0yww"; }; } { - goPackagePath = "github.com/18F/hmacauth"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; - url = "https://github.com/18F/hmacauth"; - rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd"; - sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"; + url = "https://go.googlesource.com/sys"; + rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835"; + sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "e4126357c891acdef6dcd7805daa4c6533be6544"; + sha256 = "19c874pr7vhhiyw7zn6v625g8i70gqzi3rr645kai6pnd1w7s27n"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v2"; + rev = "552e98edab5d620205ff1a8960bf52a5a10aad03"; + sha256 = "03w6rgxkvdv3vcfr23s6wbck431w7dwnw0jy7qnyl0qihxzn40rv"; }; } ] From 0b9ca7875a8eefd869fba5bd5837115ee0367eb4 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 12 Apr 2018 17:03:02 +0100 Subject: [PATCH 1794/2743] unixtools.modprobe: fix --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 8adb56f37f13..89f5e464d5aa 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -64,7 +64,7 @@ in rec { linux = pkgs.utillinux; }; modprobe = singleBinary "modprobe" { - linux = pkgs.utillinux; + linux = pkgs.kmod; }; more = singleBinary "more" { linux = pkgs.utillinux; From b30497c8b38ed371717d8b9aa3e566aeee055cb6 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 12 Apr 2018 17:34:53 +0100 Subject: [PATCH 1795/2743] caps: fix build with glibc 2.27 --- pkgs/applications/audio/caps/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 27724bc28e99..2d90599346fb 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -9,9 +9,13 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = "https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/plain/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; + url = "https://salsa.debian.org/multimedia-team/caps/raw/9a99c225/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch"; sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway"; }) + (fetchurl { + url = "https://salsa.debian.org/multimedia-team/caps/raw/a411203d/debian/patches/0002-Use-standard-exp10f-instead-of-pow10f.patch"; + sha256 = "18ciklnscabr77l8b89xmbagkk79w4iqfpzr2yhn2ywv2jp8akx9"; + }) ]; configurePhase = '' From 74305612959ba23be5b5141db908bf8522c02456 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 10:52:45 -0700 Subject: [PATCH 1796/2743] babl: 0.1.44 -> 0.1.46 (#38862) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/babl/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.1.46 with grep in /nix/store/6kx1zn1xb71zhhq4bikgyp9gvgrfh573-babl-0.1.46 - directory tree listing: https://gist.github.com/1626f882c7f8a9b5ac71254a7a415742 --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index be4cf809f0c5..285f4dea802a 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.44"; + name = "babl-0.1.46"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0zfy1jrwdp4ja2f1rqa2m46vx6nilm73f72d4d1c8d65vshgsqzl"; + sha256 = "0nwyhvfca6m35wjcccvwca7fcihzgdfyc012qi703y5d3cxl1hmv"; }; doCheck = true; From 29b1894598e0f39875ce441c54ac1d6bf3d4adbb Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 11 Apr 2018 11:37:40 -0700 Subject: [PATCH 1797/2743] yquake2: init at 7.20 --- pkgs/games/quake2/yquake2/default.nix | 93 +++++++++++++++++++++++++++ pkgs/games/quake2/yquake2/games.nix | 59 +++++++++++++++++ pkgs/games/quake2/yquake2/wrapper.nix | 31 +++++++++ pkgs/top-level/all-packages.nix | 7 ++ 4 files changed, 190 insertions(+) create mode 100644 pkgs/games/quake2/yquake2/default.nix create mode 100644 pkgs/games/quake2/yquake2/games.nix create mode 100644 pkgs/games/quake2/yquake2/wrapper.nix diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix new file mode 100644 index 000000000000..bee7d7703ab5 --- /dev/null +++ b/pkgs/games/quake2/yquake2/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchFromGitHub, buildEnv, cmake, makeWrapper +, SDL2, libGL +, oggSupport ? true, libogg, libvorbis +, openalSupport ? true, openal +, zipSupport ? true, zlib +}: + +let + mkFlag = b: if b then "ON" else "OFF"; + + games = import ./games.nix { inherit stdenv lib fetchFromGitHub cmake; }; + + wrapper = import ./wrapper.nix { inherit stdenv lib buildEnv makeWrapper yquake2; }; + + yquake2 = stdenv.mkDerivation rec { + name = "yquake2-${version}"; + version = "7.20"; + + src = fetchFromGitHub { + owner = "yquake2"; + repo = "yquake2"; + rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "1yrmn8vajab3zd0fni029s6wrvv2ljn1kyhaiw02wm1dc5yyzb2g"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ SDL2 libGL ] + ++ lib.optionals oggSupport [ libogg libvorbis ] + ++ lib.optional openalSupport openal + ++ lib.optional zipSupport zlib; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DOGG_SUPPORT=${mkFlag oggSupport}" + "-DOPENAL_SUPPORT=${mkFlag openalSupport}" + "-DZIP_SUPPORT=${mkFlag zipSupport}" + "-DSYSTEMWIDE_SUPPORT=ON" + ]; + + preConfigure = '' + # Since we can't expand $out in `cmakeFlags` + cmakeFlags="$cmakeFlags -DSYSTEMDIR=$out/share/games/quake2" + ''; + + installPhase = '' + # Yamagi Quake II expects all binaries (executables and libs) to be in the + # same directory. + mkdir -p $out/bin $out/lib/yquake2 $out/share/games/quake2 + cp -r release/* $out/lib/yquake2 + ln -s $out/lib/yquake2/quake2 $out/bin/yquake2 + ln -s $out/lib/yquake2/q2ded $out/bin/yq2ded + cp $src/stuff/yq2.cfg $out/share/games/quake2 + ''; + + meta = with stdenv.lib; { + description = "Yamagi Quake II client"; + homepage = "https://www.yamagi.org/quake2/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ tadfisher ]; + }; + }; + +in rec { + inherit yquake2; + + yquake2-ctf = wrapper { + games = [ games.ctf ]; + name = "yquake2-ctf"; + inherit (games.ctf) description; + }; + + yquake2-ground-zero = wrapper { + games = [ games.ground-zero ]; + name = "yquake2-ground-zero"; + inherit (games.ground-zero) description; + }; + + yquake2-the-reckoning = wrapper { + games = [ games.the-reckoning ]; + name = "yquake2-the-reckoning"; + inherit (games.the-reckoning) description; + }; + + yquake2-all-games = wrapper { + games = lib.attrValues games; + name = "yquake2-all-games"; + description = "Yamagi Quake II with all add-on games"; + }; +} diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix new file mode 100644 index 000000000000..059fb26eb9b8 --- /dev/null +++ b/pkgs/games/quake2/yquake2/games.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +let + games = { + ctf = { + id = "ctf"; + version = "1.05"; + description = "'Capture The Flag' for Yamagi Quake II"; + sha256 = "15ihspyshls645ig0gq6bwdzvghyyysqk60g6ad3n4idb2ms52md"; + }; + + ground-zero = { + id = "rogue"; + version = "2.04"; + description = "'Ground Zero' for Yamagi Quake II"; + sha256 = "0x1maaycrxv7d3xvvk1ih2zymhvcd3jnab7g3by8qh6g5y33is5l"; + }; + + the-reckoning = { + id = "xatrix"; + version = "2.05"; + description = "'The Reckoning' for Yamagi Quake II"; + sha256 = "0gf2ryhgz8nw1mb1arlbriihjsx09fa0wmkgcayc8ijignfi1qkh"; + }; + }; + + toDrv = title: data: stdenv.mkDerivation rec { + inherit (data) id version description sha256; + inherit title; + + name = "yquake2-${title}-${version}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "yquake2"; + repo = data.id; + rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/lib/yquake2/${id} + cp Release/* $out/lib/yquake2/${id} + ''; + + meta = with stdenv.lib; { + inherit (data) description; + homepage = "https://www.yamagi.org/quake2/"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ tadfisher ]; + }; + }; + +in + lib.mapAttrs toDrv games diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix new file mode 100644 index 000000000000..8cd1044456ac --- /dev/null +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, buildEnv, makeWrapper, yquake2 }: + +{ games +, name +, description +}: + +let + env = buildEnv { + name = "${name}-env"; + paths = [ yquake2 ] ++ games; + }; + +in stdenv.mkDerivation { + inherit name; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + '' + lib.concatMapStringsSep "\n" (game: '' + makeWrapper ${env}/bin/yquake2 $out/bin/yquake2-${game.title} \ + --add-flags "+set game ${game.id}" + makeWrapper ${env}/bin/yq2ded $out/bin/yq2ded-${game.title} \ + --add-flags "+set game ${game.id}" + '') games; + + meta = { + inherit description; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a6b87dc2eda..be1340e2b0a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19556,6 +19556,13 @@ with pkgs; xsokoban = callPackage ../games/xsokoban { }; + inherit (callPackage ../games/quake2/yquake2 { }) + yquake2 + yquake2-ctf + yquake2-ground-zero + yquake2-the-reckoning + yquake2-all-games; + zandronum = callPackage ../games/zandronum { }; zandronum-server = zandronum.override { From 2e1c5c00c7a80f4043b124bc53e4294d9bc1e252 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Wed, 4 Apr 2018 11:33:47 +0200 Subject: [PATCH 1798/2743] heptio-ark: init at 0.7.1 --- .../networking/cluster/heptio-ark/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/cluster/heptio-ark/default.nix diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix new file mode 100644 index 000000000000..d24c307fcce5 --- /dev/null +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "heptio-ark-${version}"; + version = "0.7.1"; + + goPackagePath = "github.com/heptio/ark"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "heptio"; + repo = "ark"; + sha256 = "0j3x9zxcffxhlw0fxq2cw9ph37bqw90cbmf9xshmnj8yl9rbxp7y"; + }; + + postInstall = "rm $bin/bin/generate"; + + meta = with stdenv.lib; { + description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = https://heptio.github.io/ark/; + license = licenses.asl20; + maintainers = [maintainers.mbode]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073596951efa..83f6fa110ee2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20445,6 +20445,8 @@ with pkgs; helm = callPackage ../applications/audio/helm { }; + heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; + hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; From d5dc446b38320bfefbfa664b7a4f2207e9cb80a1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 22:45:24 -0500 Subject: [PATCH 1799/2743] xcbuild: fix wrapper need $wrapper/usr/bin to exist for some SDK stuff --- pkgs/development/tools/xcbuild/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 3a1547440fd6..06c48ec0a73f 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation { ln -s $file done + mkdir $out/usr + ln -s $out/bin $out/usr/bin + mkdir -p $out/Library/Xcode/ ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications From d227d1edf4913619caa6127c678c85ffcea8e8c8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Apr 2018 22:45:58 -0500 Subject: [PATCH 1800/2743] SmartCardServices: init --- .../SmartCardServices/default.nix | 41 +++++++++++++++++++ .../darwin/apple-source-releases/default.nix | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix new file mode 100644 index 000000000000..1cb85b1e9884 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix @@ -0,0 +1,41 @@ +{ stdenv, appleDerivation, xcbuild, gnumake, Security +, libsecurity_utilities, libsecurity_cdsa_utilities }: + +appleDerivation { + buildInputs = [ xcbuild libsecurity_utilities libsecurity_cdsa_utilities ]; + + DSTROOT = "$out"; + + NIX_CFLAGS_COMPILE = "-I."; + preBuild = '' + mkdir -p Security + cp ${Security}/Library/Frameworks/Security.framework/Headers/*.h Security + ''; + + patchPhase = '' + substituteInPlace SmartCardServices.xcodeproj/project.pbxproj \ + --replace "/usr/bin/gnumake" "${gnumake}/bin/make" + substituteInPlace src/PCSC/PCSC.exp \ + --replace _PCSCVersionString "" \ + --replace _PCSCVersionNumber "" + substituteInPlace Makefile.installPhase \ + --replace chown "# chown" \ + --replace /usr/bin/ "" + ''; + + installPhase = '' + make -f Makefile.installPhase install + make -f Makefile-exec.installPhase install + mv $out/usr/* $out + rmdir $out/usr + + mkdir -p $out/Library/Frameworks + cp -r Products/Release/PCSC.bundle $out/Library/Frameworks/PCSC.framework + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 7ceeab9526ce..6019c20dd409 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -7,6 +7,7 @@ let # now it's staying here. versions = { "osx-10.11.6" = { + SmartCardServices = "55111"; dtrace = "168"; xnu = "3248.60.10"; libpthread = "138.10.4"; @@ -192,6 +193,8 @@ let adv_cmds = applePackage "adv_cmds" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; packages = { + SmartCardServices = applePackage "SmartCardServices" "osx-10.11.6" "1qqjlbi6j37mw9p3qpfnwf14xh9ff8h5786bmvzwc4kblfglabkm" {}; + inherit (adv_cmds) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; From aa21f9c578fa67a91b87dc113bf5892ded34330c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 9 Apr 2018 16:59:19 -0500 Subject: [PATCH 1801/2743] dtrace: patch impurities --- .../darwin/apple-source-releases/dtrace/xcode.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix index 3fb31fda166e..dd193f2c07dc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix @@ -1,4 +1,4 @@ -{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling }: +{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling, stdenv }: appleDerivation { buildInputs = [ xcbuild CoreSymbolication xnu bison flex darling ]; @@ -6,6 +6,14 @@ appleDerivation { NIX_LDFLAGS = "-L./Products/Release"; xcbuildFlags = "-target dtrace"; + patchPhase = '' + substituteInPlace dtrace.xcodeproj/project.pbxproj --replace "/usr/sbin" "" + substituteInPlace libdtrace/dt_open.c \ + --replace "/usr/bin/clang" "${stdenv.cc}/bin/cpp" \ + --replace "/usr/bin/ld" "${stdenv.cc}/bin/ld" \ + --replace "/usr/bin/dtrace" $out/lib/dtrace + ''; + # hack to handle xcbuild's broken lex handling preBuild = '' cd libdtrace @@ -31,5 +39,7 @@ appleDerivation { mkdir $out/bin cp Products/Release/dtrace $out/bin + + mkdir -p $out/lib/dtrace ''; } From 59bcd129e5a89dfcc49703de4499d9d83ed4305b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 9 Apr 2018 18:05:38 -0500 Subject: [PATCH 1802/2743] libsecurity_apple_x509: add more symbols --- .../apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile index 083a8a85d17d..166b4e631c84 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile @@ -5,6 +5,7 @@ LIBRARY_NAME = security_apple_x509_tp security_apple_x509_tp_HEADER_FILES = $(notdir $(wildcard lib/*.h)) security_apple_x509_tp_HEADER_FILES_DIR = lib +security_apple_x509_tp_C_FILES = $(wildcard lib/*.c) security_apple_x509_tp_CC_FILES = $(wildcard lib/*.cpp) include $(GNUSTEP_MAKEFILES)/library.make From 9ed96e76810c264b0c83a688c560effd33291fae Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 14:16:57 -0500 Subject: [PATCH 1803/2743] Revert "arm-frc-linux-gnueabi-gcc: init at 4.9.4" This reverts commit ff1e372849c74ed60eac1969d57c487c0042296a. We only want to build GCC once. Cross compilation infrastructure means this should not be needed. Revert "arm-frc-linux-gnueabi-gcc: init at 4.9.4" This reverts commit ff1e372849c74ed60eac1969d57c487c0042296a. --- .../arm-frc-linux-gnueabi-gcc/default.nix | 98 ------------------- .../minorSOname.patch | 49 ---------- .../no-nested-deprecated-warnings.patch | 22 ----- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 171 deletions(-) delete mode 100755 pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix delete mode 100755 pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch delete mode 100755 pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix deleted file mode 100755 index 6fa25df5e033..000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{stdenv, fetchurl -, arm-frc-linux-gnueabi-binutils, arm-frc-linux-gnueabi-eglibc, arm-frc-linux-gnueabi-linux-api-headers -, elfutils -, libmpc, gmp, mpfr, zlib, isl_0_15, cloog}: - -stdenv.mkDerivation rec { - _target = "arm-frc-linux-gnueabi"; - - version = "4.9.4"; - name = "${_target}-gcc-${version}"; - - src = fetchurl { - url = "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092"; - }; - - patches = [ - ./minorSOname.patch - ./no-nested-deprecated-warnings.patch - ]; - - hardeningDisable = [ "format" ]; - - buildInputs = [ - arm-frc-linux-gnueabi-binutils - arm-frc-linux-gnueabi-eglibc - arm-frc-linux-gnueabi-linux-api-headers - elfutils - libmpc - gmp - mpfr - zlib - isl_0_15 - cloog - ]; - - - configurePhase = '' - mkdir gcc-build - cd gcc-build - ../configure \ - --prefix=$out \ - --host=$CHOST \ - --build=$CHOST \ - --program-prefix=${_target}- \ - --target=${_target} \ - --enable-shared \ - --disable-nls \ - --enable-threads=posix \ - --enable-languages=c,c++ \ - --disable-multilib \ - --disable-multiarch \ - --with-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \ - --with-build-sysroot=${arm-frc-linux-gnueabi-eglibc}/${_target} \ - --with-as=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/as \ - --with-ld=${arm-frc-linux-gnueabi-binutils}/${_target}/bin/ld \ - --with-cpu=cortex-a9 \ - --with-float=softfp \ - --with-fpu=vfp \ - --with-specs='%{save-temps:-fverbose-asm} %{funwind-tables|fno-unwind-tables|mabi=*|ffreestanding|nostdlib:;:-funwind-tables}' \ - --enable-lto \ - --with-pkgversion='GCC-for-FRC' \ - --with-cloog \ - --enable-poison-system-directories \ - --enable-plugin \ - --with-system-zlib \ - --disable-libmudflap \ - --disable-libsanitizer - ''; - - makeFlags = [ - "all-gcc" - "all-target-libgcc" - "all-target-libstdc++-v3" - ]; - - installPhase = '' - make install-gcc install-target-libgcc install-target-libstdc++-v3 - ''; - - postInstall = '' - rm -rf $out/share/{man/man7,info}/ "$out/share/gcc-${version}/python" - ''; - - meta = with stdenv.lib; { - description = "FRC cross compiler"; - longDescription = '' - arm-frc-linux-gnueabi-gcc is a cross compiler for building - code for FIRST Robotics Competition. Used as a cross compiler - for the NI RoboRio. - ''; - license = licenses.gpl2; - maintainers = [ maintainers.colescott ]; - platforms = platforms.linux; - - priority = 4; - }; -} diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch deleted file mode 100755 index d97d12bc629a..000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/minorSOname.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Make the default SONAME include minor numbers (c++) - This patch adds .0.20 to the end of the SONAME for libstdc++ to support - independent side-by-side usage of .17 and .20. - . - gcc-armel (4.9.1-0frc2) trusty; urgency=low - . - * Fixing dependency ambiguity yet again... -Author: Patrick Plenefisch - ---- - ---- gcc-armel-4.9.1.orig/libstdc++-v3/configure -+++ gcc-armel-4.9.1/libstdc++-v3/configure -@@ -10698,7 +10698,7 @@ gnu*) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -10824,7 +10824,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -14382,7 +14382,7 @@ gnu*) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -14508,7 +14508,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch deleted file mode 100755 index 050a63e92fd6..000000000000 --- a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Get rid of recursive deprecated warnings. - As is, gcc gives warnings when a function with the - deprecated attribute calls another function with - the deprecated attribute. - See http://stackoverflow.com/questions/13459602/how-can-i-get-rid-of-deprecated-warnings-in-deprecated-functions-in-gcc - -Author: James Kuszmaul - --- - ---- gcc-armel-4.9.1.orig/gcc/tree.c -+++ gcc-armel-4.9.1/gcc/tree.c -@@ -12063,6 +12063,9 @@ warn_deprecated_use (tree node, tree attr) - if (node == 0 || !warn_deprecated_decl) - return; - -+ if (current_function_decl && TREE_DEPRECATED(current_function_decl)) -+ return; -+ - if (!attr) - { - if (DECL_P (node)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff147c496a69..4be3e4edaced 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -531,8 +531,6 @@ with pkgs; arm-frc-linux-gnueabi-binutils = callPackage ../development/tools/misc/arm-frc-linux-gnueabi-binutils {}; - arm-frc-linux-gnueabi-gcc = callPackage ../development/compilers/arm-frc-linux-gnueabi-gcc {}; - arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) From 831cb4169ec0d7f6b6fb812e0f9ea7dae76a970c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 14:21:47 -0500 Subject: [PATCH 1804/2743] Revert "arm-frc-linux-gnueabi-binutils: init at 2.28" This reverts commit 1d7a478c92e3ca3b952008e16cceafe4e831036b. --- .../default.nix | 50 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 52 deletions(-) delete mode 100755 pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix diff --git a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix deleted file mode 100755 index fff91c6f7f38..000000000000 --- a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{stdenv, fetchurl, glibc, bison, arm-frc-linux-gnueabi-eglibc}: - -stdenv.mkDerivation rec { - _target = "arm-frc-linux-gnueabi"; - - version = "2.28"; - name = "${_target}-binutils-${version}"; - - src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88"; - }; - - nativeBuildInputs = [ bison arm-frc-linux-gnueabi-eglibc ]; - buildInputs = [ glibc ]; - - configureFlags = '' - --target=${_target} - --with-pkgversion='GNU-Binutils-for-FRC' - --with-sysroot=$out/${_target} - --with-build-sysroot=/$out/${_target} - --disable-multilib - --disable-nls - --enable-lto - --disable-libiberty-install - --enable-ld - --enable-gold=default - --enable-plugins - ''; - - postConfigure = '' - make configure-host - ''; - - postInstall = '' - rm -rf $out/share/info - ''; - - meta = { - description = "FRC binutils"; - longDescription = '' - binutils used to build arm-frc-linux-gnueabi and user programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # since 2017-09-10 - priority = 3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4be3e4edaced..bd2b7cbe41ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -529,8 +529,6 @@ with pkgs; arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {}; - arm-frc-linux-gnueabi-binutils = callPackage ../development/tools/misc/arm-frc-linux-gnueabi-binutils {}; - arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) From ea67004ba220405e9a4415815590b94920af29ff Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 14:21:58 -0500 Subject: [PATCH 1805/2743] Revert "arm-frc-linux-gnueabi-eglibc: init at 2.21-r0.83" This reverts commit 7c32b93c9a707e16d6d5153bf73f5bc6ff028356. --- .../arm-frc-linux-gnueabi-eglibc/default.nix | 65 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 67 deletions(-) delete mode 100755 pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix deleted file mode 100755 index 8adbef8f5764..000000000000 --- a/pkgs/development/libraries/arm-frc-linux-gnueabi-eglibc/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{stdenv, fetchurl, arm-frc-linux-gnueabi-linux-api-headers}: - -let - _target = "arm-frc-linux-gnueabi"; - _basever = "2.21-r0.83"; - srcs = [ - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "117058215440e258027bb9ff18db63c078d55288787dbedfcd5730c06c7a1ae9"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-dev_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "e28b05d498c1160949f51539270035e12c5bb9d75d68df1f5f111a8fc087f3a6"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libcidn1_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "0f7372590abf69da54a9b7db8f944cf6c48d9ac8a091218ee60f84fdd9de2398"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-thread-db_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "5a839498507a0b63165cb7a78234d7eb2ee2bb6a046bff586090f2e70e0e2bfb"; - }) - (fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/libc6-extra-nss_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "d765d43c8ec95a4c64fa38eddf8cee848fd090d9cc5b9fcda6d2c9b03d2635c5"; - }) - ]; -in -stdenv.mkDerivation rec { - version = "2.21"; - name = "${_target}-eglibc-${version}"; - - sourceRoot = "."; - inherit srcs; - - phases = [ "unpackPhase" "installPhase" ]; - - unpackCmd = '' - ar x $curSrc - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/${_target} - rm -rf lib/eglibc - find . \( -name .install -o -name ..install.cmd \) -delete - cp -r lib $out/${_target} - cp -r usr $out/${_target} - - cp -r ${arm-frc-linux-gnueabi-linux-api-headers}/* $out - ''; - - meta = { - description = "FRC standard C lib"; - longDescription = '' - eglibc library for the NI RoboRio to be used in compiling frc user - programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - - priority = 2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd2b7cbe41ff..f685ed7eb87e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,8 +525,6 @@ with pkgs; argyllcms = callPackage ../tools/graphics/argyllcms {}; - arm-frc-linux-gnueabi-eglibc = callPackage ../development/libraries/arm-frc-linux-gnueabi-eglibc {}; - arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {}; arp-scan = callPackage ../tools/misc/arp-scan { }; From ce202d202e78138c93d54e5fbe948a03779f3c1a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 14:22:15 -0500 Subject: [PATCH 1806/2743] Revert "arm-frc-linux-gnueabi-linux-api-headers: init at 3.19-r0.36" This reverts commit 9597247cc03997655fde22e635bba845d40189d2. --- .../default.nix | 43 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 45 deletions(-) delete mode 100755 pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix diff --git a/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix b/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix deleted file mode 100755 index 29e349e0a820..000000000000 --- a/pkgs/development/libraries/arm-frc-linux-gnueabi-linux-api-headers/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{stdenv, fetchurl}: - -let - _target = "arm-frc-linux-gnueabi"; - _basever = "3.19-r0.36"; - src = fetchurl { - url = "http://download.ni.com/ni-linux-rt/feeds/2016/arm/ipk/cortexa9-vfpv3/linux-libc-headers-dev_${_basever}_cortexa9-vfpv3.ipk"; - sha256 = "10066ddb9a19bf764a9a67919a7976478041e98c44c19308f076c78ecb07408c"; - }; -in -stdenv.mkDerivation rec { - version = "3.19"; - name = "${_target}-linux-api-headers-${version}"; - - sourceRoot = "."; - inherit src; - - phases = [ "unpackPhase" "installPhase" ]; - - unpackCmd = '' - ar x $curSrc - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/${_target} - find . \( -name .install -o -name ..install.cmd \) -delete - cp -r usr/ $out/${_target} - ''; - - meta = { - description = "FRC linux api headers"; - longDescription = '' - All linux api headers required to compile the arm-frc-linux-gnuaebi-gcc - cross compiler and all user programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - - priority = 1; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f685ed7eb87e..24ac0d219a44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,8 +525,6 @@ with pkgs; argyllcms = callPackage ../tools/graphics/argyllcms {}; - arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {}; - arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) From 6398791733fff12ce538abf59c0d6adc26e94fe7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 14:32:11 -0500 Subject: [PATCH 1807/2743] unixtools: get rid of modprobe modprobe only exists in Linux kernel. Just use kmod if it's needed. --- pkgs/os-specific/linux/autofs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/unix-tools.nix | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index a7472de1d025..859593e4b9aa 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, modprobe, nfs-utils, e2fsprogs +{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation { export MOUNT=${mount}/bin/mount export MOUNT_NFS=${nfs-utils}/bin/mount.nfs export UMOUNT=${umount}/bin/umount - export MODPROBE=${modprobe}/bin/modprobe + export MODPROBE=${kmod}/bin/modprobe export E2FSCK=${e2fsprogs}/bin/fsck.ext2 export E3FSCK=${e2fsprogs}/bin/fsck.ext3 export E4FSCK=${e2fsprogs}/bin/fsck.ext4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 527e6e9cd143..4fc752a8ee1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21229,6 +21229,6 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); - inherit (unixtools) hexdump ps logger eject modprobe umount + inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl; } diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 89f5e464d5aa..2d62d4e6c64c 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -63,9 +63,6 @@ in rec { logger = singleBinary "logger" { linux = pkgs.utillinux; }; - modprobe = singleBinary "modprobe" { - linux = pkgs.kmod; - }; more = singleBinary "more" { linux = pkgs.utillinux; darwin = more_compat; From 6f636251445cc2a238fa400e3448bb663a97976c Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Thu, 12 Apr 2018 23:01:03 +0300 Subject: [PATCH 1808/2743] rust-bindgen: 0.35.0 -> 0.36.0 --- pkgs/development/tools/rust/bindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 61adb0b73fbd..2f4c89ab43be 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "1qs67mkvrzwzi69rlq49p098h247197f2jiq1f4ivw9naggq5c7v"; + sha256 = "1bpya490qh2jvq99mdlcifj6mgn3yxr0sqas6y5xw842b46g6hi6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped.lib}/lib" ''; - cargoSha256 = "0bh22fkynn1z83230pbj0gg5k3948f6m0idzyqjyfg1f3qmnzdi6"; + cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w"; doCheck = false; # A test fails because it can't find standard headers in NixOS From a2eacaaf3b80d7aecdf5fc547e51e6ce42ba5c53 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Thu, 12 Apr 2018 13:16:09 -0700 Subject: [PATCH 1809/2743] rustc: correct propagation of NIX_BUILD_CORES --- pkgs/development/compilers/rust/rustc.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index bb0794aeb84e..1395d8e9a3ba 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation { RUSTFLAGS = "-Ccodegen-units=10"; # We need rust to build rust. If we don't provide it, configure will try to download it. + # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] ++ [ "--enable-vendor" ] @@ -62,6 +63,13 @@ stdenv.mkDerivation { ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; + # The boostrap.py will generated a Makefile that then executes the build. + # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass + # to the bootstrap builder. + postConfigure = '' + substituteInPlace Makefile --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' + ''; + patches = patches ++ targetPatches; # the rust build system complains that nix alters the checksums From 54dc22f6efeecc46655d5c986b136a8cfbe77621 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 10 Apr 2018 21:57:09 +0200 Subject: [PATCH 1810/2743] 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 1811/2743] 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 1812/2743] 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 1813/2743] 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 1814/2743] 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 1815/2743] 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 1816/2743] 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 1817/2743] 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 1818/2743] 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 1819/2743] 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 1820/2743] 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 1821/2743] 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 1822/2743] 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 1823/2743] 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 1824/2743] 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 1825/2743] 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 1826/2743] 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 1827/2743] 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 1828/2743] 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 1829/2743] 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 1830/2743] 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 1831/2743] 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 1832/2743] 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 1833/2743] 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 1834/2743] 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 1835/2743] 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 1836/2743] 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 1837/2743] 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 1838/2743] 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 1839/2743] 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 1840/2743] 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 1841/2743] 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 1842/2743] 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 1843/2743] 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 1844/2743] 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 1845/2743] 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 1846/2743] 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 1847/2743] 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 1848/2743] 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 1849/2743] 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 1850/2743] 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 44a7be9496ef7e2e36d1cebd9f6baaa0bcdc2564 Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Thu, 12 Apr 2018 22:10:24 +0100 Subject: [PATCH 1851/2743] alot: Put included themes where alot will find them Instead of putthing them in the wrong place and then pointing alog at it via default config, put them in the right place and don't touch the default config. --- pkgs/development/python-modules/alot/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 7abc56c47839..dd06d4dde7a6 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -19,12 +19,6 @@ buildPythonPackage rec { sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi"; }; - postPatch = '' - substituteInPlace alot/defaults/alot.rc.spec \ - --replace "themes_dir = string(default=None)" \ - "themes_dir = string(default='$out/share/themes')" - ''; - nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ @@ -50,8 +44,8 @@ buildPythonPackage rec { cp -r docs/build/man $out/man '' + '' - mkdir -p $out/share/applications - cp -r extra/themes $out/share + mkdir -p $out/share/{applications,alot} + cp -r extra/themes $out/share/alot sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop ''; From 276580f76968b9d3549bb4ded12abf651dcf2528 Mon Sep 17 00:00:00 2001 From: Yorick Date: Thu, 12 Apr 2018 23:14:49 +0200 Subject: [PATCH 1852/2743] acme.sh: init at 2.7.8 (#38856) --- pkgs/tools/admin/acme.sh/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/admin/acme.sh/default.nix diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix new file mode 100644 index 000000000000..00d8bdd3ef4c --- /dev/null +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute }: +stdenv.mkDerivation rec { + name = "acme.sh-${version}"; + version = "2.7.8"; + + src = fetchFromGitHub { + owner = "Neilpang"; + repo = "acme.sh"; + rev = version; + sha256 = "0zm64z7av63xi7yjhljab2i8q1vx4q1mpcmcm58jm6k4babalxrf"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out $out/bin $out/libexec + cp -R $src/* $_ + makeWrapper $out/libexec/acme.sh $out/bin/acme.sh \ + --prefix PATH : "${lib.makeBinPath [ socat openssl curl iproute ]}" + ''; + + meta = with stdenv.lib; { + description = "A pure Unix shell script implementing ACME client protocol"; + homepage = https://acme.sh/; + license = licenses.gpl3; + maintainers = [ maintainers.yorickvp ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f1dd74b4986..998176cd089b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -414,6 +414,8 @@ with pkgs; acct = callPackage ../tools/system/acct { }; + acme-sh = callPackage ../tools/admin/acme.sh { }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { ffmpeg = ffmpeg_1; }; From 0f179416a56522fd30b1bf5a45ed8dddb43e858c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 12 Apr 2018 16:17:20 -0500 Subject: [PATCH 1853/2743] Revert "radare2: 2.4.0 -> 2.5.0" --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 844267b7adb8..d70332749d98 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,7 +13,7 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "2.5.0"; + version = "2.4.0"; name = "radare2-${version}"; src = fetchFromGitHub { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { capstone = fetchgit { url = "https://github.com/aquynh/capstone.git"; rev = cs_tip; - sha256 = "19vfgdfykmi3cfs4x1acxy0gnwggjjc8qq46pybqvcksbi11nw1k"; + sha256 = "1b126npshdbwh5y7rafmb9w4dzlvxsf4ca6bx4zs2y7kbk48jyn8"; leaveDotGit = true; }; in '' From 367db080877fc9982d7b7f1e25c97f255337b809 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 12 Apr 2018 16:22:24 -0500 Subject: [PATCH 1854/2743] radare2: 2.4.0 -> 2.5.0 --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index d70332749d98..d1bf0af631c6 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,14 +13,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.5.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "08zvxgsvc6rqpjaapcxz1wm9vzlrbsqgplfkx0lch2s67v6slr7z"; + sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd"; }; postPatch = let From e9e823c178d70b8562094ee07786e7483952919b Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Fri, 13 Apr 2018 09:04:46 +1200 Subject: [PATCH 1855/2743] spotify: 1.0.72.117 -> 1.0.77.338 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 7b78ceddda29..87bf440ed4f3 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.72.117.g6bd7cc73-35"; + version = "1.0.77.338.g758ebd78-41"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap"; + sha256 = "1971jc0431pl8yixpl37ryl2l0pqdf0xjvkg59nqdwj3vbdx5606"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f1dd74b4986..89322c8ef385 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17799,6 +17799,9 @@ with pkgs; inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; + curl = curl.override { + sslSupport = false; gnutlsSupport = true; + }; }; libspotify = callPackage ../development/libraries/libspotify { From a82aae30846c9531058a767fd8cab90fd59fafe7 Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 25 Feb 2018 14:22:23 +0100 Subject: [PATCH 1856/2743] 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 1857/2743] 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 1a525eeab1766c098460d5e12d68098c858c301d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 12 Apr 2018 18:56:41 -0300 Subject: [PATCH 1858/2743] numix-solarized: 20160919 -> 20170810 --- .../default.nix | 30 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 23 insertions(+), 9 deletions(-) rename pkgs/misc/themes/{gtk3/numix-solarized-gtk-theme => numix-solarized}/default.nix (51%) diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/numix-solarized/default.nix similarity index 51% rename from pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix rename to pkgs/misc/themes/numix-solarized/default.nix index 4ede14d3bb39..3c81e4308ca9 100644 --- a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix +++ b/pkgs/misc/themes/numix-solarized/default.nix @@ -1,26 +1,40 @@ -{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }: +{ stdenv, fetchFromGitHub, python3, sass, glib, gdk_pixbuf, libxml2, + inkscape, optipng, gtk-engine-murrine +}: stdenv.mkDerivation rec { - version = "20160919"; + version = "20170810"; name = "numix-solarized-gtk-theme-${version}"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "numix-solarized-gtk-theme"; rev = version; - sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad"; + sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl"; }; + nativeBuildInputs = [ python3 sass glib gdk_pixbuf libxml2 inkscape optipng ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + postPatch = '' - substituteInPlace Makefile --replace \ - 'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes" patchShebangs . + substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out + substituteInPlace scripts/render-assets.sh \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ + --replace /usr/bin/optipng ${optipng}/bin/optipng ''; - buildInputs = [sass glib gdk_pixbuf]; + buildPhase = "true"; + + installPhase = '' + for theme in *.colors; do + make THEME="''${theme/.colors/}" install + done + ''; meta = with stdenv.lib; { - description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart"; + description = "Solarized versions of Numix GTK2 and GTK3 theme"; longDescription = '' This is a fork of the Numix GTK theme that replaces the colors of the theme and icons to use the solarized theme with a solarized green accent color. @@ -29,7 +43,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; license = licenses.gpl3; - maintainers = [ maintainers.offline ]; platforms = platforms.linux; + maintainers = [ maintainers.offline ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff147c496a69..522a013f235d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19607,7 +19607,7 @@ with pkgs; numix-gtk-theme = callPackage ../misc/themes/numix { }; - numix-solarized-gtk-theme = callPackage ../misc/themes/gtk3/numix-solarized-gtk-theme { }; + numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { }; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; From ddbaa2dd33116570d6b34f529c8ac092d9fd58d1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 17:09:58 -0500 Subject: [PATCH 1859/2743] libutil-new: fix with newest xcbuild stuff --- .../darwin/apple-source-releases/libutil/new.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix index 2c75f3966dbf..7facea2b8936 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -4,16 +4,12 @@ appleDerivation { buildInputs = [ xcbuild ]; - dontUseXcbuild = true; - prePatch = '' substituteInPlace tzlink.c \ --replace '#include ' "" ''; - buildPhase = '' - xcodebuild -target util - ''; + xcbuildFlags = "-target util"; installPhase = '' mkdir -p $out/lib $out/include From 32c70a07fa7dfcfa0a9b1a586f8698f7ce591a87 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 13 Apr 2018 00:11:32 +0200 Subject: [PATCH 1860/2743] pinentry_mac: enable xcbuild --- pkgs/tools/security/pinentry-mac/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix index 2be8550fb4cc..e555889d1abb 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry-mac/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ xcbuild libiconv Cocoa ncurses ]; - dontUseXcbuild = true; - installPhase = '' mkdir -p $out/Applications mv Products/Release/pinentry-mac.app $out/Applications From 5c491ab529d475f1ae843e5abafae7e782385461 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 17:16:49 -0500 Subject: [PATCH 1861/2743] diskdev_cmds: init at 593 --- .../darwin/apple-source-releases/default.nix | 2 ++ .../diskdev_cmds/default.nix | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 6019c20dd409..849c9ef03b82 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -44,6 +44,7 @@ let file_cmds = "264.1.1"; shell_cmds = "187"; system_cmds = "550.6"; + diskdev_cmds = "593"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -243,6 +244,7 @@ let adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; + diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" {}; network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix new file mode 100644 index 000000000000..aba2472af602 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -0,0 +1,32 @@ +{ stdenv, appleDerivation, xcbuild, lib, hostPlatform, Libc, xnu, libutil-new }: + +appleDerivation { + buildInputs = [ xcbuild libutil-new ]; + + NIX_CFLAGS_COMPILE = "-I."; + NIX_LDFLAGS = "-lutil"; + patchPhase = '' + # ugly hacks for missing headers + # most are bsd related - probably should make this a drv + unpackFile ${Libc.src} + unpackFile ${xnu.src} + mkdir System sys machine i386 + cp xnu-*/bsd/sys/disklabel.h sys + cp xnu-*/bsd/machine/disklabel.h machine + cp xnu-*/bsd/i386/disklabel.h i386 + cp -r xnu-*/bsd/sys System + cp -r Libc-*/uuid System + ''; + installPhase = '' + install -D Products/Release/libdisk.a $out/lib/libdisk.a + rm Products/Release/libdisk.a + for bin in Products/Release/*; do + install -D $bin $out/bin/$(basename $bin) + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From 1914ef6040cee60b6dde0654b1080e8d29c78aeb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 17:17:26 -0500 Subject: [PATCH 1862/2743] unixtools: add mount, umount for darwin --- pkgs/top-level/unix-tools.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 2d62d4e6c64c..3041ef4f16bc 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -69,6 +69,7 @@ in rec { }; mount = singleBinary "mount" { linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; }; netstat = singleBinary "netstat" { linux = pkgs.nettools; @@ -96,6 +97,7 @@ in rec { }; umount = singleBinary "umount" { linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; }; whereis = singleBinary "whereis" { linux = pkgs.utillinux; From 6fd4462fcf3c706c0a9eb5a9d9ef62c73e4123aa Mon Sep 17 00:00:00 2001 From: Jason Legler Date: Thu, 12 Apr 2018 16:26:52 -0600 Subject: [PATCH 1863/2743] vscode: 1.22.1 -> 1.22.2 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 7a6fa1961e20..5c10f6fb3bbc 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.22.1"; + version = "1.22.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1w1ywf21vcwmfq5ngag1y076nxbdqg3qav90ilxgd3dkv5j6fkjr"; - "x86_64-linux" = "14phpsrkkv09dgr7phqhgjzfhm3zzbh3w2yhyng0cj3vwzysikcs"; - "x86_64-darwin" = "0fqsr4ramanl7v1damf01zkmg75s9nlfkj6298h9sjvhc93pfcll"; + "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n"; + "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam"; + "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 01e1722e8fe932106d65bc87b83e5684534fa6e6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 12 Apr 2018 19:15:01 -0400 Subject: [PATCH 1864/2743] cctools: Make assert meta.broken instead This more politely expresses the same thing --- pkgs/os-specific/darwin/cctools/port.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index bcca11d66b19..0eef47ed6dfe 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -12,8 +12,6 @@ let "${targetPlatform.config}-"; in -assert targetPlatform.isDarwin; - # Non-Darwin alternatives assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null); @@ -117,6 +115,7 @@ let }; meta = { + broken = !targetPlatform.isDarwin; # Only supports darwin targets homepage = http://www.opensource.apple.com/source/cctools/; description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; From 1001311280bc74bc020a2bed0491c25c5010a091 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 6 Sep 2017 15:05:30 -0400 Subject: [PATCH 1865/2743] cctools: Add alternative source for sierra hack Source master rebase of my [PR #34]. Eventually, we might consider doing something for GNU binutils too, in order that we switch (the normal) ld-wrapper to always use this to leverage ld to resolve libraries, rather than faking it in bash. [PR #34]: https://github.com/tpoechtrager/cctools-port/pull/34 --- pkgs/os-specific/darwin/cctools/port.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 0eef47ed6dfe..55995c1592d1 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -2,6 +2,7 @@ , llvm, libcxx, libcxxabi, clang, libuuid , libobjc ? null, maloader ? null, xctoolchain ? null , hostPlatform, targetPlatform +, enableDumpNormalizedLibArgs ? false }: let @@ -20,12 +21,18 @@ let name = "${targetPrefix}cctools-port-${version}"; version = "895"; - src = fetchFromGitHub { + src = fetchFromGitHub (if enableDumpNormalizedLibArgs then { + owner = "tpoechtrager"; + repo = "cctools-port"; + # master with https://github.com/tpoechtrager/cctools-port/pull/34 + rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df"; + sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f"; + } else { owner = "tpoechtrager"; repo = "cctools-port"; rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; - }; + }); outputs = [ "out" "dev" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f54b163c1305..82ad4769977c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5779,8 +5779,13 @@ with pkgs; clang-sierraHack = clang.override { name = "clang-wrapper-with-reexport-hack"; - bintools = clang.bintools.override { + bintools = darwin.binutils.override { useMacosReexportHack = true; + bintools = darwin.binutils.bintools.override { + cctools = darwin.cctools.override { + enableDumpNormalizedLibArgs = true; + }; + }; }; }; From e49f601b7f84e2bfe1b5c1487e132fcbb4284f91 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 00:13:25 -0500 Subject: [PATCH 1866/2743] cvs: apply darwin patch Fixes #36532 --- pkgs/applications/version-management/cvs/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index a330db6a8d67..8a729c28da9a 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nano }: +{ stdenv, fetchurl, fetchpatch, nano }: stdenv.mkDerivation { name = "cvs-1.12.13"; @@ -12,6 +12,10 @@ stdenv.mkDerivation { ./getcwd-chroot.patch ./CVE-2012-0804.patch ./CVE-2017-12836.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24118ec737c7/cvs/vasnprintf-high-sierra-fix.diff"; + sha256 = "1ql6aaia7xkfq3vqhlw5bd2z2ywka82zk01njs1b2szn699liymg"; + }) ]; hardeningDisable = [ "fortify" "format" ]; From 5211410e69ccf686caf0210ef68999aab9aed59e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 18:27:11 -0500 Subject: [PATCH 1867/2743] top: init at 108 --- .../darwin/apple-source-releases/default.nix | 2 ++ .../darwin/apple-source-releases/top/default.nix | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/top/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 849c9ef03b82..5d4cd22363d6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -45,6 +45,7 @@ let shell_cmds = "187"; system_cmds = "550.6"; diskdev_cmds = "593"; + top = "108"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -249,6 +250,7 @@ let file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {}; + top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {}; security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix new file mode 100644 index 000000000000..f262d0c74732 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix @@ -0,0 +1,11 @@ +{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new}: + +appleDerivation { + buildInputs = [ xcbuild apple_sdk.frameworks.IOKit ncurses libutil-new ]; + NIX_LDFLAGS = "-lutil"; + installPhase = '' + install -D Products/Release/libtop.a $out/lib/libtop.a + install -D Products/Release/libtop.h $out/include/libtop.h + install -D Products/Release/top $out/bin/top + ''; +} From 6b796a9c23db8cbb3065ffdd20c1a53fd86de9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Apr 2018 23:11:13 +0100 Subject: [PATCH 1868/2743] zfsUnstable: fix build fixes #38859 --- 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 4cbe527de05e..d4b312ad6d54 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -82,6 +82,7 @@ let done ./autogen.sh + configureFlagsArray+=("--libexecdir=$out/libexec") ''; configureFlags = [ @@ -91,6 +92,7 @@ let "--with-udevdir=$(out)/lib/udev" "--with-systemdunitdir=$(out)/etc/systemd/system" "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" + "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator" "--with-mounthelperdir=$(out)/bin" "--sysconfdir=/etc" "--localstatedir=/var" From 8287ba10fc7df5ae1cfcdd9057eb5e31f15a0824 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 18:36:21 -0500 Subject: [PATCH 1869/2743] unix-tools: cleanup things - Adds ifconfig to nettools - Adds top to procps - Adds fsck, fdisk, mount, umount, quota to utillinux --- pkgs/top-level/unix-tools.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 3041ef4f16bc..5bf9278ea426 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -48,6 +48,14 @@ in rec { linux = pkgs.utillinux; darwin = pkgs.getopt; }; + fdisk = singleBinary "fdisk" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + fsck = singleBinary "fsck" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; hexdump = singleBinary "hexdump" { linux = pkgs.utillinux; darwin = pkgs.darwin.shell_cmds; @@ -83,6 +91,10 @@ in rec { linux = pkgs.procps; darwin = pkgs.darwin.ps; }; + quota = singleBinary "quota" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; route = singleBinary "route" { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; @@ -95,6 +107,10 @@ in rec { linux = pkgs.procps; darwin = pkgs.darwin.system_cmds; }; + top = singleBinary "top" { + linux = pkgs.procps; + darwin = pkgs.darwin.top; + }; umount = singleBinary "umount" { linux = pkgs.utillinux; darwin = pkgs.darwin.diskdev_cmds; @@ -116,16 +132,17 @@ in rec { procps = buildEnv { name = "procps-compat"; - paths = [ sysctl ps ]; + paths = [ ps sysctl top ]; }; utillinux = buildEnv { name = "utillinux-compat"; - paths = [ getopt hexdump script whereis write ]; + paths = [ fsck fdisk getopt hexdump mount + quota script umount whereis write ]; }; nettools = buildEnv { name = "nettools-compat"; - paths = [ arp hostname netstat route ]; + paths = [ arp hostname ifconfig netstat route ]; }; } From 23467e207feb13d2ca783f0d36a21988e037507b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 18:42:21 -0500 Subject: [PATCH 1870/2743] top: add meta --- .../darwin/apple-source-releases/top/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix index f262d0c74732..4ddec2a30c90 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix @@ -1,4 +1,4 @@ -{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new}: +{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new, lib}: appleDerivation { buildInputs = [ xcbuild apple_sdk.frameworks.IOKit ncurses libutil-new ]; @@ -8,4 +8,8 @@ appleDerivation { install -D Products/Release/libtop.h $out/include/libtop.h install -D Products/Release/top $out/bin/top ''; + meta = { + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ matthewbauer ]; + }; } From 30a031b81a221319af96447b98417ea319bf8106 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Apr 2018 21:38:55 -0400 Subject: [PATCH 1871/2743] papirus-icon-theme: 20180214 -> 20180401 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index df974d8a0359..c0f4727f48fb 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20180214"; + version = "20180401"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "0lsp5cmq5wdqw6vyh6hqqrshgpzxfj8dx87l7qdlgrk73dajjmki"; + sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil"; }; nativeBuildInputs = [ gtk3 ]; From ed6f1761ccbd8635a9c53dd7743b656d5f60d62c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 12 Apr 2018 22:46:12 -0400 Subject: [PATCH 1872/2743] grafana: support socket protocol --- nixos/modules/services/monitoring/grafana.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index a5b6dbab1577..eceb91525db4 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -50,7 +50,7 @@ in { protocol = mkOption { description = "Which protocol to listen."; default = "http"; - type = types.enum ["http" "https"]; + type = types.enum ["http" "https" "socket"]; }; addr = mkOption { From 0ab54def16f5c6005f5ee19f51908be16d7d15d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 22:18:15 -0700 Subject: [PATCH 1873/2743] 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 1874/2743] 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 50c6900fd4320962382e3fbc13a8ecefbe64a6ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 12 Apr 2018 23:03:32 -0700 Subject: [PATCH 1875/2743] signal-desktop: 1.6.1 -> 1.7.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/signal-desktop/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.7.0 with grep in /nix/store/xkslw2sdzbpbzy0ddd0f5qxk1wkfahs6-signal-desktop-1.7.0 - directory tree listing: https://gist.github.com/05c86387ecf6ea0334f3d0c18b44542e --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 74f784a1ba1a..d0bbd766efe6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.6.1"; + version = "1.7.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0q2qzl84ifnhcn1qbq38fdpj8ry748h6dlzp2mdpkslsh8mc46as"; + sha256 = "19cbv15lizgf7fwxsrd8wrwcl1yan9rvajnvh06jb2zhc5zp47vp"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; From 9df0c12cde68030981ba5371b56a7840347b5f06 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 13 Apr 2018 09:28:28 +0200 Subject: [PATCH 1876/2743] elan: 0.3.0 -> 0.3.2 --- pkgs/applications/science/logic/elan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 72b4ae2049ed..a59528b86b0a 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "elan-${version}"; - version = "0.3.0"; + version = "0.3.2"; cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "116v9v1v5a6fr6h4dgxzwczpy4pbf96cnx6nss6a5y8vbhx9c1mj"; + sha256 = "13r110382dh7848lpn3mrhc5bgmj373sbpx1326ryx3wl5kfp8rs"; }; nativeBuildInputs = [ pkgconfig ]; From d503d493ab8d44bdc559585ac42f75904b3176a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Apr 2018 09:58:25 +0200 Subject: [PATCH 1877/2743] vcsh: update to latest version and add missing Perl test suite dependencies to fix the build --- .../version-management/vcsh/default.nix | 27 +++++++------------ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 77663e858ef2..0f0eec7ef9cd 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,29 +1,22 @@ -{ stdenv, fetchpatch, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: +{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand +, TestMost, TestDifferences, TestDeep, TestException, TestWarn +}: stdenv.mkDerivation rec { - version = "1.20170226"; # date of commit we're pulling + version = "1.20170915"; # date of commit we're pulling name = "vcsh-${version}"; src = fetchFromGitHub { owner = "RichiH"; repo = "vcsh"; - rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab"; - sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln"; + rev = "eadb8df6aa71a76e5be36492edcadb118bd862ac"; + sha256 = "1wfzp8167lcq6akdpbi8fikjv0z3h1i5minh3423dljc04q0klm1"; }; - patches = - [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch"; - sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k"; - }) - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/228.patch"; - sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam"; - }) - ]; - - buildInputs = [ which git ronn perl ShellCommand TestMost ]; + buildInputs = [ + which git ronn perl ShellCommand TestMost TestDifferences TestDeep + TestException TestWarn + ]; installPhase = "make install PREFIX=$out"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0efc6e6ed5..eded21134dda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5311,7 +5311,8 @@ with pkgs; vcftools = callPackage ../applications/science/biology/vcftools { }; vcsh = callPackage ../applications/version-management/vcsh { - inherit (perlPackages) ShellCommand TestMost; + inherit (perlPackages) ShellCommand TestMost TestDifferences TestDeep + TestException TestWarn; }; vcstool = callPackage ../development/tools/vcstool { }; From 8fccc7e1df9a984d41e6feb6bf677365eaaeabf0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 10 Jan 2018 01:50:28 +0100 Subject: [PATCH 1878/2743] deluge: use mkEnableOption --- nixos/modules/services/torrent/deluge.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index ec1e97f4125e..bff22cd13594 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -11,10 +11,7 @@ in { options = { services = { deluge = { - enable = mkOption { - default = false; - description = "Start the Deluge daemon"; - }; + enable = mkEnableOption "Deluge daemon"; openFilesLimit = mkOption { default = openFilesLimit; @@ -25,14 +22,7 @@ in { }; }; - deluge.web = { - enable = mkOption { - default = false; - description = '' - Start Deluge Web daemon. - ''; - }; - }; + deluge.web.enable = mkEnableOption "Deluge Web daemon"; }; }; From fe840cd3339eba56855840630d22889ee1424bfb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 10 Jan 2018 01:52:15 +0100 Subject: [PATCH 1879/2743] deluge: add test --- nixos/release.nix | 1 + nixos/tests/deluge.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 nixos/tests/deluge.nix diff --git a/nixos/release.nix b/nixos/release.nix index 4fd77e6471cf..39a6f34aa985 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -264,6 +264,7 @@ in rec { tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; + tests.deluge = callTest tests/deluge.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {}; diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix new file mode 100644 index 000000000000..6119fd58447c --- /dev/null +++ b/nixos/tests/deluge.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "deluge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ flokli ]; + }; + + nodes = { + server = + { pkgs, config, ... }: + + { services.deluge = { + enable = true; + web.enable = true; + }; + networking.firewall.allowedTCPPorts = [ 8112 ]; + }; + + client = { }; + }; + + testScript = '' + startAll; + + $server->waitForUnit("deluged"); + $server->waitForUnit("delugeweb"); + $client->waitForUnit("network.target"); + $client->waitUntilSucceeds("curl --fail http://server:8112"); + ''; +}) From f6c48829455b0ae7d5050deb23469cec3f801dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Apr 2018 23:13:03 +0100 Subject: [PATCH 1880/2743] radare2-cutter: 1.1 -> 1.3 --- .../tools/analysis/radare2-cutter/default.nix | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 3cd1d309e15d..d1ff712be2d3 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -3,35 +3,17 @@ stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "02m5sf45n455hn34y7hrqanj830rc5xhz2ppp1z3mzbz0s515pfl"; + sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - patches = [ - # Fixup version number :D - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/69506b64600df632afdca8b680baa7d946c78644.patch"; - sha256 = "0ks3ixz8bycjcfi26bd0p6z7qaplhq00alw44hsfzpdm4bmr01x0"; - }) - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/8b52c66f4f0091cd9d97389b32aa519c2c602e2b.patch"; - sha256 = "0wcdn35lx2943pfzm7mkg4sr82pm0qz3yxf74m8fxbd70s3w0gkm"; - }) - - # case-insensitive filtering - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/0ebd34370bcaed00000168147572bb78106eeab1.patch"; - sha256 = "0sc50jwhncfnd2i5mlyld4dbdzi2ws7nh4yglkhlap9l9h1jxn20"; - }) - ]; - patchFlags = [ "-p2" ]; nativeBuildInputs = [ qmake pkgconfig ]; From abefb010509750cac40d686164d969e99bf81cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 Apr 2018 10:20:47 +0100 Subject: [PATCH 1881/2743] radare2: remove dependency on .git .git breaks our hashes --- .../tools/analysis/radare2/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index d1bf0af631c6..5f7b389cc2b1 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchFromGitHub, fetchgit, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, git, -gtk2 ? null, vte ? null, gtkdialog ? null, -python ? null, -ruby ? null, -lua ? null, -useX11, rubyBindings, pythonBindings, luaBindings}: +{stdenv, fetchFromGitHub, pkgconfig, libusb, readline, libewf, perl, zlib, openssl +, gtk2 ? null, vte ? null, gtkdialog ? null +, python ? null +, ruby ? null +, lua ? null +, useX11, rubyBindings, pythonBindings, luaBindings +}: assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; @@ -23,13 +24,16 @@ stdenv.mkDerivation rec { sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd"; }; + # do not try to update capstone + WITHOUT_PULL=1; + postPatch = let cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile - capstone = fetchgit { - url = "https://github.com/aquynh/capstone.git"; + capstone = fetchFromGitHub { + owner = "aquynh"; + repo = "capstone"; rev = cs_tip; - sha256 = "1b126npshdbwh5y7rafmb9w4dzlvxsf4ca6bx4zs2y7kbk48jyn8"; - leaveDotGit = true; + sha256 = "0v6rxfpxjq0hf40qn1n5m5wsv1dv6p1j8vm94a708lhvcbk9nkv8"; }; in '' if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi @@ -39,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig git ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] From d260e95cb9fe5ca16beb2a0ab4b39ef91988cf15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Thu, 12 Apr 2018 06:10:48 +0200 Subject: [PATCH 1882/2743] nixos/prosody: add user, group options --- nixos/modules/services/networking/prosody.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index f409962816dc..d8084ff2eed9 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -301,6 +301,18 @@ in default = "/var/lib/prosody"; }; + user = mkOption { + type = types.str; + default = "prosody"; + description = "User account under which prosody runs."; + }; + + group = mkOption { + type = types.str; + default = "prosody"; + description = "Group account under which prosody runs."; + }; + allowRegistration = mkOption { type = types.bool; default = false; @@ -475,15 +487,15 @@ in '') cfg.virtualHosts) } ''; - users.extraUsers.prosody = { + users.extraUsers.prosody = mkIf (cfg.user == "prosody") { uid = config.ids.uids.prosody; description = "Prosody user"; createHome = true; - group = "prosody"; + inherit (cfg) group; home = "${cfg.dataDir}"; }; - users.extraGroups.prosody = { + users.extraGroups.prosody = mkIf (cfg.group == "prosody") { gid = config.ids.gids.prosody; }; @@ -494,7 +506,8 @@ in wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ]; serviceConfig = { - User = "prosody"; + User = cfg.user; + Group = cfg.group; Type = "forking"; PIDFile = "${cfg.dataDir}/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; From ec1419bad815fd7ffc54911239f39f3944c2d374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Fri, 13 Apr 2018 11:38:52 +0200 Subject: [PATCH 1883/2743] nixos/prosody: fix pidfile path --- nixos/modules/services/networking/prosody.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index d8084ff2eed9..1b4f81f6b56e 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -439,7 +439,7 @@ in environment.etc."prosody/prosody.cfg.lua".text = '' - pidfile = "${cfg.dataDir}/prosody.pid" + pidfile = "/run/prosody/prosody.pid" log = "*syslog" @@ -509,7 +509,8 @@ in User = cfg.user; Group = cfg.group; Type = "forking"; - PIDFile = "${cfg.dataDir}/prosody.pid"; + RuntimeDirectory = [ "prosody" ]; + PIDFile = "/run/prosody/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; }; }; From ca6a4bf05d3e382772cd0cf0b442f71ea517cc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 13 Apr 2018 10:37:54 +0100 Subject: [PATCH 1884/2743] mergerfs: 2.24.0 -> 2.24.2 Remove .git because it tend to break hashes. --- pkgs/tools/filesystems/mergerfs/default.nix | 27 +++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 6f239bfa1279..16e6db8e4f75 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }: +{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.24.0"; + version = "2.24.2"; - # not using fetchFromGitHub because of changelog being built with git log - src = fetchgit { - url = "https://github.com/trapexit/mergerfs"; - rev = "refs/tags/${version}"; - sha256 = "12ci1i5zkarl1rz0pq1ldw0fpp4yfj8vz36jij63am7w7gp7qly2"; - deepClone = true; - leaveDotGit = true; + src = fetchFromGitHub { + owner = "trapexit"; + repo = "mergerfs"; + rev = version; + sha256 = "0i65v7900s7c9jkj3a4v44vf3r5mvjkbcic3df940nmk0clahhcs"; }; - nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ]; + nativeBuildInputs = [ + automake autoconf pkgconfig gettext libtool pandoc which + ]; buildInputs = [ attr libiconv ]; + preConfigure = '' + cat > src/version.hpp < Date: Fri, 13 Apr 2018 09:43:57 +0200 Subject: [PATCH 1885/2743] pythonPackages.apsw: 3.9.2-r1 -> 3.22.0-r1 Replaced fetchPypi with fetchFromGitHub because no new version has been uploaded to pypi since 2016, but there are new releases on github --- .../python-modules/apsw/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index c16fb3c4c46b..fb22128b9288 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,24 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchFromGitHub , sqlite, isPyPy }: buildPythonPackage rec { pname = "apsw"; - version = "3.9.2-r1"; + version = "3.22.0-r1"; disabled = isPyPy; - src = fetchPypi { - inherit pname version; - sha256 = "dab96fd164dde9e59f7f27228291498217fa0e74048e2c08c7059d7e39589270"; + src = fetchFromGitHub { + owner = "rogerbinns"; + repo = "apsw"; + rev = version; + sha256 = "02ldvshcgr4c7c8anp4flfnw8g8ys5bflkb8b51rb618qxhhwyak"; }; buildInputs = [ sqlite ]; - # python: double free or corruption (fasttop): 0x0000000002fd4660 *** -# doCheck = false; - meta = with stdenv.lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; - homepage = http://code.google.com/p/apsw/; + homepage = https://github.com/rogerbinns/apsw; + license = licenses.zlib; }; } From ee7351d889a7d25ea107fa900d4f218467887d4d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 13 Apr 2018 12:59:59 +0300 Subject: [PATCH 1886/2743] shadowsocks-libev: 2.5.5 -> 3.1.3 --- .../networking/shadowsocks-libev/default.nix | 59 +++++++------------ 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 46fd9e54950a..cbbc36b383bf 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,47 +1,32 @@ -{ withMbedTLS ? true -, enableSystemSharedLib ? true -, stdenv, fetchurl, zlib -, openssl ? null -, mbedtls ? null -, libev ? null -, libsodium ? null -, udns ? null -, asciidoc -, xmlto -, docbook_xml_dtd_45 -, docbook_xsl -, libxslt -, pcre +{ stdenv, fetchurl, fetchgit, cmake +, libsodium, mbedtls, libev, c-ares, pcre +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let - - version = "2.5.5"; - sha256 = "46a72367b7301145906185f1e4136e39d6792d27643826e409ab708351b6d0dd"; - -in - -with stdenv.lib; - stdenv.mkDerivation rec { name = "shadowsocks-libev-${version}"; - src = fetchurl { - url = "https://github.com/shadowsocks/shadowsocks-libev/archive/v${version}.tar.gz"; - inherit sha256; + version = "3.1.3"; + + # Git tag includes CMake build files which are much more convenient. + # fetchgit because submodules. + src = fetchgit { + url = "https://github.com/shadowsocks/shadowsocks-libev"; + rev = "refs/tags/v${version}"; + sha256 = "16q91xh6ixfv7b5rl31an11101irv08119klfx5qgj4i6h7c41s7"; }; - buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt pcre ] - ++ optional (!withMbedTLS) openssl - ++ optional withMbedTLS mbedtls - ++ optionals enableSystemSharedLib [libev libsodium udns]; + buildInputs = [ libsodium mbedtls libev c-ares pcre ]; + nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; - configureFlags = optional withMbedTLS - [ "--with-crypto-library=mbedtls" - "--with-mbedtls=${mbedtls}" - ] - ++ optional enableSystemSharedLib "--enable-system-shared-lib"; + cmakeFlags = [ "-DWITH_STATIC=OFF" ]; - meta = { + postInstall = '' + cp lib/* $out/lib + chmod +x $out/bin/* + mv $out/pkgconfig $out/lib + ''; + + meta = with stdenv.lib; { description = "A lightweight secured SOCKS5 proxy"; longDescription = '' Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. @@ -50,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/shadowsocks/shadowsocks-libev; license = licenses.gpl3Plus; maintainers = [ maintainers.nfjinjing ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From f7651b35b8c7c8fc804f597ba22eb470da665940 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 13 Apr 2018 13:00:10 +0300 Subject: [PATCH 1887/2743] shadowsocks service: init --- nixos/modules/module-list.nix | 1 + .../services/networking/shadowsocks.nix | 112 ++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 nixos/modules/services/networking/shadowsocks.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3a9a2bf86616..0bbb1d2e534e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -547,6 +547,7 @@ ./services/networking/searx.nix ./services/networking/seeks.nix ./services/networking/skydns.nix + ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix ./services/networking/shout.nix ./services/networking/sniproxy.nix diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix new file mode 100644 index 000000000000..fe6d65a5f963 --- /dev/null +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.shadowsocks; + + opts = { + server = cfg.localAddress; + server_port = cfg.port; + method = cfg.encryptionMethod; + mode = cfg.mode; + user = "nobody"; + fast_open = true; + } // optionalAttrs (cfg.password != null) { password = cfg.password; }; + + configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts); + +in + +{ + + ###### interface + + options = { + + services.shadowsocks = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run shadowsocks-libev shadowsocks server. + ''; + }; + + localAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Local address to which the server binds. + ''; + }; + + port = mkOption { + type = types.int; + default = 8388; + description = '' + Port which the server uses. + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password for connecting clients. + ''; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Password file with a password for connecting clients. + ''; + }; + + mode = mkOption { + type = types.enum [ "tcp_only" "tcp_and_udp" "udp_only" ]; + default = "tcp_and_udp"; + description = '' + Relay protocols. + ''; + }; + + encryptionMethod = mkOption { + type = types.str; + default = "chacha20-ietf-poly1305"; + description = '' + Encryption method. See . + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + assertions = singleton + { assertion = cfg.password == null || cfg.passwordFile == null; + message = "Cannot use both password and passwordFile for shadowsocks-libev"; + }; + + systemd.services.shadowsocks-libev = { + description = "shadowsocks-libev Daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.passwordFile != null) pkgs.jq; + serviceConfig.PrivateTmp = true; + script = '' + ${optionalString (cfg.passwordFile != null) '' + cat ${configFile} | jq --arg password "$(cat "${cfg.passwordFile}")" '. + { password: $password }' > /tmp/shadowsocks.json + ''} + exec ss-server -c ${if cfg.passwordFile != null then "/tmp/shadowsocks.json" else configFile} + ''; + }; + }; +} From 7e324b857b5d66e3a81b0daf10af95eebd23f198 Mon Sep 17 00:00:00 2001 From: Suvash Thapaliya Date: Fri, 13 Apr 2018 12:51:31 +0200 Subject: [PATCH 1888/2743] iamy: init at 2.1.1 Add iamy package - maintains aws iam in yaml format --- pkgs/tools/admin/iamy/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/admin/iamy/default.nix diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix new file mode 100644 index 000000000000..cfe336a7e830 --- /dev/null +++ b/pkgs/tools/admin/iamy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "iamy-${version}"; + version = "2.1.1"; + + goPackagePath = "github.com/99designs/iamy"; + + src = fetchFromGitHub { + owner = "99designs"; + repo = "iamy"; + rev = "v${version}"; + sha256 = "0b55hxcvgil8rl6zh2kyndfi7s5nzclawjb0sby14wpys3v08bjf"; + }; + + meta = with stdenv.lib; { + description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; + homepage = https://github.com/99designs/iamy; + license = licenses.mit; + maintainers = with maintainers; [ suvash ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf5642d57999..72d403afd6e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -563,6 +563,8 @@ with pkgs; aws-vault = callPackage ../tools/admin/aws-vault { }; + iamy = callPackage ../tools/admin/iamy { }; + azure-cli = nodePackages.azure-cli; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; From f5c30005f59bb94905a731328de71ab2eda26697 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Apr 2018 05:03:51 -0700 Subject: [PATCH 1889/2743] gutenprint: 5.2.13 -> 5.2.14 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/gutenprint/versions. These checks were done: - built on NixOS - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/escputil -h’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/escputil --help’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/testpattern -h’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/testpattern --help’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/testpattern help’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppd.5.2 -h’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppd.5.2 help’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppdupdate -h’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppdupdate --help’ got 0 exit code - ran ‘/nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14/bin/cups-genppdupdate help’ got 0 exit code - found 5.2.14 with grep in /nix/store/8pdjcfv46m5w8ifh68mvajwkn3vjwal1-gutenprint-5.2.14 - directory tree listing: https://gist.github.com/6d652f72cb774ccd13cc489d708ad63d --- pkgs/misc/drivers/gutenprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 3a46414512cf..7c8750905d9c 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gutenprint-5.2.13"; + name = "gutenprint-5.2.14"; src = fetchurl { url = "mirror://sourceforge/gimp-print/${name}.tar.bz2"; - sha256 = "0hi7s0y59306p4kp06sankfa57k2805khbknkvl9d036hdfp9afr"; + sha256 = "1293x19gw1b742id7c7bz5giv3vlxaqpmbdz2g0n99wny5k0ggs5"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; From 119570cd837505e3fad7688bbf64bef650f34736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 13 Apr 2018 14:12:11 +0200 Subject: [PATCH 1890/2743] backintime-qt4: package is broken the install phase writes into /nix : ``` install -d /nix/store/1kc8xcni0wp4y35vafh03rdxvqkrsxvl-backintime-qt4-1.1.24/../etc/dbus-1/system.d install --mode=644 net.launchpad.backintime.serviceHelper.conf /nix/store/1kc8xcni0wp4y35vafh03rdxvqkrsxvl-backintime-qt4-1.1.24/../etc/dbus-1/system.d ``` --- pkgs/applications/networking/sync/backintime/qt4.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix index ef8f02827498..b8f388c63eb5 100644 --- a/pkgs/applications/networking/sync/backintime/qt4.nix +++ b/pkgs/applications/networking/sync/backintime/qt4.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }: stdenv.mkDerivation rec { - inherit (backintime-common) version src installFlags meta; + inherit (backintime-common) version src installFlags; name = "backintime-qt4-${version}"; @@ -22,4 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${backintime-common}/bin:$PATH" ''; + meta = with stdenv.lib; { + broken = true; + }; } From 98270cb95939600f26f227fc40c73406b91c4d94 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 13 Apr 2018 15:30:40 +0300 Subject: [PATCH 1891/2743] dnscache service: fix bug with several assigned DNS servers --- nixos/modules/services/networking/dnscache.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index 379203cd1ab6..470f418643ec 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -14,7 +14,7 @@ let ${concatStrings (mapAttrsToList (host: ips: '' ${concatMapStrings (ip: '' - echo ${lib.escapeShellArg ip} > "$out/servers/"${lib.escapeShellArg host} + echo ${lib.escapeShellArg ip} >> "$out/servers/"${lib.escapeShellArg host} '') ips} '') cfg.domainServers)} From dccd5a86016af2a80c83aac4e96b4b077a5dad7f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 13 Apr 2018 15:30:57 +0300 Subject: [PATCH 1892/2743] dnscache service: cleanup and add forwardOnly --- .../modules/services/networking/dnscache.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index 470f418643ec..ba5c8e2d5e53 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -9,7 +9,7 @@ let mkdir -p $out/{servers,ip} ${concatMapStrings (ip: '' - echo > "$out/ip/"${lib.escapeShellArg ip} + touch "$out/ip/"${lib.escapeShellArg ip} '') cfg.clientIps} ${concatStrings (mapAttrsToList (host: ips: '' @@ -34,33 +34,49 @@ in { options = { services.dnscache = { + enable = mkOption { default = false; type = types.bool; - description = "Whether to run the dnscache caching dns server"; + description = "Whether to run the dnscache caching dns server."; }; ip = mkOption { default = "0.0.0.0"; type = types.str; - description = "IP address on which to listen for connections"; + description = "IP address on which to listen for connections."; }; clientIps = mkOption { default = [ "127.0.0.1" ]; type = types.listOf types.str; - description = "client IP addresses (or prefixes) from which to accept connections"; + description = "Client IP addresses (or prefixes) from which to accept connections."; example = ["192.168" "172.23.75.82"]; }; domainServers = mkOption { default = { }; type = types.attrsOf (types.listOf types.str); - description = "table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts)"; + description = '' + Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). + If entry for @ is not specified predefined list of root servers is used. + ''; example = { - "example.com" = ["8.8.8.8" "8.8.4.4"]; + "@" = ["8.8.8.8" "8.8.4.4"]; + "example.com" = ["192.168.100.100"]; }; }; + + forwardOnly = mkOption { + default = false; + type = types.bool; + description = '' + Whether to treat root servers (for @) as caching + servers, requesting addresses the same way a client does. This is + needed if you want to use e.g. Google DNS as your upstream DNS. + ''; + }; + }; }; @@ -82,6 +98,7 @@ in { ''; script = '' cd /var/lib/dnscache/ + ${optionalString cfg.forwardOnly "export FORWARDONLY=1"} exec ./run ''; }; From 0b57c3ef214c051279dcaee7143baec72a01a2a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Apr 2018 05:46:32 -0700 Subject: [PATCH 1893/2743] 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 1894/2743] 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 8ce62f543849971bfbf589fa1a58a1f81d589a0a Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 11 Apr 2018 19:57:06 +0100 Subject: [PATCH 1895/2743] avidemux: fix build with glibc 2.27 --- pkgs/applications/video/avidemux/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 99ed7378745c..991842ba0dc1 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir +{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase @@ -32,7 +32,15 @@ stdenv.mkDerivation rec { sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; }; - patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch ]; + patches = [ + ./dynamic_install_dir.patch + ./bootstrap_logging.patch + # glibc 2.27 compat + (fetchpatch { + url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch; + sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6"; + }) + ]; nativeBuildInputs = [ yasm cmake pkgconfig ]; buildInputs = [ From 0625f77256b2b3cd856f7db24428e47c234d7cbc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 13 Apr 2018 09:01:53 -0400 Subject: [PATCH 1896/2743] Fix kernel-copperhead test --- nixos/tests/kernel-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index 07427d7f2a89..0af978f1851f 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -6,14 +6,14 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { config, lib, pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_hardened_copperhead; + boot.kernelPackages = pkgs.linuxPackages_copperhead_hardened; }; testScript = '' $machine->succeed("uname -a"); $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_hardened_copperhead.kernel.modDirVersion}'"); + $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_hardened.kernel.modDirVersion}'"); $machine->succeed("uname -a | grep 'hardened'"); ''; }) From f8e25030be27057fcf3890b333187ed65f8334b7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 13 Apr 2018 09:02:09 -0400 Subject: [PATCH 1897/2743] linux-copperhead: 4.15.16.a -> 4.15.17.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 82b0b44bfc06..0075cfbe165c 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.16"; + version = "4.15.17"; revision = "a"; - sha256 = "0jxf01gf5rh6kwxcsv6mwlhq3wva2ps0ayrx40zwrdhkqy03w79x"; + sha256 = "0rm5dlfj3ryz879p04px1y3hvlfgh3ryk13ihldnl2j1dzl2046i"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 25edf5ad52d27caeb65322708fe3225a711b95e5 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Fri, 13 Apr 2018 15:22:18 +0200 Subject: [PATCH 1898/2743] julia-vim: init at 2018-03-27 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 3e8c6e9b257e..a0dbc08972e5 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1500,6 +1500,17 @@ 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"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 42de002d1eaf..df699413eb9c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -87,6 +87,7 @@ "github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" "github:joonty/vim-xdebug" +"github:JuliaEditorSupport/julia-vim" "github:junegunn/fzf.vim" "github:junegunn/goyo.vim" "github:junegunn/limelight.vim" From 32d620d7397ccc3435c7f6390b788f5da2703b65 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 13 Apr 2018 09:39:06 -0400 Subject: [PATCH 1899/2743] hipchat: 4.30.3.1670 -> 4.30.4.1672 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e24ea5e6fb37..dd1ce2264d5f 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.30.3.1670"; + version = "4.30.4.1672"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay"; + sha256 = "1xrwndhbyhcmjcg8h1ib8lp1g51f7jxdhc6p7776zmhlfw94n3rx"; } else throw "HipChat is not supported on ${stdenv.system}"; From 546696e367fe94159aa7765313d93caffd11fb37 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 13 Apr 2018 09:57:06 -0400 Subject: [PATCH 1900/2743] ostree: 2017.12 -> 2018.4 --- pkgs/tools/misc/ostree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 3b220153f173..a437eba49574 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -7,8 +7,8 @@ let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08"; - sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr"; + rev = "0c82203cd459a35cc3f471e3205355e9fb79160f"; + sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc"; }; bsdiff-src = fetchFromGitHub { @@ -18,7 +18,7 @@ let sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - version = "2017.12"; + version = "2018.4"; in stdenv.mkDerivation { name = "ostree-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68"; + sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr"; }; nativeBuildInputs = [ From 59bf698238283c3f72b9c7876a25a7a7cb437f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 13 Apr 2018 15:57:41 +0200 Subject: [PATCH 1901/2743] nheko: 0.3.0 -> 0.3.1 --- .../networking/instant-messengers/nheko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 90a546154d18..8405769582f7 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "178z64vkl7nmr1amgsgvdcwipj8czp7vbvidxllxiwal21yvqpky"; + sha256 = "1dqd698p6wicz0x1lb6mzlwcp68sjkivanb9lwz3yy1mlmy8i3jn"; }; # This patch is likely not strictly speaking needed, but will help detect when From fddb1457b04e6c5700c6a30cbf349c0511bdb62d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Apr 2018 10:53:22 -0400 Subject: [PATCH 1902/2743] qemu-riscv: Mark lowPrio --- 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 cf5642d57999..3fd53aefa54c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17356,7 +17356,7 @@ with pkgs; inherit (darwin.stubs) rez setfile; }; - qemu-riscv = callPackage ../applications/virtualization/qemu/riscv.nix {}; + qemu-riscv = lowPrio (callPackage ../applications/virtualization/qemu/riscv.nix {}); qgis = callPackage ../applications/gis/qgis { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; From 1fa183defef185c5890f2e73197d4ccb7d3d468b Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 13 Apr 2018 07:57:21 -0700 Subject: [PATCH 1903/2743] sit: 0.2.1 -> 0.3.0 --- pkgs/applications/version-management/sit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index eae72739ec2b..84211543c3b3 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "1gcw5fqaqpxl2xgry0w8750g2msrk884zj1slym6r3nj7s2m9j22"; + sha256 = "1si4fg02wxi35hpkr58na06h19yjw6qd9c5mbb9xfkkzgz5mnssj"; }; - cargoSha256 = "0hb82j97m8vw8m6gpb6s3bbi31xxv9nqh3aq7hkbmp1pqc02sg3q"; + cargoSha256 = "083p7z7blj064840ddgnxvqjmih4bmy92clds3qgv5v7lh63wfmn"; meta = with stdenv.lib; { - description = "SCM-agnostic, file-based, offline-first, immutable issue tracker"; + description = "Serverless Information Tracker"; homepage = http://sit-it.org/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir ]; From bca79a970ab4e0eaa2818e4ba759a666e2ad1d20 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 13 Apr 2018 17:30:54 +0200 Subject: [PATCH 1904/2743] fplll: 5.0.2 -> 5.2.0 --- pkgs/development/libraries/fplll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index b377061fe97e..2dd757bf8216 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fplll"; - version = "5.0.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "${pname}"; repo = "${pname}"; rev = "${version}"; - sha256 = "0rl98rx284giyhj3pf6iydn1a06jis8c8mnsc7kqs4rcmiw4bjpx"; + sha256 = "0931i4q49lzlifsg9zd8a2yzj626i1s2bqhkfxvcxv94c38s0nh1"; }; nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook]; buildInputs = [gmp mpfr]; From 62315cf52a48ed78555856f5220d3136bc86a22b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 13 Apr 2018 10:40:25 -0500 Subject: [PATCH 1905/2743] quota: rename to linuxquota --- pkgs/tools/misc/{quota => linuxquota}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/tools/misc/{quota => linuxquota}/default.nix (100%) diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/linuxquota/default.nix similarity index 100% rename from pkgs/tools/misc/quota/default.nix rename to pkgs/tools/misc/linuxquota/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fd53aefa54c..906394366a3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4512,7 +4512,7 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; - quota = callPackage ../tools/misc/quota { }; + linuxquota = callPackage ../tools/misc/linuxquota { }; wiggle = callPackage ../development/tools/wiggle { }; From 47fdc26c268c8e6dad63e993b98bdd0dd85bc906 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 13 Apr 2018 10:41:16 -0500 Subject: [PATCH 1906/2743] unixtools: quota is not in utillinux --- pkgs/top-level/unix-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 5bf9278ea426..978d30ec0e77 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -138,7 +138,7 @@ in rec { utillinux = buildEnv { name = "utillinux-compat"; paths = [ fsck fdisk getopt hexdump mount - quota script umount whereis write ]; + script umount whereis write ]; }; nettools = buildEnv { From d20c6ffd657a61ec607467ef1c8c9ced94d0b5ab Mon Sep 17 00:00:00 2001 From: xeji Date: Fri, 13 Apr 2018 17:39:37 +0200 Subject: [PATCH 1907/2743] 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 f1fb3651d87f992879ac9e9c0c561c9c0421c0cc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 13 Apr 2018 10:41:46 -0500 Subject: [PATCH 1908/2743] quota: get from unixtools --- pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/unix-tools.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 906394366a3a..42a0b4f91975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3491,6 +3491,8 @@ with pkgs; limesurvey = callPackage ../servers/limesurvey { }; + linuxquota = callPackage ../tools/misc/linuxquota { }; + localtime = callPackage ../tools/system/localtime { }; logcheck = callPackage ../tools/system/logcheck { @@ -4512,7 +4514,7 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; - linuxquota = callPackage ../tools/misc/linuxquota { }; + quota = if stdenv.isLinux then linuxquota else unixtools.quota; wiggle = callPackage ../development/tools/wiggle { }; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 978d30ec0e77..439395efdf5f 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -92,7 +92,7 @@ in rec { darwin = pkgs.darwin.ps; }; quota = singleBinary "quota" { - linux = pkgs.utillinux; + linux = pkgs.linuxquota; darwin = pkgs.darwin.diskdev_cmds; }; route = singleBinary "route" { From 293e18d9c4996f5884ceeda572927682591a9b2c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Fri, 13 Apr 2018 11:10:36 -0500 Subject: [PATCH 1909/2743] unixtools: fixup hexdump issue utillinux puts everything in ".bin" output. We need to use lib.getBin to get it correctly. --- pkgs/top-level/unix-tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 439395efdf5f..1a2f7270e0e5 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,4 +1,4 @@ -{ pkgs, buildEnv, runCommand, hostPlatform }: +{ pkgs, buildEnv, runCommand, hostPlatform, lib }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -13,7 +13,7 @@ let singleBinary = cmd: providers: let - provider = "${providers.${hostPlatform.parsed.kernel.name} or "missing-package"}/bin/${cmd}"; + provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; in runCommand cmd { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' From 4e0a5e253387a51c19e3ce82ac6b30753a769a8f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 13 Apr 2018 18:12:53 +0200 Subject: [PATCH 1910/2743] 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 633f6944434f8754f5b734e3e154351bdb25dbc2 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 19:08:38 +0200 Subject: [PATCH 1911/2743] pythonPackages.fpylll: init at 0.3.0dev --- .../python-modules/fpylll/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/fpylll/default.nix diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix new file mode 100644 index 000000000000..6ce069b31910 --- /dev/null +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pkgconfig +, gmp +, pari +, mpfr +, fplll +, cython +, cysignals +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "fpylll"; + version = "0.3.0dev"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bjkh02fnxsrxwjzai8ij12zl2wq319z8y25sn9pvvzla5izgnp9"; + }; + + buildInputs = [ + gmp + pari + mpfr + fplll + ]; + + propagatedBuildInputs = [ + cython + cysignals + numpy + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "A Python interface for fplll"; + homepage = https://github.com/fplll/fpylll; + maintainers = with lib.maintainers; [ timokau ]; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e90405cd2e7..8d99671ea3c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2589,6 +2589,8 @@ in { fpdf = callPackage ../development/python-modules/fpdf { }; + fpylll = callPackage ../development/python-modules/fpylll { }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; frozendict = buildPythonPackage rec { From da8fc391a0897a3897630ce322ad19a825a4ac93 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Apr 2018 12:25:10 -0400 Subject: [PATCH 1912/2743] pythonPackages.buildSetupcfg: Allow disabling tests. --- pkgs/build-support/build-setupcfg/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index 62dda59f1d52..bc6482f0a88e 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -5,18 +5,20 @@ # * meta: Standard nixpkgs metadata. # * application: Whether this package is a python library or an # application which happens to be written in python. -pythonPackages: { src, info, meta ? {}, application ? false }: let +# * doCheck: Whether to run the test suites. +pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true }: let build = if application then pythonPackages.buildPythonApplication else pythonPackages.buildPythonPackage; in build { inherit (info) pname version; - inherit src meta; + inherit src meta doCheck; nativeBuildInputs = map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ - (info.tests_require or [])); + (if doCheck then (info.tests_require or []) else [])); propagatedBuildInputs = map (p: pythonPackages.${p}) (info.install_requires or []); From 80b6513fbf5789ff0208c19a89bae49df2b503ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 29 Mar 2018 13:47:33 +0200 Subject: [PATCH 1913/2743] nixos: enable bash command completion by default Because it improves out-of-the-box user experience a lot (IMHO). (zsh completion is already on by default.) Remove "programs.bash.enableCompletion = true" from nixos-generate-config.pl, which feels superflous now. --- nixos/modules/installer/tools/nixos-generate-config.pl | 1 - nixos/modules/programs/bash/bash.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 0e0744a52e42..14c611e18bc3 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -585,7 +585,6 @@ $bootLoaderConfig # Some programs need SUID wrappers, can be configured further or are # started in user sessions. - # programs.bash.enableCompletion = true; # programs.mtr.enable = true; # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index c0967316c0c7..69a1a482d074 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -110,7 +110,7 @@ in }; enableCompletion = mkOption { - default = false; + default = true; description = '' Enable Bash completion for all interactive bash shells. ''; From e99f9892b67f0cb9ed5e2ecdec91b94d55980a9a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 13 Apr 2018 18:51:12 +0200 Subject: [PATCH 1914/2743] masterpdfeditor: 4.3.82 -> 4.3.89 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: Version 4.3.89 March, 21h, 2018 Fixed issue with application’s settings reset. Version 4.3.88 March, 20h, 2018 Improved printing system and fixed some related errors. Fixed several crash-related bugs. Linux version is optimized for later distros. Extended application localization. Added Finnish language. --- pkgs/applications/misc/masterpdfeditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 19a45e7d17be..5ea49f28afd8 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: let - version = "4.3.82"; + version = "4.3.89"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc From 1a72330ab067cb3c48c6e6ef3d5e0d2d24a95417 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 6 Sep 2017 15:05:30 -0400 Subject: [PATCH 1915/2743] cc-wrapper: Utilize patched cctools ld for more robust macOS Sierra hack Also fix numberous bugs, such as: - Not getting confused on more flags taking file arguments. - Ensuring children reexport their children, but the original binary/library doesn't. - Not spawning children when it turns out we just dynamically link under the threshold but our total number of inputs exceeeds it. - Children were always named `libunnamed-*`, when that name was supposed to be the last resort only. ld-wrapper's own RPATH check hardcodes `.so`, but darwin uses `.dylib` *and* (in practice due to lousy build systems) `.so`. We don't care however because we never inject `--rpath` like that in practice on Darwin. Hopefully someday we won't on linux either. --- .../macos-sierra-reexport-hack.bash | 310 +++++++++++++----- 1 file changed, 224 insertions(+), 86 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash index a0c4e9edfcdb..71b9471cbc83 100644 --- a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash +++ b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash @@ -2,107 +2,245 @@ set -eu -o pipefail +# For cmd | while read; do ...; done +shopt -s lastpipe + path_backup="$PATH" if [ -n "@coreutils_bin@" ]; then PATH="@coreutils_bin@/bin" fi -declare -r recurThreshold=300 +declare -ri recurThreshold=200 +declare -i overflowCount=0 -declare overflowCount=0 -for ((n=0; n < $#; ++n)); do - case "${!n}" in - -l*) let overflowCount+=1 ;; - -reexport-l*) let overflowCount+=1 ;; - *) ;; +declare -ar origArgs=("$@") + +# Throw away what we won't need +declare -a parentArgs=() + +while (( $# )); do + case "$1" in + -l) + echo "cctools LD does not support '-l foo'" >&2 + exit 1 + ;; + -lazy_library | -reexport_library | -upward_library | -weak_library) + overflowCount+=1 + shift 2 + ;; + -l* | *.so.* | *.dylib | -lazy-l* | -reexport-l* | -upward-l* | -weak-l*) + overflowCount+=1 + shift 1 + ;; + *.a | *.o) + shift 1 + ;; + -L | -F) + # Evidentally ld doesn't like using the child's RPATH, so it still + # needs these. + parentArgs+=("$1" "$2") + shift 2 + ;; + -L?* | -F?*) + parentArgs+=("$1") + shift 1 + ;; + -o) + outputName="$2" + parentArgs+=("$1" "$2") + shift 2 + ;; + -install_name | -dylib_install_name | -dynamic-linker | -plugin) + parentArgs+=("$1" "$2") + shift 2 + ;; + -rpath) + # Only an rpath to the child is needed, which we will add + shift 2 + ;; + *) + if [[ -f "$1" ]]; then + # Propabably a non-standard object file like Haskell's + # `.dyn_o`. Skip it like other inputs + : + else + parentArgs+=("$1") + fi + shift 1 + ;; esac done -declare -a allArgs=() + if (( "$overflowCount" <= "$recurThreshold" )); then - allArgs=("$@") -else - declare -a childrenLookup=() childrenLink=() - - while (( $# )); do - case "$1" in - -L/*) - childrenLookup+=("$1") - allArgs+=("$1") - ;; - -L) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -l) - echo "cctools LD does not support '-L foo' or '-l foo'" >&2 - exit 1 - ;; - -lazy_library | -lazy_framework | -lto_library) - # We aren't linking any "azy_library", "to_library", etc. - allArgs+=("$1") - ;; - -lazy-l | -weak-l) allArgs+=("$1") ;; - # We can't so easily prevent header issues from these. - -lSystem) allArgs+=("$1") ;; - # Special case as indirection seems like a bad idea for something - # so fundamental. Can be removed for simplicity. - -l?* | -reexport-l?*) childrenLink+=("$1") ;; - *) allArgs+=("$1") ;; - esac - - shift - done - - declare n=0 - while (( $n < "${#childrenLink[@]}" )); do - if [[ "${childrenLink[n]}" = -l* ]]; then - childrenLink[n]="-reexport${childrenLink[n]}" - fi - let ++n - done - unset n - - declare -r outputNameLibless=$(basename $( \ - if [[ -z "${outputName:+isUndefined}" ]]; then - echo unnamed - elif [[ "${outputName:0:3}" = lib ]]; then - echo "${outputName:3}" - else - echo "${outputName}" - fi)) - declare -ra children=("$outputNameLibless-reexport-delegate-0" \ - "$outputNameLibless-reexport-delegate-1") - - mkdir -p "$out/lib" - - PATH="$PATH:@out@/bin" - - symbolBloatObject=$outputNameLibless-symbol-hack.o - if [[ ! -e $symbolBloatObject ]]; then - # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward - # dependency cycle. - printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @targetPrefix@as -Q -- -o $symbolBloatObject + if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: Only ${overflowCount} inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 fi + PATH="$path_backup" + exec @prog@ "${origArgs[@]}" +fi - # first half of libs - @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[0]}.dylib" \ - -install_name "$out/lib/lib${children[0]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" - # second half of libs - @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ - -o "$out/lib/lib${children[1]}.dylib" \ - -install_name "$out/lib/lib${children[1]}.dylib" \ - "${childrenLookup[@]}" "$symbolBloatObject" \ - "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" - allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") +if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: ${overflowCount} inputs counted when ${recurThreshold} is the ceiling, inspecting further. " >&2 +fi + +# Collect the normalized linker input +declare -a norm=() + +# Arguments are null-separated +@prog@ --dump-normalized-lib-args "${origArgs[@]}" | + while IFS= read -r -d '' input; do + norm+=("$input") + done + +declare -i leafCount=0 +declare lastLeaf='' +declare -a childrenInputs=() trailingInputs=() +while (( "${#norm[@]}" )); do + case "${norm[0]}" in + -lazy_library | -upward_library) + # TODO(@Ericson2314): Don't do that, but intersperse children + # between such args. + echo "ld-wrapper: Warning: Potentially changing link order" >&2 + trailingInputs+=("${norm[0]}" "${norm[1]}") + norm=("${norm[@]:2}") + ;; + -reexport_library | -weak_library) + childrenInputs+=("${norm[0]}" "${norm[1]}") + if [[ "${norm[1]}" != "$lastLeaf" ]]; then + leafCount+=1 + lastLeaf="${norm[1]}" + fi + norm=("${norm[@]:2}") + ;; + *.so | *.dylib) + childrenInputs+=(-reexport_library "${norm[0]}") + if [[ "${norm[0]}" != "$lastLeaf" ]]; then + leafCount+=1 + lastLeaf="${norm[0]}" + fi + norm=("${norm[@]:1}") + ;; + *.o | *.a) + # Don't delegate object files or static libs + parentArgs+=("${norm[0]}") + norm=("${norm[@]:1}") + ;; + *) + if [[ -f "${norm[0]}" ]]; then + # Propabably a non-standard object file. We'll let it by. + parentArgs+=("${norm[0]}") + norm=("${norm[@]:1}") + else + echo "ld-wrapper: Internal Error: Invalid normalized argument" >&2 + exit -1 + fi + ;; + esac +done + + + +if (( "$leafCount" <= "$recurThreshold" )); then + if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: Only ${leafCount} *dynamic* inputs counted while ${recurThreshold} is the ceiling, linking normally. " >&2 + fi + PATH="$path_backup" + exec @prog@ "${origArgs[@]}" +fi + + + +if [ -n "${NIX_DEBUG:-}" ]; then + echo "ld-wrapper: ${leafCount} *dynamic* inputs counted when ${recurThreshold} is the ceiling, delegating to children. " >&2 +fi + +declare -r outputNameLibless=$( \ + if [[ -z "${outputName:+isUndefined}" ]]; then + echo unnamed + return 0; + fi + baseName=$(basename ${outputName}) + if [[ "$baseName" = lib* ]]; then + baseName="${baseName:3}" + fi + echo "$baseName") + +declare -ra children=( + "$outputNameLibless-reexport-delegate-0" + "$outputNameLibless-reexport-delegate-1" +) + +mkdir -p "$out/lib" + +symbolBloatObject=$outputNameLibless-symbol-hack.o +if [[ ! -f $symbolBloatObject ]]; then + # `-Q` means use GNU Assembler rather than Clang, avoiding an awkward + # dependency cycle. + printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' | + PATH="$PATH:@out@/bin" @targetPrefix@as -Q -- -o $symbolBloatObject +fi + +# Split inputs between children +declare -a child0Inputs=() child1Inputs=("${childrenInputs[@]}") +let "countFirstChild = $leafCount / 2" || true +lastLeaf='' +while (( "$countFirstChild" )); do + case "${child1Inputs[0]}" in + -reexport_library | -weak_library) + child0Inputs+=("${child1Inputs[0]}" "${child1Inputs[1]}") + if [[ "${child1Inputs[1]}" != "$lastLeaf" ]]; then + let countFirstChild-=1 || true + lastLeaf="${child1Inputs[1]}" + fi + child1Inputs=("${child1Inputs[@]:2}") + ;; + *.so | *.dylib) + child0Inputs+=(-reexport_library "${child1Inputs[0]}") + if [[ "${child1Inputs[0]}" != "$lastLeaf" ]]; then + let countFirstChild-=1 || true + lastLeaf="${child1Inputs[1]}" + fi + child1Inputs=("${child1Inputs[@]:2}") + ;; + *) + echo "ld-wrapper: Internal Error: Invalid delegated input" >&2 + exit -1 + ;; + esac +done + + +# First half of libs +@out@/bin/@targetPrefix@ld \ + -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[0]}.dylib" \ + -install_name "$out/lib/lib${children[0]}.dylib" \ + "$symbolBloatObject" "${child0Inputs[@]}" "${trailingInputs[@]}" + +# Second half of libs +@out@/bin/@targetPrefix@ld \ + -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + -o "$out/lib/lib${children[1]}.dylib" \ + -install_name "$out/lib/lib${children[1]}.dylib" \ + "$symbolBloatObject" "${child1Inputs[@]}" "${trailingInputs[@]}" + +parentArgs+=("-L$out/lib" -rpath "$out/lib") +if [[ $outputName != *reexport-delegate* ]]; then + parentArgs+=("-l${children[0]}" "-l${children[1]}") +else + parentArgs+=("-reexport-l${children[0]}" "-reexport-l${children[1]}") +fi + +parentArgs+=("${trailingInputs[@]}") + +if [ -n "${NIX_DEBUG:-}" ]; then + echo "flags using delegated children to @prog@:" >&2 + printf " %q\n" "${parentArgs[@]}" >&2 fi PATH="$path_backup" -exec @prog@ "${allArgs[@]}" +exec @prog@ "${parentArgs[@]}" From 1659a29fef5c725d0d6cc03e5660858fd7509a0a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 13 Apr 2018 19:25:11 +0200 Subject: [PATCH 1916/2743] python2Packages.python-wifi: 0.6.0 -> 0.6.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e90405cd2e7..e635702cc2b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11859,12 +11859,12 @@ in { python-wifi = buildPythonPackage rec { name = "python-wifi-${version}"; - version = "0.6.0"; + version = "0.6.1"; disabled = ! (isPy26 || isPy27 ); src = pkgs.fetchurl { url = "mirror://pypi/p/python-wifi/${name}.tar.bz2"; - sha256 = "504639e5953eaec0e41758900fbe143d33d82ea86762b19b659a118c77d8403d"; + sha256 = "149c3dznb63d82143cz5hqdim0mqjysz6p3yk0zv271vq3xnmzvv"; }; meta = { From 67dbfd3fc177cdc2ec35af1d0ca25460811c16d3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 13 Apr 2018 19:35:29 +0200 Subject: [PATCH 1917/2743] pythonPackages.rlp: init at 0.6.0 --- .../python-modules/rlp/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/rlp/default.nix diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix new file mode 100644 index 000000000000..6443a4e2bbfe --- /dev/null +++ b/pkgs/development/python-modules/rlp/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "rlp"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; + }; + + buildInputs = [ pytest ]; + + meta = { + description = "A package for encoding and decoding data in and from Recursive Length Prefix notation"; + homepage = "https://github.com/ethereum/pyrlp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e635702cc2b0..535da74d9f64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -410,6 +410,8 @@ in { rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); + rlp = callPackage ../development/python-modules/rlp { }; + rx = callPackage ../development/python-modules/rx { }; salmon-mail = callPackage ../development/python-modules/salmon-mail { }; From 5d9bd57c635a5d67b717cf649a937d7cf448f2c8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 13 Apr 2018 19:35:53 +0200 Subject: [PATCH 1918/2743] pythonPackages.trezor: add required rlp dependency, fix build --- pkgs/development/python-modules/trezor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index cc31939ff032..3a6b5f62e4f5 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, - protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1 + protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4"; }; - propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 ]; + propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; # There are no actual tests: "ImportError: No module named tests" doCheck = false; From b2b44c9e9fbcfe1215cceec68a062e1fbbd80710 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Wed, 11 Apr 2018 00:09:57 +0200 Subject: [PATCH 1919/2743] mailutils: fix path to sendmail for local mail delivery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Re-apply patch originally introduced in 23da6f9ca42a ("mailutils: fix for sendmail path"), fixing regression introduced in 27a9ef8709bf ("mailutils: fix build break"). Fixes #21008. Closes #38708. [Bjørn: modify/extend commit message.] --- pkgs/tools/networking/mailutils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index c85aaea6f3b9..26bfd27bf9a6 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, mysql }: +, python, gss, mysql, sendmailPath ? "/run/wrappers/bin/sendmail" }: let p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files"; @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { "--with-gssapi" "--with-gsasl" "--with-mysql" + "--with-path-sendmail=${sendmailPath}" ]; readmsg-tests = stdenv.lib.optionals doCheck [ From 0f3a6284001632f5b3f4928cef4692ee0a8b0220 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 13 Apr 2018 20:50:30 +0200 Subject: [PATCH 1920/2743] nixos/transmission: fix AppArmor profile to include libkrb5 --- nixos/modules/services/torrent/transmission.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 0998d5a7107a..3564afd77f41 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -147,6 +147,7 @@ in ${getLib pkgs.libcap}/lib/libcap*.so* mr, ${getLib pkgs.attr}/lib/libattr*.so* mr, ${getLib pkgs.lz4}/lib/liblz4*.so* mr, + ${getLib pkgs.libkrb5}/lib/lib*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, From 475c4e08eaaac62c18076ea9e5d3357d65c458c4 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 10 Apr 2018 17:23:40 +0200 Subject: [PATCH 1921/2743] luaPackages.mpack: fix hash The actual revision was changed back in November 2007 with commit b7ed08665039128c24c772ba41431f24d8bbfc37 but the hash wasn't updated. --- pkgs/top-level/lua-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index a23de670836b..3da443098037 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -738,7 +738,7 @@ let owner = "libmpack"; repo = "libmpack-lua"; rev = version; - sha256 = "1nydi6xbmxwl1fmi32v5v8n74msnmzblzqaqnb102w6vkinampsb"; + sha256 = "0l4k7qmwaa0zpxrlp27yp4pbbyiz3zgxywkm543q6wkzn6wmq8l8"; }; nativeBuildInputs = [ pkgconfig ]; From f744788878bada276990e29ba8e1bf29ed75cfff Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 12 Apr 2018 10:51:09 +0200 Subject: [PATCH 1922/2743] sgtpuzzles: 20171029.69773d8 -> 20180409.d95f476 Updating since the source tarball wasn't available anymore. --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index a9f2aae443fc..30e2bcfdf524 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sgt-puzzles-r${version}"; - version = "20171029.69773d8"; + version = "20180409.d95f476"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0m1gaa802jyih9hcwpvb05zrzprgj6akafgvbsnq321s0sqzaxf0"; + sha256 = "1psml0abh3i577dns440h52568ggdny2wk1hhr30815nxibbribx"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; From a415a95e7c520b1f0f86c9729a54f5c8e7bd416c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 13 Apr 2018 21:27:44 +0200 Subject: [PATCH 1923/2743] caf: 0.15.3 -> 0.15.7 --- pkgs/development/libraries/caf/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index d3b6722b36cd..1e764aff4cc1 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,25 +2,17 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.15.3"; + version = "0.15.7"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2"; + sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb"; }; - # See https://github.com/actor-framework/actor-framework/issues/545 and remove on next release that incorporates this - patches = [ (fetchpatch { - url = "https://github.com/actor-framework/actor-framework/commit/c5a3ee26a6e76b28dd4226f35230b280f291386d.patch"; - sha256 = "1l0323cqyqlp3lvggm709fmfm6lk6av1smdbd420adhi3ksj2vhj"; - }) ]; - nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "An open source implementation of the actor model in C++"; homepage = http://actor-framework.org/; From 8cd25c50c04239fea69a8d6c15f7685ac93678e5 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Fri, 13 Apr 2018 22:56:57 +0300 Subject: [PATCH 1924/2743] sway: 0.15.1 -> 0.15.2 --- pkgs/applications/window-managers/sway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index d643e2dd2186..89e7b9dd0880 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "sway-${version}"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi"; + sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n"; }; nativeBuildInputs = [ From b65181d78b61464966da493a635004fbc3161a70 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 13 Apr 2018 00:03:31 +0100 Subject: [PATCH 1925/2743] grass: Fix Can't load GDAL library errors on darwin It is required to pass this extra flag to the build to avoid trying to dynamically load the library. --- pkgs/applications/gis/grass/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 8353bce1b847..3e0089efa6d0 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation { "--with-blas" ]; + # Otherwise a very confusing "Can't load GDAL library" error + makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ postConfigure = '' From a3de225864018f311ab59f884a27dcd81e60642b Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 13 Apr 2018 00:04:26 +0100 Subject: [PATCH 1926/2743] grass: Symlink include/ as well as bin/ --- pkgs/applications/gis/grass/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 3e0089efa6d0..a8dae5625764 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation { --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib + ln -s $out/grass-*/include $out/include ''; enableParallelBuilding = true; From a134b9354b2221dbe111cc0f7be0f5ac5070cc19 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 13 Apr 2018 00:09:32 +0100 Subject: [PATCH 1927/2743] QGIS: Allow plugins to find GDAL tools by looking on PATH --- pkgs/applications/gis/qgis/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 75f980c6781b..5d7e70227fc3 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -58,11 +58,13 @@ stdenv.mkDerivation rec { '') + (stdenv.lib.optionalString stdenv.isDarwin '' # Necessary for QGIS to find the correct default GRASS path + # Plugins look for gdal tools like deminfo on the PATH ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} for file in $(find $out -type f -name "QGIS"); do wrapProgram "$file" \ --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ --prefix DYLD_LIBRARY_PATH : "${qscintilla}/lib" \ + --prefix PATH : "${gdal}/bin" \ ${stdenv.lib.optionalString withGrass "--prefix PATH : ${grass}/bin"} \ --set PYTHONPATH $PYTHONPATH done From e84325e6ab7c110681f6971ceea5bb5fa1439093 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 13 Apr 2018 00:14:03 +0100 Subject: [PATCH 1928/2743] grass, qgis: Add myself to maintainers list --- pkgs/applications/gis/grass/default.nix | 1 + pkgs/applications/gis/qgis/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index a8dae5625764..d4e2043eaa75 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -86,5 +86,6 @@ stdenv.mkDerivation { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 5d7e70227fc3..d0b7eb9e8927 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { homepage = http://www.qgis.org; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric mpickering]; }; } From 1fe53b85117b9854298415c40cc555e959c4195e Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 13 Apr 2018 16:57:02 +0100 Subject: [PATCH 1929/2743] QGIS: Build with GRASS by default --- pkgs/applications/gis/qgis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index d0b7eb9e8927..896387b1f7f4 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl, darwin, pkgconfig -, withGrass ? false, grass, IOKit, ApplicationServices +, withGrass ? true, grass, IOKit, ApplicationServices }: stdenv.mkDerivation rec { From d81f3ecb83b6c6b6307e4848c6cc4bc88d445499 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 13 Apr 2018 22:01:37 +0200 Subject: [PATCH 1930/2743] xen-4.8: fix qemu-xen build error in memfd.c Apply https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0 see also https://www.mail-archive.com/xen-devel@lists.xenproject.org/msg08648.html cc @eelco @tstrobel @oxij --- pkgs/applications/virtualization/xen/4.8.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index cce91dcd5deb..79be1be11908 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -41,6 +41,12 @@ let sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq"; }); + qemuMemfdBuildFix = fetchpatch { + name = "xen-4.8-memfd-build-fix.patch"; + url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; + }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib @@ -63,6 +69,9 @@ callPackage (import ./generic.nix (rec { rev = "refs/tags/qemu-xen-${version}"; sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4"; }; + patches = [ + qemuMemfdBuildFix + ]; buildInputs = qemuDeps; meta.description = "Xen's fork of upstream Qemu"; }; From 2dcb1026a335c41df1b45a51b95ddc7af92120ba Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 12 Apr 2018 00:43:43 +0200 Subject: [PATCH 1931/2743] rpy2: unbreak build --- .../python-modules/rpy2/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------- 2 files changed, 55 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/rpy2/default.nix diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix new file mode 100644 index 000000000000..8db7ae3b3372 --- /dev/null +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, readline +, R +, pcre +, lzma +, bzip2 +, zlib +, icu +, singledispatch +, six +, jinja2 +, pytest +}: + +buildPythonPackage rec { + version = "2.8.2"; + pname = "rpy2"; + disabled = isPyPy; + src = fetchPypi { + inherit version pname; + sha256 = "0k5jp6n1lfab7a6r5568aq31hg4fgf2cwy0hzvf3chp6yhyk26ic"; + }; + buildInputs = [ + readline + R + pcre + lzma + bzip2 + zlib + icu + ]; + propagatedBuildInputs = [ + singledispatch + six + jinja2 + ]; + checkInputs = [ pytest ]; + # Tests fail with `assert not _relpath.startswith('..'), "Path must be within the project"` + # in the unittest `loader.py`. I don't know what causes this. + doCheck = false; + # without this tests fail when looking for libreadline.so + LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs; + + meta = { + homepage = http://rpy.sourceforge.net/rpy2; + description = "Python interface to R"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ joelmo ]; + }; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7657ffc359d..85edcdadc5cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2975,7 +2975,6 @@ in { wrapProgram $out/bin/gtimelog \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \ - ''; meta = { @@ -12490,28 +12489,7 @@ in { rpmfluff = callPackage ../development/python-modules/rpmfluff {}; - rpy2 = buildPythonPackage rec { - name = "rpy2-2.8.2"; - disabled = isPyPy; - src = pkgs.fetchurl { - url = "mirror://pypi/r/rpy2/${name}.tar.gz"; - sha256 = "2c1a313df4e64236dcfe1078ce847b8e3c180656c894928d3a4b391aacb9b24c"; - }; - buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ]; - propagatedBuildInputs = with self; [ singledispatch six ]; - - # According to manual this is how the testsuite should be invoked - checkPhase = '' - ${python.interpreter} -m rpy2.tests - ''; - meta = { - homepage = http://rpy.sourceforge.net/rpy2; - description = "Python interface to R"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ joelmo ]; - broken = true; - }; - }; + rpy2 = callPackage ../development/python-modules/rpy2 {}; rpyc = buildPythonPackage rec { name = "rpyc-${version}"; From 8d61dd8ce38acb025e471a831482c47cecb0df52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 13 Apr 2018 22:10:21 +0200 Subject: [PATCH 1932/2743] dosage: 2016.03.17 -> 2018.04.08 Dosage works again, but requires Python 3 now. As it is an application, it was also moved to its own file. --- pkgs/applications/graphics/dosage/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/python-packages.nix | 23 ------------------ 3 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/graphics/dosage/default.nix diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix new file mode 100644 index 000000000000..48302d6bcb9c --- /dev/null +++ b/pkgs/applications/graphics/dosage/default.nix @@ -0,0 +1,24 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "dosage"; + version = "2018.04.08"; + PBR_VERSION = version; + + src = fetchFromGitHub { + owner = "webcomics"; + repo = "dosage"; + rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; + sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; + }; + buildInputs = [ pythonPackages.pytest ]; + propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; + + disabled = pythonPackages.pythonOlder "3.3"; + + meta = { + description = "A comic strip downloader and archiver"; + homepage = http://dosage.rocks/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27636fb8c186..5398c065ed63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1120,7 +1120,9 @@ with pkgs; doitlive = callPackage ../tools/misc/doitlive { }; - dosage = pythonPackages.dosage; + dosage = callPackage ../applications/graphics/dosage { + pythonPackages = python3Packages; + }; dpic = callPackage ../tools/graphics/dpic { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 535da74d9f64..489021a597e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1221,29 +1221,6 @@ in { defusedxml = callPackage ../development/python-modules/defusedxml {}; - dosage = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "dosage"; - version = "2016.03.17"; - PBR_VERSION = version; - src = pkgs.fetchFromGitHub { - owner = "webcomics"; - repo = "dosage"; - rev = "1af022895e5f86bc43da95754c4c4ed305790f5b"; - sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6"; - }; - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ requests lxml pbr ]; - # prompt_toolkit doesn't work on 3.5 on OSX. - doCheck = !isPy35; - - meta = { - description = "A comic strip downloader and archiver"; - homepage = http://dosage.rocks/; - broken = true; # ctypes error - }; - }; - dugong = callPackage ../development/python-modules/dugong {}; iowait = callPackage ../development/python-modules/iowait {}; From 43c10a76984f36b4e58c1540bd89aa83590c27e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 13 Apr 2018 23:25:59 +0200 Subject: [PATCH 1933/2743] dosage: fix tests --- pkgs/applications/graphics/dosage/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 48302d6bcb9c..f95370e39e72 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -12,11 +12,15 @@ pythonPackages.buildPythonApplication rec { rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; }; - buildInputs = [ pythonPackages.pytest ]; + buildInputs = with pythonPackages; [ pytest responses ]; propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; disabled = pythonPackages.pythonOlder "3.3"; + checkPhase = '' + py.test tests/ + ''; + meta = { description = "A comic strip downloader and archiver"; homepage = http://dosage.rocks/; From e7b213d55e92307dc515eb61f227e1ed2a1f64a9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 14 Apr 2018 00:12:19 +0200 Subject: [PATCH 1934/2743] libreoffice-still, libreoffice-fresh: use fresh bluez, not the oldest ICU, comment about GCC version, use the fontconfig fix for libreoffice-still --- pkgs/applications/office/libreoffice/still.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index d1e80724aaf3..b4139d54af50 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -2,7 +2,7 @@ , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis +, icu, boost, jdk, ant, cups, xorg, libcmis, carlito , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr @@ -106,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5398c065ed63..79a7b2f4afd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16503,7 +16503,6 @@ with pkgs; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; - bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ carlito dejavu_fonts @@ -16518,6 +16517,7 @@ with pkgs; withIcu = true; withGraphite2 = true; }; # checking whether g++ supports C++14 or C++11... configure: error: no + # Still relevant: 2018-04-13 stdenv = overrideCC stdenv gcc5; };}); @@ -16527,11 +16527,13 @@ with pkgs; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; - bluez5 = bluez5_28; poppler = poppler_0_61; fontsConf = makeFontsConf { fontDirectories = [ + carlito dejavu_fonts freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary ]; }; clucene_core = clucene_core_2; @@ -16539,8 +16541,8 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - icu = icu58; # checking whether g++ supports C++14 or C++11... configure: error: no + # Still relevant: 2018-04-13; gcc6 is not enough! stdenv = overrideCC stdenv gcc5; };}); From 2ad7d5140c68baf89b83664faf747d0e201d2f49 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 14 Apr 2018 00:44:25 +0200 Subject: [PATCH 1935/2743] wesnoth-dev: 1.13.11 -> 1.13.13 --- pkgs/games/wesnoth/dev.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 9fd2dc97d980..c9cd7119d8f2 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl +, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , enableTools ? false }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.11"; + version = "1.13.13"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "168732lmdnskca9hrkmaz4mi0bssc5ppklln10s306cbsl93bd39"; + sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre openssl ]; + libvorbis fribidi dbus libpng pcre openssl icu ]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; From 4cfdcedb71b7634db284bc18761a56e1ada58ce8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 13 Apr 2018 18:41:04 -0700 Subject: [PATCH 1936/2743] Fix a typo: types.openSignifiantByte -> types.openSignificantByte --- lib/systems/parse.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 641a7f5d7584..f7c84bd41cc0 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -34,7 +34,7 @@ rec { ################################################################################ - types.openSignifiantByte = mkOptionType { + types.openSignificantByte = mkOptionType { name = "significant-byte"; description = "Endianness"; merge = mergeOneOption; @@ -42,7 +42,7 @@ rec { types.significantByte = enum (attrValues significantBytes); - significantBytes = setTypes types.openSignifiantByte { + significantBytes = setTypes types.openSignificantByte { bigEndian = {}; littleEndian = {}; }; From 256b0b5a2dec683fc82d7cc7b31eb1939b1ddeab Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Sat, 14 Apr 2018 09:29:30 +0200 Subject: [PATCH 1937/2743] c14: 2017-05-15 -> 0.3 (#38905) --- pkgs/applications/networking/c14/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 33a1e8a5c08e..242abc2ece79 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -1,17 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "c14-cli-unstable-${version}"; - version = "2017-05-15"; - rev = "97f437ef5133f73edd551c883db3076c76cb1f6b"; + name = "c14-cli-${version}"; + version = "0.3"; goPackagePath = "github.com/online-net/c14-cli"; src = fetchFromGitHub { owner = "online-net"; repo = "c14-cli"; - inherit rev; - sha256 = "1b44bh0zhh6rhw4d3nprnnxhjgaskl9kzp2cvwwyli5svhjxrfdj"; + rev = "${version}"; + sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; goDeps = ./deps.nix; From 2c23faa3d81f69ea80260a659f041012678eef50 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 20:32:52 +0200 Subject: [PATCH 1938/2743] cliquer: init at 1.21 --- .../science/math/cliquer/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/science/math/cliquer/default.nix diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix new file mode 100644 index 000000000000..2441aff9fa30 --- /dev/null +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.21"; + name = "cliquer-${version}"; + + # autotoolized version of the original cliquer + src = fetchFromGitHub { + owner = "dimpase"; + repo = "autocliquer"; + rev = "v${version}"; + sha256 = "180i4qj1a25qfp75ig2d3144xfpb1dgcgpha0iqqghd7di4awg7z"; + }; + + doCheck = true; + + buildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + homepage = https://users.aalto.fi/~pat/cliquer.html; + downloadPage = src.meta.homepage; # autocliquer + description = "Routines for clique searching"; + longDescription = '' + Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. + It uses an exact branch-and-bound algorithm developed by Patric Östergård. + It is designed with the aim of being efficient while still being flexible and + easy to use. + ''; + 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 199f6e878ff5..216885289243 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19769,6 +19769,8 @@ with pkgs; clblas = callPackage ../development/libraries/science/math/clblas { }; + cliquer = callPackage ../development/libraries/science/math/cliquer { }; + jags = callPackage ../applications/science/math/jags { }; From 7663de114a365259f07425aa582b3c5890c00874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Mar 2018 09:58:54 +0000 Subject: [PATCH 1939/2743] lxd: 2.16 -> 3.0.0 --- nixos/modules/tasks/filesystems/zfs.nix | 2 + nixos/modules/virtualisation/lxc.nix | 5 +- nixos/modules/virtualisation/lxd.nix | 60 +++++---- pkgs/tools/admin/lxd/default.nix | 38 ++++-- pkgs/tools/admin/lxd/deps.nix | 165 ------------------------ 5 files changed, 65 insertions(+), 205 deletions(-) delete mode 100644 pkgs/tools/admin/lxd/deps.nix diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 50cf30cc48de..c3bf897d51fd 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -305,6 +305,8 @@ in } ]; + virtualisation.lxd.zfsSupport = true; + boot = { kernelModules = [ "spl" "zfs" ] ; extraModulePackages = with packages; [ spl zfs ]; diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 2310fe984325..9b5adaf08249 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -74,6 +74,9 @@ in systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; security.apparmor.packages = [ pkgs.lxc ]; - security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ]; + security.apparmor.profiles = [ + "${pkgs.lxc}/etc/apparmor.d/lxc-containers" + "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" + ]; }; } diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 4988886baf60..3e76cdacfc4b 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -15,28 +15,34 @@ in options = { - virtualisation.lxd.enable = - mkOption { + virtualisation.lxd = { + enable = mkOption { type = types.bool; default = false; - description = - '' - This option enables lxd, a daemon that manages - containers. Users in the "lxd" group can interact with - the daemon (e.g. to start or stop containers) using the - lxc command line tool, among others. - ''; + description = '' + This option enables lxd, a daemon that manages + containers. Users in the "lxd" group can interact with + the daemon (e.g. to start or stop containers) using the + lxc command line tool, among others. + ''; }; - + zfsSupport = mkOption { + type = types.bool; + default = false; + description = '' + enables lxd to use zfs as a storage for containers. + This option is enabled by default if a zfs pool is configured + with nixos. + ''; + }; + }; }; - ###### implementation config = mkIf cfg.enable { - environment.systemPackages = - [ pkgs.lxd ]; + environment.systemPackages = [ pkgs.lxd ]; security.apparmor = { enable = true; @@ -47,31 +53,31 @@ in packages = [ pkgs.lxc ]; }; - systemd.services.lxd = - { description = "LXD Container Management Daemon"; + systemd.services.lxd = { + description = "LXD Container Management Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; - # TODO(wkennington): Add lvm2 and thin-provisioning-tools - path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ]; + path = lib.optional cfg.zfsSupport pkgs.zfs; - preStart = '' - mkdir -m 0755 -p /var/lib/lxc/rootfs - ''; + preStart = '' + mkdir -m 0755 -p /var/lib/lxc/rootfs + ''; - serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd"; - serviceConfig.Type = "simple"; - serviceConfig.KillMode = "process"; # when stopping, leave the containers alone + serviceConfig = { + ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd"; + Type = "simple"; + KillMode = "process"; # when stopping, leave the containers alone }; + }; + users.extraGroups.lxd.gid = config.ids.gids.lxd; users.extraUsers.root = { subUidRanges = [ { startUid = 1000000; count = 65536; } ]; subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; - }; - } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 64ec5e9b418e..cfbb90fdc308 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,23 +1,37 @@ -{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables +}: buildGoPackage rec { - name = "lxd-${version}"; - version = "2.16"; - rev = "lxd-${version}"; + name = "lxd-3.0.0"; goPackagePath = "github.com/lxc/lxd"; - src = fetchFromGitHub { - inherit rev; - owner = "lxc"; - repo = "lxd"; - sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn"; + src = fetchurl { + url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; + sha256 = "0m5prdf9sk8k5bws1zva4n9ycggmy76wnjr6wb423066pszz24ww"; }; - goDeps = ./deps.nix; + preBuild = '' + # unpack vendor + pushd go/src/github.com/lxc/lxd + rm dist/src/github.com/lxc/lxd + cp -r dist/src/* ../../.. + rm -r dist + popd + ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lxc ]; + postInstall = '' + # binaries from test/ + rm $bin/bin/{deps,macaroon-identity} + + wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables + ]} + ''; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ lxc acl ]; meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix deleted file mode 100644 index e0f591a23d1e..000000000000 --- a/pkgs/tools/admin/lxd/deps.nix +++ /dev/null @@ -1,165 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/dustinkirkland/golang-petname"; - fetch = { - type = "git"; - url = "https://github.com/dustinkirkland/golang-petname"; - rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14"; - sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef"; - sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "599cba5e7b6137d46ddf58fb1765f5d928e69604"; - sha256 = "0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; - sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "ded68f7a9561c023e790de24279db7ebf473ea80"; - sha256 = "0q019h59jq815jfl9rgk4yrpkn5rpcx9s6dksdm48rp1abafwvfc"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "cf7286f069c3ef596efcc87781a4653a2e7607bd"; - sha256 = "19ipf6bf1xd7w2fm8dnv5my4jp3lhwhlrhfwhwq559amp1h4nwyq"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "1b00554d822231195d1babd97ff4a781231955c9"; - sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan"; - }; - } - { - goPackagePath = "github.com/syndtr/gocapability"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/gocapability"; - rev = "e7cb7fa329f456b3855136a2642b197bad7366ba"; - sha256 = "1i65kyjhbaya45zj9zqkb17plbqf92sfvl9fcz9s9qslg0qab2i1"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "3543873453996aaab2fc6b3928a35fc5ca2b5afb"; - sha256 = "1d7pjqzh5893mzkz60bv5ypmr9zgyvb9z2gvcjrsqniwcqlhbk2c"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344"; - sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv"; - }; - } - { - goPackagePath = "gopkg.in/flosch/pongo2.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/flosch/pongo2.v3"; - rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; - sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; - }; - } - { - goPackagePath = "gopkg.in/inconshreveable/log15.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/inconshreveable/log15.v2"; - rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; - sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; - }; - } - { - goPackagePath = "gopkg.in/lxc/go-lxc.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/lxc/go-lxc.v2"; - rev = "8304875cc3423823032ec93556beee076c6ba687"; - sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v2"; - rev = "d5d1b5820637886def9eef33e03a27a9f166942c"; - sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; - }; - } - { - goPackagePath = "github.com/gosexy/gettext"; - fetch = { - type = "git"; - url = "https://github.com/gosexy/gettext"; - rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; - sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb"; - sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50"; - sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; - }; - } -] From 72b27f2519ff8fcd5c7b45c00580049c618a1eb5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 13 Apr 2018 23:52:39 +0200 Subject: [PATCH 1940/2743] =?UTF-8?q?gnome3:=203.28.0=20=E2=86=92=203.28.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/bijiben/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/glade/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- .../gnome-3/apps/gnome-getting-started-docs/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gdm/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-session/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-user-share/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/vte/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/zenity/default.nix | 4 ++-- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++-- pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 4 ++-- pkgs/development/libraries/gvfs/default.nix | 4 ++-- pkgs/development/libraries/libdazzle/default.nix | 4 ++-- 37 files changed, 74 insertions(+), 74 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 91b16bbba96e..93a2c41caf35 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "bijiben-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "047w8kigrdmphd17dma2lldf6r60sgx3zybai9bz9yr0hm601kr6"; + sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index f41262d85b4e..d7def6e27091 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0b6yw664jdfc8ppd78akmrl36iximh7ipknf5mlzgga6lr6pl2nf"; + sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 7c90b16d86a1..919ebdd77d17 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv"; + sha256 = "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 577382a49866..a1777137c019 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "glade-${version}"; - version = "3.22.0"; + version = "3.22.1"; src = fetchurl { url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1j7kpy4jisz4nkd3yb5af4vd4bapyqchvp2gvq6ypfw3b0x88rkc"; + sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 52fa45812fa3..8921d70787ca 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.27.92"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1v1br4zh2w3w70np5imi31md6lnqamabiin521f806rdrxsnyggq"; + sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 35888b21c2e8..b88bad2f6497 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs"; + sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 3fc444dbdd4a..b3ede7028902 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-getting-started-docs-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "09khgzrbvcqvgjkqh8rp609bx818v5c8gzq61nxy5582s8habg8g"; + sha256 = "0x60aava6ba4xliy4p4i6jm5d2nq8hx9aqgnaw4d34fvmcpcy5w0"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 1c9d243c0c51..b5c8188bd064 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1imcgw67cw1qkfz8m2my0f4qmss11fbqqqi4w7afcfq9p0rplgy0"; + sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 982cd9283ffd..c2d5045e79ea 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.28.0.1"; + version = "3.28.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; - sha256 = "0yyysmxwmk167n8wghcbmxz73kgl1y1j9js3mgkjjqsmkd9brk65"; + sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 502485862614..85587d11178d 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0d8fi5ydsh8n7d85dps8svl1bhid1p8jbnlwiqywj2gd2wpxpyjv"; + sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 6877b20df44d..3ece64dc163f 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.28.0.1"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i"; + sha256 = "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md"; }; # Tests need an X display diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 59a7c6806efa..74f10cc384d7 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "evince-${version}"; - version = "3.28.0"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1a3kcls18dcz1lj8hrx8skcli9xxfyi71c17xjwayh71cm5jc8zs"; + sha256 = "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 7a01d73ebf46..01891ad82473 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.28.0"; + version = "3.28.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1ybyyy6nls11az8lbri1y9527snz5h7qbhyfqvk0vc6vzvald5gv"; + sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 999c3f05748b..6b6b23f21b54 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0i5rzr6fdvlm88gl85gvql1wf1yflkmg90x81dqjf39as3ixs81s"; + sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 888eb073a46a..68b85d9dfe0f 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.52.0"; + version = "1.52.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1jm40imin4sxzfcxcbmf4v71apk8y9icccq1a4m4mlz1wm2s092m"; + sha256 = "1s1m8xv3ixgl0hah3r364ws249d6w8yn56q2ahfn3dg2j54rmz58"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index f30243003cbb..03fdf4b14fe0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn"; + sha256 = "05zpdp9mkfjz22hs7hfjikkxhzmvy02mxrldrjxsv8ff17w9xvic"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 9c9b26360aa8..c8636cb1dc1f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,13 +5,13 @@ , vala, meson, ninja }: let - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1qqj6k5rvmvg6v6vg4cak98w6rqknpqfsm0vfrwva6l6wbql2v8i"; + sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 5f6ed213e3e0..55ac087cfa2c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -9,13 +9,13 @@ let pname = "gnome-control-center"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0nyx5nl2rky0249rdcy0hsccnxf3angpya0q859rrbrwaixqnxh3"; + sha256 = "0f2p91bzbl39q3cb1qj5vi55km7wxb2fibx07vciz39g5va5cpn6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index dad8d8177de6..ed1e59da62c2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "17fm5z3kfm1m3420kjpvk1y0pc34p42rqfpmb1npy51jkv1p3pzi"; + sha256 = "16nbgrp0hihvrsa6kmqk0z8y7ajravyagmkmq1nnwn27psi9g8vq"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 0478877acb4b..4f9e2dda5402 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-disk-utility-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ad98mxyygyzq0y280m6z73anyv3xxr6irpkp6vc803lhdr5b7fc"; + sha256 = "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index d36e7ce7432e..7b407aad5068 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-session-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b"; + sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq"; }; mesonFlags = [ "-Dsystemd=true" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 2a59d39e8cf4..cfb41c01e6ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1p3ccf4a4qbz73hqyx9i55hkp6l7c7la5kazqawcndl7bksywgny"; + sha256 = "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 2c4663b54ec7..21a1e1a1c4c7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0zwbgxzl805c4l8kwy5bn3p91s2qxlcn4syzzg4vd4kilc6nnjwk"; + sha256 = "0j27zygb3g08q9i8ygwpxqf6g0lrivq2vhj7p7g9x0zh9r0vzlbs"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 5f707152aed8..46a91dda70e0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1wvgx5p0a29d8yzp7rinpln90pg8vsjagqlvm4cxyhnl5hsdvrvn"; + sha256 = "0wdpd5mfrm0gwmwjvcj556c3mpxf3pcfnvh7x698i8if53ci0gw7"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 9e99e84cfd55..6f80fe0c90bf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1i5wlcjb0aigm1lbmn16nmh9rkjqfdpzzgf6qw7mcrhgw7pdald5"; + sha256 = "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index d4ba838bef3c..a8efa2384470 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0sx46j61kjn8kaf75303vym5sigki239pqzf5q4n72k1hwp7albp"; + sha256 = "189j78d23c6jr5x5j9nxkbdqxg31xvmwvyblz7f9xi9ncy0qdvfh"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 367485668807..509c10d75648 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-user-share-${version}"; - version = "3.27.90"; + version = "3.28.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1wd183cjr1gmzpsq7bqwkwhmcdng0m105f6ymc89r17fz85f4jhy"; + sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index a52ec342675c..2daaf2d43261 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -4,13 +4,13 @@ let pname = "nautilus"; - version = "3.28.0.1"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1i3li3nd434vncd6j6has73xihbzjx1ab0xyw8wif11mym15ixrh"; + sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w"; }; nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 3528a9a93d9c..e4458b7d0a3f 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ki95d0v9l0pb5jvk1v8k49vb7snp9j7bnxw3m8q63m00yl33qhz"; + sha256 = "140vz94vml0vf6kiw3sg436qfvajk21x6q86smvycgf24qfyvk6a"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 73fd244c5489..6577ba3ae587 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vte-${version}"; - version = "0.52.0"; + version = "0.52.1"; src = fetchurl { url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0rq5gkg7bfrxlsm8mgdh4605hki81wljmjhhz8x4kbspvpfp5bnm"; + sha256 = "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 691ec2fdb94a..9a47ecd2842a 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v"; + sha256 = "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8"; }; nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 05637e200e31..b97881063427 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "zenity-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1y3dha9faqgy5l8wqh3qp354gzdh36fx70q2kc9k1nw7p498yn2y"; + sha256 = "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 786eece7194a..97a425bccb1f 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "devhelp-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1b4l71775p3mps1jsv7pz26v0lhd0qczsp6qr1dwv7hyslmpb5qn"; + sha256 = "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 063b97801b4e..aebd72d65df2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-chess-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1vxgb36njv4v3bgdpwxd89rvr6s6pkbh9d3xislxqry2yp4f03w0"; + sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index a690524b45a8..a7c69de44eb6 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-tweaks"; - version = "3.28.0"; + version = "3.28.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0d8zxfa8r4n4l6jzyzy6q58padxjlrad3c71mwqidm2ww8nm6i19"; + sha256 = "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 67837b345c00..238edddaf3ad 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -18,14 +18,14 @@ let pname = "gvfs"; - version = "1.36.0"; + version = "1.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy"; + sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q"; }; # Uncomment when switching back to meson diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 50f03f3ac7ac..faa8b483a780 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.28.0"; + version = "3.28.1"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zq37i7gnmnc7qfngzhj71nqhf2wxl4m247s2ym9ykakxbi6zajp"; + sha256 = "04j9pjigpgxddq6y90y73k8qyjixlalip87q121ss5d8zp8xnz32"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ]; 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 1941/2743] 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 1942/2743] 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:41:23 +0200 Subject: [PATCH 1943/2743] docker-tools: add a test for permissions issues with AUFS/overlay docker# [ 11.054736] d24d6cdd57c9[763]: /bin/bash: error while loading shared libraries: libreadline.so.7: cannot open shared object file: Permission denied docker# /bin/bash: error while loading shared libraries: libreadline.so.7: cannot open shared object file: Permission denied docker: exit status 127 docker: output: error: command `docker run --rm -u 1000:1000 bash /bin/bash --version' did not succeed (exit code 127) command `docker run --rm -u 1000:1000 bash /bin/bash --version' did not succeed (exit code 127) --- nixos/release.nix | 1 + nixos/tests/docker-tools-overlay.nix | 32 ++++++++++++++++++++++++++++ nixos/tests/docker-tools.nix | 6 +++--- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 nixos/tests/docker-tools-overlay.nix diff --git a/nixos/release.nix b/nixos/release.nix index 4fd77e6471cf..43c641f32c46 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -266,6 +266,7 @@ in rec { tests.couchdb = callTest tests/couchdb.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; + tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {}; tests.dovecot = callTest tests/dovecot.nix {}; tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {}; diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix new file mode 100644 index 000000000000..9d7fa3e7a8c5 --- /dev/null +++ b/nixos/tests/docker-tools-overlay.nix @@ -0,0 +1,32 @@ +# this test creates a simple GNU image with docker tools and sees if it executes + +import ./make-test.nix ({ pkgs, ... }: +{ + name = "docker-tools-overlay"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + + nodes = { + docker = + { config, pkgs, ... }: + { + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2 + }; + }; + + testScript = + '' + $docker->waitForUnit("sockets.target"); + + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + + # Check if the nix store has correct user permissions depending on what + # storage driver is used, incorrectly built images can show up as readonly. + # drw------- 3 0 0 3 Apr 14 11:36 /nix + # drw------- 99 0 0 100 Apr 14 11:36 /nix/store + $docker->succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + ''; +}) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 9135bca0f4f6..4466081d01e9 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "docker-tools"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ]; + maintainers = [ lnl7 ]; }; nodes = { @@ -21,12 +21,12 @@ import ./make-test.nix ({ pkgs, ... }: { $docker->waitForUnit("sockets.target"); $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); - $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} /bin/bash --version"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}"); # Check if the nix store is correctly initialized by listing dependencies of the installed Nix binary $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nix}'"); - $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} /bin/nix-store -qR ${pkgs.nix}"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} nix-store -qR ${pkgs.nix}"); $docker->succeed("docker rmi ${pkgs.dockerTools.examples.nix.imageName}"); # To test the pullImage tool From 4d7da18f5c09f04249a125143d49c3da5117b951 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Sun, 1 Apr 2018 10:47:35 +0200 Subject: [PATCH 1944/2743] perlPackages.Socket6: fix sv_undef compilation error Socket6.xs redefines `PV_sv_undef`, which breaks compilation from 306d5cdf03ad ("perlPackages: Add cross-compilation support."). I added a patch to remove this redefinition. Compilation is now working again. --- .../perl-modules/Socket6-sv_undef.patch | 18 ++++++++++++++++++ pkgs/top-level/perl-packages.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/perl-modules/Socket6-sv_undef.patch diff --git a/pkgs/development/perl-modules/Socket6-sv_undef.patch b/pkgs/development/perl-modules/Socket6-sv_undef.patch new file mode 100644 index 000000000000..3ed4b61b6d3e --- /dev/null +++ b/pkgs/development/perl-modules/Socket6-sv_undef.patch @@ -0,0 +1,18 @@ +diff --git a/Socket6.xs b/Socket6.xs +index 05c791c..058e9d9 100644 +--- a/Socket6.xs ++++ b/Socket6.xs +@@ -105,10 +105,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; + #define HAVE_INET_PTON 1 + #endif + +-#ifndef HAVE_PL_SV_UNDEF +-#define PL_sv_undef sv_undef +-#endif +- + static int + not_here(char *s) + { +-- +2.16.3 + diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ab8def15c61..2034fd81c87b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13549,6 +13549,7 @@ let self = _self // overrides; _self = with self; { }; setOutputFlags = false; buildInputs = [ pkgs.which ]; + patches = [ ../development/perl-modules/Socket6-sv_undef.patch ]; meta = { description = "IPv6 related part of the C socket.h defines and structure manipulators"; license = stdenv.lib.licenses.bsd3; From b48ba55ab11bbf49170019036e30da560c2c49de Mon Sep 17 00:00:00 2001 From: xeji Date: Sat, 14 Apr 2018 18:48:19 +0200 Subject: [PATCH 1945/2743] splLegacyCrypto: fix build --- pkgs/os-specific/linux/spl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 2550e6d28f6c..7c37d18c8684 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -78,5 +78,6 @@ in version = "2018-01-24"; rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; + patches = [ ./install_prefix.patch ]; }; } From ecf8095e9101f273684d72aa7e3b94266310aa1d Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 14 Apr 2018 16:55:39 +0000 Subject: [PATCH 1946/2743] scallion: init at 2.1 (#38817) --- pkgs/tools/security/scallion/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/security/scallion/default.nix diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix new file mode 100644 index 000000000000..75ea92a786c5 --- /dev/null +++ b/pkgs/tools/security/scallion/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl, ocl-icd }: + +stdenv.mkDerivation rec { + version = "2.1"; + name = "scallion-${version}"; + + src = fetchFromGitHub { + owner = "lachesis"; + repo = "scallion"; + rev = "v${version}"; + sha256 = "1l9aj101xpsaaa6kmmhmq68m6z8gzli1iaaf8xaxbivq0i7vka9k"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mono ]; + + buildPhase = '' + xbuild scallion.sln + ''; + + installPhase = '' + mkdir -p $out/share + cp scallion/bin/Debug/* $out/share/ + makeWrapper ${mono}/bin/mono $out/bin/scallion \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ocl-icd ]} \ + --add-flags $out/share/scallion.exe + ''; + + meta = with stdenv.lib; { + description = "GPU-based tor hidden service name generator"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cab2a1488e7c..a582ffa2eec4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4733,6 +4733,8 @@ with pkgs; sasview = callPackage ../applications/science/misc/sasview {}; + scallion = callPackage ../tools/security/scallion { }; + scanbd = callPackage ../tools/graphics/scanbd { }; screen = callPackage ../tools/misc/screen { From 02dfbab3bed6c1a2acf594c3245baada7e4ed6d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 14 Apr 2018 19:09:04 +0100 Subject: [PATCH 1947/2743] nixos/pulseaudio: pulseaudio.enable should imply sound.enable cc @fpletz --- nixos/modules/config/pulseaudio.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index a9c5fc75660d..90cea47b70ae 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -214,6 +214,8 @@ in { (mkIf cfg.enable { environment.systemPackages = [ overriddenPackage ]; + sound.enable = true; + environment.etc = [ { target = "asound.conf"; source = alsaConf; } From 8b19b14bdaafc472c7b29c4002aff1c5391e0685 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 14 Apr 2018 21:17:44 +0200 Subject: [PATCH 1948/2743] testssl: 2.9.5-4 -> 2.9.5-5 (#38936) Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-5 Also improved expression. --- .../networking/testssl/default.nix | 35 ++++++++++++------- .../networking/testssl/testssl.patch | 10 ------ 2 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/networking/testssl/testssl.patch diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 97c05dfafdbe..5a548d5ff65f 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgs }: +{ stdenv, fetchFromGitHub, makeWrapper, lib +, dnsutils, coreutils, openssl, nettools, utillinux, procps }: let - version = "2.9.5-4"; - pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; - opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; + version = "2.9.5-5"; in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; @@ -12,22 +11,32 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "0pfp7r4jhvkh06vawqlvq7vp4imwp6dpq6jx8m0k3j85ywwp45pd"; + sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r"; }; - patches = [ ./testssl.patch ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + coreutils # for pwd and printf + dnsutils # for dig + nettools # for hostname + openssl # for openssl + procps # for ps + utillinux # for hexdump + ]; postPatch = '' substituteInPlace testssl.sh \ - --replace /bin/pwd ${pwdBinPath} \ - --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \ - --replace @@openssl-path@@ ${opensslBinPath} + --replace /bin/pwd pwd \ + --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" ''; installPhase = '' - mkdir -p $out/bin $out/etc - cp -r etc/ $out/ - cp testssl.sh $out/bin/testssl.sh + install -Dt $out/bin testssl.sh + + wrapProgram $out/bin/testssl.sh \ + --prefix PATH ':' ${lib.makeBinPath buildInputs} + + cp -r etc $out ''; meta = with stdenv.lib; { @@ -38,6 +47,6 @@ in stdenv.mkDerivation rec { ''; homepage = https://testssl.sh/; license = licenses.gpl2; - maintainers = [ maintainers.etu ]; + maintainers = with maintainers; [ etu ]; }; } diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch deleted file mode 100644 index ffc9e4b1c163..000000000000 --- a/pkgs/applications/networking/testssl/testssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- testssl/testssl.sh 2017-09-24 16:53:29.395263437 +0200 -+++ testssl-new/testssl.sh 2017-09-24 16:53:41.221154492 +0200 -@@ -165,6 +165,7 @@ - # following variables make use of $ENV, e.g. OPENSSL= ./testssl.sh - # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help - declare -x OPENSSL OPENSSL_TIMEOUT -+OPENSSL=${OPENSSL:-"@@openssl-path@@"} - FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production - COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all - COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output From 277e123b1ada6875ca10200f68d1135c6dfe7866 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Apr 2018 12:27:52 -0700 Subject: [PATCH 1949/2743] cbatticon: 1.6.7 -> 1.6.8 (#38747) 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/cbatticon/versions. These checks were done: - built on NixOS - ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon -h’ got 0 exit code - ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon --help’ got 0 exit code - ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon -v’ and found version 1.6.8 - ran ‘/nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8/bin/cbatticon --version’ and found version 1.6.8 - found 1.6.8 with grep in /nix/store/b9f5y9awpbx1m193hrb57bwv70xg08cb-cbatticon-1.6.8 - directory tree listing: https://gist.github.com/248717637ae5df50bb8a3da4134c627b --- pkgs/applications/misc/cbatticon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 0c71b3ffb0ad..01511b41b08d 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; rev = version; - sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d"; + sha256 = "16g26vin1693dbdr9qsnw36fdchx394lp79gvp7gcbw0w1ny9av6"; }; makeFlags = "PREFIX=$(out)"; From d8f8e3c1b9b18b82bff925bc183b4129a49aaa6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Apr 2018 12:40:04 -0700 Subject: [PATCH 1950/2743] libqrencode: 3.4.4 -> 4.0.0 (#38711) 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/libqrencode/versions. These checks were done: - built on NixOS - ran ‘/nix/store/qb2z3p3zcqmn0qskcck42z4ffv3107p5-libqrencode-4.0.0/bin/qrencode -h’ got 0 exit code - ran ‘/nix/store/qb2z3p3zcqmn0qskcck42z4ffv3107p5-libqrencode-4.0.0/bin/qrencode --help’ got 0 exit code - found 4.0.0 with grep in /nix/store/qb2z3p3zcqmn0qskcck42z4ffv3107p5-libqrencode-4.0.0 - directory tree listing: https://gist.github.com/2503d88770c4325ed73850dbd72eb7bf --- pkgs/development/libraries/libqrencode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix index 337d9423aa3d..7c1844bf281e 100644 --- a/pkgs/development/libraries/libqrencode/default.nix +++ b/pkgs/development/libraries/libqrencode/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "libqrencode-${version}"; - version = "3.4.4"; + version = "4.0.0"; src = fetchurl { url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; sha1 = "644054a76c8b593acb66a8c8b7dcf1b987c3d0b2"; - sha256 = "0wiagx7i8p9zal53smf5abrnh9lr31mv0p36wg017401jrmf5577"; + sha256 = "10da4q5pym7pzxcv21w2kc2rxmq7sp1rg58zdklwfr0jjci1nqjv"; }; nativeBuildInputs = [ pkgconfig ]; From 3c574a458a7be9311b4ac9c2d5e810e79205ee9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Apr 2018 12:41:27 -0700 Subject: [PATCH 1951/2743] asunder: 2.9.2 -> 2.9.3 (#38750) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/asunder/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.9.3 with grep in /nix/store/maiwh6l7wa8gyjhx1zlg8l8xwrczszr7-asunder-2.9.3 - directory tree listing: https://gist.github.com/5cfcd566e15079a73ab786533722d002 --- pkgs/applications/audio/asunder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index bb0615df25b8..9c42c98ba5e3 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.2"; + version = "2.9.3"; name = "asunder-${version}"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; - sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r"; + sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5"; }; nativeBuildInputs = [ pkgconfig ]; From cdf68596c8a5d3d32c928ccedcc39d131000f3ff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 14 Apr 2018 15:53:11 -0400 Subject: [PATCH 1952/2743] oh-my-zsh: 2017-01-22 -> 2017-04-06 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 8cfcb9ecbbea..5412f4ce8967 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-01-22"; + version = "2018-04-06"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "37c2d0ddd751e15d0c87a51e2d9f9849093571dc"; - sha256 = "0x2r7205ps5v5bl1f9vdnry9gxflypaahz49cnhq5f5klb49bakn"; + rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f"; + sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From a2cd43efe865b8f3114796f1d6d8dd088b215f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 Apr 2018 21:57:58 +0200 Subject: [PATCH 1953/2743] home-assistant: 0.66.1 -> 0.67.0 (#38931) --- pkgs/servers/home-assistant/component-packages.nix | 10 ++++++++-- pkgs/servers/home-assistant/default.nix | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 94dee4c87240..103505011efc 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.66.1"; + version = "0.67.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -59,6 +59,7 @@ "coinbase" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; "config.config_entries" = ps: with ps; [ ]; + "cover.gogogate2" = ps: with ps; [ ]; "cover.myq" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; "datadog" = ps: with ps; [ datadog ]; @@ -71,6 +72,7 @@ "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; + "device_tracker.google_maps" = ps: with ps; [ ]; "device_tracker.icloud" = ps: with ps; [ ]; "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; "device_tracker.mikrotik" = ps: with ps; [ ]; @@ -84,6 +86,7 @@ "device_tracker.unifi" = ps: with ps; [ pyunifi ]; "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; + "device_tracker.xiaomi_miio" = ps: with ps; [ ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "discovery" = ps: with ps; [ netdisco ]; "dominos" = ps: with ps; [ ]; @@ -99,6 +102,7 @@ "fan.xiaomi_miio" = ps: with ps; [ construct ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; + "folder_watcher" = ps: with ps; [ watchdog ]; "frontend" = ps: with ps; [ ]; "gc100" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; @@ -139,6 +143,7 @@ "light.lifx_legacy" = ps: with ps; [ ]; "light.limitlessled" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; + "light.nanoleaf_aurora" = ps: with ps; [ ]; "light.osramlightify" = ps: with ps; [ ]; "light.piglow" = ps: with ps; [ ]; "light.rpi_gpio_pwm" = ps: with ps; [ ]; @@ -205,7 +210,6 @@ "media_player.yamaha_musiccast" = ps: with ps; [ ]; "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; "melissa" = ps: with ps; [ ]; - "mercedesme" = ps: with ps; [ ]; "mochad" = ps: with ps; [ ]; "modbus" = ps: with ps; [ ]; "mqtt" = ps: with ps; [ paho-mqtt ]; @@ -230,6 +234,7 @@ "notify.kodi" = ps: with ps; [ jsonrpc-async ]; "notify.lametric" = ps: with ps; [ ]; "notify.mailgun" = ps: with ps; [ ]; + "notify.mastodon" = ps: with ps; [ ]; "notify.matrix" = ps: with ps; [ matrix-client ]; "notify.message_bird" = ps: with ps; [ ]; "notify.pushbullet" = ps: with ps; [ pushbullet ]; @@ -375,6 +380,7 @@ "sensor.ups" = ps: with ps; [ ]; "sensor.vasttrafik" = ps: with ps; [ ]; "sensor.waqi" = ps: with ps; [ ]; + "sensor.waze_travel_time" = ps: with ps; [ ]; "sensor.whois" = ps: with ps; [ ]; "sensor.xbox_live" = ps: with ps; [ ]; "sensor.xiaomi_miio" = ps: with ps; [ construct ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 04d0ba66486f..0f5e59918aac 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -8,10 +8,10 @@ let py = python3.override { packageOverrides = self: super: { aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.0.9"; + version = "3.1.1"; src = oldAttrs.src.override { inherit version; - sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b"; + sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f"; }; }); pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { @@ -58,7 +58,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.66.1"; + hassVersion = "0.67.0"; 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 = "16yz5mfzpfms22f8linw1k3wjp3jpwj270vy2rc893x9bzsppfl0"; + sha256 = "00y7sm6nsyxxl98izxxmg2nwi76kxb7p47hv07y04fs45lnvr61s"; }; propagatedBuildInputs = [ From 5bb75e17b9dc7cfb3d1bc4751642954485155ae1 Mon Sep 17 00:00:00 2001 From: BjornMelgaard Date: Sat, 14 Apr 2018 23:17:25 +0300 Subject: [PATCH 1954/2743] node2nix: add nix as dependency (fix for #38946) --- pkgs/development/node-packages/default-v6.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 5fc007bbfd09..2be09eb16324 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -24,13 +24,13 @@ nodePackages // { phantomjs = nodePackages.phantomjs.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - + webdrvr = nodePackages.webdrvr.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - + preRebuild = '' mkdir $TMPDIR/webdrvr - + ln -s ${pkgs.fetchurl { url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; @@ -72,4 +72,11 @@ nodePackages // { ''; buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); + + node2nix = nodePackages.node2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }); } From 302c3a7a168c41555dd35576a0ab5c872ba226b3 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sat, 14 Apr 2018 13:51:41 -0700 Subject: [PATCH 1955/2743] 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 4314d14ea07ca8a429176d37ee39533f4875c429 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Apr 2018 23:43:25 +0200 Subject: [PATCH 1956/2743] i3lock-pixeled: 1.1.0 -> 1.2.0 Simple feature release with some improvements. See https://github.com/Ma27/i3lock-pixeled/releases/tag/1.2.0 --- pkgs/misc/screensavers/i3lock-pixeled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 7cb3e68dec86..5fff7b8f0ea3 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "i3lock-pixeled-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz"; - sha256 = "046qbx4qvcc66h53h4mm9pyjj9gjc6dzy38a0f0jc5a84xbivh7k"; + sha256 = "0vlynm833fk1mmdnkcgh4hwqmfypn22zskhysm110k39zvikif0h"; }; propagatedBuildInputs = with pkgs; [ From 1f9469feb4f4e802798cdedb0ae5a562731719fd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 00:34:35 +0200 Subject: [PATCH 1957/2743] =?UTF-8?q?guake:=203.1.0=20=E2=86=92=203.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/guake/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 778f273f8122..17837c6c254e 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales +{ stdenv, fetchFromGitHub, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.1.0"; + version = "3.2.0"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,17 +11,9 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "0wyis7vxfhwrpq5r72c58k7hqzbk0f5ilm1zffcmbryvy11abgmx"; + sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d"; }; - patches = [ - # https://github.com/Guake/guake/issues/1264 - (fetchpatch { - url = https://github.com/Guake/guake/commit/f289aa381bc5fffe83b1ba385c606a2e5cdc94a8.patch; - sha256 = "038niw44q14fs34nha1lz9vmxhf0l766ni8nsdxpid4crra2wjd3"; - }) - ]; - nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; From b5a19baf29df587d5d09c4a95d125db74d1528a6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 00:36:04 +0200 Subject: [PATCH 1958/2743] =?UTF-8?q?shotwell:=200.28.1=20=E2=86=92=200.28?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index c214fa58bc9b..1ebc2f88ec5d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ let pname = "shotwell"; - version = "0.28.1"; + version = "0.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1ywikm5kdsr7q8hklh146x28rzvqkqfjs8kdpw7zcc15ri0dkzya"; + sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n"; }; nativeBuildInputs = [ From 3af1374665ae23636a39d59d172d72363f473b04 Mon Sep 17 00:00:00 2001 From: rittelle <33598633+rittelle@users.noreply.github.com> Date: Sun, 15 Apr 2018 01:33:57 +0200 Subject: [PATCH 1959/2743] kalarm: init --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kalarm.nix | 37 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/kde/kalarm.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0c080753f053..36dd1773b39e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -84,6 +84,7 @@ let incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; + kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix new file mode 100644 index 000000000000..9978e7ff6674 --- /dev/null +++ b/pkgs/applications/kde/kalarm.nix @@ -0,0 +1,37 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + + kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools, + kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio, + knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, + + kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils, + kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, + pimcommon, kpimtextedit, kdepim-apps-libs, messagelib, + + qtx11extras, + + kdepim-runtime +}: + +mkDerivation { + name = "kalarm"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.rittelle ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools + kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio + knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon + + kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils + kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime + pimcommon kpimtextedit kdepim-apps-libs messagelib + + qtx11extras + ]; + propagatedUserEnvPkgs = [ kdepim-runtime ]; +} From 0a74fca53584571a42e34a7a97eb71d55beac537 Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 15 Apr 2018 01:23:07 +0200 Subject: [PATCH 1960/2743] extundelete: fix build with e2fsprogs 1.44 --- pkgs/tools/filesystems/extundelete/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index a30709d4c920..e0c5ea3def4e 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ e2fsprogs ]; + # inode field i_dir_acl was repurposed as i_size_high in e2fsprogs 1.44, + # breaking the build + patchPhase = '' + substituteInPlace src/insertionops.cc \ + --replace "Directory ACL:" "High 32 bits of size:" \ + --replace "inode.i_dir_acl" "inode.i_size_high" + ''; + meta = with stdenv.lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = http://extundelete.sourceforge.net/; From 0d3eb701333006ce73b6abadea4d95f52d1105f3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Apr 2018 20:09:51 -0400 Subject: [PATCH 1961/2743] buildSetupcfg: Include unzip for zip sources. --- pkgs/build-support/build-setupcfg/default.nix | 6 ++++-- pkgs/top-level/python-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index bc6482f0a88e..c2d58c3c7857 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -6,7 +6,7 @@ # * application: Whether this package is a python library or an # application which happens to be written in python. # * doCheck: Whether to run the test suites. -pythonPackages: +{ pkgs, pythonPackages }: { src, info, meta ? {}, application ? false, doCheck ? true }: let build = if application then pythonPackages.buildPythonApplication @@ -16,7 +16,9 @@ in build { inherit src meta doCheck; - nativeBuildInputs = map (p: pythonPackages.${p}) ( + nativeBuildInputs = [ + pkgs.unzip + ] ++ map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ (if doCheck then (info.tests_require or []) else [])); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5e3a11236c4..db508f054b31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -67,7 +67,8 @@ let })); # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../build-support/build-setupcfg self; + buildSetupcfg = import ../build-support/build-setupcfg + { inherit pkgs; pythonPackages = self; }; graphiteVersion = "1.0.2"; From 603a369b8944c2b2f15c67218f345211fafda6fa Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Apr 2018 20:12:22 -0400 Subject: [PATCH 1962/2743] Revert "buildSetupcfg: Include unzip for zip sources." Misunderstood the error I was seeing. This reverts commit 0d3eb701333006ce73b6abadea4d95f52d1105f3. --- pkgs/build-support/build-setupcfg/default.nix | 6 ++---- pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index c2d58c3c7857..bc6482f0a88e 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -6,7 +6,7 @@ # * application: Whether this package is a python library or an # application which happens to be written in python. # * doCheck: Whether to run the test suites. -{ pkgs, pythonPackages }: +pythonPackages: { src, info, meta ? {}, application ? false, doCheck ? true }: let build = if application then pythonPackages.buildPythonApplication @@ -16,9 +16,7 @@ in build { inherit src meta doCheck; - nativeBuildInputs = [ - pkgs.unzip - ] ++ map (p: pythonPackages.${p}) ( + nativeBuildInputs = map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ (if doCheck then (info.tests_require or []) else [])); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db508f054b31..d5e3a11236c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -67,8 +67,7 @@ let })); # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../build-support/build-setupcfg - { inherit pkgs; pythonPackages = self; }; + buildSetupcfg = import ../build-support/build-setupcfg self; graphiteVersion = "1.0.2"; From 642c8a8d8dae5047d5020578d36558a3dea465ce Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 12 Mar 2018 23:25:28 +0800 Subject: [PATCH 1963/2743] 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 4a9e37b7d2494216b6eaa8be67059871d40a4fca Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 14 Apr 2018 21:30:16 -0500 Subject: [PATCH 1964/2743] maloader: linux only --- pkgs/os-specific/darwin/maloader/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 5f4306ec0c12..133266ec95aa 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { description = "Mach-O loader for Linux"; homepage = https://github.com/shinh/maloader; license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; }; } From 35f75cff4f80373f0ecfe720e5aa3f1e476b6842 Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Sun, 15 Apr 2018 16:03:24 +1000 Subject: [PATCH 1965/2743] pythonPackages.python-docx: init at 0.8.6 (#38722) --- maintainers/maintainer-list.nix | 5 +++ .../python-modules/python-docx/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/python-docx/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5f47c859a8ec..da3a77f4206e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -305,6 +305,11 @@ github = "akru"; name = "Alexander Krupenkin "; }; + alexchapman = { + name = "Alex Chapman"; + email = "alex@farfromthere.net"; + github = "AJChapman"; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix new file mode 100644 index 000000000000..11ade481df5e --- /dev/null +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -0,0 +1,33 @@ +{ lib +, behave +, buildPythonPackage +, fetchPypi +, lxml +, pytest +, pyparsing +, mock +}: + +buildPythonPackage rec { + pname = "python-docx"; + version = "0.8.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "117i84s6fcdsrfckbvznnqgqwhnf1x0523ps16cki8sg9byydv2m"; + }; + + checkInputs = [ behave mock pyparsing pytest ]; + propagatedBuildInputs = [ lxml ]; + + checkPhase = '' + py.test tests + ''; + + meta = { + description = "Create and update Microsoft Word .docx files"; + homepage = https://python-docx.readthedocs.io/en/latest/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.alexchapman ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5e3a11236c4..e572eaefb2eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18298,6 +18298,8 @@ EOF wsproto = callPackage ../development/python-modules/wsproto { }; h11 = callPackage ../development/python-modules/h11 { }; + + python-docx = callPackage ../development/python-modules/python-docx { }; }); in fix' (extends overrides packages) From 792c99df349f2f3c853f9d7c98bc62b0ec399601 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Apr 2018 08:27:58 +0200 Subject: [PATCH 1966/2743] mutt: 1.9.4 -> 1.9.5 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 03bfc711c430..bbd56b188dfd 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "1pxmw5yyizb9bqbai6lihv6zxmw0znjfb60zaldwh6hc6lkbzlgl"; + sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz"; }; patches = optional smimeSupport (fetchpatch { From e471376982d5c404c0d5fb376f1e48fa4b7859ba Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 15 Apr 2018 08:33:10 +0200 Subject: [PATCH 1967/2743] libreoffice: wrapper: apparently session bus for DBus is enough, and adding a local system bus when a session bus is present makes things worse --- pkgs/applications/office/libreoffice/wrapper.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh index 591b42515063..52cd91e8030e 100644 --- a/pkgs/applications/office/libreoffice/wrapper.sh +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -3,21 +3,12 @@ export JAVA_HOME="${JAVA_HOME:-@jdk@}" export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" if uname | grep Linux > /dev/null && - ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" && - test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then + ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" mkdir "$dbus_tmp_dir" dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" - cat "@dbus@/share/dbus-1/system.conf" | - grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf" - if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & - export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" - fi - if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then - "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 & - export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system" - fi + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" fi "@libreoffice@/bin/$(basename "$0")" "$@" From d1591a841c8fbb3e63756f5c177ba21325811e48 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 15 Apr 2018 10:07:26 +0200 Subject: [PATCH 1968/2743] alacritty: add libGL to rpath libGL.so is no longer in LD_LIBRARY_PATH since #37369 --- pkgs/applications/misc/alacritty/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 6907ce877645..a5db33a0bb5a 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -13,6 +13,7 @@ libXxf86vm, libXi, libXrandr, + libGL, xclip }: with rustPlatform; @@ -26,6 +27,7 @@ let libXcursor libXxf86vm libXrandr + libGL libXi ]; in buildRustPackage rec { From b532cc3766acbb1d70318804836203ef3fc8a691 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 22 Feb 2018 18:50:42 +0000 Subject: [PATCH 1969/2743] 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 93925cd94c835ff7d6d2f668bd737446b2503fa3 Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Tue, 10 Apr 2018 06:52:24 -0400 Subject: [PATCH 1970/2743] maintainers: add sna --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index da3a77f4206e..839458dbfc9a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3411,6 +3411,11 @@ github = "grwlf"; name = "Sergey Mironov"; }; + sna = { + email = "abouzahra.9@wright.edu"; + github = "s-na"; + name = "S. Nordin Abouzahra"; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; From 92f0d31b949bcf018262252408b8a69376a6cb68 Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Tue, 10 Apr 2018 10:11:05 -0400 Subject: [PATCH 1971/2743] purple-discord: init at 2018-04-10 --- .../pidgin-plugins/purple-discord/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix new file mode 100644 index 000000000000..e41aea497a85 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: + +stdenv.mkDerivation rec { + name = "purple-discord-${version}"; + version = "unstable-2018-04-10"; + + src = fetchFromGitHub { + owner = "EionRobb"; + repo = "purple-discord"; + rev = "9a97886d15a1f028de54b5e6fc54e784531063b0"; + sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin json_glib ]; + + makeFlags = [ + "DESTDIR=$(out)" + ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "/share"; + + meta = with stdenv.lib; { + homepage = https://github.com/EionRobb/purple-discord; + description = "Discord plugin for Pidgin"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ sna ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a582ffa2eec4..c93910bf0619 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17258,6 +17258,8 @@ with pkgs; pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; + purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; 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 1972/2743] 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 a6a2e75804da87f9f68f7261e39511d72e8aab7d Mon Sep 17 00:00:00 2001 From: Raitis Veinbahs Date: Sun, 15 Apr 2018 13:53:15 +0300 Subject: [PATCH 1973/2743] ruby-modules: Import gemset if it's a path OR a string. (#38959) This fixes the bug introduced by 8686b98612dc which broke bundlerEnv exprs when gemdir was a string (thus making gemset a string by `gemset = gemdir + "/gemset.nix"`) which made it being treated as a set. --- pkgs/development/ruby-modules/bundled-common/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 1f31aec886a6..16f1abe1a899 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -29,7 +29,7 @@ with import ./functions.nix { inherit lib gemConfig; }; let gemFiles = bundlerFiles args; - importedGemset = if builtins.typeOf gemFiles.gemset == "path" + importedGemset = if builtins.typeOf gemFiles.gemset != "set" then import gemFiles.gemset else gemFiles.gemset; From 5f97adccdc23117c87825cf410b3366e9139a74b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Apr 2018 17:37:39 +0000 Subject: [PATCH 1974/2743] 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 1975/2743] 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 fe21f168572e7033257ddd83605a417ad3fa8954 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 12:50:50 +0200 Subject: [PATCH 1976/2743] libwnck3: fix git paths --- pkgs/development/libraries/libwnck/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 937fa28b9028..8efd908584e1 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; propagatedBuildInputs = [ libX11 gtk3 ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "lib/girepository-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; passthru = { updateScript = gnome3.updateScript { From 8416cd0326c3c8845cc9796223e9ab802290002f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 13:39:47 +0200 Subject: [PATCH 1977/2743] =?UTF-8?q?kazam:=201.4.3=20=E2=86=92=201.4.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/kazam/bug_1190693.patch | 14 ----- pkgs/applications/video/kazam/datadir.patch | 11 ---- pkgs/applications/video/kazam/default.nix | 53 +++++++++---------- pkgs/applications/video/kazam/fix-paths.patch | 22 ++++++++ 4 files changed, 46 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/video/kazam/bug_1190693.patch delete mode 100644 pkgs/applications/video/kazam/datadir.patch create mode 100644 pkgs/applications/video/kazam/fix-paths.patch diff --git a/pkgs/applications/video/kazam/bug_1190693.patch b/pkgs/applications/video/kazam/bug_1190693.patch deleted file mode 100644 index 9f00c6b60791..000000000000 --- a/pkgs/applications/video/kazam/bug_1190693.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== modified file 'kazam/frontend/indicator.py' ---- a/kazam/frontend/indicator.py 2013-01-26 01:53:53 +0000 -+++ b/kazam/frontend/indicator.py 2013-06-13 18:18:37 +0000 -@@ -291,3 +291,9 @@ - def start_recording(self): - logger.debug("Recording started.") - self.indicator.set_from_icon_name("kazam-recording") -+ -+ def hide_it(self): -+ self.indicator.set_visible(False) -+ -+ def show_it(self): -+ self.indicator.set_visible(True) - diff --git a/pkgs/applications/video/kazam/datadir.patch b/pkgs/applications/video/kazam/datadir.patch deleted file mode 100644 index 114d4228be2d..000000000000 --- a/pkgs/applications/video/kazam/datadir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bin/kazam 2014-02-03 23:11:38.465614061 +0100 -+++ b/bin/kazam-1 2014-02-03 23:12:28.447058700 +0100 -@@ -68,7 +68,7 @@ - # when base install path is not /usr - curpath = os.path.abspath(__file__) - curpath = os.path.realpath(curpath) -- datadir = curpath.split('bin/')[0] + "share/kazam/" -+ datadir = os.path.realpath(os.path.join(curpath, "./../../", "share/kazam/")) - - try: - import platform diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index b67c4a43cf56..9ffd62d068ae 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,46 +1,41 @@ -{ stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra-gtk2 }: +{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobjectIntrospection +, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio }: - -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { name = "kazam-${version}"; - version = "1.4.3"; + version = "1.4.5"; namePrefix = ""; src = fetchurl { url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; - sha256 = "00bcn0yj9xrv87sf6xd3wpilsjgjpsj15zzpjh351ffpjnr0ica8"; + sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f"; }; - # TODO: keybinder, appindicator3 - buildInputs = with python3Packages; - [ pygobject3 pyxdg pycairo gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gobjectIntrospection gtk3 libwnck3 distutils_extra - intltool dbus-python ]; + nativeBuildInputs = [ gobjectIntrospection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; + buildInputs = [ + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3 + keybinder3 libappindicator-gtk3 + ]; - # TODO: figure out why PYTHONPATH is not passed automatically for those programs - pythonPath = with python3Packages; - [ pygobject3 pyxdg pycairo dbus-python ]; + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ]; - patches = [ ./datadir.patch ./bug_1190693.patch ]; - prePatch = '' - rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra-gtk2}/bin/canberra-gtk-play" - ''; + patches = [ + # Fix paths + (substituteAll { + src = ./fix-paths.patch; + libcanberra = libcanberra-gtk3; + inherit libpulseaudio; + }) + # Fix compability with Python 3.4 + (fetchurl { + url = https://sources.debian.org/data/main/k/kazam/1.4.5-2/debian/patches/configparser_api_changes.patch; + sha256 = "0yvmipnh98s7y07cp1f113l0qqfw65k13an96byq707z3ymv1c2h"; + }) + ]; # no tests doCheck = false; - preFixup = '' - wrapProgram $out/bin/kazam \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ gtk3 gst_all_1.gstreamer keybinder ]}" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share" \ - --set GST_REGISTRY "/tmp/kazam.gstreamer.registry"; - ''; - - meta = with stdenv.lib; { description = "A screencasting program created with design in mind"; homepage = https://code.launchpad.net/kazam; diff --git a/pkgs/applications/video/kazam/fix-paths.patch b/pkgs/applications/video/kazam/fix-paths.patch new file mode 100644 index 000000000000..43e360830ab5 --- /dev/null +++ b/pkgs/applications/video/kazam/fix-paths.patch @@ -0,0 +1,22 @@ +--- a/kazam/backend/grabber.py ++++ b/kazam/backend/grabber.py +@@ -72,7 +72,7 @@ + # + if prefs.shutter_sound and (not self.god): + soundfile = os.path.join(prefs.datadir, 'sounds', prefs.sound_files[prefs.shutter_type]) +- subprocess.call(['/usr/bin/canberra-gtk-play', '-f', soundfile]) ++ subprocess.call(['@libcanberra@/bin/canberra-gtk-play', '-f', soundfile]) + + if self.xid: + if prefs.capture_borders_pic: +--- a/kazam/pulseaudio/ctypes_pulseaudio.py ++++ b/kazam/pulseaudio/ctypes_pulseaudio.py +@@ -20,7 +20,7 @@ + # MA 02110-1301, USA. + + from ctypes import * +-PA = CDLL('libpulse.so.0') ++PA = CDLL('@libpulseaudio@/lib/libpulse.so.0') + + # + # Pulse Audio constants and defines From fdc21ac57ac62200c68908e2e8390861bde67651 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 14:17:05 +0200 Subject: [PATCH 1978/2743] terminator: clean up --- pkgs/applications/misc/terminator/default.nix | 16 ++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 59ea70e3da2d..2fef852ace9f 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool, file, gtk3, gobjectIntrospection, cairo -, wrapGAppsHook, gnome3 +{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobjectIntrospection +, libnotify, wrapGAppsHook, gnome3 }: -pythonPackages.buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { name = "terminator-${version}"; version = "1.91"; @@ -11,13 +11,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; }; - nativeBuildInputs = [ file intltool wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.vte gobjectIntrospection cairo ]; - - pythonPath = with pythonPackages; [ - pygobject3 vte keybinder notify gettext psutil - pycairo - ]; + nativeBuildInputs = [ file intltool wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; + propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' patchShebangs . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c93910bf0619..b8015166929a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17957,9 +17957,7 @@ with pkgs; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { - vte = gnome2.vte.override { pythonSupport = true; }; - }; + terminator = callPackage ../applications/misc/terminator { }; terminus = callPackage ../applications/misc/terminus { inherit (gnome2) GConf; }; From 4a30f2efecc8bea1ad605388baa5db7668a9f580 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 15 Apr 2018 13:58:05 +0100 Subject: [PATCH 1979/2743] requireFile: exit with non-zero error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the script running is a failure condition, we should fail the build properly, not leaving it up to the missing output to determine that the build went wrong. This should partly address #38952 — nix build will print out the build log on non-zero exits. --- pkgs/build-support/trivial-builders.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 9664abeb4651..d092efb556e5 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -170,6 +170,7 @@ rec { *** _EOF_ + exit 1 ''; }; From c8977cdadf9b1facd0e244788cee43024950777d Mon Sep 17 00:00:00 2001 From: Thorsten Weber Date: Sun, 15 Apr 2018 14:58:45 +0200 Subject: [PATCH 1980/2743] slic3r-prusa3d: fix build before #ffe86fe949199ebe0e5610c74230edf60a05ae8d perlPackages.ModuleBuildWithXSpp and perlPackages.ExtUtilsTypemapsDefault seem to have been implicitly provided by perlPackages.MathClipper --- pkgs/applications/misc/slic3r-prusa3d/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix index 3a55ea6205ec..1ee2bfab94c3 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { ClassXSAccessor EncodeLocale ExtUtilsMakeMaker + ExtUtilsTypemapsDefault ExtUtilsXSpp GrowlGNTP ImportInto @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath - ModuleBuild + ModuleBuildWithXSpp Moo NetDBus OpenGL From 2331332459a436fd39c9d92579a811deedef285f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 15 Apr 2018 09:27:09 +0100 Subject: [PATCH 1981/2743] iputils: enable rarpd also add self to maintainers --- pkgs/os-specific/linux/iputils/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3fc4f3b23774..d2eab02f6753 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -35,20 +35,21 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -p ping tracepath clockdiff arping rdisc $out/bin/ + cp -p ping tracepath clockdiff arping rdisc rarpd $out/bin/ if [ -x ninfod/ninfod ]; then cp -p ninfod/ninfod $out/bin fi mkdir -p $out/share/man/man8 cp -p \ - doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/tracepath.8 doc/ninfod.8 \ + doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/rarpd.8 doc/tracepath.8 doc/ninfod.8 \ $out/share/man/man8 ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ lheckemann ]; }; } From 3bea518b36066c7cb002c4ec26e92e43ed3f4451 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 14:42:35 +0200 Subject: [PATCH 1982/2743] =?UTF-8?q?gnome2.gtkglext:=20fix=20build=20with?= =?UTF-8?q?=20glibc=20=E2=89=A5=202.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 3a316f71f082..8bbfde5e2086 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -12,8 +12,14 @@ stdenv.mkDerivation rec { [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ]; propagatedBuildInputs = [ pangox_compat ]; - # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and - # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. + patches = [ + # Fix build with glibc ≥ 2.27 + (fetchurl { + url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff; + sha256 = "1l1swkjkai6pnah23xfsfpbq2fgbhp5pzj3l0ybsx6b858cxqzj5"; + }) + ]; + CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; meta = with stdenv.lib; { From d4f97d5fed7c2358342c2d617398221b215a1568 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 15:03:21 +0200 Subject: [PATCH 1983/2743] gnome2.gtkglext: patch deprecated symbols --- pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 8bbfde5e2086..834ec2201581 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pangox_compat ]; patches = [ + # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and + # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. + (fetchpatch { + name = "02_fix_gtk-2.20_deprecated_symbols.diff"; + url = https://git.gnome.org/browse/gtkglext/patch/?id=d8f285d1397f6c41099c67e668288eecc1cdae67; + sha256 = "1zxak73plhy3m6psil1q9ssvjh9aqrif7kcbcz69y480qfb4ja08"; + }) # Fix build with glibc ≥ 2.27 (fetchurl { url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff; @@ -20,8 +27,6 @@ stdenv.mkDerivation rec { }) ]; - CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; - meta = with stdenv.lib; { homepage = https://projects.gnome.org/gtkglext/; description = "GtkGLExt, an OpenGL extension to GTK+"; From cfee336c8998405cfd599126d3b0d5d2a68558f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 17:20:52 +0200 Subject: [PATCH 1984/2743] k3d: clean up --- pkgs/applications/graphics/k3d/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index eb59b6ff6d65..996d495d87c1 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc -, cmake, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: @@ -20,24 +20,25 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; + cmakeFlags = [ + "-DK3D_BUILD_DOCS=false" + "-DK3D_BUILD_GUIDE=false" + ]; preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" ''; + nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; + buildInputs = [ - cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng - boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff - gettext intltool perl unzip ftgl glew asciidoc - gtkmm2 glibmm gtkglext pangox_compat libXmu + libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng + boost cairomm imagemagick libjpeg libtiff + ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu ]; #doCheck = false; - enableParallelBuilding = true; - meta = { description = "A 3D editor with support for procedural editing"; homepage = http://www.k-3d.org/; From cee2c50748e0a6dc24ed42463a8cb484e1c59fec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Apr 2018 17:21:11 +0200 Subject: [PATCH 1985/2743] celestia: clean up --- .../science/astronomy/celestia/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 328253c53437..589625cc18f9 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -56,12 +56,10 @@ stdenv.mkDerivation { patch -Np1 -i "${gcc47Patch}" ''; - configureFlags = "--with-gtk --with-lua=${lua}"; - CPPFLAGS = "-DNDEBUG"; - CFLAGS = "-O2 -fsigned-char"; - CXXFLAGS = "-O2 -fsigned-char"; - GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"; - GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"; + configureFlags = [ + "--with-gtk" + "--with-lua=${lua}" + ]; installPhase = ''make MKDIR_P="mkdir -p" install''; @@ -69,7 +67,7 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; - homepage = http://www.shatters.net/celestia/; + homepage = https://celestia.space/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; 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 1986/2743] 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 1935782c0019128e4b5a8902968760e51795c69c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 15 Apr 2018 16:08:12 +0200 Subject: [PATCH 1987/2743] vim-plugins: add bats.vim --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a0dbc08972e5..a06b090bb6df 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -54,6 +54,7 @@ rec { # aliasess airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 + bats = bats-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; coffeeScript = coffee-script; # backwards compat, added 2014-10-18 @@ -3046,6 +3047,17 @@ rec { }; + bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "bats-vim-2013-07-03"; + src = fetchgit { + url = "https://github.com/vim-scripts/bats.vim"; + rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; + sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; + }; + dependencies = []; + + }; + changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "changeColorScheme-vim-2010-10-17"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index df699413eb9c..fcc4fcaa76f4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -247,6 +247,7 @@ "github:vim-scripts/align" "github:vim-scripts/argtextobj.vim" "github:vim-scripts/a.vim" +"github:vim-scripts/bats.vim" "github:vim-scripts/changeColorScheme.vim" "github:vim-scripts/Colour-Sampler-Pack" "github:vim-scripts/Improved-AnsiEsc" From 4707e69aac4456a19611a3754bd1f0c5251113e5 Mon Sep 17 00:00:00 2001 From: John Boehr Date: Sun, 15 Apr 2018 12:15:26 -0700 Subject: [PATCH 1988/2743] 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 1989/2743] 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 1990/2743] 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 1991/2743] 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 1992/2743] 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 1993/2743] 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 1994/2743] 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 bf31818f46804ef94017d35173fb831b93ba52bb Mon Sep 17 00:00:00 2001 From: Thorsten Weber Date: Mon, 16 Apr 2018 00:34:08 +0200 Subject: [PATCH 1995/2743] python: python-digitalocean: fix build fix hash and add missing dependency "jsonpickle" see https://github.com/NixOS/nixpkgs/commit/886048fdff39963ec6ba89a650954c4c641a93e6#diff-714655688532fd4a33aab2085f266252 --- pkgs/development/python-modules/digitalocean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 1d36f7b5486e..e81caa66e5f3 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ stdenv, buildPythonPackage, fetchPypi, requests, jsonpickle }: buildPythonPackage rec { pname = "python-digitalocean"; @@ -6,10 +6,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "06391cf0b253c8b4a5a10b3a4b7b7808b890a1d1e3b43d5ce3b5293a9c77af6b"; + sha256 = "0h4drpdsmk0b3rlvg6q6cz11k23w0swj1iddk7xdcw4m7r7c52kw"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests jsonpickle ]; # Package doesn't distribute tests. doCheck = false; From 368947a3a5a7de4c2bcb336eac47faafc02f9a03 Mon Sep 17 00:00:00 2001 From: Raphael Das Gupta Date: Mon, 16 Apr 2018 01:14:23 +0200 Subject: [PATCH 1996/2743] 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 1997/2743] 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 438631e4013b074f83cc812d2fe8aa5dfcba473e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 5 Apr 2018 23:35:18 +0200 Subject: [PATCH 1998/2743] kernelPatches: Adds bcm2835_mmal_v4l2_camera_driver The kernel patch is required for raspberry pi, to enable the camera module. [dezgeg: Add some comments indicating it's only needed for 4.16] --- pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e163459d7f4f..cedb2dfc2230 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -73,4 +73,15 @@ rec { }; }; + # https://patchwork.kernel.org/patch/9626797/ + # Should be included in 4.17, so this patch can be dropped when 4.16 becomes obsolete. + bcm2835_mmal_v4l2_camera_driver = rec { + name = "bcm2835_mmal_v4l2_camera_driver"; + patch = fetchpatch { + name = name + ".patch"; + url = https://patchwork.kernel.org/patch/9626797/raw/; + sha256 = "0iwb0yxsf95zv4qxkvlvhqfmzx0rk13g9clvxsharvwkb4w5lwa0"; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1dca5399220..0ab695cd5866 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13354,6 +13354,7 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From 0d88a2becf529fa68e616fad3cd8b155f46c3c2b Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Mon, 16 Apr 2018 11:41:26 +0800 Subject: [PATCH 1999/2743] fastlane: 2.80.0 -> 2.91.0 --- pkgs/tools/admin/fastlane/Gemfile.lock | 35 ++++++++------ pkgs/tools/admin/fastlane/gemset.nix | 63 ++++++++++++++++++-------- 2 files changed, 65 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index a578bb4bca27..9cb80eb131c0 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) + CFPropertyList (3.0.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) atomos (0.1.2) @@ -9,14 +9,15 @@ GEM claide (1.0.2) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.5) + commander-fastlane (4.4.6) highline (~> 1.7.2) declarative (0.0.10) declarative-option (0.1.0) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - dotenv (2.2.1) - excon (0.60.0) + dotenv (2.2.2) + emoji_regex (0.1.1) + excon (0.62.0) faraday (0.14.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -25,20 +26,21 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.1) - fastlane (2.80.0) + fastlane (2.91.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 2.0.0) colored - commander-fastlane (>= 4.4.5, < 5.0.0) + commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (~> 0.1) excon (>= 0.45.0, < 1.0.0) faraday (~> 0.9) faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 0.9) fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.0.1, < 2.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) google-api-client (>= 0.13.1, < 0.14.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) @@ -50,16 +52,17 @@ GEM public_suffix (~> 2.0.0) rubyzip (>= 1.1.0, < 2.0.0) security (= 0.1.3) + simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 1.6.2, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.5.2, < 2.0.0) + xcodeproj (>= 1.5.7, < 2.0.0) xcpretty (>= 0.2.4, < 1.0.0) xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.1.1) + gh_inspector (1.1.3) google-api-client (0.13.6) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.5) @@ -93,7 +96,8 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nanaimo (0.2.3) + nanaimo (0.2.5) + naturally (2.1.0) os (0.9.6) plist (3.4.0) public_suffix (2.0.5) @@ -110,6 +114,9 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) + simctl (1.6.3) + CFPropertyList + naturally slack-notifier (2.3.2) terminal-notifier (1.8.0) terminal-table (1.8.0) @@ -121,15 +128,15 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.5) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.6) - CFPropertyList (~> 2.3.3) + xcodeproj (1.5.7) + CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.2) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.3) + nanaimo (~> 0.2.4) xcpretty (0.2.8) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index c9ddb7b77c04..4a0d0467d804 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -27,10 +27,10 @@ CFPropertyList = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; + sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z"; type = "gem"; }; - version = "2.3.6"; + version = "3.0.0"; }; claide = { source = { @@ -60,10 +60,10 @@ dependencies = ["highline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04gpg733wv878acvrzp4kc3k934v10l3v8bcz3fjq5imjsrjdnbp"; + sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; type = "gem"; }; - version = "4.4.5"; + version = "4.4.6"; }; declarative = { source = { @@ -93,18 +93,26 @@ dotenv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + sha256 = "1f9s04xwa9gcsql734nwxvacgsl1si7xka4g4w3r6d3ab8a274y9"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; + }; + emoji_regex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pcw3axgcmsgihp0xlsdqrqmavz0lw8g396b048fg21033kssxjn"; + type = "gem"; + }; + version = "0.1.1"; }; excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc"; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; type = "gem"; }; - version = "0.60.0"; + version = "0.62.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -142,21 +150,21 @@ version = "2.1.1"; }; fastlane = { - dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0saas50qdfipkms66snyg7imvzn1vfngd87dfygj9x8v18bqwvis"; + sha256 = "04k6pn95qbpvbmqxrs4pngvfyk4pifcv8is3819b33p754pkiqrp"; type = "gem"; }; - version = "2.80.0"; + version = "2.91.0"; }; gh_inspector = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mpfl279k8yff2ia601b37zw31blwh2plkr501iz6qj8drx3mq3c"; + sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.3"; }; google-api-client = { dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; @@ -294,10 +302,18 @@ nanaimo = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi"; type = "gem"; }; - version = "0.2.3"; + version = "0.2.5"; + }; + naturally = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0avn8b2qbfm22afln2p7rky73zns8c444mdhdh4ki8hbjsn0f8cx"; + type = "gem"; + }; + version = "2.1.0"; }; os = { source = { @@ -373,6 +389,15 @@ }; version = "0.8.1"; }; + simctl = { + dependencies = ["CFPropertyList" "naturally"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l1hwxkbpgfhla6dbf0f6nhj794c0k6ilxlh07zcm8by3vdrsvib"; + type = "gem"; + }; + version = "1.6.3"; + }; slack-notifier = { source = { remotes = ["https://rubygems.org"]; @@ -443,10 +468,10 @@ unf_ext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.5"; }; unicode-display_width = { source = { @@ -468,10 +493,10 @@ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zqx24qhax7p91rs1114da0v86cy9m7an1bjwxq6dyccp8g6kb50"; + sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz"; type = "gem"; }; - version = "1.5.6"; + version = "1.5.7"; }; xcpretty = { dependencies = ["rouge"]; From 348215569af3449425de7754dc8898286fe6a1a5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 15 Apr 2018 22:22:28 -0500 Subject: [PATCH 2000/2743] text_cmds: init at 99 --- .../darwin/apple-source-releases/default.nix | 2 ++ .../text_cmds/default.nix | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 5d4cd22363d6..3120d8ae3d10 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -46,6 +46,7 @@ let system_cmds = "550.6"; diskdev_cmds = "593"; top = "108"; + text_cmds = "99"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -250,6 +251,7 @@ let file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {}; + text_cmds = applePackage "text_cmds" "osx-10.11.6" "1f93m7dd0ghqb2hwh905mjhzblyfr7dwffw98xhgmv1mfdnigxg0" {}; top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {}; security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix new file mode 100644 index 000000000000..196276b0b273 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -0,0 +1,25 @@ +{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, bzip2, zlib, lzma }: + +appleDerivation { + buildInputs = [ xcbuild ncurses bzip2 zlib lzma ]; + + # patches to use ncursees + # disables md5 + patchPhase = '' + substituteInPlace text_cmds.xcodeproj/project.pbxproj \ + --replace 'FC6C98FB149A94EB00DDCC47 /* libcurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurses.dylib; path = /usr/lib/libcurses.dylib; sourceTree = ""; };' 'FC6C98FB149A94EB00DDCC47 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = ""; };' \ + --replace 'FC7A7EB5149875E00086576A /* PBXTargetDependency */,' "" + ''; + + installPhase = '' + mkdir -p $out/bin + for f in Products/Release/*; do + install -D $f $out/bin/$(basename $f) + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From 9673ac562cf40859ed370759e9bd0bfc8c1053b9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 15 Apr 2018 22:22:58 -0500 Subject: [PATCH 2001/2743] unixtools: add col to utillinux --- pkgs/top-level/unix-tools.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 1a2f7270e0e5..26adcda8ee17 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -41,6 +41,10 @@ in rec { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; }; + col = singleBinary "col" { + linux = pkgs.utillinux; + darwin = pkgs.darwin.text_cmds; + }; eject = singleBinary "eject" { linux = pkgs.utillinux; }; @@ -138,7 +142,7 @@ in rec { utillinux = buildEnv { name = "utillinux-compat"; paths = [ fsck fdisk getopt hexdump mount - script umount whereis write ]; + script umount whereis write col ]; }; nettools = buildEnv { From 70588bc82ecb0f810bd0fbe31dda1a5a7fe9d24a Mon Sep 17 00:00:00 2001 From: Peter Schuller Date: Sun, 15 Apr 2018 21:19:20 -0700 Subject: [PATCH 2002/2743] signal-desktop: 0.7.0 -> 0.7.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d0bbd766efe6..d524be287cd2 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "19cbv15lizgf7fwxsrd8wrwcl1yan9rvajnvh06jb2zhc5zp47vp"; + sha256 = "02zx8ynbvvs260mrvqbsg0fi561da4ni3i9f4bjh53vqn92vhvvq"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; From 2a499ab4110b4ad1770dfd5dd77a133bb9f8ca40 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 15 Apr 2018 23:21:00 -0500 Subject: [PATCH 2003/2743] adv_cmds: fix xcbuild invocation Need to set SYMROOT and OBJROOT --- .../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 1d5c0defcbfd..dcfb4aefe1f5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -27,7 +27,7 @@ appleDerivation { | grep -v -e Desktop -e Embedded -e mklocale -e colldef) for i in $targets; do - xcodebuild -target $i + xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target $i done ''; From 6bb3ec8264be35bf68e3b08ab479eb738ef50c2c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 15 Apr 2018 23:22:12 -0500 Subject: [PATCH 2004/2743] darling: use correct 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 8c94b2d878dd..de06c176d1da 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 231e8e2a340baa1e7da54d877ba286ce6e263e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 16 Apr 2018 07:57:12 +0200 Subject: [PATCH 2005/2743] ghostwriter: 1.6.1 -> 1.6.2 --- pkgs/applications/editors/ghostwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index aeae711c1c0f..7a0399ea0f84 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ghostwriter"; - version = "1.6.1"; + version = "1.6.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "1ihdr4xk0j83q83xknbikxb7yf9qhlkgvc89w33lhj090cv376gd"; + sha256 = "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12"; }; nativeBuildInputs = [ qmake pkgconfig ]; From 764d03decc33fa05d464557bd07edbbf9bf20a95 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 10 Apr 2018 00:08:15 +0800 Subject: [PATCH 2006/2743] pythonPackages.envs: init at 1.2.4 --- .../python-modules/envs/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/envs/default.nix diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix new file mode 100644 index 000000000000..7b6159d0e616 --- /dev/null +++ b/pkgs/development/python-modules/envs/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, click, jinja2, terminaltables }: + +buildPythonPackage rec { + pname = "envs"; + version = "1.2.4"; + + # move to fetchPyPi when https://github.com/capless/envs/issues/8 is fixed + src = fetchFromGitHub { + owner = "capless"; + repo = "envs"; + rev = "e1f6cbad7f20316fc44324d2c50826d57c2817a8"; + sha256 = "0p88a79amj0jxll3ssq1dzg78y7zwgc8yqyr7cf53nv2i7kmpakv"; + }; + + checkInputs = [ click jinja2 terminaltables ]; + + meta = with lib; { + description = "Easy access to environment variables from Python"; + homepage = https://github.com/capless/envs; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e572eaefb2eb..1193189f6f94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1646,6 +1646,8 @@ in { curtsies = callPackage ../development/python-modules/curtsies { }; + envs = callPackage ../development/python-modules/envs { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; From c859867e4222621ae2bca28dd36ca73b2a5d0e0a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 10 Apr 2018 00:12:13 +0800 Subject: [PATCH 2007/2743] pythonPackages.warrant: init at 0.6.1 --- .../python-modules/warrant/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/warrant/default.nix diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix new file mode 100644 index 000000000000..ac83430fbae2 --- /dev/null +++ b/pkgs/development/python-modules/warrant/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi +, mock +, boto3, envs, python-jose, requests }: + +buildPythonPackage rec { + pname = "warrant"; + version = "0.6.1"; + + # move to fetchPyPi when https://github.com/capless/warrant/issues/97 is fixed + src = fetchFromGitHub { + owner = "capless"; + repo = "warrant"; + rev = "ff2e4793d8479e770f2461ef7cbc0c15ee784395"; + sha256 = "0gw3crg64p1zx3k5js0wh0x5bldgs7viy4g8hld9xbka8q0374hi"; + }; + + # this needs to go when 0.6.2 or later is released + postPatch = '' + substituteInPlace requirements.txt \ + --replace "python-jose-cryptodome>=1.3.2" "python-jose>=2.0.0" + ''; + + checkInputs = [ mock ]; + + propagatedBuildInputs = [ boto3 envs python-jose requests ]; + + # all the checks are failing + doCheck = false; + + meta = with lib; { + description = "Python library for using AWS Cognito with support for SRP"; + homepage = https://github.com/capless/warrant; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1193189f6f94..d1ee00515cbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18275,6 +18275,8 @@ EOF sseclient = callPackage ../development/python-modules/sseclient { }; + warrant = callPackage ../development/python-modules/warrant { }; + textacy = callPackage ../development/python-modules/textacy { }; pyemd = callPackage ../development/python-modules/pyemd { }; From f6d9eed57f66b45a7f5f9643e4c5cdbd0fed4d21 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 10 Apr 2018 00:13:37 +0800 Subject: [PATCH 2008/2743] home-assistant: enable cloud integration --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 103505011efc..718fd3cc6a91 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -55,7 +55,7 @@ "climate.sensibo" = ps: with ps; [ ]; "climate.touchline" = ps: with ps; [ ]; "climate.venstar" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ warrant ]; "coinbase" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; "config.config_entries" = ps: with ps; [ ]; 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 2009/2743] 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 1441787c847ed8d5cb4ff6050fdf94f41dce8781 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 16 Apr 2018 16:14:09 +0800 Subject: [PATCH 2010/2743] kirigami: dump deprecated/unmaintained kirigami1 --- .../libraries/kirigami/default.nix | 47 ------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 53 deletions(-) delete mode 100644 pkgs/development/libraries/kirigami/default.nix diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix deleted file mode 100644 index 1127f3e197df..000000000000 --- a/pkgs/development/libraries/kirigami/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig -, plasma-framework, qtbase, qttranslations -, qtquickcontrols ? null -, qtquickcontrols2 ? null }: - -let - pname = "kirigami"; - - generic = { name, version, sha256, qtqc, broken }: - stdenv.mkDerivation rec { - inherit name version; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - inherit sha256; - }; - - buildInputs = [ plasma-framework qtbase qtqc qttranslations ]; - - nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - - meta = with stdenv.lib; { - license = licenses.lgpl2; - homepage = http://www.kde.org; - maintainers = with maintainers; [ ttuegel peterhoeg ]; - platforms = platforms.unix; - inherit broken; - }; - }; - -in { - kirigami_1 = generic rec { - name = "${pname}-${version}"; - version = "1.1.0"; - sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6"; - qtqc = qtquickcontrols; - broken = false; - }; - - kirigami_2 = generic rec { - name = "${pname}2-${version}"; - version = "2.1.0"; - sha256 = "0d79h10jzv9z7xzap4k9vbw6p9as8vdkz3x6xlzx407i9sbzyi77"; - qtqc = qtquickcontrols2; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ab695cd5866..40792a702afa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11129,10 +11129,6 @@ with pkgs; grantlee = callPackage ../development/libraries/grantlee/5 { }; - inherit (callPackage ../development/libraries/kirigami { }) - kirigami_1 - kirigami_2; - kdb = callPackage ../development/libraries/kdb { }; kdiagram = callPackage ../development/libraries/kdiagram { }; @@ -11141,8 +11137,6 @@ with pkgs; kreport = callPackage ../development/libraries/kreport { }; - kirigami = kirigami_1; - libcommuni = callPackage ../development/libraries/libcommuni { }; libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; From 911a6da2fe2f3270707e2e9489eec7d4303f19a6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 16 Apr 2018 16:14:26 +0800 Subject: [PATCH 2011/2743] peruse: 1.2 -> 1.2.20180219 --- pkgs/tools/misc/peruse/default.nix | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index a3fdca001d94..38cab5cf8623 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,37 +1,30 @@ { mkDerivation, fetchFromGitHub, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework + baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework }: let pname = "peruse"; - version = "1.2"; - unarr = fetchFromGitHub { - owner = "zeniko"; - repo = "unarr"; - rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7"; - sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr"; - }; + version = "1.2.20180219"; + in mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq"; + # The last formal release from 2016 uses kirigami1 which is deprecated + src = fetchFromGitHub { + owner = "KDE"; + repo = pname; + rev = "4125d3149c45d196600258686610de701130113d"; + sha256 = "1x8in7z17gzgiibshw7xfs6m6bhr3n5fys3nlpab77nm0dl3f4r5"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami knewstuff plasma-framework ]; + propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami2 knewstuff plasma-framework ]; pathsToLink = [ "/etc/xdg/peruse.knsrc"]; - preConfigure = '' - rm -rf src/qtquick/karchive-rar/external/unarr - ln -s ${unarr} src/qtquick/karchive-rar/external/unarr - ''; - meta = with lib; { license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; From 9751771c73209b58c89829bf3889473a801a013f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Thu, 12 Apr 2018 13:03:56 +0200 Subject: [PATCH 2012/2743] 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 2013/2743] 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 2014/2743] =?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 d536542ee4db45c1ccbe0d5448ea072496025043 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 16 Apr 2018 12:27:04 +0200 Subject: [PATCH 2015/2743] jemalloc: add 4.5.0 version --- .../development/libraries/jemalloc/common.nix | 40 +++++++++++++++++++ .../libraries/jemalloc/default.nix | 40 ++----------------- .../libraries/jemalloc/jemalloc450.nix | 6 +++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 51 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/libraries/jemalloc/common.nix create mode 100644 pkgs/development/libraries/jemalloc/jemalloc450.nix diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix new file mode 100644 index 000000000000..f4bd35ee56ee --- /dev/null +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, fetchpatch, version, sha256 }: + +stdenv.mkDerivation rec { + name = "jemalloc-${version}"; + inherit version; + + src = fetchurl { + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; + inherit sha256; + }; + + # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which + # then stops downstream builds (mariadb in particular) from detecting it. This + # option should remove the prefix and give us a working jemalloc. + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" + # jemalloc is unable to correctly detect transparent hugepage support on + # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default + # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support + ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; + doCheck = true; + + patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; + sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; + }); + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://jemalloc.net; + description = "General purpose malloc(3) implementation"; + longDescription = '' + malloc(3)-compatible memory allocator that emphasizes fragmentation + avoidance and scalable concurrency support. + ''; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 0882431cc15b..c507eacbd002 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,40 +1,6 @@ { stdenv, fetchurl, fetchpatch }: - -stdenv.mkDerivation rec { - name = "jemalloc-${version}"; +import ./common.nix { + inherit stdenv fetchurl fetchpatch; version = "5.0.1"; - - src = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; - }; - - # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which - # then stops downstream builds (mariadb in particular) from detecting it. This - # option should remove the prefix and give us a working jemalloc. - configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; - doCheck = true; - - patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; - sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; - }); - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://jemalloc.net; - description = "General purpose malloc(3) implementation"; - longDescription = '' - malloc(3)-compatible memory allocator that emphasizes fragmentation - avoidance and scalable concurrency support. - ''; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; - }; + sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; } diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix new file mode 100644 index 000000000000..a55270fcd021 --- /dev/null +++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix @@ -0,0 +1,6 @@ +{ stdenv, fetchurl, fetchpatch }: +import ./common.nix { + inherit stdenv fetchurl fetchpatch; + version = "4.5.0"; + sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40792a702afa..ce9fb7bd94ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9445,6 +9445,8 @@ with pkgs; jemalloc = callPackage ../development/libraries/jemalloc { }; + jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { }; + jshon = callPackage ../development/tools/parsing/jshon { }; json2hcl = callPackage ../development/tools/json2hcl { }; From 2c5efc873557f43613d6adcd45d741a62d867bb6 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 16 Apr 2018 12:29:12 +0200 Subject: [PATCH 2016/2743] rocksdb: use jemalloc 4.5.0 --- 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 ce9fb7bd94ac..0345c91362e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11304,7 +11304,7 @@ with pkgs; rlog = callPackage ../development/libraries/rlog { }; - rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb = callPackage ../development/libraries/rocksdb { jemalloc = jemalloc450; }; rocksdb_lite = rocksdb.override { enableLite = true; }; From 78f661fd5e348746fa6c7998280ed5950e10a295 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Mon, 16 Apr 2018 13:37:41 +0300 Subject: [PATCH 2017/2743] 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 5ad99e6b057a69ba07935dfb9ff1020438195c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 16 Apr 2018 11:37:31 +0100 Subject: [PATCH 2018/2743] firefox-bin: add hint on how to update --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3a6dd626ac69..5b01daeef510 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -174,6 +174,8 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.gssSupport = true; + # update with: + # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = From 415093d4c02ce2d437b8f35ac2acdcdf52ae9c28 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 16 Apr 2018 12:46:31 +0200 Subject: [PATCH 2019/2743] rocksdb: package binary tools --- pkgs/development/libraries/rocksdb/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 0951c113e3f1..ef39034f931b 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, lib , fetchFromGitHub , fixDarwinDylibNames , which, perl @@ -15,12 +15,13 @@ let malloc = if jemalloc != null then jemalloc else gperftools; + tools = [ "sst_dump" "ldb" "rocksdb_dump" "rocksdb_undump" "blob_dump" ]; in stdenv.mkDerivation rec { name = "rocksdb-${version}"; version = "5.10.3"; - outputs = [ "dev" "out" "static" ]; + outputs = [ "dev" "out" "static" "bin" ]; src = fetchFromGitHub { owner = "facebook"; @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { buildFlags = buildAndInstallFlags ++ [ "shared_lib" "static_lib" - ]; + ] ++ tools ; installFlags = buildAndInstallFlags ++ [ "INSTALL_PATH=\${out}" @@ -69,6 +70,9 @@ stdenv.mkDerivation rec { cat make_config.mk mkdir -pv $static/lib/ mv -vi $out/lib/${LIBNAME}.a $static/lib/ + + install -d ''${!outputBin}/bin + install -D ${lib.concatStringsSep " " tools} ''${!outputBin}/bin ''; enableParallelBuilding = true; From bd4ad008dd2bfe60f7473cbf652ed3c1b11f4955 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 16 Apr 2018 13:06:28 +0200 Subject: [PATCH 2020/2743] =?UTF-8?q?sublime3-dev:=203161=20=E2=86=92=2031?= =?UTF-8?q?62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/sublime/3/packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index 84394e85c885..01445ade4732 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -5,14 +5,14 @@ let in rec { sublime3-dev = common { - buildVersion = "3161"; - x32sha256 = "0qrm2qmfsj71lr83c8zas2n3xk8hk9k4w8ygnasjhggmyjm3wy0q"; - x64sha256 = "0cgadylm68s2jly10r038q1fvmbzmpc2nvqy86vlyq9avgqbm5pc"; + buildVersion = "3162"; + x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i"; + x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3"; } {}; sublime3 = common { buildVersion = "3143"; x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; + x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; } {}; } From b901c40a8e2aeabafedbaeec6e07f3ce4567d42a Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 12 Apr 2018 18:45:14 +0200 Subject: [PATCH 2021/2743] oauth2_proxy: update module for extraConfig support --- .../services/security/oauth2_proxy.nix | 125 ++++++++++-------- 1 file changed, 71 insertions(+), 54 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index ef48d52e7a94..d4557a7dfe21 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -6,70 +6,80 @@ with lib; let cfg = config.services.oauth2_proxy; - # Use like: - # repeatedArgs (arg: "--arg=${arg}") args - repeatedArgs = concatMapStringsSep " "; - # oauth2_proxy provides many options that are only relevant if you are using # a certain provider. This set maps from provider name to a function that # takes the configuration and returns a string that can be inserted into the # command-line to launch oauth2_proxy. providerSpecificOptions = { - azure = cfg: '' - --azure-tenant=${cfg.azure.tenant} \ - --resource=${cfg.azure.resource} \ - ''; + azure = cfg: { + azure.tenant = cfg.azure.tenant; + resource = cfg.azure.resource; + }; - github = cfg: '' - ${optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}"} \ - ${optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}"} \ - ''; + github = cfg: { github = { + inherit (cfg.github) org team; + }; }; - google = cfg: '' - --google-admin-email=${cfg.google.adminEmail} \ - --google-service-account=${cfg.google.serviceAccountJSON} \ - ${repeatedArgs (group: "--google-group=${group}") cfg.google.groups} \ - ''; + google = cfg: { google = with cfg.google; { + admin-email = adminEmail; + service-account = serviceAccountJSON; + group = groups; + }; }; }; authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses; - getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: "") cfg; + getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: {}) cfg; - mkCommandLine = cfg: '' - --provider='${cfg.provider}' \ - ${optionalString (!isNull cfg.email.addresses) "--authenticated-emails-file='${authenticatedEmailsFile}'"} \ - --approval-prompt='${cfg.approvalPrompt}' \ - ${optionalString (cfg.passBasicAuth && !isNull cfg.basicAuthPassword) "--basic-auth-password='${cfg.basicAuthPassword}'"} \ - --client-id='${cfg.clientID}' \ - --client-secret='${cfg.clientSecret}' \ - ${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \ - --cookie-expire='${cfg.cookie.expire}' \ - --cookie-httponly=${boolToString cfg.cookie.httpOnly} \ - --cookie-name='${cfg.cookie.name}' \ - --cookie-secret='${cfg.cookie.secret}' \ - --cookie-secure=${boolToString cfg.cookie.secure} \ - ${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \ - ${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \ - ${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \ - --http-address='${cfg.httpAddress}' \ - ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${boolToString cfg.htpasswd.displayForm}"} \ - ${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \ - --pass-access-token=${boolToString cfg.passAccessToken} \ - --pass-basic-auth=${boolToString cfg.passBasicAuth} \ - --pass-host-header=${boolToString cfg.passHostHeader} \ - --proxy-prefix='${cfg.proxyPrefix}' \ - ${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \ - ${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \ - ${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \ - --request-logging=${boolToString cfg.requestLogging} \ - ${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \ - ${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \ - ${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \ - --upstream='${cfg.upstream}' \ - ${optionalString (!isNull cfg.validateURL) "--validate-url='${cfg.validateURL}'"} \ - ${optionalString cfg.tls.enable "--tls-cert='${cfg.tls.certificate}' --tls-key='${cfg.tls.key}' --https-address='${cfg.tls.httpsAddress}'"} \ - '' + getProviderOptions cfg cfg.provider; + allConfig = with cfg; { + inherit (cfg) provider scope upstream; + approval-prompt = approvalPrompt; + basic-auth-password = basicAuthPassword; + client-id = clientID; + client-secret = clientSecret; + custom-templates-dir = customTemplatesDir; + email-domain = email.domains; + http-address = httpAddress; + login-url = loginURL; + pass-access-token = passAccessToken; + pass-basic-auth = passBasicAuth; + pass-host-header = passHostHeader; + proxy-prefix = proxyPrefix; + profile-url = profileURL; + redeem-url = redeemURL; + redirect-url = redirectURL; + request-logging = requestLogging; + skip-auth-regex = skipAuthRegexes; + signature-key = signatureKey; + validate-url = validateURL; + htpasswd-file = htpasswd.file; + cookie = { + inherit (cookie) domain secure expire name secret refresh; + httponly = cookie.httpOnly; + }; + } // lib.optionalAttrs (!isNull cfg.email.addresses) { + authenticated-emails-file = authenticatedEmailsFile; + } // lib.optionalAttrs (cfg.passBasicAuth) { + basic-auth-password = cfg.basicAuthPassword; + } // lib.optionalAttrs (!isNull cfg.htpasswd.file) { + display-htpasswd-file = cfg.htpasswd.displayForm; + } // lib.optionalAttrs tls.enable { + tls-cert = tls.certificate; + tls-key = tls.key; + https-address = tls.httpsAddress; + } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; + + mapConfig = key: attr: + if (!isNull attr && attr != []) then ( + if (builtins.typeOf attr) == "set" then concatStringsSep " " + (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else + if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else + if (builtins.typeOf attr) == "bool" then "--${key}=${boolToString attr}" else + if (builtins.typeOf attr) == "string" then "--${key}='${attr}'" else + "--${key}=${toString attr}") + else ""; + + configString = concatStringsSep " " (mapAttrsToList mapConfig allConfig); in { options.services.oauth2_proxy = { @@ -365,7 +375,7 @@ in }; secret = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The seed string for secure cookies. ''; @@ -494,6 +504,13 @@ in ''; }; + extraConfig = mkOption { + default = {}; + description = '' + Extra config to pass to oauth2_proxy. + ''; + }; + }; config = mkIf cfg.enable { @@ -511,7 +528,7 @@ in serviceConfig = { User = "oauth2_proxy"; Restart = "always"; - ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${mkCommandLine cfg}"; + ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; }; }; From dee60d8e2cbd001d2f8e1982e09f654c3a172abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 16 Apr 2018 12:28:04 +0100 Subject: [PATCH 2022/2743] rustc: disable tests for aarch64 upstream is doing the same --- pkgs/development/compilers/rust/default.nix | 9 ++++++--- .../aarch64-disable-test_loading_cosine.patch | 12 ------------ pkgs/development/compilers/rust/rustc.nix | 3 --- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index d9a36273ce1d..f47c1f753ee1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -20,11 +20,14 @@ in rec { configureFlags = [ "--release-channel=stable" ]; + # 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; + patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch - # https://github.com/rust-lang/rust/issues/45410 - ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; }; diff --git a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch b/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch deleted file mode 100644 index bafab0e9ef71..000000000000 --- a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/librustc_metadata/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs -index 1b42fa0..92256dc 100644 ---- a/src/librustc_metadata/dynamic_lib.rs -+++ b/src/librustc_metadata/dynamic_lib.rs -@@ -80,6 +80,7 @@ mod tests { - use std::mem; - - #[test] -+ #[ignore] - fn test_loading_cosine() { - if cfg!(windows) { - return diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1395d8e9a3ba..19c4a590e454 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -108,9 +108,6 @@ stdenv.mkDerivation { # Useful debugging parameter # export VERBOSE=1 - '' + optionalString stdenv.isAarch64 '' - # https://github.com/rust-lang/rust/issues/49807 - rm -vr src/test/debuginfo/by-value-self-argument-in-trait-impl.rs '' + optionalString stdenv.isDarwin '' # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set From f13cb56360cbf9cc1059221a24acdb5ac4ca69a3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 11 Apr 2018 20:08:51 +0000 Subject: [PATCH 2023/2743] 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 2024/2743] 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 a037cbd46bab2553921c5d5de51641bfdcf902a9 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 16 Apr 2018 14:06:22 +0200 Subject: [PATCH 2025/2743] oauth2_proxy: add keyFile, make some options optional --- .../services/security/oauth2_proxy.nix | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index d4557a7dfe21..cf41625d16c8 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -20,7 +20,7 @@ let inherit (cfg.github) org team; }; }; - google = cfg: { google = with cfg.google; { + google = cfg: { google = with cfg.google; optionalAttrs (groups != []) { admin-email = adminEmail; service-account = serviceAccountJSON; group = groups; @@ -57,6 +57,7 @@ let inherit (cookie) domain secure expire name secret refresh; httponly = cookie.httpOnly; }; + set-xauthrequest = setXauthrequest; } // lib.optionalAttrs (!isNull cfg.email.addresses) { authenticated-emails-file = authenticatedEmailsFile; } // lib.optionalAttrs (cfg.passBasicAuth) { @@ -120,7 +121,7 @@ in }; clientID = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The OAuth Client ID. ''; @@ -128,7 +129,7 @@ in }; clientSecret = mkOption { - type = types.str; + type = types.nullOr types.str; description = '' The OAuth Client Secret. ''; @@ -282,7 +283,8 @@ in #################################################### # UPSTREAM Configuration upstream = mkOption { - type = types.commas; + type = with types; coercedTo string (x: [x]) (listOf string); + default = []; description = '' The http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path. @@ -504,6 +506,14 @@ in ''; }; + setXauthrequest = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). + ''; + }; + extraConfig = mkOption { default = {}; description = '' @@ -511,10 +521,28 @@ in ''; }; + keyFile = mkOption { + type = types.nullOr types.string; + default = null; + description = '' + oauth2_proxy allows passing sensitive configuration via environment variables. + Make a file that contains lines like + OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com + and specify the path here. + ''; + example = "/run/keys/oauth2_proxy"; + }; + }; config = mkIf cfg.enable { + services.oauth2_proxy = mkIf (!isNull cfg.keyFile) { + clientID = mkDefault null; + clientSecret = mkDefault null; + cookie.secret = mkDefault null; + }; + users.extraUsers.oauth2_proxy = { description = "OAuth2 Proxy"; }; @@ -529,6 +557,7 @@ in User = "oauth2_proxy"; Restart = "always"; ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; + EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile; }; }; From 29a30597461b641df53f3ca06a76eb5b699d4b6c Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Mon, 16 Apr 2018 14:11:25 +0200 Subject: [PATCH 2026/2743] 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 f2e16a647ac0d8cab315d805a86c3dbe57ef232b Mon Sep 17 00:00:00 2001 From: Yorick Date: Mon, 16 Apr 2018 14:15:14 +0200 Subject: [PATCH 2027/2743] rocksdb: use stdenv.lib instead of lib --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index ef39034f931b..bb0faf76be69 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib +{ stdenv , fetchFromGitHub , fixDarwinDylibNames , which, perl @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { mv -vi $out/lib/${LIBNAME}.a $static/lib/ install -d ''${!outputBin}/bin - install -D ${lib.concatStringsSep " " tools} ''${!outputBin}/bin + install -D ${stdenv.lib.concatStringsSep " " tools} ''${!outputBin}/bin ''; enableParallelBuilding = true; From 3476b4c7d7b5ad54dd92b2a3c6a75a86fead3817 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Mon, 16 Apr 2018 12:22:59 +0200 Subject: [PATCH 2028/2743] 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 2029/2743] 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 2030/2743] 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 c03f5f557979825bcd34c4fbbd65766d1d44586d Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 16 Apr 2018 16:18:33 +0200 Subject: [PATCH 2031/2743] jemalloc: don't try to patch 4.5.0 --- pkgs/development/libraries/jemalloc/common.nix | 11 +++-------- pkgs/development/libraries/jemalloc/default.nix | 6 +++++- pkgs/development/libraries/jemalloc/jemalloc450.nix | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index f4bd35ee56ee..1a26bd13d41c 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, version, sha256 }: +{ stdenv, fetchurl, version, sha256, ... }@args: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "jemalloc-${version}"; inherit version; @@ -19,11 +19,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; doCheck = true; - patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; - sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; - }); - enableParallelBuilding = true; meta = with stdenv.lib; { @@ -37,4 +32,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; }; -} +} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ])) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index c507eacbd002..40c06cbffdf0 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl, fetchpatch }: import ./common.nix { - inherit stdenv fetchurl fetchpatch; + inherit stdenv fetchurl; version = "5.0.1"; sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; + patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; + sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; + }); } diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix index a55270fcd021..00b38a855532 100644 --- a/pkgs/development/libraries/jemalloc/jemalloc450.nix +++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: import ./common.nix { - inherit stdenv fetchurl fetchpatch; + inherit stdenv fetchurl; version = "4.5.0"; sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; } From be660b8f512f6f108fc081a6d8d587c14903f372 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 16 Apr 2018 16:49:01 +0200 Subject: [PATCH 2032/2743] 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 2033/2743] 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 bd77849b2f5b15f17a40f1142e8a90a02c6c8ddd Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 12 Apr 2018 18:15:42 +0300 Subject: [PATCH 2034/2743] nixos/installer/channel: Add some files that the channel also has Nothing probably uses this, but let's be pedantic and have the pre-included channel on the install media be as close as possible to what 'nix-channel --update' will give them. The only remaining difference is that the channel adds programs.sqlite, which is fundamentally unfixable. --- nixos/modules/installer/cd-dvd/channel.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 4a1983167957..01cfe8a02e10 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -21,7 +21,9 @@ let if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi + echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision ''; in From 333a24a628391137a7283f09498edd5822f12023 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 15 Apr 2018 05:32:59 +0300 Subject: [PATCH 2035/2743] nixos/release.nix: Add SD images for ARMv6 + ARMv7 These don't have affect the default Hydra setup (you need to pass the relevant system in the supportedSystem list) but let's add it for completeness and convenience. --- nixos/release.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 43c641f32c46..7c066f8ee9e5 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -166,8 +166,12 @@ in rec { inherit system; }); - sd_image = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { - module = ./modules/installer/cd-dvd/sd-image-aarch64.nix; + sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage { + module = { + armv6l-linux = ./modules/installer/cd-dvd/sd-image-raspberrypi.nix; + armv7l-linux = ./modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix; + aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64.nix; + }.${system}; inherit system; }); From 1f230af96f0e17de173e3eaa5618736c4791a8a1 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Apr 2018 19:51:57 +0200 Subject: [PATCH 2036/2743] 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 2037/2743] 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 2038/2743] 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 2039/2743] 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 2040/2743] 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 2041/2743] 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 2042/2743] 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 2043/2743] 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 2044/2743] 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 2045/2743] 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 2046/2743] 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 2047/2743] 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 2048/2743] 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 2049/2743] 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 2050/2743] 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 2051/2743] 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 2052/2743] 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 2053/2743] 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 2054/2743] 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 2055/2743] 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 2056/2743] 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 2057/2743] 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 2058/2743] 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 2059/2743] 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 2060/2743] 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 2061/2743] 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 2062/2743] 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 2063/2743] 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 2064/2743] 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 2065/2743] 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 2066/2743] 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 2067/2743] 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 2068/2743] 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 2069/2743] 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 2070/2743] 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 2071/2743] 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 2072/2743] 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 2073/2743] 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 2074/2743] 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 2075/2743] 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 2076/2743] 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 2077/2743] 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 2078/2743] 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 2079/2743] 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 2080/2743] 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 2081/2743] 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 2082/2743] 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 2083/2743] 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 2084/2743] 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 2085/2743] 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 2086/2743] 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 2087/2743] 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 2088/2743] 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 2089/2743] 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 2090/2743] 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 2091/2743] 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 2092/2743] 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 2093/2743] 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 2094/2743] 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 2095/2743] 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 2096/2743] 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 2097/2743] 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 2098/2743] 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 2099/2743] 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 2100/2743] 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 2101/2743] 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 2102/2743] 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 2103/2743] 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 2104/2743] 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 2105/2743] 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 2106/2743] 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 2107/2743] 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 2108/2743] 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 2109/2743] 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 2110/2743] 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 2111/2743] 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 2112/2743] 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 2113/2743] 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 2114/2743] 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 2115/2743] 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 2116/2743] 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 2117/2743] 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 2118/2743] 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 2119/2743] 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 2120/2743] 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 2121/2743] 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 2122/2743] 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 2123/2743] 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 2124/2743] 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 2125/2743] 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 2126/2743] 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 2127/2743] 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 2128/2743] 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 2129/2743] 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 2130/2743] 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 2131/2743] 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 2132/2743] 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 2133/2743] 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 2134/2743] 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 2135/2743] 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 2136/2743] 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 2137/2743] 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 2138/2743] 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 2139/2743] 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 2140/2743] 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 2141/2743] 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 2142/2743] 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 2143/2743] 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 2144/2743] 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 2145/2743] 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 9b4b21c6abba97773de7c19f31880676684696a5 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Wed, 18 Apr 2018 20:23:27 +0300 Subject: [PATCH 2146/2743] handbrake: refactor (fx, clenup, description, cosmetics, add maintainer) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/video/handbrake/default.nix | 20 +++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 839458dbfc9a..2bb748e0ce66 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28,6 +28,11 @@ github = "AndersonTorres"; name = "Anderson Torres"; }; + Anton-Latukha = { + email = "anton.latuka+nixpkgs@gmail.com"; + github = "Anton-Latukha"; + name = "Anton Latukha"; + }; Baughn = { email = "sveina@gmail.com"; github = "Baughn"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 904401c5e913..6ce2ae08eeb4 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -37,15 +37,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 - ] ++ lib.optionals useGtk [ - intltool wrapGAppsHook - ]; + ] ++ 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 + lame libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev @@ -60,8 +58,6 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs scripts - echo 'TAG=${version}' > version.txt - # `configure` errors out when trying to read the current year which is too low substituteInPlace make/configure.py \ --replace developer release \ @@ -97,13 +93,17 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://handbrake.fr/; - description = "A tool for ripping DVDs into video files"; + description = "A tool for converting video files and ripping DVDs"; longDescription = '' - Handbrake is a versatile transcoding DVD ripper. This package - provides the cli HandbrakeCLI and the GTK+ version ghb. + Tool for converting and remuxing video files + into selection of modern and widely supported codecs + and containers. Very versatile and customizable. + Package provides: + CLI - `HandbrakeCLI` + GTK+ GUI - `ghb` ''; license = licenses.gpl2; - maintainers = with maintainers; [ wmertens ]; + maintainers = with maintainers; [ Anton-Latukha wmertens ]; # Not tested on anything else platforms = platforms.linux; }; From 3b69e6ef1a3d752fa8572784b0fadfffefaeee7f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 18 Apr 2018 15:34:23 -0400 Subject: [PATCH 2147/2743] sherpa: 2.2.4 -> 2.2.5 --- .../science/physics/sherpa/default.nix | 7 +- .../physics/sherpa/explicit_overloads.patch | 119 ------------------ 2 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 pkgs/applications/science/physics/sherpa/explicit_overloads.patch diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index cdbe19c53b33..340428e8e777 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { name = "sherpa-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1rw0ivx78zkbkl7nwil9i4fn8rvkifc3i20zrq3asbi4kb6brj2x"; + sha256 = "0rv14j8gvjjr3darb0wcradlmsnyq915jz7v2yybrjzqfbsr3zb5"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; enableParallelBuilding = true; - # LLVM 4 doesn't allow ambigous type in std::abs argument - patches = stdenv.lib.optional stdenv.cc.isClang [ ./explicit_overloads.patch ]; - configureFlags = [ "--with-sqlite3=${sqlite.dev}" "--enable-hepmc2=${hepmc}" diff --git a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch b/pkgs/applications/science/physics/sherpa/explicit_overloads.patch deleted file mode 100644 index 33e5a7632178..000000000000 --- a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/ATOOLS/Phys/Flavour.C b/ATOOLS/Phys/Flavour.C -index 1986348..740eea3 100644 ---- a/ATOOLS/Phys/Flavour.C -+++ b/ATOOLS/Phys/Flavour.C -@@ -298,8 +298,8 @@ std::string Flavour::IDName() const - - bool Flavour::IsDiQuark() const - { -- if(abs(Kfcode())>=1103&&abs(Kfcode())<=5505) { -- double help=abs(Kfcode())/100.0-int(abs(Kfcode())/100.0); -+ if(abs((long)Kfcode())>=1103&&abs((long)Kfcode())<=5505) { -+ double help=abs((long)Kfcode())/100.0-int(abs((long)Kfcode())/100.0); - if(help<0.031) return true; - } - return false; -@@ -307,27 +307,27 @@ bool Flavour::IsDiQuark() const - - bool Flavour::IsBaryon() const - { -- if (abs(Kfcode())%10000<1000) return false; -+ if (abs((long)Kfcode())%10000<1000) return false; - return !IsDiQuark(); - } - - bool Flavour::IsB_Hadron() const - { -- if (abs(Kfcode())<100) return 0; -+ if (abs((long)Kfcode())<100) return 0; - if (Kfcode()-100*int(Kfcode()/100)<10) return 0; -- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; -- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; -- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; -+ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; -+ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; -+ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; - return 0; - } - - bool Flavour::IsC_Hadron() const - { -- if (abs(Kfcode())<100) return 0; -+ if (abs((long)Kfcode())<100) return 0; - if (Kfcode()-100*int(Kfcode()/100)<10) return 0; -- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; -- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; -- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; -+ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; -+ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; -+ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; - return 0; - } - -diff --git a/AddOns/Pythia/Pythia_Jet_Criterion.C b/AddOns/Pythia/Pythia_Jet_Criterion.C -index bbe9597..c1201e1 100644 ---- a/AddOns/Pythia/Pythia_Jet_Criterion.C -+++ b/AddOns/Pythia/Pythia_Jet_Criterion.C -@@ -117,8 +117,8 @@ namespace PYTHIA { - double Qsq = sign * Q.Abs2(); - // Mass term of radiator - DEBUG_VAR(ampl->MS()); -- double m2Rad = ( abs(RadAfterBranch.Flav().Kfcode()) >= 4 -- && abs(RadAfterBranch.Flav().Kfcode()) < 7) -+ double m2Rad = ( abs((long)RadAfterBranch.Flav().Kfcode()) >= 4 -+ && abs((long)RadAfterBranch.Flav().Kfcode()) < 7) - ? ampl->MS()->Mass2(RadAfterBranch.Flav()) - : 0.; - // Construct 2->3 variables for FSR -diff --git a/BEAM/Main/EPA.C b/BEAM/Main/EPA.C -index 861a1b2..340ac33 100644 ---- a/BEAM/Main/EPA.C -+++ b/BEAM/Main/EPA.C -@@ -54,7 +54,7 @@ double EPA::CosInt::GetCosInt(double X) - - double EPA::phi(double x, double qq) - { -- if (abs(m_beam.Kfcode()) == kf_p_plus) { -+ if (abs((long)m_beam.Kfcode()) == kf_p_plus) { - const double a = 7.16; - const double b = -3.96; - const double c = .028; -@@ -179,7 +179,7 @@ bool EPA::CalculateWeight(double x,double q2) - m_weight=0.0; - return 1; - } -- if (abs(m_beam.Kfcode()) == kf_e) { -+ if (abs((long)m_beam.Kfcode()) == kf_e) { - double f = alpha/M_PI*(1+sqr(1-m_x))/m_x*log(2.*m_energy/m_mass); - if (f < 0) f = 0.; - m_weight = f; -@@ -187,7 +187,7 @@ bool EPA::CalculateWeight(double x,double q2) - <<"energy = "<Get()<0.25) -- anti=Flavour((kf_code)(abs(rem[0])*1000+abs(rem[1])*100+1)); -+ anti=Flavour((kf_code)(abs((long)rem[0])*1000+abs((long)rem[1])*100+1)); - } - else { -- anti=Flavour((kf_code)(abs(rem[0])*1100+3)); -+ anti=Flavour((kf_code)(abs((long)rem[0])*1100+3)); - } - if (flav.IsAnti()) anti=anti.Bar(); - return anti; From 1eddfaffb1bb847ddda91d9c844078c6163b14f5 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 18 Apr 2018 22:07:42 +0200 Subject: [PATCH 2148/2743] 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 2149/2743] 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 2150/2743] 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 2151/2743] 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 2152/2743] 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 2153/2743] 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 2154/2743] 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 2155/2743] 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 2156/2743] 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 2157/2743] 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 2158/2743] 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 2159/2743] 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 2160/2743] 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 2161/2743] 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 2162/2743] 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 2163/2743] 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 2164/2743] 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 2165/2743] 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 2166/2743] 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 2167/2743] 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 2168/2743] 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 2169/2743] 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 2170/2743] 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 2171/2743] 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 2172/2743] 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 2173/2743] 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 dd5e2a08fbb0ea321885c7e36b3c072bf3d2aef7 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Thu, 19 Apr 2018 16:44:08 +0200 Subject: [PATCH 2174/2743] zramSwap: default to 1 device One device per cpu is only needed for kernel 3.14 --- nixos/modules/config/zram.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index ae1b0a6c8e11..b8adb51765f6 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -26,15 +26,16 @@ in description = '' Enable in-memory compressed swap space provided by the zram kernel module. It is recommended to enable only for kernel 3.14 or higher. + See https://www.kernel.org/doc/Documentation/blockdev/zram.txt ''; }; numDevices = mkOption { - default = 4; + default = 1; type = types.int; description = '' Number of zram swap devices to create. It should be equal to the - number of CPU cores your system has. + number of CPU cores your system has for kernel < v3.15. ''; }; From 8e3a14549ffde6b721d77185ae64ddcc4831e490 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Thu, 19 Apr 2018 16:53:40 +0200 Subject: [PATCH 2175/2743] zramSwap: remove mentions of old kernels --- nixos/modules/config/zram.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index b8adb51765f6..c1748812821e 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -25,7 +25,7 @@ in type = types.bool; description = '' Enable in-memory compressed swap space provided by the zram kernel - module. It is recommended to enable only for kernel 3.14 or higher. + module. See https://www.kernel.org/doc/Documentation/blockdev/zram.txt ''; }; @@ -34,8 +34,7 @@ in default = 1; type = types.int; description = '' - Number of zram swap devices to create. It should be equal to the - number of CPU cores your system has for kernel < v3.15. + Number of zram swap devices to create. ''; }; From ebc224377853eb2a67f59aa68d95d94fc8770a77 Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Sun, 15 Apr 2018 19:22:08 -0400 Subject: [PATCH 2176/2743] 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 2177/2743] 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 2178/2743] 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 2179/2743] 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 2180/2743] 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 2181/2743] 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 2182/2743] 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 2183/2743] 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 2184/2743] 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 4959111f304c047af89990a708f12cc5e639505a Mon Sep 17 00:00:00 2001 From: nocent Date: Tue, 17 Apr 2018 23:17:06 +0200 Subject: [PATCH 2185/2743] bonzomatic: init at 2018-03-29 --- maintainers/maintainer-list.nix | 5 +++ .../editors/bonzomatic/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/bonzomatic/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 839458dbfc9a..8e9b0ef337e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2650,6 +2650,11 @@ github = "nmattia"; name = "Nicolas Mattia"; }; + nocent = { + email = "nocent@protonmail.ch"; + github = "nocent"; + name = "nocent"; + }; nocoolnametom = { email = "nocoolnametom@gmail.com"; github = "nocoolnametom"; diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix new file mode 100644 index 000000000000..57aa381e68c5 --- /dev/null +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -0,0 +1,31 @@ +{ stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: + +let + name = "bonzomatic"; +in stdenv.mkDerivation { + inherit name; + + src = fetchFromGitHub { + repo = name; + owner = "Gargaj"; + rev = "2018-03-29"; + sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg"; + }; + + buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; + + postFixup = '' + wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" + ''; + + meta = with stdenv.lib; { + description = "A live-coding tool for writing 2D fragment/pixel shaders"; + license = with licenses; [ + unlicense + unfreeRedistributable # contains libbass.so in repository + ]; + maintainers = [ maintainers.nocent ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b0423de0f43..c26500c3d197 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14943,6 +14943,8 @@ with pkgs; ffmpeg = ffmpeg_2; }; + bonzomatic = callPackage ../applications/editors/bonzomatic { }; + brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; 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 2186/2743] 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 2187/2743] 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 2188/2743] 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 2189/2743] 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 2190/2743] 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 2191/2743] 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 2192/2743] 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 2193/2743] 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 2194/2743] 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 2195/2743] 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 e8c936556dcbb08e23f374015191d96c621a10c2 Mon Sep 17 00:00:00 2001 From: vodkabot <38538876+vodkabot@users.noreply.github.com> Date: Thu, 19 Apr 2018 21:54:09 +0300 Subject: [PATCH 2196/2743] twilight: init at 2018-04-19 --- pkgs/tools/graphics/twilight/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/graphics/twilight/default.nix diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix new file mode 100644 index 000000000000..8d1ee7b7bfbe --- /dev/null +++ b/pkgs/tools/graphics/twilight/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub +, libGL, libGLU, freeglut, libX11 }: + +let + version = "2018-04-19"; +in stdenv.mkDerivation rec { + name = "twilight-${version}"; + + src = fetchFromGitHub { + owner = "tweakoz"; + repo = "twilight"; + rev = "43f21d15c2a8923c9d707bdf3789f480bfd4b36d"; + sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz"; + }; + + buildInputs = [ libGL libGLU freeglut libX11 ]; + + installPhase = '' + install -Dm755 twilight $out/bin/twilight + ''; + + meta = with stdenv.lib; { + description = "Redo of IRIX twilight backdrop in old school OpenGL"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05bb159a5f77..bf47b1ebf6f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5251,6 +5251,10 @@ with pkgs; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + twilight = callPackage ../tools/graphics/twilight/default.nix { + libX11 = xorg.libX11; + }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; From ef3db7d14c90e1876d38ebc25428b4f65962ffbc Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Sun, 15 Apr 2018 19:21:45 -0400 Subject: [PATCH 2197/2743] 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 2198/2743] 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 2199/2743] 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 2200/2743] 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 2201/2743] 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 2202/2743] 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 2203/2743] 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 2204/2743] 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 2205/2743] 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 2206/2743] 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 2207/2743] 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 2208/2743] 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 2209/2743] 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 2210/2743] 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 2211/2743] 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 bf6660c3ed27a323999fe70cce5731551693d1ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 21:47:14 -0700 Subject: [PATCH 2212/2743] xpra: 2.2.5 -> 2.2.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/xpra/versions. These checks were done: - built on NixOS - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra_launcher-wrapped -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra_launcher-wrapped --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra_launcher -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra_launcher --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/..xpra-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/..xpra-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra-wrapped -h’ got 0 exit code - ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra-wrapped --help’ got 0 exit code - found 2.2.6 with grep in /nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6 - directory tree listing: https://gist.github.com/01ffc3c415200e59fd7469357044a87a --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index b931f270dee2..9bc13b3260da 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; + sha256 = "1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz"; }; nativeBuildInputs = [ pkgconfig ]; From 65d5a8272977afdad7d7f5115fdbad7644c72035 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 21:50:46 -0700 Subject: [PATCH 2213/2743] 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 2214/2743] 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 5257f8e5b4c927020491f1caf13ac53da99e4591 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 22:41:26 -0700 Subject: [PATCH 2215/2743] supercollider: 3.9.2 -> 3.9.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/supercollider/versions. These checks were done: - built on NixOS - ran ‘/nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3/bin/supernova -h’ got 0 exit code - ran ‘/nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3/bin/supernova --help’ got 0 exit code - ran ‘/nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3/bin/sclang -h’ got 0 exit code - found 3.9.3 with grep in /nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3 - directory tree listing: https://gist.github.com/1dcdb0888d56e74baf1a827e371acad1 --- pkgs/development/interpreters/supercollider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 2d3509542135..2737fd6fae04 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "0d3cb6dw8jz7ijriqn3rlwin24gffczp69hl17pzxj1d5w57yj44"; + sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr"; }; hardeningDisable = [ "stackprotector" ]; From 9b40680d466677e4fc77c6e8a40f7b4c0a191053 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Apr 2018 22:43:14 -0700 Subject: [PATCH 2216/2743] 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 2217/2743] 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 2218/2743] 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 2219/2743] 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 2220/2743] 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 2221/2743] 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 2222/2743] 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 2223/2743] 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 2224/2743] 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 2225/2743] 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 2226/2743] 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 2227/2743] 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 2228/2743] 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 2229/2743] 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 2230/2743] 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 2231/2743] 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 2232/2743] 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 2233/2743] 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 2234/2743] 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 2235/2743] 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 2236/2743] 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 2237/2743] 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 2238/2743] 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 2239/2743] 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 2240/2743] 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 2241/2743] 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 24fe3dbb3f26dfeeb5b90bf4923247255a9605ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 04:05:06 -0700 Subject: [PATCH 2242/2743] jackett: 0.8.823 -> 0.8.886 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/jackett/versions. These checks were done: - built on NixOS - ran ‘/nix/store/gi1iygygag1b9cb30gir6yzv0jas2612-jackett-0.8.886/bin/Jackett -h’ got 0 exit code - ran ‘/nix/store/gi1iygygag1b9cb30gir6yzv0jas2612-jackett-0.8.886/bin/Jackett help’ got 0 exit code - found 0.8.886 with grep in /nix/store/gi1iygygag1b9cb30gir6yzv0jas2612-jackett-0.8.886 - directory tree listing: https://gist.github.com/79337833aca5adb980efc368f828a551 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 34d242b92a8a..f2d38111d5d2 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.823"; + version = "0.8.886"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0hicz21dvcakqkxix70akc3rrz570j3g0a512pqrr3bdq7ay0dkk"; + sha256 = "18agnavhch29pi1w6vp374cs6bz2j7bf55mh4ym0cs038h5xkdvv"; }; buildInputs = [ makeWrapper ]; 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 2243/2743] 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 2244/2743] 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 2245/2743] 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 2246/2743] 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 2247/2743] 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 2248/2743] 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 2249/2743] 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 2250/2743] 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 2251/2743] 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 2252/2743] 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 2253/2743] 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 2254/2743] 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 2255/2743] 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 2256/2743] 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 2257/2743] 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 2258/2743] 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 2259/2743] 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 2260/2743] 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 2261/2743] 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 2262/2743] 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 2263/2743] 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 2264/2743] 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 2265/2743] 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 2266/2743] 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 2267/2743] 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 2268/2743] 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 2269/2743] 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 2270/2743] 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 2271/2743] 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 2272/2743] 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 2273/2743] 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 2274/2743] 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 2275/2743] 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 2276/2743] 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 2277/2743] 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 2278/2743] 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 2279/2743] 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 2280/2743] 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 2281/2743] 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 2282/2743] 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 2283/2743] 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 53bea54a651c9a7c3f3a21af08779f806cd8735a Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 16:42:27 +0200 Subject: [PATCH 2284/2743] matrix-synapse: 0.27.2 -> 0.27.4 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3cf460539699..4c82f5cfdde8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.27.2"; + version = "0.27.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3"; + sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17"; }; patches = [ From 7a04c6fc5894095a535e3311b1c1777e414cd6f0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 20 Apr 2018 17:03:39 +0200 Subject: [PATCH 2285/2743] 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 2286/2743] 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 2287/2743] 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 2288/2743] 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 2289/2743] 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 2290/2743] 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 cf351f6389eaf83f7122285389e9958110fe9da2 Mon Sep 17 00:00:00 2001 From: James Kay Date: Fri, 20 Apr 2018 16:20:45 +0100 Subject: [PATCH 2291/2743] atlassian-cli: init at 7.8.0 --- .../office/atlassian-cli/default.nix | 31 +++++++++++++++++++ .../office/atlassian-cli/wrapper.sh | 20 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/office/atlassian-cli/default.nix create mode 100755 pkgs/applications/office/atlassian-cli/wrapper.sh diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix new file mode 100644 index 000000000000..a56c15bffb2a --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchzip, jre }: +stdenv.mkDerivation { + name = "atlassian-cli"; + version = "7.8.0"; + src = fetchzip { + url = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip; + sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + extraPostFetch = "chmod go-w $out"; + }; + tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv" + "hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ]; + installPhase = '' + mkdir -p $out/{bin,share/doc/atlassian-cli} + cp -r lib $out/share/java + cp -r README.txt license $out/share/doc/atlassian-cli + for tool in $tools + do + substitute ${./wrapper.sh} $out/bin/$tool \ + --subst-var out \ + --subst-var-by jre ${jre} \ + --subst-var-by tool $tool + chmod +x $out/bin/$tool + done + ''; + meta = with stdenv.lib; { + description = "An integrated family of CLI’s for various Atlassian applications"; + homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + maintainers = [ maintainers.twey ]; + license = [ licenses.unfreeRedistributable ]; + }; +} diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/applications/office/atlassian-cli/wrapper.sh new file mode 100755 index 000000000000..80b60dbc468c --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/wrapper.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +tool=@tool@ +user=ATLASSIAN_${tool^^}_USER +host=ATLASSIAN_${tool^^}_HOST +pass=ATLASSIAN_${tool^^}_PASS + +[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli +if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ] +then + >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli' + exit 1 +fi + +@jre@/bin/java \ + -jar @out@/share/java/@tool@-cli-* \ + --server "${!host}" \ + --user "${!user}" \ + --password "${!pass}" \ + "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b80db9d4d0ca..3b34769e148d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14766,6 +14766,8 @@ with pkgs; artha = callPackage ../applications/misc/artha { }; + atlassian-cli = callPackage ../applications/office/atlassian-cli { }; + atomEnv = callPackage ../applications/editors/atom/env.nix { gconf = gnome2.GConf; }; From 36c592df5a48de9b12ffe0eb692bab96ce3e6739 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Apr 2018 11:05:06 -0700 Subject: [PATCH 2292/2743] 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 2293/2743] 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 2294/2743] 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 2295/2743] 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 2296/2743] 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 2297/2743] 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 2298/2743] 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 2299/2743] 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 2300/2743] 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 2301/2743] 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 2302/2743] 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 2303/2743] 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 2304/2743] 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 2305/2743] 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 3d974552f35c450d6f6f74e18932e1d55d06e541 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 17:24:19 +0200 Subject: [PATCH 2306/2743] canonicaljson: 1.0.0 -> 1.1.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93e821fb719d..c2465a8e2f22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16640,16 +16640,16 @@ EOF canonicaljson = buildPythonPackage rec { name = "canonicaljson-${version}"; - version = "1.0.0"; + version = "1.1.3"; src = pkgs.fetchgit { url = "https://github.com/matrix-org/python-canonicaljson.git"; rev = "refs/tags/v${version}"; - sha256 = "0r82zlip93y169ijkn8xpbp0yr22mf92pni6dw420vb53l27sprq"; + sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy"; }; propagatedBuildInputs = with self; [ - frozendict simplejson + frozendict simplejson six ]; }; From a36538f33c071b0236e68ae99719c025dd4e6ab2 Mon Sep 17 00:00:00 2001 From: Pi3r Date: Fri, 20 Apr 2018 22:41:48 +0200 Subject: [PATCH 2307/2743] 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 2308/2743] 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 2309/2743] 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 2310/2743] 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 2311/2743] 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 2312/2743] 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 2313/2743] 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 2314/2743] 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 2315/2743] 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 2316/2743] 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 2317/2743] 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 2318/2743] 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 2319/2743] 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 2320/2743] 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 2321/2743] 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 2322/2743] 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 2323/2743] 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 2324/2743] 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 3ce3708d197021fa941d63fd50afd219ba2065fa Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Sat, 21 Apr 2018 14:33:02 +0200 Subject: [PATCH 2325/2743] libgphoto2: 2.5.16 -> 2.5.17 --- pkgs/development/libraries/libgphoto2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 9c0ea4a3a73e..96b42ac068cc 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9"; + sha256 = "0pbfg89817qkb35mmajsw2iz6j9nhkkj67m419f8x8yxpqkaa0wb"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.16"; - tag = "libgphoto2-2_5_16-release"; + version = "2.5.17"; + tag = "libgphoto2-2_5_17-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; From 294f823146aa1961f493d0c2f408872e9b2d34cb Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Sat, 21 Apr 2018 14:41:43 +0200 Subject: [PATCH 2326/2743] gphoto2: 2.5.15 -> 2.5.17 --- pkgs/applications/misc/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 77e7b592f647..5131e0739e73 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.15"; + name = "gphoto2-2.5.17"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf"; + sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; From 4115237312597b1ae944d24670a028ee6c6ccfef Mon Sep 17 00:00:00 2001 From: John Mercier Date: Thu, 19 Apr 2018 22:15:40 -0400 Subject: [PATCH 2327/2743] 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 2328/2743] 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 2329/2743] 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 2330/2743] 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 2331/2743] 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 2332/2743] 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 2333/2743] 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 2334/2743] 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 2335/2743] 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 2336/2743] 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 2337/2743] 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 2338/2743] 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 2339/2743] 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 2340/2743] 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 2341/2743] 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 2342/2743] 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 2343/2743] 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 2344/2743] 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 2345/2743] 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 79eebad05559adb9a4e7c3de73e3bcdad508729a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 21 Apr 2018 22:34:39 +0200 Subject: [PATCH 2346/2743] Fix incorrect merge --- nixos/modules/security/acme.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index eb705007d028..e430c2ddb903 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -212,7 +212,6 @@ in domain = if data.domain != null then data.domain else cert; cpath = lpath + optionalString (data.activationDelay != null) ".staging"; lpath = "${cfg.directory}/${cert}"; - cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] 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 2347/2743] 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 2348/2743] 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 f7fe61207b57d678e20548bee7d790a885c29df0 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sat, 21 Apr 2018 14:50:07 -0700 Subject: [PATCH 2349/2743] hydra: fix run-time dependencies after latest CPAN update. --- pkgs/development/tools/misc/hydra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 38b28ec0f607..4fdd017306ac 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -27,6 +27,7 @@ let CatalystViewDownload CatalystViewJSON CatalystViewTT + CatalystXRoleApplicator CatalystXScriptServerStarman CryptRandPasswd DBDPg @@ -39,6 +40,7 @@ let FileSlurp IOCompress IPCRun + JSONAny JSONXS LWP LWPProtocolHttps From 355d39c02c532128a3db7c126d807080b74a0322 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 21 Apr 2018 23:58:03 +0200 Subject: [PATCH 2350/2743] 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 2351/2743] 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 2352/2743] 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 2353/2743] 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 2354/2743] 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 2355/2743] 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 2356/2743] 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 2357/2743] 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 2358/2743] 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 2359/2743] 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 2360/2743] 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 3e3b5895ca2088126219559768e412902b137ee0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Apr 2018 22:30:59 +0800 Subject: [PATCH 2361/2743] remarshal: use python3 instead of python2 Officially both python2 and 3 are supported. --- pkgs/development/tools/remarshal/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index baba4fd75ea9..23c9768f7e05 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,7 +1,7 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { - name = "remarshal-${version}"; +python3Packages.buildPythonApplication rec { + pname = "remarshal"; version = "0.7.0"; src = fetchFromGitHub { @@ -11,10 +11,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb"; }; - propagatedBuildInputs = with pythonPackages; [ - dateutil - pytoml - pyyaml + propagatedBuildInputs = with python3Packages; [ + dateutil pytoml pyyaml ]; meta = with stdenv.lib; { From 92f083af238f844a0267531cc25275f80e97622e Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 10:28:11 +1000 Subject: [PATCH 2362/2743] 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 4bf61fa67adfc39e3ee53934ef2a2cf505137a8c Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 25 Mar 2018 23:41:41 -0700 Subject: [PATCH 2363/2743] trezord: Added Trezor Model-T (v2) udev rules --- nixos/modules/services/hardware/trezord.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index fa0496114684..f2ec00a7d3e1 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -26,8 +26,15 @@ in { name = "trezord-udev-rules"; destination = "/etc/udev/rules.d/51-trezor.rules"; text = '' - SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" + # Trezor 1 + SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" + + # Trezor 2 (Model-T) + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + ]; ''; }); From 0eab0596d063534eeb25525f994a451aa126470b Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 11:32:11 +1000 Subject: [PATCH 2364/2743] 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 2365/2743] 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 2366/2743] 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 2367/2743] 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 701f22275c5c54a9cd0db980accb88012578f703 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 22 Apr 2018 08:55:10 +0100 Subject: [PATCH 2368/2743] 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 bf6d796a2763f2f58c8e04f9505478d478de0e97 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 21 Apr 2018 19:37:49 +0200 Subject: [PATCH 2369/2743] haskell: allow overriding all package sets at once Setting haskell.packageOverrides like so: haskell = super.haskell // { packageOverrides = self: super: { my-package = ...; my-other-package = ...; }; }; causes all compiler-specific package sets to be overridden with those overrides. --- doc/languages-frameworks/haskell.section.md | 50 +++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 1623e0d276f2..3b8971c295bb 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -666,6 +666,56 @@ prefer one built with GHC 7.8.x in the first place. However, for users who cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an older version might be useful. +### How to override packages in all compiler-specific package sets + +In the previous section we learned how to override a package in a single +compiler-specific package set. You may have some overrides defined that you want +to use across multiple package sets. To accomplish this you could use the +technique that we learned in the previous section by repeating the overrides for +all the compiler-specific package sets. For example: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packages = super.haskell.packages // { + ghc784 = super.haskell.packages.ghc784.override { + overrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + ghc822 = super.haskell.packages.ghc784.override { + overrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + ... + }; + }; + }; +} +``` + +However there's a more convenient way to override all compiler-specific package +sets at once: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + haskell = super.haskell // { + packageOverrides = self: super: { + my-package = ...; + my-other-package = ...; + }; + }; + }; +} +``` + ### How to recover from GHC's infamous non-deterministic library ID bug GHC and distributed build farms don't get along well: diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f9cd2eb94337..48980e48f1d4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -19,7 +19,10 @@ let inherit pkgs; }; - callPackage = newScope { inherit haskellLib; }; + callPackage = newScope { + inherit haskellLib; + overrides = pkgs.haskell.packageOverrides; + }; bootstrapPackageSet = self: super: { mkDerivation = drv: super.mkDerivation (drv // { @@ -99,6 +102,9 @@ in rec { (name: compiler."${name}".override { enableIntegerSimple = true; })); }; + # Default overrides that are applied to all package sets. + packageOverrides = self : super : {}; + # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { From e9baa47a3b441631e2c124f919416eb827ad662a Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Fri, 13 Apr 2018 17:09:47 +0200 Subject: [PATCH 2370/2743] tribler: 7.0.1 -> 7.0.2 --- pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index f6828fe6f317..aa42af5ccbdd 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -2,13 +2,12 @@ , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { - pname = "tribler"; - name = "${pname}-${version}"; - version = "7.0.1"; + name = "tribler-${version}"; + version = "7.0.2"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4"; + sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42"; }; buildInputs = [ @@ -41,6 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.service-identity pythonPackages.psutil pythonPackages.meliae + pythonPackages.sip ]; postPatch = '' From 81a255dc93a6844070b71f45e8d7141b0e9232dd Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 22 Apr 2018 11:36:25 +0200 Subject: [PATCH 2371/2743] 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 2372/2743] 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 46425a65ac4df2010f9ad1c94f03e4cf95139891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Apr 2018 20:06:36 +0100 Subject: [PATCH 2373/2743] bitcoin-{unlimited,xt}: fix darwin --- .../altcoins/bitcoin-unlimited.nix | 10 ++++++---- pkgs/applications/altcoins/bitcoin-xt.nix | 8 +++++--- pkgs/applications/altcoins/default.nix | 20 +++++++++++++++---- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index d9040377ebe3..5a67dc565aa7 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +, withGui +, Foundation, ApplicationServices, AppKit }: with stdenv.lib; @@ -19,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qrencode ] + ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; patches = [ ./bitcoin-unlimited-const-comparators.patch @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. - + The Bitcoin Unlimited (BU) project seeks to provide a voice to all stakeholders in the Bitcoin ecosystem. @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { If you support an increase in the blocksize limit by any means - or just support Bitcoin conflict resolution as originally envisioned by its founder - - consider running a Bitcoin Unlimited client. + consider running a Bitcoin Unlimited client. ''; homepage = https://www.bitcoinunlimited.info/; maintainers = with maintainers; [ DmitryTsygankov ]; diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index ccc55d17bcf6..feb2924f8651 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent -, withGui }: +, withGui +, Foundation, ApplicationServices, AppKit }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -18,7 +19,8 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib libevent miniupnpc utillinux protobuf curl ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qrencode ] + ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" @@ -36,7 +38,7 @@ stdenv.mkDerivation rec{ Bitcoin XT is an implementation of a Bitcoin full node, based upon the source code of Bitcoin Core. It is built by taking the latest stable Core release, applying a series of patches, and then doing deterministic - builds so anyone can check the downloads correspond to the source code. + builds so anyone can check the downloads correspond to the source code. ''; homepage = https://bitcoinxt.software/; maintainers = with maintainers; [ jefdaj ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 174ff96a1247..c58178e3edbb 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -10,14 +10,26 @@ rec { bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; - bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; - bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; + bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = true; + }; + bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = false; + }; bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; }; - bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; }; + bitcoin-xt = callPackage ./bitcoin-xt.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + boost = boost165; withGui = true; + }; + bitcoind-xt = callPackage ./bitcoin-xt.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + boost = boost165; withGui = false; + }; btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; 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 2374/2743] 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 63901546df7b0b473459ad076c9dd190b5a0aba7 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 21 Apr 2018 18:46:44 +0200 Subject: [PATCH 2375/2743] canonicaljson: separating from pythonPackages --- .../python-modules/canonicaljson/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +----------- 2 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/canonicaljson/default.nix diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix new file mode 100644 index 000000000000..b7fd01472aab --- /dev/null +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, frozendict, simplejson, six +}: + +buildPythonPackage rec { + pname = "canonicaljson"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6"; + }; + + propagatedBuildInputs = [ + frozendict simplejson six + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/matrix-org/python-canonicaljson; + description = "Encodes objects and arrays as RFC 7159 JSON."; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2465a8e2f22..878292cb2025 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16638,20 +16638,7 @@ EOF }; }; - canonicaljson = buildPythonPackage rec { - name = "canonicaljson-${version}"; - version = "1.1.3"; - - src = pkgs.fetchgit { - url = "https://github.com/matrix-org/python-canonicaljson.git"; - rev = "refs/tags/v${version}"; - sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy"; - }; - - propagatedBuildInputs = with self; [ - frozendict simplejson six - ]; - }; + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; daemonize = buildPythonPackage rec { name = "daemonize-${version}"; From ce3961cc70d506838084834c22e29983899c5011 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 20 Apr 2018 22:37:06 +0200 Subject: [PATCH 2376/2743] python-frozendict: 0.5 -> 1.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 878292cb2025..1de6d8bafa3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2558,11 +2558,11 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; frozendict = buildPythonPackage rec { - name = "frozendict-0.5"; + name = "frozendict-1.2"; src = pkgs.fetchurl { url = "mirror://pypi/f/frozendict/${name}.tar.gz"; - sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n"; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; }; meta = { From 2749531e0f1a76c7e611ce8a7f553de337c1f8e9 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Sat, 21 Apr 2018 18:48:10 +0200 Subject: [PATCH 2377/2743] frozendict: move to separate module --- .../python-modules/frozendict/default.nix | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +-------------- 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/frozendict/default.nix diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix new file mode 100644 index 000000000000..4ec8eff70c6d --- /dev/null +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "frozendict"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/slezica/python-frozendict; + description = "An immutable dictionary"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1de6d8bafa3f..b4028e01a4e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2557,20 +2557,7 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - frozendict = buildPythonPackage rec { - name = "frozendict-1.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/frozendict/${name}.tar.gz"; - sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; - }; - - meta = { - homepage = https://github.com/slezica/python-frozendict; - description = "An immutable dictionary"; - license = stdenv.lib.licenses.mit; - }; - }; + frozendict = callPackage ../development/python-modules/frozendict { }; ftputil = callPackage ../development/python-modules/ftputil { }; 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 2378/2743] 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 2379/2743] 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 2380/2743] 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 2381/2743] 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 2382/2743] 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 2383/2743] 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 ae4dac3e5c787044ef9639be61d6a22f087541c2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 22 Apr 2018 09:10:25 -0700 Subject: [PATCH 2384/2743] openmpi: 3.0.0 -> 3.0.1 --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 9aca076c5dcb..2d3b9780090d 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -9,14 +9,14 @@ let majorVersion = "3.0"; - minorVersion = "0"; + minorVersion = "1"; in stdenv.mkDerivation rec { name = "openmpi-${majorVersion}.${minorVersion}"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "1mw2d94k6mp4scg1wnkj50vdh734fy5m2ygyrj65s4mh3prbz6gn"; + sha256 = "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36"; }; postPatch = '' From 0c9aaf0814a099b56dd9829fe47d702bddcdf50f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 20:48:46 +0200 Subject: [PATCH 2385/2743] rankwidth: init at 0.7 --- .../science/math/rankwidth/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/science/math/rankwidth/default.nix diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix new file mode 100644 index 000000000000..f38fce5831ee --- /dev/null +++ b/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "rankwidth"; + version = "0.7"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mirrors.mit.edu/sage/spkg/upstream/rw/rw-${version}.tar.gz"; + sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0"; + }; + + configureFlags = [ + "--enable-executable=no" # no igraph dependency + ]; + + # check phase is empty for now (as of version 0.7) + doCheck = true; + + meta = with stdenv.lib; { + description = "Calculates rank-width and rank-decompositions"; + license = with 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 1e22c7e93a79..c227e2367da7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19904,6 +19904,8 @@ with pkgs; planarity = callPackage ../development/libraries/science/math/planarity { }; + rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; + fenics = callPackage ../development/libraries/science/math/fenics { inherit (python3Packages) numpy ply pytest python six sympy; pythonPackages = python3Packages; From 7c90a8677090bb144cc8db17aaf485def8d54a91 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 1 Apr 2018 18:22:14 +0300 Subject: [PATCH 2386/2743] 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 28c023e2466b2fa65358a97a991f55e52d30818c Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 21:06:03 +0200 Subject: [PATCH 2387/2743] zn_poly: init at 0.9 --- .../science/math/zn_poly/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/science/math/zn_poly/default.nix diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix new file mode 100644 index 000000000000..bc322d4c5341 --- /dev/null +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, gmp +, python2 +}: + +stdenv.mkDerivation rec { + version = "0.9"; + pname = "zn_poly"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/releases/zn_poly-${version}.tar.gz"; + sha256 = "1kxl25av7i3v68k32hw5bayrfcvmahmqvs97mlh9g238gj4qb851"; + }; + + buildInputs = [ + gmp + ]; + + nativeBuildInputs = [ + python2 # needed by ./configure to create the makefile + ]; + + libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}"; + + # Tuning (either autotuning or with hand-written paramters) is possible + # but not implemented here. + # It seems buggy anyways (see homepage). + buildFlags = [ "all" libname ]; + + + # `make install` fails to install some header files and the lib file. + installPhase = '' + mkdir -p "$out/include/zn_poly" + mkdir -p "$out/lib" + cp "${libname}" "$out/lib" + cp include/*.h "$out/include/zn_poly" + ''; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/; + description = "Polynomial arithmetic over Z/nZ"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 199f6e878ff5..9c10e7a4fdd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19832,6 +19832,8 @@ with pkgs; gmsh = callPackage ../applications/science/math/gmsh { }; + zn_poly = callPackage ../development/libraries/science/math/zn_poly { }; + ### SCIENCE/MOLECULAR-DYNAMICS lammps = callPackage ../applications/science/molecular-dynamics/lammps { From 7de43f38e07d29a5b0c3c91f96724c330929029a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 22 Apr 2018 16:38:27 +0000 Subject: [PATCH 2388/2743] 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 2389/2743] 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 2390/2743] 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 From 0f92afdd6d4ead5abc929e6954350e684edbc843 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 22 Apr 2018 22:43:39 +0300 Subject: [PATCH 2391/2743] diskrsync: fix argv0 When using diskrsync over SSH, on the remote machine it calls an executable equal to argv0. Typically, this is just diskrsync but now that diskrsync is wrapped, the wrapper uses absolute path to diskrsync and that path doesn't most likely work on the remote machine. Thus, we need to force argv0 to "diskrsync" so that it works on the remote machine. --- pkgs/tools/backup/diskrsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 2e86ad0deda8..3a5ffc30f8f2 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preFixup = '' - wrapProgram "$bin/bin/diskrsync" --prefix PATH : ${openssh}/bin + wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin ''; meta = with stdenv.lib; { From 14cab1ac57b44decdbf12a854f9cddd02af54004 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 22 Apr 2018 16:02:57 -0400 Subject: [PATCH 2392/2743] nixos-enter: Ensures presence of full /sys tree. This partially reverts a change from e88f28965a7d76e83478d3ae6fcddc165b1c94f1 which removed the `mount --rbind /sys`. While true that the activation scripts will mount `sysfs` at `/sys`, none of the mountpoints lower in the `/sys` tree are handled by the activation script, which includes `efivarfs`. This fixes #38477 since it ensures the presence of `efivarfs` in the `/sys` tree, which is why the systemd-boot installation failed. --- nixos/modules/installer/tools/nixos-enter.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 679391189612..518dbbbf21e3 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -51,8 +51,9 @@ if [[ ! -e $mountPoint/etc/NIXOS ]]; then exit 126 fi -mkdir -m 0755 -p "$mountPoint/dev" +mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/sys" mount --rbind /dev "$mountPoint/dev" +mount --rbind /sys "$mountPoint/sys" # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true From ef47a5846ca56df999235c8ba7da04eda6d8f7af Mon Sep 17 00:00:00 2001 From: Balletie Date: Sun, 22 Apr 2018 22:43:21 +0200 Subject: [PATCH 2393/2743] pythonPackages.html5-parser: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/html5-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index faddfe2bfddb..ae036d33f9ed 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.4"; + version = "0.4.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5"; + sha256 = "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9"; }; nativeBuildInputs = [ pkgconfig ]; From b577f3292ebc98de91297fb24ed6ef3c2a95cb93 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Apr 2018 15:46:12 -0500 Subject: [PATCH 2394/2743] mono: allow custom meta in generic --- pkgs/development/compilers/mono/generic.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 3b476bce0273..a62f2f24dd87 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -5,13 +5,15 @@ , version, sha256 , withLLVM ? false , enableParallelBuilding ? true +, meta ? {} }: let llvm = callPackage ./llvm.nix { }; -in -stdenv.mkDerivation rec { name = "mono-${version}"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { inherit sha256; @@ -91,5 +93,5 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.x86; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? - }; + } // meta; } From 6e0a68b1e6bd8decfb78ea5cc0b21d9c65fc3058 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Apr 2018 15:46:51 -0500 Subject: [PATCH 2395/2743] mono: add knownVulnerabilities for 4.0.4 http://www.mono-project.com/docs/about-mono/vulnerabilities/#string-to-double-parser-bug --- pkgs/development/compilers/mono/4.0.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix index 8621751e5a14..f13883db74ff 100644 --- a/pkgs/development/compilers/mono/4.0.nix +++ b/pkgs/development/compilers/mono/4.0.nix @@ -3,4 +3,7 @@ callPackage ./generic.nix (rec { inherit Foundation libobjc; version = "4.0.4.1"; sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd"; + meta = { + knownVulnerabilities = [ "CVE-2009-0689" ]; + }; }) From 6a4cc3562cf6e41272e542f3aeb7ae46cec45ecc Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 22 Apr 2018 15:57:51 -0500 Subject: [PATCH 2396/2743] Revert "initial TBS driver" --- pkgs/os-specific/linux/tbs/default.nix | 50 -------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 52 deletions(-) delete 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 deleted file mode 100644 index e4b954d4dbf5..000000000000 --- a/pkgs/os-specific/linux/tbs/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 1e22c7e93a79..5bd83347ab09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13501,8 +13501,6 @@ 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 69f23d9e730afd135a0342394869470453979dc9 Mon Sep 17 00:00:00 2001 From: Corbin Simpson Date: Sun, 22 Apr 2018 14:42:20 -0700 Subject: [PATCH 2397/2743] enhanced-ctorrent: fix CVE-2009-1759 (#39311) Patches from Debian. --- .../networking/enhanced-ctorrent/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index fedbfeb957ce..2cfde73a01a6 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -1,13 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { version = "dnh3.3.2"; name = "enhanced-ctorrent"; + src = fetchurl { url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz"; sha256 = "0qs8waqwllk56i3yy3zhncy7nsnhmf09a494p5siz4vm2k4ncwy8"; }; + # These patches come from Debian and fix CVE-2009-1759. + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/cve-security-fix.diff"; + sha256 = "1qkzzm8sfspbcs10azmmif4qcr7pr8r38dsa2py84lsjm1yi3kls"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/FTBFS-fix.diff"; + sha256 = "1m3zh96xwqjjzsbg62f7kx0miams58nys1f484qhdn870b5x9p06"; + }) + ]; + meta = { description = "BitTorrent client written in C++"; longDescription = '' From 1dbdffa0994d00d2b10485b40eb355cc28e96cc1 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 22 Apr 2018 23:13:05 +0200 Subject: [PATCH 2398/2743] arb: 2.8.1 -> 2.13.0 --- pkgs/development/libraries/arb/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index c4b37ddb78fd..a59641e99d39 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -2,15 +2,21 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; - version = "2.8.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = "${pname}"; rev = "${version}"; - sha256 = "15phk71ci9rr32aqznpkd2b993wjahsgliilkg4mnxsr86nwdf6x"; + sha256 = "1fl9gmxf6c1cphk5r8jbys5pywj2rfm705kv0055i0aqc6hrv303"; }; buildInputs = [mpir gmp mpfr flint]; - configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}"; + configureFlags = [ + "--with-gmp=${gmp}" + "--with-mpir=${mpir}" + "--with-mpfr=${mpfr}" + "--with-flint=${flint}" + ]; + doCheck = true; meta = { inherit version; description = ''A library for arbitrary-precision interval arithmetic''; From a05581674300579d5da75346e6576d8d65e6bf2c Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 22 Apr 2018 23:37:04 +0200 Subject: [PATCH 2399/2743] eclib: 20160720 -> 20171002 --- pkgs/development/libraries/eclib/default.nix | 39 ++++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 3651b9e7660e..dbe487368dc5 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,21 +1,44 @@ -{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook -, pari, ntl, gmp}: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, gettext +, pari +, ntl +, gmp +# "FLINT is optional and only used for one part of sparse matrix reduction, +# which is used in the modular symbol code but not mwrank or other elliptic +# curve programs." -- https://github.com/JohnCremona/eclib/blob/master/README +, withFlint ? false, flint ? null +}: + +assert withFlint -> flint != null; + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20160720"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + version = "20171002"; src = fetchFromGitHub { owner = "JohnCremona"; repo = "${pname}"; - rev = "${version}"; - sha256 = "0qrcd5c8cqhw9f14my6k6013w8li5vdigrjvchkr19n2l8g75j0h"; + rev = "v${version}"; + sha256 = "092an90405q9da0k0z5jfp5rng9jl0mqbvsbv4fx6jc9ykfcahsj"; }; - buildInputs = [pari ntl gmp]; - nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook]; + buildInputs = [ + pari + ntl + gmp + ] ++ stdenv.lib.optionals withFlint [ + flint + ]; + nativeBuildInputs = [ + autoreconfHook + ]; + doCheck = true; meta = { inherit version; description = ''Elliptic curve tools''; + homepage = https://github.com/JohnCremona/eclib; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; From 9e9cc471b663ae318fbddd98232137640500c195 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 22 Apr 2018 18:24:44 -0400 Subject: [PATCH 2400/2743] dejavu-fonts: fix missing Perl IOString dependency (#39341) Per the docs, IOString was recently added as a dependency: https://github.com/dejavu-fonts/dejavu-fonts/blob/master/BUILDING.md As-is, attempting to rebulid from source errors out with this missing perl module. --- pkgs/data/fonts/dejavu-fonts/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 23158a38f218..251654e2d58d 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,4 +1,4 @@ -{fetchFromGitHub, stdenv, fontforge, perl, FontTTF}: +{ fetchFromGitHub, stdenv, fontforge, perl, perlPackages }: let version = "2.37"; @@ -25,7 +25,7 @@ let full-ttf = stdenv.mkDerivation { name = "dejavu-fonts-full-${version}"; - nativeBuildInputs = [fontforge perl FontTTF]; + nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF]; src = fetchFromGitHub { owner = "dejavu-fonts"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bd83347ab09..d07ac59c80f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14241,9 +14241,7 @@ with pkgs; crimson = callPackage ../data/fonts/crimson {}; - dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { - inherit (perlPackages) FontTTF; - }); + dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {}); # solve collision for nix-env before https://github.com/NixOS/nix/pull/815 dejavu_fontsEnv = buildEnv { From bc7c7b2b09ed93910a24645e284250351c9d023d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Apr 2018 23:44:29 +0100 Subject: [PATCH 2401/2743] zfs: mark as broken for 4.16 --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a467b457f236..bdc43a092f7f 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -153,7 +153,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to the latest release. version = "0.7.8"; From 63507ada7d8d53434c5d01ab1a94bed8d1d66ee6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 22 Apr 2018 18:43:40 -0500 Subject: [PATCH 2402/2743] calc: cleanup expression Fixes #39321 (Still needs testing on Linux) --- .../science/math/calc/default.nix | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index efd38f053451..9d95960bde27 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -1,47 +1,49 @@ -{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, utillinux }: +{ stdenv, lib, fetchurl, utillinux, makeWrapper +, enableReadline ? true, readline, ncurses }: -with stdenv.lib; -let - makeFlags = '' - INCDIR=${glibc.dev}/include \ - BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \ - USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \ - TERMCONTROL=-DUSE_TERMIOS \ - ''; -in stdenv.mkDerivation rec { - name = "calc-${version}"; version = "2.12.6.6"; src = fetchurl { - url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"; + urls = [ + "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2" + "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2" + ]; sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5"; }; - buildInputs = [ makeWrapper readline ncurses utillinux ]; - - configurePhase = '' - sed -i 's/all: check_include/all:/' Makefile + patchPhase = '' + substituteInPlace Makefile \ + --replace 'all: check_include' 'all:' \ + --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \ + --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' ''; - buildPhase = '' - make ${makeFlags} - ''; + buildInputs = [ utillinux makeWrapper ] + ++ lib.optionals enableReadline [ readline ncurses ]; - installPhase = '' - make install ${makeFlags} - wrapProgram $out/bin/calc --prefix LD_LIBRARY_PATH : $out/lib - ''; + makeFlags = [ + "T=$(out)" + "INCDIR=${lib.getDev stdenv.cc.libc}/include" + "BINDIR=/bin" + "LIBDIR=/lib" + "CALC_SHAREDIR=/share/calc" + "CALC_INCDIR=/include" + "MANDIR=/share/man/man1" - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; + # Handle LDFLAGS defaults in calc + "DEFAULT_LIB_INSTALL_PATH=$(out)/lib" + ] ++ lib.optionals enableReadline [ + "READLINE_LIB=-lreadline" + "USE_READLINE=-DUSE_READLINE" + ]; - meta = { + meta = with lib; { description = "C-style arbitrary precision calculator"; homepage = http://www.isthe.com/chongo/tech/comp/calc/; license = licenses.lgpl21; - maintainers = [ ]; + maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; }; } From afd3dbcce8ef99ea806675569a9dc86bf9b1e7e4 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Sun, 22 Apr 2018 21:29:19 -0400 Subject: [PATCH 2403/2743] vmTools: update Debian 9 names and hashes --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8e8b88a9bd2d..08d0a358e61f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -997,22 +997,22 @@ rec { }; debian9i386 = { - name = "debian-9.3-stretch-i386"; - fullName = "Debian 9.3 Stretch (i386)"; + name = "debian-9.4-stretch-i386"; + fullName = "Debian 9.4 Stretch (i386)"; packagesList = fetchurl { url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz; - sha256 = "1rpv0r92pkr9dmjvpffvgmq3an1s83npfmq870h67jqag3qpwj9l"; + sha256 = "05z5ccg4ysbrgallhai53sh83i0364w7a3fdq84dpv1li059jf10"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian9x86_64 = { - name = "debian-9.3-stretch-amd64"; - fullName = "Debian 9.3 Stretch (amd64)"; + name = "debian-9.4-stretch-amd64"; + fullName = "Debian 9.4 Stretch (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz; - sha256 = "1gnkvh7wc5yp0rw8kq8p8rlskvl0lc4cv3gdylw8qpqzy75xqlig"; + sha256 = "19j0c54b1b9lbk9fv2c2aswdh0s2c3klf97zrlmsz4hs8wm9jylq"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 23ccc6904a5cd6f958a35e0e547bd65ed086f2bb Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 23 Apr 2018 11:00:33 +0800 Subject: [PATCH 2404/2743] bftpd: minor cleanups --- pkgs/servers/ftp/bftpd/default.nix | 34 ++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 38fb7d250e34..c35177e6aa90 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -1,24 +1,36 @@ -{stdenv, fetchurl}: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +{ stdenv, fetchurl }: + +let pname = "bftpd"; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; version = "4.9"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; sha256 = "13pjil9cjggpi773m0516lszyqvwzlgcrmmj8yn9nc24rbxwvn6d"; }; - buildInputs = []; + preConfigure = '' sed -re 's/-[og] 0//g' -i Makefile* ''; - meta = { + + postInstall = '' + mkdir -p $out/share/doc/${pname} + mv $out/etc/*.conf $out/share/doc/${pname} + rm -rf $out/{etc,var} + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { inherit version; - description = ''A minimal ftp server''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = http://bftpd.sf.net/; + description = "A minimal ftp server"; downloadPage = "http://bftpd.sf.net/download.html"; + homepage = http://bftpd.sf.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } From 1faea2934b9a46d0fbf1a605a01c356f9d0da94a Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 22 Apr 2018 10:28:11 +1000 Subject: [PATCH 2405/2743] nix-pin: 0.1.2 -> 0.2.2 and add updateScript --- .../package-management/nix-pin/default.nix | 33 ++++++++++++++----- 1 file changed, 24 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..bb3a1faa0c3b 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,27 @@ 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 + defaults = import "${self}/share/nix/defaults.nix"; + in { + api = { pinConfig ? defaults.pinConfig }: + let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in + { inherit (impl) 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"; description = "nixpkgs development utility"; From 5f82c322d64eaa2c10ff6bbcd3a00b6025632bbb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 Apr 2018 09:16:03 +0200 Subject: [PATCH 2406/2743] eff: 20140928 -> 5.0 (#39264) --- pkgs/development/interpreters/eff/default.nix | 23 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/ocaml-packages.nix | 2 -- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 28ea05066c23..258aebe81727 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }: +{ stdenv, fetchFromGitHub, which, ocamlPackages }: -let inherit (stdenv.lib) getVersion versionAtLeast; in - -assert versionAtLeast (getVersion ocaml) "3.12"; +let version = "5.0"; in stdenv.mkDerivation { - name = "eff-20140928"; + name = "eff-${version}"; - src = fetchgit { - url = "https://github.com/matijapretnar/eff.git"; - rev = "90f884a790fddddb51d4d1d3b7c2edf1e8aabb64"; - sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm"; + src = fetchFromGitHub { + owner = "matijapretnar"; + repo = "eff"; + rev = "v${version}"; + sha256 = "1fslfj5d7fhj3f7kh558b8mk5wllwyq4rnhfkyd96fpy144sdcka"; }; - buildInputs = [ ocaml findlib ocamlbuild menhir which ]; + buildInputs = [ which ] ++ (with ocamlPackages; [ + ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild + ]); doCheck = true; checkTarget = "test"; @@ -29,7 +30,7 @@ stdenv.mkDerivation { backtracking, multi-threading, and much more... ''; license = licenses.bsd2; - platforms = ocaml.meta.platforms or []; + inherit (ocamlPackages.ocaml.meta) platforms; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d07ac59c80f1..35e320dc31fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2089,6 +2089,8 @@ with pkgs; edk2 = callPackage ../development/compilers/edk2 { }; + eff = callPackage ../development/interpreters/eff { }; + eflite = callPackage ../applications/audio/eflite {}; eid-mw = callPackage ../tools/security/eid-mw { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 72bcc45c48e6..f095ccb34ab5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,8 +217,6 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; - eff = callPackage ../development/interpreters/eff { }; - eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; js_of_ocaml = js_of_ocaml_2; From a586011b58963c42a7854fae61b12ef4ae7e4de4 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Mon, 23 Apr 2018 09:33:09 +0200 Subject: [PATCH 2407/2743] firefox-wrapper: fix icon linking (#39315) don't try to link non-existing icons --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8f07415db5f2..45917bf65c1e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -132,8 +132,10 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - ln -s "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" \ + icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" ) + if [ -e "$icon" ]; then ln -s "$icon" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" + fi done fi From e7ee85199310071d899d73709534f1055d1a17f6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 09:19:35 +0200 Subject: [PATCH 2408/2743] gmime3: 3.0.5 -> 3.2.0 --- pkgs/development/libraries/gmime/3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 66d0cf88bd02..124fc08cf3bd 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.0.5"; + version = "3.2.0"; name = "gmime-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gmime/3.0/${name}.tar.xz"; - sha256 = "1q45gd1ahnz9q1milc2lqqwl7j3q0wd6kiswhp25iak222n56lrg"; + url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz"; + sha256 = "1q6palbpf6lh6bvy9ly26q5apl5k0z0r4mvl6zzqh90rz4rn1v3m"; }; outputs = [ "out" "dev" ]; From f396f0937e69f843187e5c899e8e6a21123ec2ec Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 25 Dec 2017 15:20:42 +0100 Subject: [PATCH 2409/2743] pythonPackages.milksnake: init at 0.1.5 --- .../python-modules/milksnake/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/milksnake/default.nix diff --git a/pkgs/development/python-modules/milksnake/default.nix b/pkgs/development/python-modules/milksnake/default.nix new file mode 100644 index 000000000000..014bb223225d --- /dev/null +++ b/pkgs/development/python-modules/milksnake/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, cffi }: + +buildPythonPackage rec { + pname = "milksnake"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "120nprd8lqis7x7zy72536gk2j68f7gxm8gffmx8k4ygifvl7kfz"; + }; + + propagatedBuildInputs = [ + cffi + ]; + + # tests rely on pip/venv + doCheck = false; + + meta = with lib; { + description = "A python library that extends setuptools for binary extensions"; + homepage = https://github.com/getsentry/milksnake; + license = licenses.asl20; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ca134a413f9..5e35996a0a03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9452,6 +9452,8 @@ in { micawber = callPackage ../development/python-modules/micawber { }; + milksnake = callPackage ../development/python-modules/milksnake { }; + minimock = buildPythonPackage rec { version = "1.2.8"; name = "minimock-${version}"; From 7f693c2fda272094e3e3990e6074f68f1cd91ccc Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Mon, 23 Apr 2018 10:56:41 +0300 Subject: [PATCH 2410/2743] xonsh: 0.6.0 -> 0.6.1 --- pkgs/shells/xonsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index d22a66eb93ae..a923602cdd76 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "0hfsan22i81wffx2xbamm8wwkxgpv12z4kfl37p9m22vpqgg0fdg"; + sha256= "0lxjklwj267q0ikqab8p743sjvm44gq1w7mp80c7hgrn2ndvrypg"; }; LC_ALL = "en_US.UTF-8"; @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A Python-ish, BASHwards-compatible shell"; - homepage = http://xonsh.org; + homepage = http://xon.sh/; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt garbas vrthra ]; platforms = platforms.all; From 49f55fa3375910259a7d9ba813121c3ca4096506 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 25 Dec 2017 15:20:57 +0100 Subject: [PATCH 2411/2743] vdirsyncer: 0.16.4 -> 0.17.0a2 --- pkgs/tools/misc/vdirsyncer/default.nix | 51 +++++++++++++++++++++----- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 9d1e4096776a..9e9ded5c3a76 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchurl, python3Packages, glibcLocales }: +{ stdenv, python3Packages, glibcLocales, rustPlatform }: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst let pythonPackages = python3Packages; -in -pythonPackages.buildPythonApplication rec { - version = "0.16.4"; - name = "vdirsyncer-${version}"; - - src = fetchurl { - url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "03wva48bgv1ad3df6plc9b8xxh6k8bcaxrhlzwh81c9mzn5bspzv"; + version = "0.17.0a2"; + pname = "vdirsyncer"; + name = pname + "-" + version; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0y464rsx5la6bp94z2g0nnkbl4nwfya08abynvifw4c84vs1gr4q"; }; + native = rustPlatform.buildRustPackage { + name = name + "-native"; + inherit src; + sourceRoot = name + "/rust"; + cargoSha256 = "1cr7xs11gbsc3x5slga9qahchwc22qq49amf28g4jgs9lzf57qis"; + postInstall = '' + mkdir $out/include $out/lib + cp $out/bin/libvdirsyncer_rustext* $out/lib + rm -r $out/bin + cp target/vdirsyncer_rustext.h $out/include + ''; + }; +in pythonPackages.buildPythonApplication rec { + inherit version pname src; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading @@ -20,14 +32,33 @@ pythonPackages.buildPythonApplication rec { requests requests_oauthlib # required for google oauth sync atomicwrites + milksnake ]; - buildInputs = with pythonPackages; [hypothesis pytest pytest-localserver pytest-subtesthack setuptools_scm ] ++ [ glibcLocales ]; + buildInputs = with pythonPackages; [ setuptools_scm ]; + + checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ]; + + postPatch = '' + sed -i "/cargo build/d" Makefile + ''; + + preBuild = '' + mkdir -p rust/target/release + ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ + ln -s ${native}/include/vdirsyncer_rustext.h rust/target/ + ''; LC_ALL = "en_US.utf8"; + preCheck = '' + ln -sf ../dist/tmpbuild/vdirsyncer/vdirsyncer/_native__lib.so vdirsyncer + ''; + checkPhase = '' + runHook preCheck make DETERMINISTIC_TESTS=true test + runHook postCheck ''; meta = with stdenv.lib; { From 85dfd4b41c2525e758f66579c1ff77800c63234d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 23 Apr 2018 10:30:57 +0200 Subject: [PATCH 2412/2743] slop: 7.3.49 -> 7.4 --- pkgs/tools/misc/slop/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index ad1c2b64e65d..f411bbd2c300 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glew, glm, libGLU_combined, libX11, libXext, libXrender, cppcheck, icu}: +, glew, glm, libGLU_combined, libX11, libXext, libXrender, icu +, cppcheck +}: stdenv.mkDerivation rec { name = "slop-${version}"; - version = "7.3.49"; + version = "7.4"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "0is3mh2d1jqgvv72v5x92w23yf26n8n384nbr1b6cn883aw8j7jz"; + sha256 = "0fgd8a2dqkg64all0f96sca92sdss9r3pzmv5kck46b99z2325z6"; }; nativeBuildInputs = [ cmake pkgconfig ]; From cd1eefcd29a8cad8056166658cddbb8b53c0794e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 23 Apr 2018 10:31:14 +0200 Subject: [PATCH 2413/2743] maim: 5.4.68 -> 5.5 --- pkgs/tools/graphics/maim/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index c7e8dc966e8d..cac86e29c472 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, zlib, libpng, libjpeg -, libGLU_combined, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: +, zlib, libpng, libjpeg, libGLU_combined, glm +, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu +}: stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.4.68"; + version = "5.5"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "12jvfxzfhh6cbk6ygliwnkvm3mb7rca60k6x9qdzm17jsz65xhh0"; + sha256 = "0dr44lwqsvhwf9pncxq6k42zj9hj07b96qsk1q8vh4l42zcpqzla"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = - [ zlib libpng libjpeg libGLU_combined glm libX11 libXext libXfixes libXrandr - libXcomposite slop icu ]; + [ zlib libpng libjpeg libGLU_combined glm + libX11 libXext libXfixes libXrandr libXcomposite slop icu ]; doCheck = false; From 9b5793790eb1b12fe4aa6b2ec259b3b5f9e8ba01 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 23 Apr 2018 10:49:47 +0200 Subject: [PATCH 2414/2743] motuclient: 1.4.00 -> 1.5.00 --- pkgs/applications/science/misc/motu-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix index 0d5c79fde900..0994bb1ca38d 100644 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ b/pkgs/applications/science/misc/motu-client/default.nix @@ -1,11 +1,11 @@ { python27Packages, fetchurl, lib } : python27Packages.buildPythonApplication rec { - name = "motu-client-${version}"; - version = "1.4.00"; + pname = "motu-client"; + version = "1.5.00"; src = fetchurl { url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; - sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb"; + sha256 = "1iqsws3wa2gpb36ms21xmaxfi83i8p8cdya4cxpn4r47c8mz74x8"; }; meta = with lib; { From 4cd88807d8434efdc3fb666767098e2b3ee0b812 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Apr 2018 22:32:09 +0800 Subject: [PATCH 2415/2743] home-assistant: make port configurable so we can use it elsewhere Additionally, some settings based on NixOS configuation is set via defaultConfig which is then merged with the user provided configration. For now that just means http port and time zone but others can easily be added. --- .../modules/services/misc/home-assistant.nix | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index ac37c11106ef..07b14bb67643 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -5,7 +5,9 @@ with lib; let cfg = config.services.home-assistant; - configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config); + configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig + then (lib.recursiveUpdate defaultConfig (if (isNull cfg.config) then {} else cfg.config)) + else cfg.config)); availableComponents = pkgs.home-assistant.availableComponents; @@ -38,6 +40,12 @@ let then (cfg.package.override { inherit extraComponents; }) else cfg.package; + # If you are changing this, please update the description in applyDefaultConfig + defaultConfig = { + homeassistant.time_zone = config.time.timeZone; + http.server_port = (toString cfg.port); + }; + in { meta.maintainers = with maintainers; [ dotlambda ]; @@ -50,6 +58,26 @@ in { description = "The config directory, where your configuration.yaml is located."; }; + port = mkOption { + default = 8123; + type = types.int; + description = "The port on which to listen."; + }; + + applyDefaultConfig = mkOption { + default = true; + type = types.bool; + description = '' + Setting this option enables a few configuration options for HA based on NixOS configuration (such as time zone) to avoid having to manually specify configuration we already have. + + + Currently one side effect of enabling this is that the http component will be enabled. + + + This only takes effect if config != null in order to ensure that a manually managed configuration.yaml is not overwritten. + ''; + }; + config = mkOption { default = null; type = with types; nullOr attrs; @@ -110,15 +138,14 @@ in { ln -s ${configFile} ${cfg.configDir}/configuration.yaml ''; serviceConfig = { - ExecStart = '' - ${package}/bin/hass --config "${cfg.configDir}" - ''; + ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; User = "hass"; Group = "hass"; Restart = "on-failure"; ProtectSystem = "strict"; ReadWritePaths = "${cfg.configDir}"; PrivateTmp = true; + RemoveIPC = true; }; path = [ "/run/wrappers" # needed for ping From b886faa6b60eb67bc9c09484673998924083c12b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Apr 2018 22:33:32 +0800 Subject: [PATCH 2416/2743] home-assistant: use remarshal to convert configuration to YAML HA doesn't mind the configuration being JSON instead of YAML but since YAML is the official language, use that as it allows users to easily exchange config data with other parties in the community. --- nixos/modules/services/misc/home-assistant.nix | 6 ++++-- nixos/tests/home-assistant.nix | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 07b14bb67643..b9a972967792 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -134,8 +134,10 @@ in { description = "Home Assistant"; after = [ "network.target" ]; preStart = lib.optionalString (cfg.config != null) '' - rm -f ${cfg.configDir}/configuration.yaml - ln -s ${configFile} ${cfg.configDir}/configuration.yaml + config=${cfg.configDir}/configuration.yaml + rm -f $config + ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config + chmod 444 $config ''; serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 2e45dc78471f..4ebccb7ab868 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -51,9 +51,9 @@ in { startAll; $hass->waitForUnit("home-assistant.service"); - # Since config is specified using a Nix attribute set, - # configuration.yaml is a link to the Nix store - $hass->succeed("test -L ${configDir}/configuration.yaml"); + # The config is specified using a Nix attribute set, + # but then converted from JSON to YAML + $hass->succeed("test -f ${configDir}/configuration.yaml"); # Check that Home Assistant's web interface and API can be reached $hass->waitForOpenPort(8123); From a8f9fc1c1647d1407863a34ece572db428e7fb3b Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Apr 2018 18:53:31 +0200 Subject: [PATCH 2417/2743] pythonPackages.flask-autoindex: init at 0.6 --- .../flask-autoindex/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/flask-autoindex/default.nix diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix new file mode 100644 index 000000000000..397d1e03ee82 --- /dev/null +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, buildPythonPackage +, fetchpatch +, fetchPypi +, flask +, flask-silk +, future +}: + +buildPythonPackage rec { + pname = "Flask-AutoIndex"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "19b10mb1nrqfjyafki6wnrbn8mqi30bbyyiyvp5xssc74pciyfqs"; + }; + + propagatedBuildInputs = [ + flask + flask-silk + future + ]; + + patches = [ + # fix generated binary, see https://github.com/sublee/flask-autoindex/pull/32 + (fetchpatch { + name = "fix_binary.patch"; + url = "https://github.com/sublee/flask-autoindex/pull/32.patch"; + sha256 = "1v2r0wvi7prhipjq89774svv6aqj0a13mdfj07pdlkpzfbf029dn"; + }) + ]; + + meta = with stdenv.lib; { + description = "The mod_autoindex for Flask"; + longDescription = '' + Flask-AutoIndex generates an index page for your Flask application automatically. + The result is just like mod_autoindex, but the look is more awesome! + ''; + license = licenses.bsd2; + maintainers = with maintainers; [ timokau ]; + homepage = http://pythonhosted.org/Flask-AutoIndex/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b1877875344..2eab753e491f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5533,6 +5533,8 @@ in { flask_assets = callPackage ../development/python-modules/flask-assets { }; + flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; + flask-babel = callPackage ../development/python-modules/flask-babel { }; flask_cache = buildPythonPackage rec { From 2becf90c935ae8849add008d4198c2d7392818d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 23 Apr 2018 13:26:57 +0200 Subject: [PATCH 2418/2743] knot-resolver: 2.2.0 -> 2.3.0 (security) Contains fixes for CVE-2018-1110. --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 09fda1b81b8b..1a5577e81655 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "1yhlwvpl81klyfb8hhvrhii99q7wvydi3vandmq9j7dvig6z1dvv"; + sha256 = "2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b"; }; outputs = [ "out" "dev" ]; From 1b4027c6fcaf73b7e1ed83bbe728827a83f1be47 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 12:08:24 +0200 Subject: [PATCH 2419/2743] abootimg: init at 0.6 --- pkgs/development/mobile/abootimg/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/mobile/abootimg/default.nix diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix new file mode 100644 index 000000000000..a2ddda34347a --- /dev/null +++ b/pkgs/development/mobile/abootimg/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, utillinux }: + +let + version = "0.6"; +in +stdenv.mkDerivation { + name = "abootimg-${version}"; + + src = fetchFromGitHub { + owner = "ggrandou"; + repo = "abootimg"; + rev = "7e127fee6a3981f6b0a50ce9910267cd501e09d4"; + sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a"; + }; + + nativeBuildInputs = [ makeWrapper utillinux ]; + + postPatch = '' + cat < version.h + #define VERSION_STR "${version}" + EOF + ''; + + installPhase = '' + mkdir -p $out/bin + install -D -m 755 abootimg $out/bin + install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1; + + install -D -m 755 abootimg-pack-initrd $out/bin + wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]} + + install -D -m 755 abootimg-unpack-initrd $out/bin + wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ggrandou/abootimg; + description = "Manipulate Android Boot Images"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e320dc31fc..940a3672f198 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -688,6 +688,8 @@ with pkgs; pkgs_i686 = pkgsi686Linux; }; + abootimg = callPackage ../development/mobile/abootimg {}; + adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { adb = androidenv.platformTools; }; From b73c44ece4b99421c488a08ebbaf0878e09c8d31 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Apr 2018 15:04:09 +0200 Subject: [PATCH 2420/2743] sqldeveloper: add desktop item --- .../tools/database/sqldeveloper/default.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index a5d5702029b9..f2c756e30f12 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,21 @@ -{ stdenv, makeWrapper, requireFile, unzip, openjdk }: +{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, openjdk }: -stdenv.mkDerivation rec { +let version = "17.4.1.054.0712"; + + desktopItem = makeDesktopItem { + name = "sqldeveloper"; + exec = "sqldeveloper"; + icon = "sqldeveloper"; + desktopName = "Oracle SQL Developer"; + genericName = "Oracle SQL Developer"; + comment = "Oracle's Oracle DB GUI client"; + categories = "Application;Development;"; + }; +in + stdenv.mkDerivation rec { + + inherit version; name = "sqldeveloper-${version}"; src = requireFile rec { @@ -51,6 +65,10 @@ stdenv.mkDerivation rec { cd $out unzip ${src} mv sqldeveloper $out/lib/${name} + + install -D -m 444 $out/lib/$name/icon.png $out/share/pixmaps/sqldeveloper.png + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications ''; meta = with stdenv.lib; { From 483815a743e1cb1676ddef4cf5621f3216dbbaff Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 5 Apr 2018 22:20:46 +0000 Subject: [PATCH 2421/2743] nixos: documentation: move some code around, make docstrings more informative --- nixos/modules/misc/documentation.nix | 32 ++++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index cea8981370bb..4af40a6bb42d 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -16,7 +16,10 @@ let cfg = config.documentation; in description = '' Whether to install documentation of packages from into the generated system path. + + See "Multiple-output packages" chapter in the nixpkgs manual for more info. ''; + # which is at ../../../doc/multiple-output.xml }; man.enable = mkOption { @@ -28,6 +31,15 @@ let cfg = config.documentation; in ''; }; + info.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install info pages and the info command. + This also includes "info" outputs. + ''; + }; + doc.enable = mkOption { type = types.bool; default = true; @@ -38,14 +50,6 @@ let cfg = config.documentation; in ''; }; - info.enable = mkOption { - type = types.bool; - default = true; - description = '' - Whether to install info pages and the info command. - This also includes "info" outputs. - ''; - }; }; @@ -59,6 +63,12 @@ let cfg = config.documentation; in environment.extraOutputsToInstall = [ "man" ]; }) + (mkIf cfg.info.enable { + environment.systemPackages = [ pkgs.texinfoInteractive ]; + environment.pathsToLink = [ "/share/info" ]; + environment.extraOutputsToInstall = [ "info" ]; + }) + (mkIf cfg.doc.enable { # TODO(@oxij): put it here and remove from profiles? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? @@ -66,12 +76,6 @@ let cfg = config.documentation; in environment.extraOutputsToInstall = [ "doc" ]; }) - (mkIf cfg.info.enable { - environment.systemPackages = [ pkgs.texinfoInteractive ]; - environment.pathsToLink = [ "/share/info" ]; - environment.extraOutputsToInstall = [ "info" ]; - }) - ]); } From fbd4563b537ee083ffdc6964cf027e542a2ff249 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 5 Apr 2018 22:27:46 +0000 Subject: [PATCH 2422/2743] nixos: documentation: implement `documentation.dev.enable` option I know that "devinfo" output does not currently exist, but so does "devman". It is mentioned in the nixpkgs manual, but no derivation in nixpkgs actually uses it. --- nixos/modules/misc/documentation.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 4af40a6bb42d..2e426c017080 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -50,6 +50,21 @@ let cfg = config.documentation; in ''; }; + dev.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install documentation targeted at developers. + + This includes man pages targeted at developers if is + set (this also includes "devman" outputs). + This includes info pages targeted at developers if + is set (this also includes "devinfo" outputs). + This includes other pages targeted at developers if + is set (this also includes "devdoc" outputs). + + ''; + }; }; @@ -60,20 +75,20 @@ let cfg = config.documentation; in (mkIf cfg.man.enable { environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToInstall = [ "man" ]; + environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ]; }) (mkIf cfg.info.enable { environment.systemPackages = [ pkgs.texinfoInteractive ]; environment.pathsToLink = [ "/share/info" ]; - environment.extraOutputsToInstall = [ "info" ]; + environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ]; }) (mkIf cfg.doc.enable { # TODO(@oxij): put it here and remove from profiles? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? environment.pathsToLink = [ "/share/doc" ]; - environment.extraOutputsToInstall = [ "doc" ]; + environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ]; }) ]); From 9c194b1b63ffc92f289a783398f71ce6dfb70d18 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Mon, 23 Apr 2018 15:29:50 +0200 Subject: [PATCH 2423/2743] frozendict: disable checks as there are none --- pkgs/development/python-modules/frozendict/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 4ec8eff70c6d..94d42206d63d 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -9,6 +9,9 @@ buildPythonPackage rec { sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; }; + # frozendict does not come with tests + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/slezica/python-frozendict; description = "An immutable dictionary"; From ccffc7a5dda79caa29bb62ce27d5cca8056e5d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Apr 2018 07:48:22 -0700 Subject: [PATCH 2424/2743] todo-txt-cli: 2.10 -> 2.11.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/todo.txt-cli/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.0 with grep in /nix/store/ws0k0b3kcl4j2aainnn8xg1vnx803s9c-todo.txt-cli-2.11.0 - directory tree listing: https://gist.github.com/37dad7ad49e196a469453b0b6a4ddb16 --- pkgs/applications/office/todo.txt-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index faecc3f4227b..77a602954438 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: let - version = "2.10"; + version = "2.11.0"; in stdenv.mkDerivation { name = "todo.txt-cli-${version}"; src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; - sha256 = "1agn4zzbizrrylvbfi053b5mpb39bvl1gzziw08xibzfdyi1g55m"; + sha256 = "0majx8lcvhh8ji54qi0sxr833wchdss95fjc92byd8g3lfz27rsz"; }; installPhase = '' From 5960919876e2ae24fde9979587e7e936fd926610 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Apr 2018 07:53:00 -0700 Subject: [PATCH 2425/2743] urh: 2.0.1 -> 2.0.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/urh/versions. These checks were done: - built on NixOS - ran ‘/nix/store/cs9vqxk0xqcpqcs10bbqhq6h7vdbmyny-urh-2.0.2/bin/.urh-wrapped --version’ and found version 2.0.2 - ran ‘/nix/store/cs9vqxk0xqcpqcs10bbqhq6h7vdbmyny-urh-2.0.2/bin/urh --version’ and found version 2.0.2 - found 2.0.2 with grep in /nix/store/cs9vqxk0xqcpqcs10bbqhq6h7vdbmyny-urh-2.0.2 - directory tree listing: https://gist.github.com/fd267c85c4f90f14b9af167c50b169a0 --- pkgs/applications/misc/urh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index d2463616d677..fa2f16166446 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0mnnrxm49s77s1qg7zbfciw0525ipsl010sciqdw8a22jg1rfjh8"; + sha256 = "1qqb31y65rd85rf3gvxxxy06hm89ary00km1ac84qz5bwm6n5fyb"; }; buildInputs = [ hackrf rtl-sdr ]; From 69746047cdfd464c82413027061ed5c6443eb6ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Apr 2018 08:27:39 -0700 Subject: [PATCH 2426/2743] sc-controller: 0.4.1 -> 0.4.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/sc-controller/versions. These checks were done: - built on NixOS - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc -h’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc --help’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc help’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped -h’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped --help’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped help’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped -h’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped --help’ got 0 exit code - ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped help’ got 0 exit code - found 0.4.2 with grep in /nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2 - directory tree listing: https://gist.github.com/3f673ef175fbb295f67a2384aef61ede --- pkgs/misc/drivers/sc-controller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 93e8ffbc3ca8..d4ed749ca9cc 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "0zal8sl3j17gqmynig8jhqrhj7zfqql8vci4whn19gymchwjalzi"; + sha256 = "19i9z5cjjgi3a94hrz5g3a6m4vj71p1gs6mhklc6dq8ydwsadwzz"; }; nativeBuildInputs = [ wrapGAppsHook ]; From ffd428b5a099838697e9d6c6da0bf40163dccda2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Apr 2018 09:06:07 -0700 Subject: [PATCH 2427/2743] sabnzbd: 2.3.2 -> 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/sabnzbd/versions. These checks were done: - built on NixOS - ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/.sabnzbd-wrapped -h’ got 0 exit code - ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/.sabnzbd-wrapped --help’ got 0 exit code - ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/sabnzbd -h’ got 0 exit code - ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/sabnzbd --help’ got 0 exit code - found 2.3.3 with grep in /nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3 - directory tree listing: https://gist.github.com/06ad54e65a99a41896933852c69b59c1 --- pkgs/servers/sabnzbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index d46f5677b9f0..1b5a8c24424a 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -4,7 +4,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "2.3.2"; + version = "2.3.3"; pname = "sabnzbd"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "0c0ap8bygvz643fgfvvmwshcyfblq2c5jziqwgpf30g6rsbfv2v0"; + sha256 = "0za4xjc4x44f7i30r86bbza3zppid333ifwzp5h526w3zak1lal8"; }; buildInputs = [ pythonEnv makeWrapper ]; From 617db2df96a75f7808d544b57aa97d9859377e84 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 20 Apr 2018 06:35:35 -0500 Subject: [PATCH 2428/2743] foundationdb: init at 5.1.7 Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 99 +++++++++++++++++++ .../foundationdb/fix-scm-version.patch | 42 ++++++++ pkgs/servers/foundationdb/ldflags.patch | 90 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 233 insertions(+) create mode 100644 pkgs/servers/foundationdb/default.nix create mode 100644 pkgs/servers/foundationdb/fix-scm-version.patch create mode 100644 pkgs/servers/foundationdb/ldflags.patch diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix new file mode 100644 index 000000000000..95326b4c1c6c --- /dev/null +++ b/pkgs/servers/foundationdb/default.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, fetchFromGitHub +, which, findutils, m4, gawk, python, openjdk, mono58, libressl_2_6 +}: + +let + version = "5.1.7"; + branch = "release-5.1"; + rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; + sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; + + # hysterical raisins dictate a version of boost this old. however, + # we luckily do not need to build anything, we just need the header + # files. + boost152 = stdenv.mkDerivation rec { + name = "boost-headers-1.52.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + buildPhase = ":"; + configurePhase = ":"; + installPhase = '' + mkdir -p $out/include/ + cp -R boost $out/include/ + ''; + }; + +in stdenv.mkDerivation rec { + name = "foundationdb-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "apple"; + repo = "foundationdb"; + inherit rev sha256; + }; + + nativeBuildInputs = [ gawk which m4 findutils boost152 mono58 ]; + buildInputs = [ python openjdk libressl_2_6 ]; + + patches = + [ ./fix-scm-version.patch + ./ldflags.patch + ]; + + postPatch = '' + substituteInPlace ./build/scver.mk \ + --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ + --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" + + substituteInPlace ./Makefile \ + --replace 'shell which ccache' 'shell true' \ + --replace -Werror "" + + substituteInPlace ./Makefile \ + --replace libstdc++_pic libstdc++ + + substituteInPlace ./build/link-validate.sh \ + --replace 'exit 1' '#exit 1' + + patchShebangs . + ''; + + enableParallelBuilding = true; + makeFlags = [ "all" "fdb_c" "KVRELEASE=1" ]; + + configurePhase = ":"; + installPhase = '' + mkdir -vp $out/{bin,libexec/plugins} $lib/lib $dev/include/foundationdb + + cp -v ./lib/libfdb_c.so $lib/lib + cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so + + cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb + cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + + for x in fdbbackup fdbcli fdbserver fdbmonitor; do + cp -v "./bin/$x" $out/bin; + done + + ln -sfv $out/bin/fdbbackup $out/bin/dr_agent + ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore + ln -sfv $out/bin/fdbbackup $out/bin/fdbdr + + ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent + ''; + + outputs = [ "out" "lib" "dev" ]; + + meta = with stdenv.lib; { + description = "Open source, distributed, transactional key-value store"; + homepage = https://www.foundationdb.org; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/servers/foundationdb/fix-scm-version.patch b/pkgs/servers/foundationdb/fix-scm-version.patch new file mode 100644 index 000000000000..0e0df7ade82b --- /dev/null +++ b/pkgs/servers/foundationdb/fix-scm-version.patch @@ -0,0 +1,42 @@ +diff --git a/build/scver.mk b/build/scver.mk +index bdae8be..7539864 100644 +--- a/build/scver.mk ++++ b/build/scver.mk +@@ -98,33 +98,10 @@ endif + GITPRESENT := $(wildcard $(FDBDIR)/.git) + HGPRESENT := $(wildcard $(FDBDIR)/.hg) + +-# Use Git, if not missing +-ifneq ($(GITPRESENT),) +- SCVER := $(shell cd "$(FDBDIR)" && git --version 2>/dev/null) +- ifneq ($(SCVER),) +- VERSION_ID := $(shell cd "$(FDBDIR)" && git rev-parse --verify HEAD) +- SOURCE_CONTROL := GIT +- SCBRANCH := $(shell cd "$(FDBDIR)" && git rev-parse --abbrev-ref HEAD) +- else +-$(error Missing git executable on $(PLATFORM) ) +- endif +-# Otherwise, use Mercurial +-else +- # Otherwise, use Mercurial, if not missing +- ifneq ($(HGPRESENT),) +- SCVER := $(shell cd "$(FDBDIR)" && hg --version 2>/dev/null) +- ifdef SCVER +- VERSION_ID := $(shell cd "$(FDBDIR)" && hg id -n) +- SOURCE_CONTROL := MERCURIAL +- SCBRANCH := $(shell cd "$(FDBDIR)" && hg branch) +- else +-$(error Missing hg executable on $(PLATFORM)) +- endif +- else +- FDBFILES := (shell ls -la $(FDBDIR)) +-$(error Missing source control information for source on $(PLATFORM) in directory: $(FDBDIR) with files: $(FDBFILES)) +- endif +-endif ++# NixOS-specific non-VCS packaging, filled out by the nix build ++SOURCE_CONTROL := GIT ++VERSION_ID := @NIXOS_FDB_VERSION_ID@ ++SCBRANCH := @NIXOS_FDB_SCBRANCH@ + + # Set the RELEASE variable based on the KVRELEASE variable. + ifeq ($(KVRELEASE),1) diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags.patch new file mode 100644 index 000000000000..4d523a7ecdd3 --- /dev/null +++ b/pkgs/servers/foundationdb/ldflags.patch @@ -0,0 +1,90 @@ +diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk +index 0b6eac8..b1891ca 100644 +--- a/FDBLibTLS/local.mk ++++ b/FDBLibTLS/local.mk +@@ -1,6 +1,5 @@ + FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) +-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto +-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt ++FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto + FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map + + # The plugin isn't a typical library, so it feels more sensible to have a copy +diff --git a/bindings/c/local.mk b/bindings/c/local.mk +index 44f0c31..7aea5a4 100644 +--- a/bindings/c/local.mk ++++ b/bindings/c/local.mk +@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c + CLEAN_TARGETS += fdb_c_tests_clean + + ifeq ($(PLATFORM),linux) +- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl +- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete ++ fdb_c_LIBS += lib/libstdc++.a ++ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl + fdb_c_tests_LIBS += -lpthread + endif + +diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk +index 2ef4fcb..6e59625 100644 +--- a/bindings/flow/tester/local.mk ++++ b/bindings/flow/tester/local.mk +@@ -35,8 +35,7 @@ _fdb_flow_tester_clean: + @rm -rf bindings/flow/bin + + ifeq ($(PLATFORM),linux) +- fdb_flow_tester_LIBS += -ldl -lpthread -lrt +- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + else ifeq ($(PLATFORM),osx) + fdb_flow_tester_LDFLAGS += -lc++ + endif +diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk +index 033fe7d..865fc92 100644 +--- a/fdbbackup/local.mk ++++ b/fdbbackup/local.mk +@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS) + fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + + ifeq ($(PLATFORM),linux) +- fdbbackup_LIBS += -ldl -lpthread -lrt +- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 +diff --git a/fdbcli/local.mk b/fdbcli/local.mk +index 81a4a42..892c079 100644 +--- a/fdbcli/local.mk ++++ b/fdbcli/local.mk +@@ -22,14 +22,13 @@ + + fdbcli_CFLAGS := $(fdbclient_CFLAGS) + fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS) +-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl ++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + fdbcli_STATIC_LIBS := + + fdbcli_GENERATED_SOURCES += versions.h + + ifeq ($(PLATFORM),linux) +- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc +- fdbcli_LIBS += -lpthread -lrt ++ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl + else ifeq ($(PLATFORM),osx) + fdbcli_LDFLAGS += -lc++ + endif +diff --git a/fdbserver/local.mk b/fdbserver/local.mk +index 78cad1b..36f2c0f 100644 +--- a/fdbserver/local.mk ++++ b/fdbserver/local.mk +@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS) + fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + + ifeq ($(PLATFORM),linux) +- fdbserver_LIBS += -ldl -lpthread -lrt +- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 578ff7f2cc5e..67a5390aa6aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2409,6 +2409,8 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; + foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; + fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; fwknop = callPackage ../tools/security/fwknop { }; From 18f28a6413e33416576f632367f0a4816c74c188 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 23 Apr 2018 01:02:31 -0500 Subject: [PATCH 2429/2743] nixos: add foundationdb module, documentation Signed-off-by: Austin Seipp --- nixos/modules/module-list.nix | 1 + .../services/databases/foundationdb.nix | 360 ++++++++++++++++++ .../services/databases/foundationdb.xml | 279 ++++++++++++++ 3 files changed, 640 insertions(+) create mode 100644 nixos/modules/services/databases/foundationdb.nix create mode 100644 nixos/modules/services/databases/foundationdb.xml diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5a56554dc98b..1261fe950928 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -195,6 +195,7 @@ ./services/databases/clickhouse.nix ./services/databases/couchdb.nix ./services/databases/firebird.nix + ./services/databases/foundationdb.nix ./services/databases/hbase.nix ./services/databases/influxdb.nix ./services/databases/memcached.nix diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix new file mode 100644 index 000000000000..ba921a9c1521 --- /dev/null +++ b/nixos/modules/services/databases/foundationdb.nix @@ -0,0 +1,360 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.foundationdb; + + # used for initial cluster configuration + initialIpAddr = if (cfg.publicAddress != "auto") then cfg.publicAddress else "127.0.0.1"; + + fdbServers = n: + concatStringsSep "\n" (map (x: "[fdbserver.${toString (x+cfg.listenPortStart)}]") (range 0 (n - 1))); + + backupAgents = n: + concatStringsSep "\n" (map (x: "[backup_agent.${toString x}]") (range 1 n)); + + configFile = pkgs.writeText "foundationdb.conf" '' + [general] + cluster_file = /etc/foundationdb/fdb.cluster + + [fdbmonitor] + restart_delay = ${toString cfg.restartDelay} + user = ${cfg.user} + group = ${cfg.group} + + [fdbserver] + command = ${pkgs.foundationdb}/bin/fdbserver + public_address = ${cfg.publicAddress}:$ID + listen_address = ${cfg.listenAddress} + datadir = ${cfg.dataDir}/$ID + logdir = ${cfg.logDir} + logsize = ${cfg.logSize} + maxlogssize = ${cfg.maxLogSize} + ${optionalString (cfg.class != null) "class = ${cfg.class}"} + memory = ${cfg.memory} + storage_memory = ${cfg.storageMemory} + + ${optionalString (cfg.locality.machineId != null) "locality_machineid=${cfg.locality.machineId}"} + ${optionalString (cfg.locality.zoneId != null) "locality_zoneid=${cfg.locality.zoneId}"} + ${optionalString (cfg.locality.datacenterId != null) "locality_dcid=${cfg.locality.datacenterId}"} + ${optionalString (cfg.locality.dataHall != null) "locality_data_hall=${cfg.locality.dataHall}"} + + ${fdbServers cfg.serverProcesses} + + [backup_agent] + command = ${pkgs.foundationdb}/libexec/backup_agent + ${backupAgents cfg.backupProcesses} + ''; +in +{ + options.services.foundationdb = { + + enable = mkEnableOption "FoundationDB Server"; + + publicAddress = mkOption { + type = types.str; + default = "auto"; + description = "Publicly visible IP address of the process. Port is determined by process ID"; + }; + + listenAddress = mkOption { + type = types.str; + default = "public"; + description = "Publicly visible IP address of the process. Port is determined by process ID"; + }; + + listenPortStart = mkOption { + type = types.int; + default = 4500; + description = '' + Starting port number for database listening sockets. Every FDB process binds to a + subsequent port, to this number reflects the start of the overall range. e.g. having + 8 server processes will use all ports between 4500 and 4507. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the firewall ports corresponding to FoundationDB processes and coordinators + using . + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/foundationdb"; + description = "Data directory. All cluster data will be put under here."; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/foundationdb"; + description = "Log directory."; + }; + + user = mkOption { + type = types.str; + default = "foundationdb"; + description = "User account under which FoundationDB runs."; + }; + + group = mkOption { + type = types.str; + default = "foundationdb"; + description = "Group account under which FoundationDB runs."; + }; + + class = mkOption { + type = types.nullOr (types.enum [ "storage" "transaction" "stateless" ]); + default = null; + description = "Process class"; + }; + + restartDelay = mkOption { + type = types.int; + default = 10; + description = "Number of seconds to wait before restarting servers."; + }; + + logSize = mkOption { + type = types.string; + default = "10MiB"; + description = '' + Roll over to a new log file after the current log file + reaches the specified size. + ''; + }; + + maxLogSize = mkOption { + type = types.string; + default = "100MiB"; + description = '' + Delete the oldest log file when the total size of all log + files exceeds the specified size. If set to 0, old log files + will not be deleted. + ''; + }; + + serverProcesses = mkOption { + type = types.int; + default = 1; + description = "Number of fdbserver processes to run."; + }; + + backupProcesses = mkOption { + type = types.int; + default = 1; + description = "Number of backup_agent processes to run for snapshots."; + }; + + memory = mkOption { + type = types.string; + default = "8GiB"; + description = '' + Maximum memory used by the process. The default value is + 8GiB. When specified without a unit, + MiB is assumed. This parameter does not + change the memory allocation of the program. Rather, it sets + a hard limit beyond which the process will kill itself and + be restarted. The default value of 8GiB + is double the intended memory usage in the default + configuration (providing an emergency buffer to deal with + memory leaks or similar problems). It is not recommended to + decrease the value of this parameter below its default + value. It may be increased if you wish to allocate a very + large amount of storage engine memory or cache. In + particular, when the storageMemory + parameter is increased, the memory + parameter should be increased by an equal amount. + ''; + }; + + storageMemory = mkOption { + type = types.string; + default = "1GiB"; + description = '' + Maximum memory used for data storage. The default value is + 1GiB. When specified without a unit, + MB is assumed. Clusters using the memory + storage engine will be restricted to using this amount of + memory per process for purposes of data storage. Memory + overhead associated with storing the data is counted against + this total. If you increase the + storageMemory, you should also increase + the memory parameter by the same amount. + ''; + }; + + locality = mkOption { + default = { + machineId = null; + zoneId = null; + datacenterId = null; + dataHall = null; + }; + + description = '' + FoundationDB locality settings. + ''; + + type = types.submodule ({ + options = { + machineId = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Machine identifier key. All processes on a machine should share a + unique id. By default, processes on a machine determine a unique id to share. + This does not generally need to be set. + ''; + }; + + zoneId = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Zone identifier key. Processes that share a zone id are + considered non-unique for the purposes of data replication. + If unset, defaults to machine id. + ''; + }; + + datacenterId = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Data center identifier key. All processes physically located in a + data center should share the id. If you are depending on data + center based replication this must be set on all processes. + ''; + }; + + dataHall = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Data hall identifier key. All processes physically located in a + data hall should share the id. If you are depending on data + hall based replication this must be set on all processes. + ''; + }; + }; + }); + }; + + extraReadWritePaths = mkOption { + default = [ ]; + type = types.listOf types.path; + description = '' + An extra set of filesystem paths that FoundationDB can read to + and write from. By default, FoundationDB runs under a heavily + namespaced systemd environment without write access to most of + the filesystem outside of its data and log directories. By + adding paths to this list, the set of writeable paths will be + expanded. This is useful for allowing e.g. backups to local files, + which must be performed on behalf of the foundationdb service. + ''; + }; + + pidfile = mkOption { + type = types.path; + default = "/run/foundationdb.pid"; + description = "Path to pidfile for fdbmonitor."; + }; + }; + + config = mkIf cfg.enable { + meta.doc = ./foundationdb.xml; + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + + environment.systemPackages = [ pkgs.foundationdb ]; + + users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton + { name = "foundationdb"; + description = "FoundationDB User"; + uid = config.ids.uids.foundationdb; + group = cfg.group; + }); + + users.extraGroups = optionalAttrs (cfg.group == "foundationdb") (singleton + { name = "foundationdb"; + gid = config.ids.gids.foundationdb; + }); + + networking.firewall.allowedTCPPortRanges = mkIf cfg.openFirewall + [ { from = cfg.listenPortStart; + to = (cfg.listenPortStart + cfg.serverProcesses) - 1; + } + ]; + + systemd.services.foundationdb = { + description = "FoundationDB Service"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = + { RequiresMountsFor = "${cfg.dataDir} ${cfg.logDir}"; + }; + + serviceConfig = + let rwpaths = [ cfg.dataDir cfg.logDir cfg.pidfile "/etc/foundationdb" ] + ++ cfg.extraReadWritePaths; + in + { Type = "simple"; + Restart = "always"; + RestartSec = 5; + User = cfg.user; + Group = cfg.group; + PIDFile = "${cfg.pidfile}"; + + PermissionsStartOnly = true; # setup needs root perms + TimeoutSec = 120; # give reasonable time to shut down + + # Security options + NoNewPrivileges = true; + ProtectHome = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectControlGroups = true; + PrivateTmp = true; + PrivateDevices = true; + ReadWritePaths = lib.concatStringsSep " " (map (x: "-" + x) rwpaths); + }; + + path = [ pkgs.foundationdb pkgs.coreutils ]; + + preStart = '' + rm -f ${cfg.pidfile} && \ + touch ${cfg.pidfile} && \ + chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile} + + for x in "${cfg.logDir}" "${cfg.dataDir}" /etc/foundationdb; do + [ ! -d "$x" ] && mkdir -m 0700 -vp "$x" && chown -R ${cfg.user}:${cfg.group} "$x"; + done + + if [ ! -f /etc/foundationdb/fdb.cluster ]; then + cf=/etc/foundationdb/fdb.cluster + desc=$(tr -dc A-Za-z0-9 /dev/null | head -c8) + rand=$(tr -dc A-Za-z0-9 /dev/null | head -c8) + echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf + chmod 0660 $cf && chown -R ${cfg.user}:${cfg.group} $cf + touch "${cfg.dataDir}/.first_startup" + fi + ''; + + script = '' + exec fdbmonitor --lockfile ${cfg.pidfile} --conffile ${configFile}; + ''; + + postStart = '' + if [ -e "${cfg.dataDir}/.first_startup" ]; then + fdbcli --exec "configure new single ssd" + rm -f "${cfg.dataDir}/.first_startup"; + fi + ''; + }; + }; +} diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml new file mode 100644 index 000000000000..d10a5cfe836e --- /dev/null +++ b/nixos/modules/services/databases/foundationdb.xml @@ -0,0 +1,279 @@ + + +FoundationDB + +Source: modules/services/databases/foundationdb.nix + +Upstream documentation: + +Maintainer: Austin Seipp + +Default version: 5.1.x + +FoundationDB (or "FDB") is a distributed, open source, high performance, +transactional key-value store. It can store petabytes of data and deliver +exceptional performance while maintaining consistency and ACID semantics over a +large cluster. + +
Configuring and basic setup + +To enable FoundationDB, add the following to your +configuration.nix: + + +services.foundationdb.enable = true; + + + +After running nixos-rebuild, you can verify whether +FoundationDB is running by executing fdbcli (which is added +to ): + + +$ sudo -u foundationdb fdbcli +Using cluster file `/etc/foundationdb/fdb.cluster'. + +The database is available. + +Welcome to the fdbcli. For help, type `help'. +fdb> status + +Using cluster file `/etc/foundationdb/fdb.cluster'. + +Configuration: + Redundancy mode - single + Storage engine - memory + Coordinators - 1 + +Cluster: + FoundationDB processes - 1 + Machines - 1 + Memory availability - 5.4 GB per process on machine with least available + Fault Tolerance - 0 machines + Server time - 04/20/18 15:21:14 + +... + +fdb> + + + +FoundationDB is run under the foundationdb user and +group by default, but this may be changed in the NixOS configuration. The +systemd unit foundationdb.service controls the +fdbmonitor process. + +By default, the NixOS module for FoundationDB creates a single +SSD-storage based database for development and basic usage. This storage engine +is designed for SSDs and will perform poorly on HDDs; however it can handle far +more data than the alternative "memory" engine and is a better default choice +for most deployments. (Note that you can change the storage backend on-the-fly +for a given FoundationDB cluster using fdbcli.) + +Furthermore, only 1 server process and 1 backup agent are started in the +default configuration. See below for more on scaling to increase this. + +FoundationDB stores all data for all server processes under +/var/lib/foundationdb. You can override this using +, e.g. + + +services.foundationdb.dataDir = "/data/fdb"; + + + + +Similarly, logs are stored under +/var/log/foundationdb by default, and there is a +corresponding as well. + +
+ +
Scaling processes and backup agents + +Scaling the number of server processes is quite easy; simply specify + to be the number of +FoundationDB worker processes that should be started on the machine. + +FoundationDB worker processes typically require 4GB of RAM per-process at +minimum for good performance, so this option is set to 1 by default since the +maximum aount of RAM is unknown. You're advised to abide by this restriction, +so pick a number of processes so that each has 4GB or more. + +A similar option exists in order to scale backup agent processes, +. Backup agents are not +as performance/RAM sensitive, so feel free to experiment with the number of +available backup processes. + +
+ +
Clustering + +FoundationDB on NixOS works similarly to other Linux systems, so this +section will be brief. Please refer to the full FoundationDB documentation for +more on clustering. + +FoundationDB organizes clusters using a set of +coordinators, which are just specially-designated worker +processes. By default, every installation of FoundationDB on NixOS will start +as its own individual cluster, with a single coordinator: the first worker +process on localhost. + +Coordinators are specified globally using the +/etc/foundationdb/fdb.cluster file, which all servers and +client applications will use to find and join coordinators. Note that this file +can not be managed by NixOS so easily: FoundationDB is +designed so that it will rewrite the file at runtime for all clients and nodes +when cluster coordinators change, with clients transparently handling this +without intervention. + +When dealing with a cluster, there are two main things you want to +do: + + + Add a node to the cluster for storage/compute. + Promote an ordinary worker to a coordinator. + + +A node must already be a member of the cluster in order to properly be +promoted to a coordinator, so you must always add it first if you wish to +promote it. + +To add a machine to a FoundationDB cluster: + + + Choose one of the servers to start as the initial coordinator. + + Copy the /etc/foundationdb/fdb.cluster file + from this server to all the other servers. Restart FoundationDB on all of + these other servers, so they join the cluster. + All of these servers are now connected and working together + in the cluster, under the chosen coordinator. + + +At this point, you can add as many nodes as you want by just repeating +the above steps. By default there will still be a single coordinator: you can +use fdbcli to change this and add new coordinators. + +As a convenience, FoundationDB can automatically assign coordinators +based on the redundancy mode you wish to achieve for the cluster. Once all the +nodes have been joined, simply set the replication policy, and then issue the +coordinators auto command + +For example, assuming we have 3 nodes available, we can enable double +redundancy mode, then auto-select coordinators. For double redundancy, 3 +coordinators is ideal: therefore FoundationDB will make +every node a coordinator automatically: + + +fdbcli> configure double ssd +fdbcli> coordinators auto + + +This will transparently update all the servers within seconds, and +appropriately rewrite the fdb.cluster file, as well as +informing all client processes to do the same. + +
+ +
Client connectivity + +By default, all clients must use the current +fdb.cluster file to access a given FoundationDB cluster. +This file is located by default in +/etc/foundationdb/fdb.cluster on all machines with the +FoundationDB service enabled, so you may copy the active one from your cluster +to a new node in order to connect, if it is not part of the cluster. + +
+ +
Backups and Disaster Recovery + +The usual rules for doing FoundationDB backups apply on NixOS as written +in the FoundationDB manual. However, one important difference is the security +profile for NixOS: by default, the foundationdb systemd unit +uses Linux namespaces to restrict write access to the +system, except for the log directory, data directory, and the +/etc/foundationdb/ directory. This is enforced by default +and cannot be disabled. + +However, a side effect of this is that the fdbbackup +command doesn't work properly for local filesystem backups: FoundationDB uses a +server process alongside the database processes to perform backups and copy the +backups to the filesystem. As a result, this process is put under the +restricted namespaces above: the backup process can only write to a limited +number of paths. + +In order to allow flexible backup locations on local disks, the +FoundationDB NixOS module supports a + option. This option +takes a list of paths, and adds them to the systemd unit, allowing the +processes inside the service to write (and read) the specified +directories. + +For example, to create backups in /opt/fdb-backups, +first set up the paths in the module options: + + +services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; + + +Restart the FoundationDB service, and it will now be able to write to +this directory (even if it does not yet exist.) Note: this path +must exist before restarting the unit. Otherwise, systemd +will not include it in the private FoundationDB namespace (and it will not add +it dynamically at runtime). + +You can now perform a backup: + + +$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups +$ sudo -u foundationdb fdbbackup status -t default + + +
+ +
Known limitations + +The FoundationDB setup for NixOS should currently be considered beta. +FoundationDB is not new software, but the NixOS compilation and integration has +only undergone fairly basic testing of all the available functionality. + + + TLS plugin support is compiled in, but it's currently not + possible to specify the set of TLS certificate options in + services.foundationdb + There is no way to specify individual parameters for + individual fdbserver processes. Currently, all server + processes inherit all the global fdbmonitor settings. + + Python bindings are not currently installed. + Ruby bindings are not currently installed. + Java bindings are not currently installed. + Go bindings are not currently installed. + + +
+ +
Options + +NixOS's FoundationDB module allows you to configure all of the most +relevant configuration options for fdbmonitor, matching it +quite closely. For a complete list of all options, check man +configuration.nix. + +
+ +
Full documentation + +FoundationDB is a complex piece of software, and requires careful +administration to properly use. Full documentation for administration can be +found here: . + +
+ + From dc61a487c90580144919512f019905b06816bd44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Apr 2018 10:22:07 -0700 Subject: [PATCH 2430/2743] qlcplus: 4.11.1 -> 4.11.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/qlcplus/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.11.2 with grep in /nix/store/4qhjfvk9i1hi3q4jqzic5ajndnqschfi-qlcplus-4.11.2 - directory tree listing: https://gist.github.com/2877914d9c008fd955d2946bfd21926e --- pkgs/applications/misc/qlcplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index e162d0d317f7..2fa4887a0f0f 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { name = "qlcplus-${version}"; - version = "4.11.1"; + version = "4.11.2"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "0lb1mdp7kbnkja14phgyknr65irwkxcmzk96rqacysvwrvzvfzyd"; + sha256 = "0ry7j8d5mm3h3mzd49xqlagnldmfhfr6plwk73pz62hxr4j58s6w"; }; nativeBuildInputs = [ qmake pkgconfig ]; From c214bc9aeec943345e095b88a94eabc6fba9671f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 23 Apr 2018 12:31:36 -0500 Subject: [PATCH 2431/2743] gstreamer: fix on Darwin --- .../libraries/gstreamer/core/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index ab3f78767a1c..5845c8c50db2 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -2,17 +2,18 @@ , pkgconfig, gettext, gobjectIntrospection , bison, flex, python3, glib, makeWrapper , libcap,libunwind, darwin +, lib }: stdenv.mkDerivation rec { name = "gstreamer-1.14.0"; - meta = { + meta = with lib ;{ description = "Open source multimedia framework"; homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ttuegel matthewbauer ]; }; src = fetchurl { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw"; }; - patches = [ + patches = [ (fetchpatch { url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370411"; sha256 = "16plzzmkk906k4892zq68j3c9z8vdma5nxzlviq20jfv04ykhmk2"; @@ -34,7 +35,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext bison flex python3 makeWrapper gobjectIntrospection ]; - buildInputs = [ libcap libunwind ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; + buildInputs = + lib.optionals stdenv.isLinux [ libcap libunwind ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; propagatedBuildInputs = [ glib ]; From b09c250435dcdcb8fd66fcb0ed701b580ca3d482 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 23 Apr 2018 12:32:37 -0500 Subject: [PATCH 2432/2743] gst_plugins_base: fix on darwin --- .../libraries/gstreamer/base/default.nix | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index b3a4f445289e..39cf57ec5258 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, meson -, ninja, gettext, gobjectIntrospection, python -, gstreamer, orc, alsaLib, libXv, pango, libtheora -, wayland, cdparanoia, libvisual, libintl -}: +{ stdenv, fetchurl, fetchpatch, lib +, pkgconfig, meson, ninja, gettext, gobjectIntrospection +, python, gstreamer, orc, pango, libtheora, libvisual +, libintl +, enableX11 ? stdenv.isLinux, libXv +, enableWayland ? stdenv.isLinux, wayland +, enableAlsa ? stdenv.isLinux, alsaLib +, enableCocoa ? false, darwin +, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: stdenv.mkDerivation rec { name = "gst-plugins-base-1.14.0"; - meta = { + meta = with lib; { description = "Base plugins and helper libraries"; homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; }; src = fetchurl { @@ -21,19 +26,32 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ - pkgconfig python meson ninja gettext gobjectIntrospection - ]; + nativeBuildInputs = [ pkgconfig python gettext gobjectIntrospection ] - buildInputs = [ - orc libXv pango libtheora cdparanoia libintl wayland + # Broken meson with Darwin. Should hopefully be fixed soon. Tracking + # in https://bugzilla.gnome.org/show_bug.cgi?id=781148. + ++ lib.optionals (!stdenv.isDarwin) [ meson ninja ]; + + # TODO How to pass these to Meson? + configureFlags = [ + "--enable-x11=${if enableX11 then "yes" else "no"}" + "--enable-wayland=${if enableWayland then "yes" else "no"}" + "--enable-cocoa=${if enableCocoa then "yes" else "no"}" ] - ++ stdenv.lib.optional stdenv.isLinux alsaLib - ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual; + + # Introspection fails on my MacBook currently + ++ lib.optional stdenv.isDarwin "--disable-introspection"; + + buildInputs = [ orc libtheora libintl ] + ++ lib.optional enableAlsa alsaLib + ++ lib.optionals enableX11 [ libXv pango ] + ++ lib.optional enableWayland wayland + ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa + ++ lib.optional enableCdparanoia cdparanoia; propagatedBuildInputs = [ gstreamer ]; - preConfigure = '' + postPatch = '' patchShebangs . ''; From 83e5b55ed00a705a6425c2ac2e4e86177de9b542 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 23 Apr 2018 20:08:12 +0200 Subject: [PATCH 2433/2743] ecl_16_1_2: Adopt upstream error handling patch --- pkgs/development/compilers/ecl/16.1.2.nix | 13 +++++++++++-- pkgs/development/compilers/ecl/default.nix | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 30fee77321f5..b324ec490f1a 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , libtool, autoconf, automake , gmp, mpfr, libffi, makeWrapper , noUnicode ? false , gcc -, threadSupport ? true +, threadSupport ? false }: let s = # Generated upstream information @@ -39,6 +39,15 @@ stdenv.mkDerivation { "--enable-unicode") ; + patches = [ + (fetchpatch { + # Avoid infinite loop, see https://gitlab.com/embeddable-common-lisp/ecl/issues/43 (fixed upstream) + name = "avoid-infinite-loop.patch"; + url = "https://gitlab.com/embeddable-common-lisp/ecl/commit/caba1989f40ef917e7486f41b9cd5c7e3c5c2d79.patch"; + sha256 = "07vw91psbc9gdn8grql46ra8lq3bgkzg5v480chnbryna4sv6lbb"; + }) + ]; + hardeningDisable = [ "format" ]; postInstall = '' diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index e506e3aace1f..b877ca58e95b 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Lisp implementation aiming to be small, fast and easy to embed"; + homepage = https://common-lisp.net/project/ecl/; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; From 84ace02e87cce36323e2dff26e0845b82b68f51c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 23 Apr 2018 20:21:11 +0200 Subject: [PATCH 2434/2743] android-studio: 3.1.1.0 -> 3.1.2.0 --- 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 e18235024df4..df0c275ba25d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.1.1.0"; # "Android Studio 3.1.1" - build = "173.4697961"; - sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8"; + version = "3.1.2.0"; # "Android Studio 3.1.2" + build = "173.4720617"; + sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; }; latestVersion = { version = "3.2.0.10"; # "Android Studio 3.2 Canary 11" From 42a9ba28d116420424e935668890d4d1e810d982 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 23 Apr 2018 20:22:00 +0200 Subject: [PATCH 2435/2743] androidStudioPackages.{dev,canary}: 3.2.0.10 -> 3.2.0.11 --- 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 df0c275ba25d..75385275ec84 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; }; latestVersion = { - version = "3.2.0.10"; # "Android Studio 3.2 Canary 11" - build = "181.4720098"; - sha256Hash = "00cd7qdznspi69cgs1a13a3fnkvsc7zjfl517jgp32vdygkb0qxw"; + version = "3.2.0.11"; # "Android Studio 3.2 Canary 12" + build = "181.4729833"; + sha256Hash = "1b976m59d230pl35ajhdic46cw8qmnykkbrg3l7am7zmih0zk64c"; }; in rec { # Old alias From 3cdb8f581dbb85a0cb9552c0d84c44f736aecc63 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Wed, 18 Oct 2017 16:05:07 +0200 Subject: [PATCH 2436/2743] spark: provided-hadoop -> nixpkgs hadoop spark should use nixpkgs provided hadoop to make it consistent for bigger Nix hadoop + spark setup --- .../networking/cluster/spark/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 2b36d7c5647a..6401194eac20 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,20 +1,16 @@ -{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils +{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop , RSupport? true, R , mesosSupport ? true, mesos , version }: let - versionMap = { - "2.2.1" = { - hadoopVersion = "hadoop2.7"; - sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; - }; - }; + sha256 = { + "1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf"; + "2.2.1" = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c"; + }.${version}; in -with versionMap.${version}; - with stdenv.lib; stdenv.mkDerivation rec { @@ -22,15 +18,15 @@ stdenv.mkDerivation rec { name = "spark-${version}"; src = fetchzip { - url = "mirror://apache/spark/${name}/${name}-bin-${hadoopVersion}.tgz"; - sha256 = sparkSha256; + inherit sha256; + url = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] ++ optional RSupport R ++ optional mesosSupport mesos; - untarDir = "${name}-bin-${hadoopVersion}"; + untarDir = "${name}-bin-without-hadoop"; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} @@ -42,6 +38,7 @@ stdenv.mkDerivation rec { cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF export JAVA_HOME="${jre}" export SPARK_HOME="$out/lib/${untarDir}" + export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" ${optionalString RSupport @@ -63,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "http://spark.apache.org"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline ]; + maintainers = with maintainers; [ thoughtpolice offline kamilchm ]; repositories.git = git://git.apache.org/spark.git; }; } From 5e548e94e805794d76402d90bc0dc7e887dde8c9 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 23 Apr 2018 21:13:25 +0200 Subject: [PATCH 2437/2743] glpk: Add gmp support --- pkgs/development/libraries/glpk/default.nix | 26 ++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index b9634e01900e..5b9296608d45 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,13 +1,33 @@ -{ fetchurl, stdenv }: +{ stdenv +, fetchurl +# Excerpt from glpk's INSTALL file: +# This feature allows the exact simplex solver to use the GNU MP +# bignum library. If it is disabled, the exact simplex solver uses the +# GLPK bignum module, which provides the same functionality as GNU MP, +# however, it is much less efficient. +, withGmp ? true +, gmp +}: + +assert withGmp -> gmp != null; stdenv.mkDerivation rec { - name = "glpk-4.65"; + version = "4.65"; + name = "glpk-${version}"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; }; + buildInputs = stdenv.lib.optionals withGmp [ + gmp + ]; + + configureFlags = stdenv.lib.optionals withGmp [ + "--with-gmp" + ]; + doCheck = true; meta = { @@ -23,7 +43,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/glpk/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bjg ]; + maintainers = with stdenv.lib.maintainers; [ bjg ]; platforms = stdenv.lib.platforms.all; }; } From 412066173d36f991d90ce51128cd3125e6ec2a70 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Mon, 23 Apr 2018 21:55:26 +0200 Subject: [PATCH 2438/2743] Adjust email address --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1178ebb536ec..c827e0d11a92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1731,7 +1731,7 @@ name = "Jeffrey David Johnson"; }; jensbin = { - email = "jensbin@protonmail.com"; + email = "jensbin+git@pm.me"; github = "jensbin"; name = "Jens Binkert"; }; From 5d2671de81a4fde5be8d4bf9ee8caf3d2e3a3c66 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 23 Apr 2018 21:57:23 +0200 Subject: [PATCH 2439/2743] fflas-ffpack: Drop liblapack dependency --- pkgs/development/libraries/fflas-ffpack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 82ece22b7c7d..5f99f35a1599 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas , gmpxx , optimize ? false # impure }: @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { autoreconfHook pkgconfig ] ++ stdenv.lib.optionals doCheck checkInputs; - buildInputs = [ givaro (liblapack.override {shared = true;}) openblas]; + buildInputs = [ givaro openblas]; configureFlags = [ "--with-blas-libs=-lopenblas" - "--with-lapack-libs=-llapack" + "--with-lapack-libs=-lopenblas" ] ++ stdenv.lib.optionals (!optimize) [ # disable SIMD instructions (which are enabled *when available* by default) "--disable-sse" From e304b6b216ef77c7c19fae799e282c94a4b32506 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Mon, 23 Apr 2018 22:02:24 +0200 Subject: [PATCH 2440/2743] typora: 0.9.44 -> 0.9.47 --- pkgs/applications/editors/typora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7c6d186b8830..d687712fc08a 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.44"; + version = "0.9.47"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; + sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; + sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6"; } ; From ce8f347ca8d69f606bbfeee44f74a5f05664b3cd Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 23 Apr 2018 23:40:47 +0300 Subject: [PATCH 2441/2743] nixos/hans, nixos/iodine: fix passwordFile attribute --- nixos/modules/services/networking/hans.nix | 2 +- nixos/modules/services/networking/iodine.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index 56c30a6b96e1..dd34ef8d4ca1 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -131,7 +131,7 @@ in description = "hans, ip over icmp server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}"; + script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.server.passwordFile != "") "-p $(cat \"${cfg.server.passwordFile}\")"}"; }; }; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 709c36ee54f0..3f41421d27f7 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -136,7 +136,7 @@ in description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}"; + script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "-P $(cat \"${cfg.server.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}"; }; }; From d32983a1caa92c74e8240c9a355ce9f1df8f5f42 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 23 Apr 2018 14:03:19 -0700 Subject: [PATCH 2442/2743] google-compute-engine: 20170914 -> 20180129 (#36565) Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -V` and found version 20180129 - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -v` and found version 20180129 - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --version` and found version 20180129 - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue version` and found version 20180129 - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -h` and found version 20180129 - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --help` and found version 20180129 - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue help` and found version 20180129 - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_accounts_daemon-wrapped -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_accounts_daemon-wrapped --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_accounts_daemon -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_accounts_daemon --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_instance_setup-wrapped -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_instance_setup-wrapped --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_instance_setup -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_instance_setup --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_network_setup-wrapped -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_network_setup-wrapped --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_network_setup -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_network_setup --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_metadata_script_runner-wrapped -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_metadata_script_runner-wrapped --help` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_metadata_script_runner -h` got 0 exit code - ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_metadata_script_runner --help` got 0 exit code - found 20180129 with grep in /nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129 - found 20180129 in filename of file in /nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129 only build on Linux --- pkgs/tools/virtualization/google-compute-engine/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index a923d73c03e4..3645de88bf8a 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20170914"; + version = "20180129"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "0hlzcrf6yhzan25f4wzy1vbncak9whhqzrzza026ly3sq0smmjpg"; + sha256 = "0380fnr64109hv8l1f3sgdg8a5mf020axj7jh8y25xq6wzkjm20c"; }; postPatch = '' @@ -52,5 +52,6 @@ buildPythonApplication rec { homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm ]; + platforms = platforms.linux; }; } From cf758a5aa4f089f86e82bf6224864fc63cb3d08e Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 23 Apr 2018 16:51:33 -0500 Subject: [PATCH 2443/2743] release: add inkscape, qt5.qtmultimedia (darwin) We want to make sure these work in Darwin. Hopefully this will improve their stability. --- pkgs/top-level/release.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index aee73f206696..3ea873cdc7ff 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -101,6 +101,9 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin + # Ensure that UI stuff works on darwin + jobs.inkscape.x86_64-darwin + jobs.qt5.qtmultimedia.x86_64-darwin jobs.tests.cc-wrapper.x86_64-linux jobs.tests.cc-wrapper.x86_64-darwin From 8edb13f0797befb79cfed0f1a777673eb7323bb7 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Mon, 23 Apr 2018 17:07:53 -0500 Subject: [PATCH 2444/2743] doc: add filtered pr list --- doc/reviewing-contributions.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index d6f33ccd1cdb..7b017f0a8cc4 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -23,7 +23,9 @@ xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most recently and the least - recently updated pull-requests. + recently updated pull-requests. + We highly encourage looking at + this list of ready to merge, unreviewed pull requests. When reviewing a pull request, please always be nice and polite. Controversial changes can lead to controversial opinions, but it is important From bca24c02ac7a8225f11aa79647f58dc71a03b1f0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Apr 2018 00:19:34 +0200 Subject: [PATCH 2445/2743] qemu: fix darwin build --- pkgs/applications/virtualization/qemu/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f5cd661fbecb..a10687141615 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -8,7 +8,7 @@ , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 -, gtkSupport ? !xenSupport, gtk3, gettext, gnome3 +, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, gnome3 , vncSupport ? true, libjpeg, libpng , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir @@ -107,6 +107,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] + # disable sysctl check on darwin. + ++ optional stdenv.isDarwin "--cpu=x86_64" ++ optional numaSupport "--enable-numa" ++ optional seccompSupport "--enable-seccomp" ++ optional spiceSupport "--enable-spice" From fe6386c2f0ac2bdfaac9bc70f3e361f2391bb5c1 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Apr 2018 00:28:54 +0200 Subject: [PATCH 2446/2743] oniguruma: remove darwin install_name patch --- pkgs/development/libraries/oniguruma/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 3989ab42468d..f9a75801e101 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -13,16 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - prePatch = stdenv.lib.optional stdenv.isDarwin '' - substituteInPlace cmake/dist.cmake \ - --replace '@executable_path/''${UP_DIR}/''${INSTALL_LIB}' $out'/''${INSTALL_LIB}' - ''; - - meta = { + meta = with stdenv.lib; { homepage = https://github.com/kkos/oniguruma; description = "Regular expressions library"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.bsd2; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.unix; }; } From 63b82757096e9b57bf5cffc5b0a7463d19d2f797 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 00:25:22 +0200 Subject: [PATCH 2447/2743] ecl: Use boehmgc --- pkgs/development/compilers/ecl/16.1.2.nix | 7 +++++++ pkgs/development/compilers/ecl/default.nix | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index b324ec490f1a..291b0ed013d6 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -4,7 +4,11 @@ , noUnicode ? false , gcc , threadSupport ? false +, useBoehmgc ? true, boehmgc }: + +assert useBoehmgc -> boehmgc != null; + let s = # Generated upstream information rec { @@ -19,6 +23,9 @@ let ]; propagatedBuildInputs = [ libffi gmp mpfr gcc + ] ++ stdenv.lib.optionals useBoehmgc [ + # replaces ecl's own gc which other packages can depend on, thus propagated + boehmgc ]; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index b877ca58e95b..33ed690772ea 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -4,6 +4,7 @@ , noUnicode ? false , gcc , threadSupport ? true +, useBoehmgc ? false, boehmgc }: let s = # Generated upstream information @@ -20,6 +21,10 @@ let ]; propagatedBuildInputs = [ libffi gmp mpfr gcc + # replaces ecl's own gc which other packages can depend on, thus propagated + ] ++ stdenv.lib.optionals useBoehmgc [ + # replaces ecl's own gc which other packages can depend on, thus propagated + boehmgc ]; in stdenv.mkDerivation { From 7a82fcfefa02b491c8354ea7a29c1286478fdea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Apr 2018 00:55:30 +0200 Subject: [PATCH 2448/2743] python.pkgs.faulthandler: 3.0 -> 3.1 --- .../python-modules/faulthandler/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index 1fc1aea94d57..a05ac1ba679e 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -2,24 +2,13 @@ buildPythonPackage rec { pname = "faulthandler"; - version = "3.0"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a"; + sha256 = "83301ffab03c86b291677b64b5cec7026f412cbda5ebd27e4cb3338452c40021"; }; - patches = [ - (fetchpatch { - url = https://github.com/vstinner/faulthandler/commit/67b661e.patch; - sha256 = "1nn8c9nq5qypja949hzz0n4yprsyr63wihf5g3gwrinm2nkjnnv7"; - }) - (fetchpatch { - url = https://github.com/vstinner/faulthandler/commit/07cbb7b.patch; - sha256 = "0fh6rjyjw7z1hsiy3sgdc8j9mncg1vlv3y0h4bplqyw18vq3srb3"; - }) - ]; - meta = { description = "Dump the Python traceback"; license = stdenv.lib.licenses.bsd2; From e109784f84d44cc73abeaa6c96c5a5d5bf9e3e06 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 07:10:23 +0200 Subject: [PATCH 2449/2743] .version: remove final newline When reading the `nixpkgs` version from `.version` you always have a `\n` at the end because of the final newline. This issue exists since b7d15ed and had to be fixed several times according to the history of `.version`. Furthermore @Infinisil recommended I explicitly configured `.editorconfig` to avoid newlines in `.version`. --- .editorconfig | 4 ++++ .version | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 7b40ff1ff568..f5df33889e6b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,3 +26,7 @@ indent_size = 4 # Match diffs, avoid to trim trailing whitespace [*.{diff,patch}] trim_trailing_whitespace = false + +# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754 +[.version] +insert_final_newline = false diff --git a/.version b/.version index 770bde1f44b3..c1b80a502792 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -18.09 +18.09 \ No newline at end of file From 3cd2707e370e4773954cb3fe84b768d648c5ed63 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 07:13:49 +0200 Subject: [PATCH 2450/2743] osquery: 2.5.2 -> 3.2.2 The package was originally broken as reported in #38940 and facebook/osquery#4257. The latest version (3.x) contains several important fixes for GCC 7, so now we can compile without a much less complicated patches. The following changes were needed to fix the derivation: * Upgrade `osquery/third-party` to the latest rev to be compliant with osquery 3. * Keep using an override for the AWS SDK (for a lower closure size and less compile time), but make the `ec2` API available. * Added the dependencies `fpm`, `zstd`, `rdkafka`, `rapidjson` to the build. `linenoise-ng` is obsolete as it's directly bundled with `osquery/third-party`. * Fixed the linking issue with `gflags` as recommended in the mailing list: https://groups.google.com/d/msg/nix-devel/l1blj-mWxtI/J3CwPATBCAAJ * Dropped the obsolete dependencies `cpp-netlib`, `lz4`, `apt` and `devicemapper` (thanks @Infinisil). * Override `OSQUERY_PLATFORM` to provide `nixos:version` for sandbox and non-NixOS based builds. The `platform-nixos.patch` file is now obsolete (thanks @flokli). The patch was rebased against the 3.x branch of `osquery` and contains mostly old changes. Additionally several testing targets were skipped as they broke the build. The functionality has been testing using the following command: ``` mkdir /tmp/osq.log/ ./result/bin/osqueryd --pidfile /tmp/osq.pid \ --database_path /tmp/test.db --logger_path /tmp/osq.log ``` With the daemon running the database can be queried easily using `./result/bin/osqueryi`. Fixes ticket #38940 See ticket #36453 Further reference can be gathered from the affected Hydra logs for the master branch: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.osquery.x86_64-linux --- pkgs/tools/system/osquery/default.nix | 48 ++--- pkgs/tools/system/osquery/misc.patch | 195 ++++++++---------- .../tools/system/osquery/platform-nixos.patch | 22 -- 3 files changed, 111 insertions(+), 154 deletions(-) delete mode 100644 pkgs/tools/system/osquery/platform-nixos.patch diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 44d5bcf5f38a..2a719efd79b3 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -1,59 +1,62 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive -, libgpgerror, libuuid, iptables, apt, dpkg, lzma, lz4, bzip2, rpm +, libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags -, thrift, boost, rocksdb_lite, cpp-netlib, glog, gbenchmark, snappy -, openssl, linenoise-ng, file, doxygen, devicemapper -, gtest, sqlite +, thrift, boost, rocksdb_lite, glog, gbenchmark, snappy +, openssl, file, doxygen +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path }: let + thirdparty = fetchFromGitHub { owner = "osquery"; repo = "third-party"; - rev = "6919841175b2c9cb2dee8986e0cfe49191ecb868"; - sha256 = "1kjxrky586jd1b2z1vs9cm7x1dxw51cizpys9kddiarapc2ih65j"; + rev = "4ef099c31a1165c5e7e3a699f9e4b3eb68c3c3d9"; + sha256 = "1vm0prw4dix0m51vkw9z0vwfd8698gqjw499q8h604hs1rvn6132"; }; in stdenv.mkDerivation rec { name = "osquery-${version}"; - version = "2.5.2"; + version = "3.2.2"; # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; + OSQUERY_PLATFORM = "nixos;${builtins.readFile "${toString path}/.version"}"; src = fetchFromGitHub { owner = "facebook"; repo = "osquery"; rev = version; - sha256 = "16isplk66qpvhrf041l0lxb4z6k7wwd1sg7kpsw2q6kivkxpnk3z"; + sha256 = "0qwj4cy6m25sqwb0irqfqinipx50l4imnz1gqxx147vzfwb52jlq"; }; - patches = [ ./misc.patch ] ++ lib.optional stdenv.isLinux ./platform-nixos.patch; + patches = [ ./misc.patch ]; nativeBuildInputs = [ - pkgconfig cmake pythonPackages.python pythonPackages.jinja2 + pkgconfig cmake pythonPackages.python pythonPackages.jinja2 doxygen fpm ]; - buildInputs = [ + buildInputs = let + gflags' = google-gflags.overrideAttrs (old: { + cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; + }); + in [ udev audit (aws-sdk-cpp.override { - apis = [ "firehose" "kinesis" "sts" ]; + apis = [ "firehose" "kinesis" "sts" "ec2" ]; customMemoryManagement = false; }) - lvm2 libgcrypt libarchive libgpgerror libuuid iptables.dev apt dpkg - lzma lz4 bzip2 rpm beecrypt augeas libxml2 sleuthkit - yara lldpd google-gflags thrift boost - cpp-netlib glog gbenchmark snappy openssl linenoise-ng - file doxygen devicemapper cryptsetup - gtest sqlite - - # need to be consistent about the malloc implementation - (rocksdb_lite.override { jemalloc = null; gperftools = null; }) + lvm2 libgcrypt libarchive libgpgerror libuuid iptables dpkg + lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit + yara lldpd gflags' thrift boost + glog gbenchmark snappy openssl + file cryptsetup + gtest sqlite zstd rdkafka rapidjson rocksdb_lite ]; preConfigure = '' @@ -74,7 +77,6 @@ stdenv.mkDerivation rec { homepage = https://osquery.io/; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; - broken = true; # 2018-04-11 + maintainers = with maintainers; [ cstrahan ma27 ]; }; } diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch index 1a0ef267f0df..acdbf6346c83 100644 --- a/pkgs/tools/system/osquery/misc.patch +++ b/pkgs/tools/system/osquery/misc.patch @@ -1,33 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a976a46d..408ac308 100644 +index b8eb5a16..319d81dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -125,14 +125,13 @@ else() - set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libc++") - else() - set(LINUX TRUE) -- set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libstdc++") -+ set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14") - endif() - set(POSIX TRUE) - endif() - - if(POSIX) - add_compile_options( -- -Qunused-arguments - -Wstrict-aliasing - -Wno-missing-field-initializers - -Wno-unused-local-typedef -@@ -154,7 +153,6 @@ if(POSIX) - ) - if(NOT FREEBSD) - add_compile_options( -- -Werror=shadow - -fvisibility=hidden - -fvisibility-inlines-hidden - ) -@@ -372,12 +370,6 @@ elseif(NOT FREEBSD) - endif() +@@ -447,12 +447,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin") endif() -if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3") @@ -39,7 +15,7 @@ index a976a46d..408ac308 100644 # Make sure deps were built before compiling (else show warning). execute_process( COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}" -@@ -439,6 +431,8 @@ endif() +@@ -518,6 +512,8 @@ endif() if(APPLE) LOG_PLATFORM("OS X") @@ -48,87 +24,67 @@ index a976a46d..408ac308 100644 elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian") LOG_PLATFORM("Debian") elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu") -@@ -477,7 +471,6 @@ if(POSIX) - include_directories("${BUILD_DEPS}/include/openssl") +@@ -567,7 +563,6 @@ if(POSIX AND DEPS) + endif() endif() -include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3") include_directories("${CMAKE_SOURCE_DIR}/include") include_directories("${CMAKE_SOURCE_DIR}") -@@ -559,21 +552,10 @@ else() - set(GTEST_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=0") +@@ -655,18 +650,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "") + add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0) endif() -set(GTEST_FLAGS -- ${GTEST_FLAGS} - "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include" - "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include" -) -join("${GTEST_FLAGS}" " " GTEST_FLAGS) - - set(BUILD_GTEST TRUE) - --add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest") +-if(NOT SKIP_TESTS) +- add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest") +-endif() - - include(Thrift) - -add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3") - - add_subdirectory(osquery) - add_subdirectory(tools/tests) - -diff --git a/include/osquery/core.h b/include/osquery/core.h -index b597edee..b0628037 100644 ---- a/include/osquery/core.h -+++ b/include/osquery/core.h -@@ -15,8 +15,9 @@ - #include - #include - --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) - #include -+#include - #else - #include - #endif -@@ -188,7 +189,7 @@ inline bool isPlatform(PlatformType a, const PlatformType& t = kPlatformType) { - return (static_cast(t) & static_cast(a)) != 0; - } - --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) - #define MUTEX_IMPL boost - #else - #define MUTEX_IMPL std -@@ -204,10 +205,10 @@ using WriteLock = MUTEX_IMPL::unique_lock; - using ReadLock = MUTEX_IMPL::shared_lock; - - /// Helper alias for defining recursive mutexes. --using RecursiveMutex = std::recursive_mutex; -+using RecursiveMutex = MUTEX_IMPL::recursive_mutex; - - /// Helper alias for write locking a recursive mutex. --using RecursiveLock = std::lock_guard; -+using RecursiveLock = MUTEX_IMPL::lock_guard; - } - - /** + if(NOT FREEBSD) + add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng") + endif() diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt -index 77913d31..671b20d4 100644 +index 1c8201ee..a89e6821 100644 --- a/osquery/CMakeLists.txt +++ b/osquery/CMakeLists.txt -@@ -57,7 +57,7 @@ endif() +@@ -35,8 +35,6 @@ if(CLANG AND POSIX) + -Wextra + -pedantic + -Wuseless-cast +- -Wno-c99-extensions +- -Wno-zero-length-array + -Wno-unused-parameter + -Wno-gnu-case-range + -Weffc++ +@@ -61,14 +59,7 @@ endif() # Construct a set of all object files, starting with third-party and all # of the osquery core objects (sources from ADD_CORE_LIBRARY macros). --set(OSQUERY_OBJECTS $) -+set(OSQUERY_OBJECTS "") +-if(FREEBSD) +- set(OSQUERY_OBJECTS $) +-else() +- set(OSQUERY_OBJECTS +- $ +- $ +- ) +-endif() ++set(OSQUERY_OBJECTS $) # Add subdirectories add_subdirectory(config) -@@ -138,6 +138,8 @@ elseif(FREEBSD) +@@ -147,10 +138,11 @@ if(APPLE OR LINUX) + ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite") + elseif(FREEBSD) + ADD_OSQUERY_LINK_CORE("icuuc") +- ADD_OSQUERY_LINK_CORE("linenoise") ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite") endif() @@ -137,41 +93,62 @@ index 77913d31..671b20d4 100644 if(POSIX) ADD_OSQUERY_LINK_CORE("boost_system") ADD_OSQUERY_LINK_CORE("boost_filesystem") -@@ -157,6 +159,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}") +@@ -168,6 +160,8 @@ endif() ADD_OSQUERY_LINK_CORE("glog${WO_KEY}") if(POSIX) + ADD_OSQUERY_LINK_ADDITIONAL("benchmark") - ADD_OSQUERY_LINK_ADDITIONAL("snappy") ++ ADD_OSQUERY_LINK_ADDITIONAL("snappy") ADD_OSQUERY_LINK_ADDITIONAL("ssl") ADD_OSQUERY_LINK_ADDITIONAL("crypto") -@@ -336,13 +339,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY) - - install(DIRECTORY "${CMAKE_SOURCE_DIR}/packs/" - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/packs" COMPONENT main) -- if(APPLE) -- install(FILES "${CMAKE_SOURCE_DIR}/tools/deployment/com.facebook.osqueryd.plist" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/" COMPONENT main) -- else() -- install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/deployment/osqueryd.initd" -- DESTINATION "/etc/init.d/" RENAME "osqueryd" COMPONENT main) -- endif() + ADD_OSQUERY_LINK_ADDITIONAL("libpthread") +diff --git a/osquery/extensions/CMakeLists.txt b/osquery/extensions/CMakeLists.txt +index 52f3bf80..066ed1c0 100644 +--- a/osquery/extensions/CMakeLists.txt ++++ b/osquery/extensions/CMakeLists.txt +@@ -60,12 +60,6 @@ else() + ) endif() - if(NOT SKIP_TESTS) -diff --git a/osquery/tables/system/linux/tests/md_tables_tests.cpp b/osquery/tables/system/linux/tests/md_tables_tests.cpp -index 126be362..119d361d 100644 ---- a/osquery/tables/system/linux/tests/md_tables_tests.cpp -+++ b/osquery/tables/system/linux/tests/md_tables_tests.cpp -@@ -72,7 +72,7 @@ void GetDrivesForArrayTestHarness(std::string arrayName, - EXPECT_CALL(md, getArrayInfo(arrayDevPath, _)) - .WillOnce(DoAll(SetArgReferee<1>(arrayInfo), Return(true))); +-if(NOT WINDOWS) +- add_compile_options( +- -Wno-macro-redefined +- ) +-endif() +- + ADD_OSQUERY_LIBRARY(TRUE osquery_extensions + ${THRIFT_GENERATED_FILES} + ${THRIFT_IMPL_FILE} +diff --git a/osquery/logger/CMakeLists.txt b/osquery/logger/CMakeLists.txt +index ab91bd24..d8364991 100644 +--- a/osquery/logger/CMakeLists.txt ++++ b/osquery/logger/CMakeLists.txt +@@ -55,9 +55,9 @@ if(NOT SKIP_KAFKA AND NOT WINDOWS AND NOT FREEBSD) -- Sequence::Sequence s1; -+ Sequence s1; - for (int i = 0; i < MD_SB_DISKS; i++) { - mdu_disk_info_t diskInfo; - diskInfo.number = i; + ADD_OSQUERY_LINK_ADDITIONAL("rdkafka") + +- set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS +- "logger/plugins/tests/kafka_producer_tests.cpp" +- ) ++ #set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS ++ # "logger/plugins/tests/kafka_producer_tests.cpp" ++ #) + + ADD_OSQUERY_TEST_ADDITIONAL(${OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS}) + endif() +diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt +index dd78084f..158758e1 100644 +--- a/osquery/tables/CMakeLists.txt ++++ b/osquery/tables/CMakeLists.txt +@@ -68,7 +68,7 @@ if(LINUX) + set(TABLE_PLATFORM "linux") + + ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so") +- ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient") ++ ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app") + ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error") + ADD_OSQUERY_LINK_ADDITIONAL("blkid") + ADD_OSQUERY_LINK_ADDITIONAL("ip4tc") diff --git a/specs/windows/services.table b/specs/windows/services.table index 4ac24ee9..657d8b99 100644 --- a/specs/windows/services.table diff --git a/pkgs/tools/system/osquery/platform-nixos.patch b/pkgs/tools/system/osquery/platform-nixos.patch deleted file mode 100644 index 7e1afcb640b3..000000000000 --- a/pkgs/tools/system/osquery/platform-nixos.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tools/get_platform.py b/tools/get_platform.py -index 3dd34516..f53ca83a 100644 ---- a/tools/get_platform.py -+++ b/tools/get_platform.py -@@ -26,6 +26,8 @@ DEBIAN_VERSION = "/etc/debian_version" - GENTOO_RELEASE = "/etc/gentoo-release" - - def _platform(): -+ return ("nixos", "nixos") -+ - osType, _, _, _, _, _ = platform.uname() - - if osType == "Windows": -@@ -75,6 +77,8 @@ def _platform(): - return (None, osType.lower()) - - def _distro(osType): -+ return "unknown_version" -+ - def getRedhatDistroVersion(pattern): - with open(SYSTEM_RELEASE, "r") as fd: - contents = fd.read() From 56df1aca245d2a415301d560366da637f081670c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 24 Apr 2018 06:47:44 +0000 Subject: [PATCH 2451/2743] powerline-go: 1.8.2 -> 1.10.0 --- pkgs/tools/misc/powerline-go/default.nix | 4 ++-- pkgs/tools/misc/powerline-go/deps.nix | 29 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 4e465e7ea1ca..e31c0da6306a 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "powerline-go"; - version = "1.8.2"; + version = "1.10.0"; name = "${pname}-${version}"; rev = "v${version}"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justjanne"; repo = pname; inherit rev; - sha256 = "1q45hxbrnx0mgi7z1rqkxp47dk8yf4mzy62i0027fhr65aifq6xj"; + sha256 = "1bmgim61cx6i4m24a474nm3w4zqjflm0wnw3y24299n9dj14izs3"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/misc/powerline-go/deps.nix b/pkgs/tools/misc/powerline-go/deps.nix index a3276ab229bb..78e28efb3b10 100644 --- a/pkgs/tools/misc/powerline-go/deps.nix +++ b/pkgs/tools/misc/powerline-go/deps.nix @@ -5,8 +5,17 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "a9d6d1e4dc51df2130326793d49971f238839169"; - sha256 = "1x6x5r6ijik5ardfrpncjbqvpv8j5m7yb94svzz83a15ln44ajmg"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "63047d776e07105e370af46ecbd0ae96850f5ef2"; + sha256 = "0204f0gx3fd8ya6rb478a7a4gr2v4i3m71148iv3jrdfvr5q5aaw"; }; } { @@ -14,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "91a49db82a88618983a78a06c1cbd4e00ab749ab"; - sha256 = "1xb4vlshx76xany4w60dkpz67plyfk7nr97pinf1bbha32pi36jc"; + rev = "2b6c08872f4b66da917bb4ce98df4f0307330f78"; + sha256 = "07wgdhs7ac3qmx0lfr4zazg2l159jqbwmn7jx49rr9811vivl1yh"; }; } { @@ -23,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "dd2ff4accc098aceecb86b36eaa7829b2a17b1c9"; - sha256 = "086j1kk56vm1m5m9sf3lcww9phqw6p2q3g0is1jn4ixfxd3wm2wg"; + rev = "79b0c6888797020a994db17c8510466c72fe75d9"; + sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag"; }; } { @@ -32,8 +41,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "b7ef84aaf62aa3e70962625c80a571ae7c17cb40"; - sha256 = "0xfb515f3bmcq15sq1cm641qwgsmq1w5xjdx2mhwgns770jngndd"; + rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; + sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; }; } { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "7f97868eec74b32b0982dd158a51a446d1da7eb5"; - sha256 = "0a31jd1p00b9c82f3sfsbv2bdh7mlfy9vhcqxipll2cyvxplgfq8"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] From 6799fcb42b25b41e9674f459c6817d232192d6fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 11:57:56 +0200 Subject: [PATCH 2452/2743] R: 3.4.4 -> 3.5.0 Unfortunately, the new version fails its test suite AGAIN when the recommended packages are not build. Makes one wonder whether maybe we should offer the R developers CI builds that check this. I've reported the issue upstream, let's see what happens. --- pkgs/applications/science/math/R/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index a9b2de1a00c5..953f4e62c22b 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.4.4"; + name = "R-3.5.0"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk"; + sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx"; }; buildInputs = [ @@ -65,7 +65,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - doCheck = true; + doCheck = withRecommendedPackages; # R 3.5.0 fails the test suite if the + # recommended packages are not built preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; enableParallelBuilding = true; From 94295e3cee960f54789353cb41cbc00c5ced3afc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 21:26:52 +0200 Subject: [PATCH 2453/2743] R: update CRAN and BIOC package sets --- .../r-modules/bioc-experiment-packages.nix | 6 +- pkgs/development/r-modules/bioc-packages.nix | 108 +- pkgs/development/r-modules/cran-packages.nix | 2314 +++++++++-------- pkgs/development/r-modules/default.nix | 2 - 4 files changed, 1335 insertions(+), 1095 deletions(-) diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix index 220ac60486b8..f323532ad7d9 100644 --- a/pkgs/development/r-modules/bioc-experiment-packages.nix +++ b/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -70,7 +70,7 @@ in with self; { HelloRangesData = derive2 { name="HelloRangesData"; version="1.4.0"; sha256="1c7gfhwr9g6hv0p3s4yd8v9rhjp3jmrnzsqsqq4ysc2i24nf7drr"; depends=[]; }; HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.112.0"; sha256="1qxg7650lbfbjl9p75clrybsdbzd0yzpi8pi2biv83jgqkkjrd0b"; depends=[]; }; HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.14.0"; sha256="0708xgm495a330h70yi2qd494h6gf0n46j016mw9bc4gzbb7aq9p"; depends=[]; }; - Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.14.0"; sha256="0lah9l8gd5gs1wj68l9hqakcwha0rl88dg2p0zk92nff64jxn3pj"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; + Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.14.1"; sha256="0b47hi6di0gy4f8bzhsjm5ag5jhqqsgh5h19h4lwr5jcg2710ang"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; HumanAffyData = derive2 { name="HumanAffyData"; version="1.4.0"; sha256="0xgb3rrvgrx6sdwbb8gb1q8mgf0s2giih8l8d3hzvnxazh80qs8b"; depends=[Biobase ExperimentHub]; }; IHWpaper = derive2 { name="IHWpaper"; version="1.6.0"; sha256="08gkdi1lra9mn1cbsqddqn3pwj3pfy2yfgzay5igr7n1akfmgh7k"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; }; ITALICSData = derive2 { name="ITALICSData"; version="2.16.0"; sha256="1rrfxc3hzlq2i0z5j432w3s33ln56i91a06q49piisz06vviz6yv"; depends=[]; }; @@ -260,7 +260,7 @@ in with self; { lungExpression = derive2 { name="lungExpression"; version="0.16.0"; sha256="09v9r6rmfcqprqd1rx53sa4dhjjmg6d9649vlhfhzkyc73yknwmb"; depends=[Biobase]; }; lydata = derive2 { name="lydata"; version="1.4.0"; sha256="0dflfp14gdjgy7qf3my0vas5zbg77l16li7xgv1924cry11w2dxx"; depends=[]; }; mAPKLData = derive2 { name="mAPKLData"; version="1.10.0"; sha256="1bfx4imb5yg17n0g1ag436zlks4jcp8ga0xj9wyh9bhx4miwyay4"; depends=[]; }; - mammaPrintData = derive2 { name="mammaPrintData"; version="1.14.0"; sha256="0ks72wnagdvnbilqcsvl5lbhgh64fhbfys0da03336f1z16f5lv9"; depends=[]; }; + mammaPrintData = derive2 { name="mammaPrintData"; version="1.14.2"; sha256="04ymimgj8ng5qgvq0cglmhcxv7a3jqx9a2zyg8lwiwzpyip18inx"; depends=[]; }; maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.22.0"; sha256="0hn20i11vl9x23mx283aki097r1a8rspagac821kmlwghyab1mxq"; depends=[]; }; metaMSdata = derive2 { name="metaMSdata"; version="1.14.0"; sha256="1iygqxymvb98cm325bmdqb34n9b4k1vdzdyzcq8a0gh1dvs2m0iw"; depends=[]; }; methyvimData = derive2 { name="methyvimData"; version="1.0.0"; sha256="1b2mvcawafkr15py8h9j10w5givifi99h9clbdmkgfyixbbh0m94"; depends=[minfi]; }; @@ -287,7 +287,7 @@ in with self; { pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.14.0"; sha256="137lj4j0hlz3mkwyf334xr3bpm9j2jg1cd2sw9203kx6hvk92i2z"; depends=[]; }; pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.14.0"; sha256="0kb62bm1a8m88g59v6553qg69rmv0gh0wy4yfkqvn2sgz51zk4r4"; depends=[]; }; pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.14.0"; sha256="0b3cak7nzd6qxr7gnly4246gjdhxyp8h0w5dr1xsgwd9zy1k0psw"; depends=[]; }; - pcxnData = derive2 { name="pcxnData"; version="1.0.0"; sha256="0bkzqac0b2x1f398bflv077dp6nb3ysdf75jcwxpj4nwyhcb7n4f"; depends=[]; }; + pcxnData = derive2 { name="pcxnData"; version="2.0.0"; sha256="10qhw7v1nzf4y9xhd34jiimcyi6lgjy6y9zc6kzk80hm6qiry8j2"; depends=[]; }; pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.16.0"; sha256="1ilwm4nx232dll01xqqvagq3qi6qa060v84y20ihxhfwdm46z0ci"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pepDat = derive2 { name="pepDat"; version="0.112.0"; sha256="15v4yk9cpnz2k16ka4iyc61ji5ck9mlkabgzxalwfnz77ri23mk0"; depends=[GenomicRanges]; }; plasFIA = derive2 { name="plasFIA"; version="1.6.0"; sha256="0p3pbjm5ww24ax7h72m38l0rcm01w5a4h8j5rsgynczvfv9jlwjq"; depends=[proFIA]; }; diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index 2d98b23a8671..efb91b43bb04 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -38,7 +38,7 @@ in with self; { AnnotationForge = derive2 { name="AnnotationForge"; version="1.20.0"; sha256="01vbrf76vqfvxh6vpfxkjwccxggnha3byqzj333glqz2b6kwx5q1"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; }; AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.28.0"; sha256="1g6y7bwk573yaays0fmlicxq2452sli0kv41bq8sh4ja2l5jh5i6"; depends=[AnnotationDbi DBI]; }; AnnotationHub = derive2 { name="AnnotationHub"; version="2.10.1"; sha256="14v8g44a6zg9j2rwn9x9y8509k0wr2cw8yccliz24glplb40wva4"; depends=[AnnotationDbi BiocGenerics BiocInstaller curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; }; - AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.8.0"; sha256="1nsai8a2vf5jwczd4k3vbdd9xbn6dfg6dydvf4byklxj6pk6vi97"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; }; + AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.8.1"; sha256="08pvswszxnbr6b3amg2g2353iil2bm9bs571c6lf4v8z0z1by8g5"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; }; ArrayExpress = derive2 { name="ArrayExpress"; version="1.38.0"; sha256="01kb4322pfl9w6za6glb777hdyc8j36xs6flz3b11n1mjryipz7c"; depends=[Biobase limma oligo XML]; }; ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.28.0"; sha256="04qnxgywyxww8xd6r8vgy8sglbixd25749dmbsw0wgqk6zcgysim"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; }; ArrayTV = derive2 { name="ArrayTV"; version="1.16.0"; sha256="1hn5dngk4civwzx1w2py1n9g1k1jv3kwrj6z6ysvfsfi4q668341"; depends=[DNAcopy foreach oligoClasses S4Vectors]; }; @@ -47,7 +47,7 @@ in with self; { BAC = derive2 { name="BAC"; version="1.38.0"; sha256="04s7fbb8b4is97alj64p86jnh1lgf4a0n02wg3g9rvd75jxmzbai"; depends=[]; }; BADER = derive2 { name="BADER"; version="1.16.0"; sha256="05p006rqydnvz5a8gdbara9fsyn51b5flc05j593bvvlmkc6anl5"; depends=[]; }; BAGS = derive2 { name="BAGS"; version="2.18.0"; sha256="1qhmrz6ffhhsbnmcc0xmb64psv50b1jd1gxkjhhv479mcfl6mk06"; depends=[Biobase breastCancerVDX]; }; - BASiCS = derive2 { name="BASiCS"; version="1.0.0"; sha256="15yby5dz0hizr76bpa5clrpfh1ycvpkk11i7y7ak164ikzxvvmd9"; depends=[BiocGenerics coda data_table KernSmooth matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; }; + BASiCS = derive2 { name="BASiCS"; version="1.0.1"; sha256="02acpq0mrdr8l3xa3k32k2mq8k96c95gm9603m5z5z3x3npjdzq7"; depends=[BiocGenerics coda data_table KernSmooth matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; }; BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.8.0"; sha256="0fv5gyzfv0093dlyrlci9d88fcb0ifgljxwivrxpkbbsll5vrpxh"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; }; BCRANK = derive2 { name="BCRANK"; version="1.40.0"; sha256="0vbjskazhm5v4lmwdc456r5vl2v848ldqrzbdjrdxjlvd72wfprw"; depends=[Biostrings]; }; BEAT = derive2 { name="BEAT"; version="1.16.0"; sha256="0x4k45qgzwv6m00zq1jhbhc2aa5slgg5p4g8g909vajc75fpp6g7"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; }; @@ -83,13 +83,13 @@ in with self; { Biobase = derive2 { name="Biobase"; version="2.38.0"; sha256="1cgm1ja1kp56zdlzyy9ggbkfn8r2vbsd4hncmz8g4hjd47fg18kg"; depends=[BiocGenerics]; }; BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.40.0"; sha256="0hwmqv8nimc8gl1c5a72ckmgag5j8886ab62i1irlkfis5x2rj8m"; depends=[Biobase]; }; BiocCheck = derive2 { name="BiocCheck"; version="1.14.0"; sha256="1nzp8kgw13z9pgf885rplj6k37jcldfhbz0adqclxr2gq0yalmyx"; depends=[BiocInstaller biocViews codetools graph httr optparse stringdist]; }; - BiocFileCache = derive2 { name="BiocFileCache"; version="1.2.2"; sha256="111rrzz366kmqs1v8jx5ck0kb0xs42f250m5i0sn65ypvg9ag504"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; }; + BiocFileCache = derive2 { name="BiocFileCache"; version="1.2.3"; sha256="0fam0j8kwf9kfbvh4h7q4m53via75c5wnbn2g55cv3d37hikbpsm"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; }; BiocGenerics = derive2 { name="BiocGenerics"; version="0.24.0"; sha256="03wxvhxyrhipbgcg83lqlfn7p9gbzzrnl48y0dq7303xgp232zai"; depends=[]; }; BiocInstaller = derive2 { name="BiocInstaller"; version="1.28.0"; sha256="19fga27bv6q9v5mpil74y76lahmnwvpg2h33rdx1r79nvljkd19d"; depends=[]; }; BiocParallel = derive2 { name="BiocParallel"; version="1.12.0"; sha256="13ng3n2wsgl3fh0v6jnz3vg51k5c1sh44pqdvblcrcd1qyjmmqhd"; depends=[BH futile_logger snow]; }; BiocSklearn = derive2 { name="BiocSklearn"; version="1.0.2"; sha256="1zpfb7g353c01ffldrx7251919r6giy58s19w78jf0bslagblv4y"; depends=[BBmisc knitr reticulate SummarizedExperiment]; }; BiocStyle = derive2 { name="BiocStyle"; version="2.6.1"; sha256="03pp04pkcq99kdv2spzr995h2cxsza7l6w3d4gp4112m06prcybm"; depends=[bookdown knitr rmarkdown yaml]; }; - BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.4.1"; sha256="13xcsd4c2l9jrcbl8axrragk4g2x6sp6xrk5r4gcligdicgxpq9l"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown stringr]; }; + BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.4.2"; sha256="1nfph17y36vkji7yyvmkry134s4naml256p6687ag53klqxvvz7x"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown stringr]; }; Biostrings = derive2 { name="Biostrings"; version="2.46.0"; sha256="0vg50qdlxqcm2d6axjnzg8wh8pr4c5gz03l8bdl0llmwzp0zclzk"; depends=[BiocGenerics IRanges S4Vectors XVector]; }; BitSeq = derive2 { name="BitSeq"; version="1.22.0"; sha256="1xkmvzv2kdla3mrarlw21w1hz788w71443jbn36a8dc4p6wrnxhy"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; }; BrainStars = derive2 { name="BrainStars"; version="1.22.0"; sha256="0fipnpjpsp462dsfsvcrnysca4vsq2k6z15a6mxfxvqs1gybhvvj"; depends=[Biobase RCurl RJSONIO]; }; @@ -129,7 +129,7 @@ in with self; { CNVtools = derive2 { name="CNVtools"; version="1.72.0"; sha256="0ihmgg5f0p7yhg0273jb785fcrhcw704vz8r6ban8c63wk0qbqb5"; depends=[survival]; }; CODEX = derive2 { name="CODEX"; version="1.10.0"; sha256="1knfgii0n8grn4436aksk7f2xkk93ih2snvrp7p8pkr206kqadnq"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; }; COHCAP = derive2 { name="COHCAP"; version="1.24.0"; sha256="1ggxn35hif4x4k1rbnxinf0pdqbg1n53wym9rm5zs6cnya4aimgj"; depends=[COHCAPanno gplots RColorBrewer WriteXLS]; }; - COMPASS = derive2 { name="COMPASS"; version="1.16.0"; sha256="1x1vcn37nr4mcx5q8zahyg654gbx0srxckxvz6shvprpdvgs83sn"; depends=[abind clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang scales tidyr]; }; + COMPASS = derive2 { name="COMPASS"; version="1.16.2"; sha256="1g9y5gryy1r8sg75008v3b2a1l2wkxvf8h5bnljnkc0wsd4f4nvb"; depends=[abind clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang scales tidyr]; }; CONFESS = derive2 { name="CONFESS"; version="1.6.0"; sha256="0kmvhwyzxz9ahvvzicigxal3r4ya8y5i090m7pi7d1p5arir7djl"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; }; CORREP = derive2 { name="CORREP"; version="1.44.0"; sha256="10bjv02x2xzanajfbsvbxd7s2s07z0gydx1ypmbfym41jjwac9ra"; depends=[e1071]; }; COSNet = derive2 { name="COSNet"; version="1.12.0"; sha256="0x5kg4c5ml7ndqq81k5jy07fyra4q6nhhly6v7qd98gpmvrj6gnk"; depends=[]; }; @@ -193,7 +193,7 @@ in with self; { DEP = derive2 { name="DEP"; version="1.0.1"; sha256="0glkq6xlhcsr364zl4nkc7g3gnscv0yb3kcyvhzgm3bbfvd9q7ac"; depends=[assertthat Biobase broom circlize ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; }; DESeq = derive2 { name="DESeq"; version="1.30.0"; sha256="0mn5w3cy16iwwk8zxs7za6aa6cnrca75z0g45zd5zh1py5d7nfv9"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; }; DESeq2 = derive2 { name="DESeq2"; version="1.18.1"; sha256="1iyimg1s0x5pdmvl8x08s8h0v019y0nhjzs50chagbpk2x91fsmv"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; - DEXSeq = derive2 { name="DEXSeq"; version="1.24.3"; sha256="0xip73hlbr3zry9d7ly9vvvsbb3xjcmfa09lr9fdy528dwjrf084"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; + DEXSeq = derive2 { name="DEXSeq"; version="1.24.4"; sha256="1a80yv742fx5c7qav7imsdybphf0d5bixsqyf8w5zng7fk8j16d5"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; DEsubs = derive2 { name="DEsubs"; version="1.4.0"; sha256="1i9blymzj18r9646vac9grrjxw6xar8m6chn1dgdila17jag1wlp"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; }; DFP = derive2 { name="DFP"; version="1.36.0"; sha256="117gmzcgr9wr9wb7g0rm7wlrakd76ys1frhmhx1k6ps97ibxlz1k"; depends=[Biobase]; }; DMCHMM = derive2 { name="DMCHMM"; version="1.0.0"; sha256="1y0wmxks51h0d21v8g4mryq7kzq49khhpa88fbhza9xp2bmwk358"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; }; @@ -242,8 +242,8 @@ in with self; { ENmix = derive2 { name="ENmix"; version="1.14.0"; sha256="117jp47hpm276x4q25jwqfagymvay0qk3ji5l9xvrj74piwqpgwh"; depends=[doParallel foreach geneplotter impute MASS minfi preprocessCore SummarizedExperiment sva wateRmelon]; }; EasyqpcR = derive2 { name="EasyqpcR"; version="1.20.0"; sha256="06lmq3pp0j86rv9bgs809r30qscgpxv5vjbkccf32q9wv82vd7hw"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; }; EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.6.0"; sha256="1wv1anm4bwm2kqi9lqn06bl1w17q6wvc1v2amrifbqjbmi5k7g8y"; depends=[]; }; - EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.9.2"; sha256="0ffyb40qcvpjqval78146w8wvk3ng7v1ipdwnqkzj705gqkwbw9y"; depends=[ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; }; - EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.8.6"; sha256="1vxnl0n34ygl4fx28s8zmp71b8hidlp4sn34k1cfkw7hiaf2gg9n"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; }; + EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.9.4"; sha256="03n7w56r14y3jrrsdl2awcan5d0hsn3kd8900lrj015pmgf2r9d0"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; }; + EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.8.7"; sha256="12wrxbp14ahjjph85g040f72yk4j47svsyyv7b9s56mkc513vd6v"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; }; EpiDISH = derive2 { name="EpiDISH"; version="1.0.0"; sha256="065bvrfsssf5y4j9axqdcybqb5i8y2hnl09f9jr44bpbay34ay5f"; depends=[e1071 MASS quadprog]; }; EventPointer = derive2 { name="EventPointer"; version="1.2.0"; sha256="1yh6yhaf8c2rp8f4ipsk014552pplb28cl5z7wjwvarjb21waj05"; depends=[affxparser doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph limma MASS Matrix matrixStats nnls prodlim RBGL S4Vectors SGSeq stringr SummarizedExperiment]; }; ExiMiR = derive2 { name="ExiMiR"; version="2.20.0"; sha256="0saxway680972dmn6q1gbbmkxcwv08hl2bq973qbyrv5drg6g4vv"; depends=[affy affyio Biobase limma preprocessCore]; }; @@ -298,10 +298,10 @@ in with self; { GSRI = derive2 { name="GSRI"; version="2.26.0"; sha256="12silcf67r3ni40g7vsc7iv15arzy7w12abpj2xcjfd9nr4d84js"; depends=[Biobase fdrtool genefilter GSEABase les]; }; GSReg = derive2 { name="GSReg"; version="1.12.0"; sha256="1rdzkv6kf14shfddvrz3pssjgr6pvg6is4lzcvjzrxai4y34n0y6"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; }; GSVA = derive2 { name="GSVA"; version="1.26.0"; sha256="1zvi0w7clm5qg6fv6akqw4cx84kswcgzfzjdkhxsrid0l4hwmw09"; depends=[Biobase BiocGenerics geneplotter GSEABase shiny shinythemes]; }; - GUIDEseq = derive2 { name="GUIDEseq"; version="1.8.0"; sha256="1xsjz3mq6iawspdz1rif3fb8j2h92ykfrjj3lzlcsnvg92bnlczq"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; }; + GUIDEseq = derive2 { name="GUIDEseq"; version="1.8.1"; sha256="1vx24scbwr4xqhza4q90jpw3xv1pyd7afbqlxijy2fv4p1fzwi4h"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; }; GWASTools = derive2 { name="GWASTools"; version="1.24.1"; sha256="1x8p32f47fki2kl0pkjv4v7az8s1b6zwqjnxywfxy0drs9g6lky4"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; }; GenRank = derive2 { name="GenRank"; version="1.6.0"; sha256="071k23qknpd46x22bj2cmp07mmxj22higw8ma4b0a8w0wmd05bwz"; depends=[matrixStats reshape2 survcomp]; }; - GenVisR = derive2 { name="GenVisR"; version="1.8.0"; sha256="03jc5qz1xfqpbll8qbs5ib7g70s21crmggc9a6xi9nvjq8ky05r6"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; }; + GenVisR = derive2 { name="GenVisR"; version="1.8.1"; sha256="0c8dm4k2fn4g7vpjvd452vx0a1xb4rp5w1ii1h4q96957s8s52hj"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; }; GeneAnswers = derive2 { name="GeneAnswers"; version="2.20.0"; sha256="11bdc59ybi1kck3jkzilf0vmql6a3k97b1f9h940h28mhgn5x9w6"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; }; GeneBreak = derive2 { name="GeneBreak"; version="1.8.0"; sha256="1157crj12c3girr6973a24ph15rfjw0vcakr42fpx7yhhirs89lb"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.24.0"; sha256="1l8829axy6fp29bkqlwbjcsajq99yb86yp5cc8211zprlhlxb30i"; depends=[Biobase PGSEA]; }; @@ -318,7 +318,7 @@ in with self; { GenoGAM = derive2 { name="GenoGAM"; version="1.6.0"; sha256="1dvaapinarpgn3i63iqhdbjh9mc5h7sgdxwlv9d55l42d1jyj6h3"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; }; GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.38.0"; sha256="15p75cbbgwgcc3awyvawkah491yim0rp73af815pfiai11a51i4m"; depends=[biomaRt]; }; GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.14.0"; sha256="1jhm0imkac4gvchbjxj408aakk39xdv2fyh818d3lk295bz6bnyp"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; - GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.14.1"; sha256="033p6fw46sn7w2yyn14nb9qcnkf30cl0nv6zh014ixflm3iifz39"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; + GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.14.2"; sha256="1659nj1xps7vliy5955i51x6hvrf16n1z0dfh10mmpaaswn2d2mv"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.2.0"; sha256="0ndzpzripibx38nk40xpz4xkghhr4an3skqdhfh8479jk2fnfwjd"; depends=[data_table GenomicRanges httr IRanges jsonlite lazyeval magrittr readr xml2]; }; GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.30.3"; sha256="010vn8hlwbnw12pd1d8pv6m12yp3xwx557gba5rbjq9p4qypnn3z"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RMySQL RSQLite rtracklayer S4Vectors XVector]; }; GenomicFiles = derive2 { name="GenomicFiles"; version="1.14.0"; sha256="0r0wmrs5jycf1kckhnc2sgjmp336srlcjdkpbb1ymm7kazdd0s9n"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; @@ -352,7 +352,7 @@ in with self; { Heatplus = derive2 { name="Heatplus"; version="2.24.0"; sha256="0lil1yfqqga9l6qrgismngvary4495zmi4yk01izpcx29pk8zn6n"; depends=[RColorBrewer]; }; HelloRanges = derive2 { name="HelloRanges"; version="1.4.0"; sha256="0pbikr79lh6iij044sy6fw6i2bqigmna4hb806kyihclpm0rs3y2"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; HiCcompare = derive2 { name="HiCcompare"; version="1.0.0"; sha256="1r25l4q7rpzjhz02ys78a4p8ga3wrd231znk84pp7xgka3xpprv0"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq S4Vectors]; }; - HiTC = derive2 { name="HiTC"; version="1.22.0"; sha256="0288xa1jy6nzvz2ha07csmp6dirjw5r7p9vy69q2wsbyzr02ymkp"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; + HiTC = derive2 { name="HiTC"; version="1.22.1"; sha256="0da1jw9my2n2gihs31zyn14wwr23d8v2vij39ll7rm6fma3ydfbl"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; HilbertCurve = derive2 { name="HilbertCurve"; version="1.9.1"; sha256="1k3l3i8fpfhzsdwrlkyp7k8rpkyg51lx6c776vd8nm4f2nqn7z36"; depends=[circlize GenomicRanges HilbertVis IRanges png]; }; HilbertVis = derive2 { name="HilbertVis"; version="1.36.0"; sha256="1yilvi5pcr0z5h0n0mf7hfrjc7cl44vn6svczlmw57n8pxf8p35g"; depends=[lattice]; }; HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.36.0"; sha256="12bwk0lj2s6jgrpwigc4jd80irzxqjwc8smq1dhsm6pj62v0gvlk"; depends=[HilbertVis]; }; @@ -420,7 +420,7 @@ in with self; { MBCB = derive2 { name="MBCB"; version="1.32.0"; sha256="0amqmzi54dvkgzylavy0dbv973s2p02jppd5vzqzkrqs8amb3r4c"; depends=[preprocessCore tcltk2]; }; MBttest = derive2 { name="MBttest"; version="1.5.0"; sha256="0gswdh61mmqn7h4d6vwvis08lxx383ynj6pk2va3z8bn25qki5lz"; depends=[gplots gtools]; }; MCRestimate = derive2 { name="MCRestimate"; version="2.34.0"; sha256="1n4abpm6ld4ap87pgrv3mfr1aycdjb4hjg3fm699rckyl9qynjr3"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; }; - MCbiclust = derive2 { name="MCbiclust"; version="1.2.1"; sha256="1yqm6fwap4553nmh1dl3vg87hixljzm097wcv4l6sd5sd0sg63c7"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; }; + MCbiclust = derive2 { name="MCbiclust"; version="1.2.2"; sha256="0xll7qdg8cf854yzwxmzvd8xh0pjzkq9x9fskcsv7brm25ar6ghv"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; }; MEAL = derive2 { name="MEAL"; version="1.8.0"; sha256="0mccjr21jvmwlszhb9qixm7dr83gkhm2hjh9yrn11d22cm9r6g1q"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SNPassoc snpStats SummarizedExperiment vegan]; }; MEDIPS = derive2 { name="MEDIPS"; version="1.30.0"; sha256="06mm424g3rc8j64wfyv6w40m106wifzhi91nsbpi317fg98qfd3d"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; }; MEDME = derive2 { name="MEDME"; version="1.38.0"; sha256="137p9z1g3z4r7q3nsrpsp2gbm657nrbrrq96ph1mykvv41ylq59p"; depends=[Biostrings drc MASS]; }; @@ -428,9 +428,9 @@ in with self; { MGFM = derive2 { name="MGFM"; version="1.12.0"; sha256="0yjr14anr5rny6g1508nrw905d4b01jh34vpwi8737p1q4d9bzis"; depends=[annotate AnnotationDbi]; }; MGFR = derive2 { name="MGFR"; version="1.4.0"; sha256="04nxg65m1s8qyq8sbs8733d541r0vcmabz27w03vs87f0dbxhg11"; depends=[annotate biomaRt]; }; MIGSA = derive2 { name="MIGSA"; version="1.2.0"; sha256="0ih5i1acb7igbcqk7wykxhncvl5vbgx34gl5nqc65adpqb0199fl"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase limma matrixStats mGSZ org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; }; - MIMOSA = derive2 { name="MIMOSA"; version="1.16.0"; sha256="0rnxr7gxcps2raxka8c2x58liwwc75acwpahi2xc1dl8c2z4jpvx"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; }; + MIMOSA = derive2 { name="MIMOSA"; version="1.16.1"; sha256="1fsjpqpv32ps8pyj1mjkhrpikchhmm3l06yyjqy3bgrfa1ch36vx"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; }; MIRA = derive2 { name="MIRA"; version="1.0.1"; sha256="0dapp1q6vrdixz8n2g6ivav4d4si3wg1na7cg5jirb22mwi2rrpk"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; }; - MLInterfaces = derive2 { name="MLInterfaces"; version="1.58.0"; sha256="1py603bykvnzyq15rcqvq1nly3l6chh5zh6x4biwdn0smyjlnkns"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; }; + MLInterfaces = derive2 { name="MLInterfaces"; version="1.58.1"; sha256="0hran4cavh1zlzwjwpmmd13qsx95z7kf8pqmh7w1pb36isj2z3hy"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; }; MLP = derive2 { name="MLP"; version="1.26.0"; sha256="0mhaw39rbzrnrminvsiq6vrdrmf3zm2zqg3ilnsq1zw8bm2bsbh7"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; }; MLSeq = derive2 { name="MLSeq"; version="1.18.0"; sha256="1r6b33ic2lnj3v2qzs7r904rfyibz96yr35mgpiz4zzsax4ar6v4"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; }; MMDiff2 = derive2 { name="MMDiff2"; version="1.6.0"; sha256="13f96dw630hadqa0z83ispdni728g7zl12xj8zxrf5hvw1c1hs2h"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; @@ -468,7 +468,7 @@ in with self; { MiRaGE = derive2 { name="MiRaGE"; version="1.20.0"; sha256="1jbs427vpld18l83s5dngijc8rgllqvrili8gv4in20nr6dyk9hi"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; }; MineICA = derive2 { name="MineICA"; version="1.18.0"; sha256="1zdq5i14ksm8rirbry6j1dh56r1bhy5yvfzrxfjkm94lynqcdpdy"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; }; MinimumDistance = derive2 { name="MinimumDistance"; version="1.22.0"; sha256="1j2g0ji1ac9608b965rr9vvbhlcbvirqypngh11havh3vn54m9rf"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; - Mirsynergy = derive2 { name="Mirsynergy"; version="1.14.0"; sha256="1mwcv1fb3vda4ilmvwjrwb2qg65bgdxsvd2jd9ndaccxb7m3c2lk"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; }; + Mirsynergy = derive2 { name="Mirsynergy"; version="1.14.1"; sha256="09hg5mak0ba0vifix5s0nq7md4hjldmar23jyxz5da1lp22cza9i"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; }; MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.28.0"; sha256="058nvymnnzd61a7x2vpzic1s2nm3q520cnfdhd6i09isg6kqr6c8"; depends=[Biobase lattice limma statmod vsn xtable]; }; MoPS = derive2 { name="MoPS"; version="1.12.0"; sha256="0g4awrm90kjnk66b291y2n5vwwwzpdb3kaq96sxfc5a1af8q5q81"; depends=[Biobase]; }; MoonlightR = derive2 { name="MoonlightR"; version="1.4.0"; sha256="0kisic6bzp2gy1yjg717izbkirlvrwb1wndckd2yvncrjzpidcq6"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; }; @@ -478,7 +478,7 @@ in with self; { MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.4.9"; sha256="0kbr2nfxkny9y6hgijr2xpzczs0ijv0g7nh37yrzgkh10rwjsflq"; depends=[Biobase BiocGenerics GenomicRanges IRanges reshape2 S4Vectors shiny shinydashboard SummarizedExperiment tidyr]; }; MultiDataSet = derive2 { name="MultiDataSet"; version="1.6.0"; sha256="0h187dkqn63m6askai30x31va24hiv4ig0kxvp9xraz7n9zfr24g"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; }; MultiMed = derive2 { name="MultiMed"; version="1.12.0"; sha256="1b48iv34bnsbyg7j70kwi8iyikc1hxlcfmaxsc97249dfq71rfab"; depends=[]; }; - MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.4.2"; sha256="08ay9h5cqsi8ypb6r0g4rfa5l1g06jgfzl64wmhgz134yqbl7vfv"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 gridExtra IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; }; + MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.4.3"; sha256="0ml4gsp5dfv23xqrknxh25q8q65hly1xb1215lcwyc8hj9z8f941"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; }; NADfinder = derive2 { name="NADfinder"; version="1.2.0"; sha256="0npzbgbpwir4jv8h4giar9w8vjy3rivk55bimqd9bq7m83iwqapq"; depends=[baseline BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; }; NCIgraph = derive2 { name="NCIgraph"; version="1.26.0"; sha256="094dnqj1gss4dh8hsc8y9k98b0g33n7yy714kjavcd16glp4w7i0"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; }; NGScopy = derive2 { name="NGScopy"; version="1.12.0"; sha256="1aibq3rbs52vyhcx388p7szax7v8ac023pxayqmn2xq3kzj172ah"; depends=[changepoint rbamtools Xmisc]; }; @@ -501,7 +501,7 @@ in with self; { OmicCircos = derive2 { name="OmicCircos"; version="1.16.0"; sha256="13dw36n0lg5cafsrgkgr65al6y7jij2clyf1wzidn05p508i02m3"; depends=[GenomicRanges]; }; OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.10.0"; sha256="0s7zyj3xkr74w0jw604hv3v775kqjpdgks4gkkrkfa3a1xj7xa5b"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; }; Onassis = derive2 { name="Onassis"; version="1.0.1"; sha256="11sq6f3qcq37i4blml024kb24ifcq1xplklv2i9c55wg299ni620"; depends=[AnnotationDbi data_table GEOmetadb OnassisJavaLibs rJava RSQLite SRAdb]; }; - OncoScore = derive2 { name="OncoScore"; version="1.6.0"; sha256="02vzvvdnisx3xhr7428xdclgx90apa49h64bvp2h3nsa0vnhnj9l"; depends=[biomaRt]; }; + OncoScore = derive2 { name="OncoScore"; version="1.6.2"; sha256="0lv3rx92fslikv79cpib839wbhj7v3ad869n50frqylyp6kn5nyg"; depends=[biomaRt]; }; OncoSimulR = derive2 { name="OncoSimulR"; version="2.8.0"; sha256="1b0myymp38j6fbd4y8ppwmsj8v9w96g8wayc20bcygm16i1zjm5k"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph nem RColorBrewer Rcpp Rgraphviz smatr]; }; OperaMate = derive2 { name="OperaMate"; version="1.9.0"; sha256="11ah55sl04gm8hq3gkcz3b4shq4dxdpwlwl0wn4j82ciai0k6wsm"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; }; OrderedList = derive2 { name="OrderedList"; version="1.50.0"; sha256="1sk9ni3vyixb3vwn86vz174lfd7n7rnc8jmm1fx94pjsp9r6sbgr"; depends=[Biobase twilight]; }; @@ -538,10 +538,10 @@ in with self; { PathoStat = derive2 { name="PathoStat"; version="1.4.1"; sha256="1al0h4mw5lsmn4n3d76d8p9px62l4y5c5z78md2zchnam3x9ii78"; depends=[alluvial ape BatchQC BiocStyle corpcor DESeq2 dplyr DT edgeR ggplot2 gtools knitr limma matrixStats MCMCpack pander phyloseq plyr preprocessCore rentrez reshape2 rmarkdown scales shiny tidyr XML]; }; PathwaySplice = derive2 { name="PathwaySplice"; version="1.0.0"; sha256="1yi302xjf355xi14vx5rl6qyrm35qz9llf48fwrj7ycb41vla0fj"; depends=[AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; }; Pbase = derive2 { name="Pbase"; version="0.18.0"; sha256="17ya1mmz8dqrr81vcfy3ygw490bwg26xkj72mcmba17cyy0nv11x"; depends=[AnnotationFilter Biobase BiocGenerics BiocParallel biomaRt Biostrings cleaver ensembldb GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; }; - PharmacoGx = derive2 { name="PharmacoGx"; version="1.8.2"; sha256="0w77wpvi4qs8ngf5404m2cgac9zfj4jvkh88xcrz7zmmjmg2wvb9"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; }; + PharmacoGx = derive2 { name="PharmacoGx"; version="1.8.3"; sha256="1lax2naj6qcjp4fy640m9pflvi2y1aqbsh5m9j2mpphy6a1dlvmh"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; }; PhenStat = derive2 { name="PhenStat"; version="2.14.0"; sha256="1hjj1i083ihi7c1lc1rrh3k7513xcqpybn3aaivdjw66pi1bg7vp"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; Pi = derive2 { name="Pi"; version="1.6.2"; sha256="0x3b5cs7r4cjvjjc2gx7xapzlkvg56784aj04zg6271hldpcd84j"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; }; - Pigengene = derive2 { name="Pigengene"; version="1.4.2"; sha256="15wnq91k360jblns36dgx4a24jk6a7rwkj342ja0sgfc6kvwvvqb"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; }; + Pigengene = derive2 { name="Pigengene"; version="1.4.20"; sha256="13pzgzls2k48h31h25n2rw028n97xaxfxlb4dq49ndwy5874cbzb"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; }; Polyfit = derive2 { name="Polyfit"; version="1.12.0"; sha256="1gkn6g5hwa8ss156armxam9ky5fd7dj0k3gh1b0gy5plpzzyzv1h"; depends=[DESeq]; }; Prize = derive2 { name="Prize"; version="1.8.0"; sha256="1vaf4n69pb2sa6fd79988picz08d3c46cjmxfr5qf7hxay9lbwc6"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; }; ProCoNA = derive2 { name="ProCoNA"; version="1.16.0"; sha256="06jlzcr9b6nfrlgb1wqxp7r2z8042ygjx4d2z7jzg07hqn3gymjz"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; }; @@ -562,7 +562,7 @@ in with self; { RBGL = derive2 { name="RBGL"; version="1.54.0"; sha256="18jad23i3899ypv4bg3l47cvvs3qnj1pqis2p9x0135yv5y6wnv7"; depends=[graph]; }; RBM = derive2 { name="RBM"; version="1.10.0"; sha256="1nqmf9yiaam767f2wkwggnw6v0rymszx7chnkis0xbdsllzqb0j4"; depends=[limma marray]; }; RBioinf = derive2 { name="RBioinf"; version="1.38.0"; sha256="01qk9ddk8bm9sl70rlwgmrkz2y7dnqzrhi13hhh0ii62s0z0gdwh"; depends=[graph]; }; - RCAS = derive2 { name="RCAS"; version="1.4.3"; sha256="0ajnhi8i9p755lr0l2j5j52d5j6rsilrjhm3zrjr1zsgwqm2an6z"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; }; + RCAS = derive2 { name="RCAS"; version="1.4.4"; sha256="0jnrikh0qhpxgjc6rdgfj9d57x4i5b40wxx7lfafrxdxg60qsy1g"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; }; RCASPAR = derive2 { name="RCASPAR"; version="1.24.0"; sha256="1v19pv81q0g965mks88ablznzhcdk3kfd7j2dgxx4r12bl1afawg"; depends=[]; }; RCy3 = derive2 { name="RCy3"; version="1.8.0"; sha256="09p66zxh82j5pcjz1zn3cg43rpsp0gnkwja836m6g1i450zrialv"; depends=[graph httr RCurl RJSONIO]; }; RCyjs = derive2 { name="RCyjs"; version="1.10.0"; sha256="0vlyh32byw49j3vfw0avknixflpjs5h599xxlbf2zc6irvncg1wg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; }; @@ -577,19 +577,19 @@ in with self; { RIPSeeker = derive2 { name="RIPSeeker"; version="1.18.0"; sha256="0bqkzwrncww7il36273chkd3gfxmii7p566ycki9qij419pwr35y"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; RITAN = derive2 { name="RITAN"; version="1.2.0"; sha256="199kddc19fwkfgqnbhx7v4sl5h6lj6f3wqs5xy9f9n9bg09f5rrf"; depends=[BgeeDB dynamicTreeCut ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png ProNet RColorBrewer reshape2 RITANdata sqldf STRINGdb]; }; RIVER = derive2 { name="RIVER"; version="1.2.0"; sha256="00j9i0hrn0j2i5rxgsax3ixj8pwm2ks9fyvp657yd5amm1vackxq"; depends=[Biobase ggplot2 glmnet pROC]; }; - RImmPort = derive2 { name="RImmPort"; version="1.6.0"; sha256="1fj69k1mb0gbajsiah23azp0ina3wvc43ghr6866glqcfh4xckj7"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; }; + RImmPort = derive2 { name="RImmPort"; version="1.7.2"; sha256="0h3r7q7lfl4z7srmallaldljv2231j3zhxy0d4x9q7ghcfglfnbf"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; }; RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.2.0"; sha256="0xjscfbxrrfnd40dmzhrrly0v3pk1k33jdl4z19bslh89gmrmygr"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; RLMM = derive2 { name="RLMM"; version="1.40.0"; sha256="01mbk00fbhzldivxlr5jfy1fgfrdbd657lya3s3p7zxw7z0054a0"; depends=[MASS]; }; RMassBank = derive2 { name="RMassBank"; version="2.6.0"; sha256="1yfnj64ybl95a7bc4980i5h6cvs2hq3nkmj9dklarcp9wfw5p59w"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; }; RNASeqPower = derive2 { name="RNASeqPower"; version="1.18.0"; sha256="08x58sd6q5xm47ix2f1kkqpgyk10nnbf994i4m1wia8fjhx0hdkm"; depends=[]; }; RNAinteract = derive2 { name="RNAinteract"; version="1.26.0"; sha256="1cscf2izpx924ai0vian9mm528mn1k618zqscss7mry13ik78p3c"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; }; - RNAither = derive2 { name="RNAither"; version="2.26.0"; sha256="1dyxmk0j319822qf0wwd41xw7v9qdahixkhmsbv3qp6203hp49w5"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; + RNAither = derive2 { name="RNAither"; version="2.26.1"; sha256="0fs3kab20h77d00kg48rdgslj3fsmnl73qi740sa7xmwx6ra5lc7"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; }; RNAprobR = derive2 { name="RNAprobR"; version="1.10.0"; sha256="0lq0cf5g004w2gi8rs29rhdy3p49njmwnw5jhfijfj4hgkgc6caf"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr Rsamtools rtracklayer S4Vectors]; }; ROC = derive2 { name="ROC"; version="1.54.0"; sha256="0a60k93q0zsmj2s4gy9wgzpd5yl9xdv2g62m18z4s4dmr3ykwsdv"; depends=[]; }; ROTS = derive2 { name="ROTS"; version="1.6.0"; sha256="12dqbwqiiz21im45iqf41nm25anf0fffip86glpydwwc0km054jh"; depends=[Biobase Rcpp]; }; ROntoTools = derive2 { name="ROntoTools"; version="2.6.0"; sha256="0lxxqa8syanb9v4nzc93arlwg65zyf4hkgxgw6q4h62mxkabdp0d"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; }; RPA = derive2 { name="RPA"; version="1.34.0"; sha256="1s5d8wpy3n69f9lnsi8avwalbzzvi7v8np6bv3vcnxy3nfx0iqx3"; depends=[affy BiocGenerics phyloseq]; }; - RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.0.1"; sha256="1a8psx12hwbzybkd92k9n3351g24fqqxrmq5x3sln62z2f0c7psw"; depends=[]; }; + RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.0.2"; sha256="14hs5mam4yjcm00zqz5fgmgxzwhw45fniaihch2mwrb6kbys2y68"; depends=[]; }; RRHO = derive2 { name="RRHO"; version="1.18.0"; sha256="1nz643k6bahg1bizw5bgjkpv2hd7hpi87s4kh1z38jqfpfixw9lk"; depends=[VennDiagram]; }; RSVSim = derive2 { name="RSVSim"; version="1.18.0"; sha256="0f2fv2cxwhsl6gvz3dpgk55faymdwxyry6lr3l6f2s8f6rqpnzgf"; depends=[Biostrings GenomicRanges IRanges ShortRead]; }; RTCA = derive2 { name="RTCA"; version="1.30.0"; sha256="0y2vrqfr4qjgsq8f82a5xnfhm835wi5zqf1xlxrv4mpxm9f9jr38"; depends=[Biobase gtools RColorBrewer]; }; @@ -628,7 +628,7 @@ in with self; { Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.0.0"; sha256="0kkc4rprjbqn2wvbx4d49kk9l91vihccxbl4843qr1wqk6v33r1w"; depends=[]; }; Rhtslib = derive2 { name="Rhtslib"; version="1.10.0"; sha256="1dw3p44bfr0m7w39ckc2k37sjcp1zz0b9g12mr8am15jaj6v0q2j"; depends=[zlibbioc]; }; RiboProfiling = derive2 { name="RiboProfiling"; version="1.7.2"; sha256="0yygf098phiakaj8c74c337gbwpd0dh4haabbg2qq1k0qjw4prmp"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; }; - Ringo = derive2 { name="Ringo"; version="1.42.0"; sha256="174zcz86x43yrg9wl1wwdhammgyxhfc3aqas3yqgrdq7vdsnxzxq"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; + Ringo = derive2 { name="Ringo"; version="1.42.1"; sha256="12r4bcn2sivcp68rd7jr4w4a8yz7xdydwx6bv1mi2lp2s2mzf5c5"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; Risa = derive2 { name="Risa"; version="1.20.0"; sha256="10ypbd9qwh1rk27fwm8naf3gl05w9zlw79qyr55pk5m6x5lnn9cb"; depends=[affy Biobase biocViews Rcpp xcms]; }; Rmagpie = derive2 { name="Rmagpie"; version="1.34.0"; sha256="1hvv8pps0q7xnsl33rammqvyj191j5gs78r2333jgscxnw4byqb7"; depends=[Biobase e1071 kernlab pamr]; }; RmiR = derive2 { name="RmiR"; version="1.34.0"; sha256="10n8i7qirbd8xrb73ccxyj7c6bi1szx263nwjh8w2j9x4dgzx22x"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; }; @@ -655,7 +655,7 @@ in with self; { SICtools = derive2 { name="SICtools"; version="1.8.0"; sha256="0n3m3435wa95mld4b57hr31rfhlk41yw1qqi1jdnybkqgdndpqf8"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; }; SIM = derive2 { name="SIM"; version="1.48.0"; sha256="1n207w5idd2v515v8ppsfx7q1wvn2zxy6if7dp2hpr0x2qvxijnf"; depends=[globaltest quantreg quantsmooth]; }; SIMAT = derive2 { name="SIMAT"; version="1.10.0"; sha256="0gd99p8kjf1wn0xygdyppxgddp9bnp3a3grg8za2mmm8xv5r990h"; depends=[ggplot2 mzR Rcpp reshape2]; }; - SIMLR = derive2 { name="SIMLR"; version="1.4.0"; sha256="1sfd32qd39wy8a1206xkazbmvkqwhs09p7fhdn8n59xf56914pfa"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; }; + SIMLR = derive2 { name="SIMLR"; version="1.4.1"; sha256="09siwqc57f0rfx0297hk2jbpvvayhk47wkvapz2ap621ya203b0z"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; }; SISPA = derive2 { name="SISPA"; version="1.8.0"; sha256="18v8fw3l4pxh4fi18fhnqxbd1hlhp2w36s31vf58ffldq3bz1bpb"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; }; SLGI = derive2 { name="SLGI"; version="1.38.0"; sha256="1p0lwzmzz820npnsw9sk6x12innc39qv0ja0di7rplkmsi60z92j"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; }; SLqPCR = derive2 { name="SLqPCR"; version="1.44.0"; sha256="16kvssib1j4d5cn3b350ip2m9m7fcsgm1mgq13wbfnwcd6sx52kb"; depends=[]; }; @@ -669,7 +669,7 @@ in with self; { SPEM = derive2 { name="SPEM"; version="1.18.0"; sha256="05gpj1fykiw8xjcbd6splqkb8jsyksnhzl6g6pzinpbczhslq55a"; depends=[Biobase Rsolnp]; }; SPIA = derive2 { name="SPIA"; version="2.30.0"; sha256="0m2vv6zj0vgd98w2jrlbwbyn998ml2i2wr9160gmq5h77rn91xq3"; depends=[KEGGgraph]; }; SPLINTER = derive2 { name="SPLINTER"; version="1.4.0"; sha256="06xamivcwlpwj6n8c3wzgd5ykh21q2mrdl7zz1bnicq5npha99l9"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo]; }; - SPONGE = derive2 { name="SPONGE"; version="1.0.2"; sha256="100gbcysmf3fhn22zmvvx2sck6hhfgc7ar782l822vbsig1vnyk9"; depends=[bigmemory Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; }; + SPONGE = derive2 { name="SPONGE"; version="1.0.3"; sha256="1jb7nwji4j9kvnx40hr26qhcn3pbmjaahl4cpvqbljs9pmi9lfdy"; depends=[bigmemory Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; }; SQUADD = derive2 { name="SQUADD"; version="1.28.0"; sha256="1z139p0xbaq4gvd9acxnd8dlapdsiaab1fj10pc7wx2iz4dj9zd6"; depends=[RColorBrewer]; }; SRAdb = derive2 { name="SRAdb"; version="1.40.0"; sha256="18aayqid2fhhkjf7anlk34qw3fj3byxsxcrw2lmq4s4mqq06k5vh"; depends=[GEOquery graph RCurl RSQLite]; }; SRGnet = derive2 { name="SRGnet"; version="1.4.0"; sha256="1a2as38svd6vp6pdllir4gs6jqicg7n7ya42ffjgiy2rpnyijbci"; depends=[DMwR EBcoexpress gbm Hmisc igraph limma MASS matrixStats pvclust]; }; @@ -688,7 +688,7 @@ in with self; { SeqArray = derive2 { name="SeqArray"; version="1.18.2"; sha256="05w051i63af4akr6zna9w14bdyi06bpif0vab9yvf6iwq2ag72kz"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; SeqGSEA = derive2 { name="SeqGSEA"; version="1.18.0"; sha256="1vaqa6jkvwxpbqnz9wz3i6p26mky6d7d704cjv5as67j04v99b2a"; depends=[Biobase biomaRt DESeq doParallel]; }; SeqSQC = derive2 { name="SeqSQC"; version="1.0.0"; sha256="0qj1y9zsjxkh08jkw80hl62072viincq1pvcz9r3i0m28nhk7pg5"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; }; - SeqVarTools = derive2 { name="SeqVarTools"; version="1.16.0"; sha256="14n70xzj91f4rshl0kx549rqzy9rrv5mv0b0xvj891i8anxahb2n"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray tidyr]; }; + SeqVarTools = derive2 { name="SeqVarTools"; version="1.16.1"; sha256="0vjgksqyapvkdbnl3af0sjbbraslyc6m7f63sl05m87zdkav8fzz"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray tidyr]; }; ShortRead = derive2 { name="ShortRead"; version="1.36.1"; sha256="1cyv47632m9ljkxfsvnvmd19sb607ys5kz8fwh6v39dnw16g0a6m"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; }; SigCheck = derive2 { name="SigCheck"; version="2.10.0"; sha256="1k2xmb7jcjbdxafr8fspf9pbc0jwcll914lqc42gvhhjq6rnf8q4"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; SigFuge = derive2 { name="SigFuge"; version="1.16.0"; sha256="0ddy6bayb05gsgh06p5awhjwyx57z0l8fb5x6p0dci2fgzy6gr4f"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; @@ -708,7 +708,7 @@ in with self; { SwimR = derive2 { name="SwimR"; version="1.16.0"; sha256="033hh3bpkn6qladvn7iz0fvrbphffzy1rkvmi0j32v9n9h88lizz"; depends=[gplots heatmap_plus R2HTML signal]; }; TCC = derive2 { name="TCC"; version="1.18.0"; sha256="10nmha786k85jr93vbnlsxkrr2wiykxa5rl2z5ry49w14fis82m5"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; }; TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.6.12"; sha256="0pih8jpzffsjlhamfpvgcapa48dq2m86f4hxqr5m5z4vgjd7j1mv"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment survival survminer sva tibble XML xml2]; }; - TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.4.2"; sha256="1g81w346lvws8bcm8w94b1r3jjr1zfg5ln80p0rq69gzv9hkdjyw"; depends=[clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks]; }; + TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.4.7"; sha256="1hwq13rsynxv18pzahq54107n2dm0wgbh7a5xizda4zqgf4s50gj"; depends=[clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks]; }; TCseq = derive2 { name="TCseq"; version="1.2.0"; sha256="07wbp4caw18g1mf5h40i1c1y7jadfqmx3p7a8zz5rjjibsfa2bw1"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; TDARACNE = derive2 { name="TDARACNE"; version="1.28.0"; sha256="0agzpgz39ya46kgnz95ff2h0hml2mb14fb3pdj218adas24zq9jf"; depends=[Biobase GenKern Rgraphviz]; }; TEQC = derive2 { name="TEQC"; version="3.18.0"; sha256="0rnqlk677hcf2w3whc9gdqm21gjqf4rsanaw8a847jc7li8isnpj"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; }; @@ -718,7 +718,7 @@ in with self; { TIN = derive2 { name="TIN"; version="1.10.0"; sha256="16lv7k4js3zbak0b1m2mlimd1f56gif3vlm2hpc5vx1y315mz9gd"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; TMixClust = derive2 { name="TMixClust"; version="1.0.1"; sha256="1mv9hv5hjg55mwbp824n5b74w8zcb9sv8a1wa6hxmfb00n6wcr4h"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; }; TPP = derive2 { name="TPP"; version="3.6.0"; sha256="1gma7lfnq1ybcqnl9536wv22advjaqxmysfgamrgn38zwbcwhdi9"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown sme stringr tidyr VennDiagram VGAM]; }; - TRONCO = derive2 { name="TRONCO"; version="2.10.0"; sha256="1lvzfx75z50r8kd3yrcjwzvsg16yi5644rz90bm1l6hpkmw2wcpf"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; + TRONCO = derive2 { name="TRONCO"; version="2.10.3"; sha256="1kw4j57wri0sm3piinq169pkljfb3ff4vcj1ify2il2pl7va94l4"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; }; TReNA = derive2 { name="TReNA"; version="0.99.10"; sha256="1yiq953w6830v1fba4gglnf485m6lis11qlpp9g1jw0x4s0rpg70"; depends=[DBI doParallel flare foreach GenomicRanges glmnet lassopv randomForest RPostgreSQL RSQLite vbsr]; }; TSCAN = derive2 { name="TSCAN"; version="1.16.0"; sha256="0m88r5yg46ra8k6ymzfrk68fqbg2y47kshzgj5flblbay079hnxg"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; }; TSRchitect = derive2 { name="TSRchitect"; version="1.4.0"; sha256="0qymyjmzpi1n5fpyzw8riz32kwsc2bi1cw3sx9sxvpvhjk45dmyx"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; }; @@ -742,7 +742,7 @@ in with self; { VariantTools = derive2 { name="VariantTools"; version="1.20.0"; sha256="1ma1qs9n606a5gjcm8l9fna8vfg5f8ixdzriwaalhys22pyjgqsy"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; Vega = derive2 { name="Vega"; version="1.26.0"; sha256="1kya7h7xa47d7l3svkpnkwjg49izpjfird5fjja6490ynr1a55yd"; depends=[]; }; VegaMC = derive2 { name="VegaMC"; version="3.16.0"; sha256="1lmgmaf4andfxv2z4h2pahyggnic5wj61llzkm8q4k0q7i50l63i"; depends=[Biobase biomaRt genoset]; }; - XBSeq = derive2 { name="XBSeq"; version="1.8.0"; sha256="07123c1wd3l7lj29kaa0d83dlv7zsrx8gk8aag7g0h8k9vlhcni4"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; }; + XBSeq = derive2 { name="XBSeq"; version="1.10.0"; sha256="0p2f2wckndgrsf0jjcag22i6bgrn2ky78ngdk9c5cvqnxwjcfagz"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; }; XDE = derive2 { name="XDE"; version="2.24.0"; sha256="11g74znfafp03q710mhmzgxap6f7j04b75jhm7x6lmd6cbwqh25p"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools MergeMaid mvtnorm RColorBrewer siggenes]; }; XVector = derive2 { name="XVector"; version="0.18.0"; sha256="1i4i3kdxr78lr1kcxq657p11ybi7kq10c8kyaqyh6gfc8i9rhvmk"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; YAPSA = derive2 { name="YAPSA"; version="1.4.0"; sha256="0jv940xdqrbb8hw13nm6cky767zn9k8wh6sh5vz5b7hgh7c75kww"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; }; @@ -776,11 +776,11 @@ in with self; { anamiR = derive2 { name="anamiR"; version="1.6.1"; sha256="0mxpxangzbvx7rpzm4ak321pcgj6pa0nbslgvh8rplyz4sf6v0z6"; depends=[agricolae DBI DESeq2 gage gplots limma lumi RMySQL S4Vectors SummarizedExperiment]; }; annaffy = derive2 { name="annaffy"; version="1.50.0"; sha256="0qprkcvq56h6dwcylqsa0dq0nmv5bk280j89cwa3brm4jfncs4hm"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; }; annmap = derive2 { name="annmap"; version="1.20.0"; sha256="0q4lcx1j5av5jpn2wmarn7z32clzzdaprvpcagnvv453i11vp5bi"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; - annotate = derive2 { name="annotate"; version="1.56.1"; sha256="14c5xd9kasvcwg5gbjys2c1vizxhlqlzxakqc2kml0kw97hmx0rq"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; }; + annotate = derive2 { name="annotate"; version="1.56.2"; sha256="0ybg9k1s289h15nj1kp9821i1rsk1gkn8i8blplmk7gsgpbw1f42"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; }; annotationTools = derive2 { name="annotationTools"; version="1.52.0"; sha256="1kmhgasb26dbq10d4r8wig5pjlbiqcqsa12zpgcsasj8kvpr2gpd"; depends=[Biobase]; }; annotatr = derive2 { name="annotatr"; version="1.4.1"; sha256="10izqb0x92fjpsycsyppvz6yidg8ssix452jfni692na7ih564y9"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges org_Dm_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db readr regioneR reshape2 rtracklayer S4Vectors TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Dmelanogaster_UCSC_dm6_ensGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene TxDb_Rnorvegicus_UCSC_rn5_refGene TxDb_Rnorvegicus_UCSC_rn6_refGene]; }; anota = derive2 { name="anota"; version="1.26.0"; sha256="1fvr9yvyf0m7m5dnfbzbm29kd1yqq78carv9v7xx60szi30w4lvq"; depends=[multtest qvalue]; }; - anota2seq = derive2 { name="anota2seq"; version="1.0.0"; sha256="1pcmjlnvx3g2209l54jcbw044k6iz9zch3l01d1vr1cxiqag8smh"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; }; + anota2seq = derive2 { name="anota2seq"; version="1.0.1"; sha256="0fya2plqvpmypm3jf6mwncpi1ngjsprbnadh7j33wdshr4znhyc3"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; }; antiProfiles = derive2 { name="antiProfiles"; version="1.18.0"; sha256="03y6j3y0qvfzwbwzjgjsl5zlqayqj1400gj278m28l70l43ifnyg"; depends=[locfit matrixStats]; }; apComplex = derive2 { name="apComplex"; version="2.44.0"; sha256="132j6gm70h8sma82jd566hrih7npa217h5r6kqx4lq5yw3dlqcs1"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; apeglm = derive2 { name="apeglm"; version="1.0.3"; sha256="06j68szmxdr9c8qmmlcx85rv1hjl2rk52lagack83cr3q1gd10bj"; depends=[emdbook GenomicRanges SummarizedExperiment]; }; @@ -844,10 +844,10 @@ in with self; { chipenrich = derive2 { name="chipenrich"; version="2.2.0"; sha256="0q24il68grjqdxpy7qjk6lw6l5zlmw6yybrbrbb8l42gljyi6s74"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; }; chipseq = derive2 { name="chipseq"; version="1.28.0"; sha256="1ymcq77krwjzrkzzcw7i9909cmkqa7c0675z9wzvrrk81hgdssfq"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; chopsticks = derive2 { name="chopsticks"; version="1.42.0"; sha256="0awwk8k7vnsc0c1ic17m2mhmpin0s0ijd2gn7my9yysqzld9sncd"; depends=[survival]; }; - chroGPS = derive2 { name="chroGPS"; version="1.26.0"; sha256="1lx12mlrj1syl2qaibm08b4vq8h2xw609vr6vxynl1wvvf8wdarp"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; }; + chroGPS = derive2 { name="chroGPS"; version="1.27.3"; sha256="0glqisz3nzlrcvjryxf406dkiq6sg9bg1g3bcqqnmayirm92w5qv"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; }; chromDraw = derive2 { name="chromDraw"; version="2.8.0"; sha256="1lqrpbf322kxpx5068mw650ibzqksfmxc4j6q1fs4dv0ghpxdcsf"; depends=[GenomicRanges Rcpp]; }; chromPlot = derive2 { name="chromPlot"; version="1.6.0"; sha256="16qy1zqwlxc2pdkdb1jf8rknvr5cz2k4vbg2jybr6ks73pzagb47"; depends=[biomaRt GenomicRanges]; }; - chromVAR = derive2 { name="chromVAR"; version="1.0.1"; sha256="0a62gp47ymspn9pbdz7j2vjpd0g7bhl333dicbs468qjjfpm8fbw"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; }; + chromVAR = derive2 { name="chromVAR"; version="1.0.2"; sha256="08bp5wyxg5s9gjwnpymcahhy5rar64x385msczam62i1h1y95f8b"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; }; chromstaR = derive2 { name="chromstaR"; version="1.4.0"; sha256="1ky2z9v6gwwgzvd498ng9ac5s7x8nkgm5170gywr7bgw7lqrycjz"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; }; chromswitch = derive2 { name="chromswitch"; version="1.0.0"; sha256="1ym7vdj6lfwi4nja38lixm3vsxp296dpb90zwnmabws3dhysxhfy"; depends=[Biobase BiocParallel cluster DescTools dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats mclust NMF rtracklayer S4Vectors tidyr]; }; cisPath = derive2 { name="cisPath"; version="1.18.0"; sha256="0ya1kkvghs23c4rqydkas68a7y6z16ihjnv8ljjy9h3i7pdani4h"; depends=[]; }; @@ -934,7 +934,7 @@ in with self; { eegc = derive2 { name="eegc"; version="1.4.0"; sha256="1v3586qddx1l74ha083x36m3lqdblrhmwd63k22jzfpkh30adz09"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; }; eiR = derive2 { name="eiR"; version="1.18.0"; sha256="1ypd7yq9c6mqp7nm984dm60qzvwy4qb81zrp2mvp7g87c5vdj2a3"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; }; eisa = derive2 { name="eisa"; version="1.30.0"; sha256="11ydmv5kddq75sknbax1aiyxq60rx146qa7pd3m09axjzvk83mq5"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; }; - ensemblVEP = derive2 { name="ensemblVEP"; version="1.20.0"; sha256="1xza76fyqp8xikc98ipamsz6175nirdv7aisfvkb9nmzba4q0r62"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; + ensemblVEP = derive2 { name="ensemblVEP"; version="1.20.1"; sha256="0785hhfsgmnkangcq6lg48kdr5pifxs6j9v6apv80457k70d7ybv"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; ensembldb = derive2 { name="ensembldb"; version="2.2.2"; sha256="1yngndkf3588z91z0a2fvkg423p26ajm6xv1p27x0l9mzhhaqq3k"; depends=[AnnotationDbi AnnotationFilter AnnotationHub Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; epiNEM = derive2 { name="epiNEM"; version="1.2.0"; sha256="0d3r4m0q3w2ljf4bm03z1dpiiih9cshzpbi4nnqq3jwls82f7nlq"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; }; epigenomix = derive2 { name="epigenomix"; version="1.18.0"; sha256="0x567fxak38ngy5hs3x567381aigh1x1fb8ww8xvmpf2wlzrlfwp"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; @@ -943,8 +943,8 @@ in with self; { epivizrData = derive2 { name="epivizrData"; version="1.6.0"; sha256="101ibx9nq17dnn5j8kjy31pm8ly4nyzs1rrlbsvk0140avjhz154"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; }; epivizrServer = derive2 { name="epivizrServer"; version="1.6.0"; sha256="0qa13yvq9ywa3m1n2vmi60087cgg18rpnqbr1m7f137ivnxyb11b"; depends=[httpuv mime R6 rjson]; }; epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.6.0"; sha256="0rbd2kmdi0y97mx72gkg93s97slfig1k1bgcv5maknsqqqcwzz8j"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; }; - erccdashboard = derive2 { name="erccdashboard"; version="1.12.0"; sha256="07dc80l8618rlv3sywr0gp9i49kq66i9glx3md2r0k5c4l67mw37"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; }; - erma = derive2 { name="erma"; version="0.10.0"; sha256="0gcfs9g8vvdv5vmq9b21kd8sq5mizjj49nfzd4in9zvp4b9v7x1g"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; }; + erccdashboard = derive2 { name="erccdashboard"; version="1.12.1"; sha256="19fg4n99w983wp6ffmzadzfp1bzmsn8papb5szbrxz102r2mq6df"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; }; + erma = derive2 { name="erma"; version="0.10.1"; sha256="1fi8nc6fbd7i4p9i9hli31xplmdpsxqcdrb8v3nf8fx9klllbdav"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; }; esATAC = derive2 { name="esATAC"; version="1.0.23"; sha256="1g2pai0b98dfnng4h7w2xs73qp2dqacmx8x3ackqi6a515x0cyaf"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; }; esetVis = derive2 { name="esetVis"; version="1.4.0"; sha256="1yb238lxy8sqmxim3zd25rp642cpz8p25vdffjlija2wivq8phn1"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; }; eudysbiome = derive2 { name="eudysbiome"; version="1.8.0"; sha256="13ayrigzy55h6an3am9f77r6mzcvyfcpxpby71xilhaf6mjhyj39"; depends=[Biostrings plyr R_utils Rsamtools]; }; @@ -992,14 +992,14 @@ in with self; { flowUtils = derive2 { name="flowUtils"; version="1.42.0"; sha256="0d4ab30xp722h9avi785wj8z1qz7dy65z5faqf3jc6j6v40bzikq"; depends=[Biobase corpcor flowCore graph RUnit XML]; }; flowVS = derive2 { name="flowVS"; version="1.10.0"; sha256="07vcqcxzd9cw4hvc1yld2v05zcxqs5p9spka2l80pmsjr0aij043"; depends=[flowCore flowStats flowViz]; }; flowViz = derive2 { name="flowViz"; version="1.42.0"; sha256="1fbr0snid9vgb133sb5dwkk469n465p8r490r67vsmm8wqsf6iyl"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; - flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.6"; sha256="11r9c9h1ffp3i1p7gw0f93l5g30waawl7f2vbyh06p5mcr732dmp"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; }; + flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.9"; sha256="04vs7knal0mrlj0rxpq5p3x1243ji0191zf0xmvk9689m94ib2za"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; }; flowcatchR = derive2 { name="flowcatchR"; version="1.12.0"; sha256="0i6r86b1g98kaw8nhbnjjrw8gw6vvhfpr5r7dn4whl4hwlizc5qx"; depends=[abind BiocParallel colorRamps EBImage rgl]; }; fmcsR = derive2 { name="fmcsR"; version="1.20.0"; sha256="0cbbil337zbb968zibkysrmpc8bwlpn7rl908zyvzvj8v11lxzcc"; depends=[BiocGenerics ChemmineR RUnit]; }; focalCall = derive2 { name="focalCall"; version="1.12.0"; sha256="07lb0ijdsryd31dxp5fgp393p9f21b7in3rnf9j43qn8wmz48hnl"; depends=[CGHcall]; }; frma = derive2 { name="frma"; version="1.30.1"; sha256="0319m8l7n2sfp4m6zipm7pkc57xikb735qk605m952m8ra08v8ml"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; }; frmaTools = derive2 { name="frmaTools"; version="1.30.0"; sha256="02z7igfcvhjg9f36snmmif8d7lsca9n9izg8zc543hcy7s704aa2"; depends=[affy Biobase DBI preprocessCore]; }; funtooNorm = derive2 { name="funtooNorm"; version="1.2.0"; sha256="09n7vq5f26px57sy35s29b8pmb9wcx6kii0h0i354sr3yg21ccpc"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; }; - gCMAP = derive2 { name="gCMAP"; version="1.22.0"; sha256="1ghaidxm8wpg9jx8s9ymlkciwkxjnlr5g5yfjappj7mf4qaqxvil"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; }; + gCMAP = derive2 { name="gCMAP"; version="1.22.1"; sha256="0va9jixmp3v001gnym3clyjwarxs5d31vnyklzv31n5zffd7dm3l"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; }; gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.18.0"; sha256="152nd7vxz3cja8xmg5rq4j08lvd7cw1y09a737bfdq1zwrxc22v8"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; }; gCrisprTools = derive2 { name="gCrisprTools"; version="1.6.0"; sha256="0x7bsnhs3qwimfkkxr8yslawdfy83x5ip8j2wlwq4m9hqwqk060g"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; }; gQTLBase = derive2 { name="gQTLBase"; version="1.10.0"; sha256="1756vfcj2dkkgcmfkkg7qdaig36dv9gfvpypn9rbrky56wm1p035"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; @@ -1024,7 +1024,7 @@ in with self; { geneRxCluster = derive2 { name="geneRxCluster"; version="1.14.0"; sha256="0r0lnhf19qw1d4p87632lz0rgx0d9q3cakpd6qh43b10fil7wjgp"; depends=[GenomicRanges IRanges]; }; geneXtendeR = derive2 { name="geneXtendeR"; version="1.4.0"; sha256="02a3aqn115l85cnvxy16ppri4hwir6mcp1av6s00nj66afxxnzmv"; depends=[AnnotationDbi data_table dplyr GO_db networkD3 org_Ag_eg_db org_Bt_eg_db org_Ce_eg_db org_Cf_eg_db org_Dm_eg_db org_Dr_eg_db org_Gg_eg_db org_Hs_eg_db org_Mm_eg_db org_Mmu_eg_db org_Pt_eg_db org_Rn_eg_db org_Sc_sgd_db org_Ss_eg_db org_Xl_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; }; genefilter = derive2 { name="genefilter"; version="1.60.0"; sha256="173swlg6gj4kdllbqvyiw5dggbcxiwlwpqmllsv4dxzn7h25i3g7"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; }; - genefu = derive2 { name="genefu"; version="2.10.0"; sha256="0pg9425z0inlbgvi15d050s6928xyqbxj36kk12z3dh3w2gwkycf"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; }; + genefu = derive2 { name="genefu"; version="2.11.2"; sha256="1z70pnzgci0sjpr8vsvyg93zrjim7jh9jmba0p3pgqp3qw4gbi34"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; }; geneplast = derive2 { name="geneplast"; version="1.4.0"; sha256="12ncf9rpnv1mwmdw4rbzzhggppcnzch764aiipy0jb21ix9xj61q"; depends=[ape snow]; }; geneplotter = derive2 { name="geneplotter"; version="1.56.0"; sha256="1z3g7frc1iviwrsv2dlm4nqvkc0685h4va0388yfxn102ln8wwma"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; genoCN = derive2 { name="genoCN"; version="1.30.0"; sha256="0m4sj2w0zra67d939knzriwda0nwphzspsmnl9jakl0kq8dvhjki"; depends=[]; }; @@ -1034,9 +1034,9 @@ in with self; { genoset = derive2 { name="genoset"; version="1.34.0"; sha256="1cw6g8r3n33xlqmbjsfn6kkdzz19kh71ag529sjbk9wlxi69rrz0"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; genotypeeval = derive2 { name="genotypeeval"; version="1.10.0"; sha256="1pff2n1s350j6i7klsnwqlizkdvvfpyqqrvc7kq5gj7yh508dxy9"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer Rtsne VariantAnnotation]; }; genphen = derive2 { name="genphen"; version="1.6.0"; sha256="0m1g1hfhhbq3xjdr2fjf3wbng6d953kci965h298c168dv3864k6"; depends=[Biostrings e1071 effsize ggplot2 randomForest rjags]; }; - gespeR = derive2 { name="gespeR"; version="1.10.0"; sha256="09xd080b08bfpqqbha4rxn4vmglv7c5asd4gibfjgjkasd78g40m"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; + gespeR = derive2 { name="gespeR"; version="1.10.1"; sha256="10aw6s5bn5jiw3qlqskcp2ngshgyykslsqlwrdpyahr4rh7z0zyl"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; ggbio = derive2 { name="ggbio"; version="1.26.1"; sha256="1xlmlngn27iwnr21s9di4059kav1a7c1sajx08wja8yn8f7j06hp"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; - ggcyto = derive2 { name="ggcyto"; version="1.6.1"; sha256="07rsg673hnrn1kf82nb59sxa925hjlb3qnjwlxvzlr2lzs958rcd"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; }; + ggcyto = derive2 { name="ggcyto"; version="1.6.2"; sha256="0qg9ivya9c2998hq40c0pvzfilb1q24h13fafymwa8p2lj59jyrg"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; }; ggtree = derive2 { name="ggtree"; version="1.10.5"; sha256="1gkfjgihykkvqrhvzhr5brwzsgva0mxvfpa664k08jan9brjg22f"; depends=[ape ggplot2 magrittr rvcheck scales tidyr treeio]; }; girafe = derive2 { name="girafe"; version="1.30.0"; sha256="0k8fjn7d1hxwin0vywly7vc570048i7nckhyw9j4cind6fi6f75v"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; globalSeq = derive2 { name="globalSeq"; version="1.6.0"; sha256="19aws180r5gwxrz6xmfgic0mp8piki2qmzrxyy1f75866blk3r4f"; depends=[]; }; @@ -1100,7 +1100,7 @@ in with self; { keggorthology = derive2 { name="keggorthology"; version="2.30.0"; sha256="117s7b32nkv95adh2j91b87r90svhfb91ag28brsq3r333m2q8cn"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; kimod = derive2 { name="kimod"; version="1.6.0"; sha256="0mb9bv6bz7k27vs8rl26kh2zm8mvpkgzqhgc471lp4qz8f4fsbxc"; depends=[Biobase cluster]; }; lapmix = derive2 { name="lapmix"; version="1.44.0"; sha256="1b7daaqsq3bvb1wbhf99pk8kl4pm4kac7bnx211isr7ica34pxb5"; depends=[Biobase]; }; - ldblock = derive2 { name="ldblock"; version="1.8.0"; sha256="18nfsixh6d2wfrb9laqsgly5w1frzihhak683k0p8fdf51h4aqba"; depends=[erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; }; + ldblock = derive2 { name="ldblock"; version="1.8.1"; sha256="1q8dz8wcq1r7kr635s9q21g36sxkdybk8khhpa4p57qv8r0gppl0"; depends=[erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; }; les = derive2 { name="les"; version="1.28.0"; sha256="0xy7ggc2b20i1c78mww84xvc0jhbinxn00nbfvnbw997vjqr7r79"; depends=[boot fdrtool gplots RColorBrewer]; }; lfa = derive2 { name="lfa"; version="1.8.0"; sha256="06w0032wwqm2cxid7brb6iq6bkhqc5x3a08wwyjbib6lnj5n7rvh"; depends=[corpcor]; }; limma = derive2 { name="limma"; version="3.34.9"; sha256="1y2fm61g5i0fn0j3l31xvwh9zww9bpkc4nwzb1d0yv1cag20jkdc"; depends=[]; }; @@ -1121,7 +1121,7 @@ in with self; { maanova = derive2 { name="maanova"; version="1.48.0"; sha256="1vvjk6y8mp5h7l8yk4f1y48jx5k9fl9s12x2mgsbap306paw860q"; depends=[Biobase]; }; macat = derive2 { name="macat"; version="1.52.0"; sha256="168jw5bi1nbj2dfhipnvja7w0avmiw6vrvdany73d41fvigmagj5"; depends=[annotate Biobase]; }; made4 = derive2 { name="made4"; version="1.52.0"; sha256="1ns7f47l7ig2fm95l67ppym5gbkbr8lp18vx51pqwjg8r5rvj9sc"; depends=[ade4 gplots RColorBrewer scatterplot3d]; }; - maftools = derive2 { name="maftools"; version="1.4.25"; sha256="0k4ry5pnh3lxyzkab094wpjiaqjrymq9hbgpz8xv9g67fhg2g8ah"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; }; + maftools = derive2 { name="maftools"; version="1.4.28"; sha256="17b3v1v9ipid8gqsq2gy0fpminc58f1mng9i2andswfr5ip38g7s"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; }; maigesPack = derive2 { name="maigesPack"; version="1.42.0"; sha256="1c92kkr2rmfydckmbvri8g0lzz1v3hx93zpmb1pwrnlfpm01j95j"; depends=[convert graph limma marray]; }; makecdfenv = derive2 { name="makecdfenv"; version="1.54.0"; sha256="17fmzd12acdpq3vfnqrafmmg5jcmdgkf83mrqjpw92zah2w8490a"; depends=[affy affyio Biobase zlibbioc]; }; manta = derive2 { name="manta"; version="1.24.0"; sha256="060x5rdzkx882pa8x9w7j3sgj0clar6w35yblbcggq579r9jpx06"; depends=[caroline edgeR Hmisc]; }; @@ -1177,7 +1177,7 @@ in with self; { missMethyl = derive2 { name="missMethyl"; version="1.12.0"; sha256="1fvpny7x56l55zhgabm6al2i2n0hix7fp7d01bzirsn7chxpwny3"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; }; mitoODE = derive2 { name="mitoODE"; version="1.16.0"; sha256="11kyihynbl3kcrngv8dhiqn3ghpkvv0xi35pf8np2p41zdhbrpyv"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; }; mogsa = derive2 { name="mogsa"; version="1.12.2"; sha256="0a29q9jak4vr05ngh2pcsfifa9i6p086acjk2qrzwnc3lcfm00bm"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; }; - monocle = derive2 { name="monocle"; version="2.6.3"; sha256="1qag8q6wy1wf1zx16h2lwki6rn4nxkjff7yhpn8m30hp3v01fvhn"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; }; + monocle = derive2 { name="monocle"; version="2.6.4"; sha256="1x4y02kn8spzz8y4hgmis9h2l494ys2j1vjs0axh32fp1rpc6d8c"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; }; mosaics = derive2 { name="mosaics"; version="2.16.0"; sha256="08q48zakyfydrj8vix3a5w0j4ix5h1hpqccv0jxgj55gpdc062kj"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; motifRG = derive2 { name="motifRG"; version="1.22.0"; sha256="193zl2rlzwxv9p9q5i7rilj3w05ndqfyp9bdpvagp5s5cin4hf44"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; }; motifStack = derive2 { name="motifStack"; version="1.22.4"; sha256="13wrpdgyhzrqdp7k0d7iym2pjjla46rh3i1qwm34j22n7j0pxs8x"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; }; @@ -1202,7 +1202,7 @@ in with self; { mzID = derive2 { name="mzID"; version="1.16.0"; sha256="0yk70dka56zd8w62f03ggx3mandj91gfa767h9ajj0sd3mjmfqb9"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; }; mzR = derive2 { name="mzR"; version="2.12.0"; sha256="1x3gp30sfxz2v3k3swih9kff9b2rvk7hzhnlkp6ywlnn2wgb0q8c"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; }; ncdfFlow = derive2 { name="ncdfFlow"; version="2.24.0"; sha256="1rvqlfzdbqz7a035c2d0rfziail71pvyla6fi3mv1xzrm2vpw0b8"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo Rhdf5lib zlibbioc]; }; - ndexr = derive2 { name="ndexr"; version="1.0.3"; sha256="05wnjya61w0mbskrfs9k5w04pr3hcf4c8w15y85z7j1vxjhpgwjq"; depends=[httr igraph jsonlite plyr tidyr]; }; + ndexr = derive2 { name="ndexr"; version="1.0.4"; sha256="1hr49a3svk65d585yix13ggd57zv5zzmavb81c452y2jpay0www0"; depends=[httr igraph jsonlite plyr tidyr]; }; nem = derive2 { name="nem"; version="2.52.0"; sha256="0114b8nzv07gii87rdcvia6n7jn203f5whx6x6x54ijxq8m1fkk8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; }; netReg = derive2 { name="netReg"; version="1.2.0"; sha256="1cmh66m5zp1awrg79f8d09b48shq8hyjvkz6mfxrnvqbcj32v8ph"; depends=[Rcpp RcppArmadillo]; }; netbenchmark = derive2 { name="netbenchmark"; version="1.10.0"; sha256="173jmvslg8vj078psnvk6s4sns8n9zv2z8hkq6iq64pavmn9cf91"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; }; @@ -1231,7 +1231,7 @@ in with self; { ontoCAT = derive2 { name="ontoCAT"; version="1.29.0"; sha256="057sbc0s08i22gjg886ngz0k59r4v29ssh11qj0wyv4n5g3zs0hg"; depends=[rJava]; }; ontoProc = derive2 { name="ontoProc"; version="1.0.0"; sha256="0la7lcynmdgavvzdz7b5g726pm4205r8194dnsmnhc5h3lryr36k"; depends=[AnnotationDbi Biobase ontologyIndex S4Vectors shiny]; }; openCyto = derive2 { name="openCyto"; version="1.16.1"; sha256="1qzx0qq1d2hi5whqi0kbg8xmjbglv6j2fli3wcx932g66lxwg3sv"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; }; - openPrimeR = derive2 { name="openPrimeR"; version="1.0.0"; sha256="0x4h7lcanzclcxnbrj2hii5mpv2b7rm5izm9p51drqylr69gvns2"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; }; + openPrimeR = derive2 { name="openPrimeR"; version="1.0.4"; sha256="1gw4b7df390q40zy0bnv0wlwr9dwji99rhgy678k32nm8r2cdc19"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; }; openPrimeRui = derive2 { name="openPrimeRui"; version="1.0.0"; sha256="1mchbalmq6mbxp9mdrmndz3pja7j1ffx5xglnzglfdqm2004gdlf"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; }; oposSOM = derive2 { name="oposSOM"; version="1.16.0"; sha256="1855wrszaxwc8rghhn1hgj6hrp5mxsyffbs9ccjckq5jl3z7z1mj"; depends=[ape arules Biobase biomaRt fastICA fdrtool igraph pixmap scatterplot3d som tsne]; }; oppar = derive2 { name="oppar"; version="1.6.0"; sha256="0h4wfgjq8xm5f6bcaj5vxy686ymr42r3ig9zw93ayycpfl81p275"; depends=[Biobase GSEABase GSVA]; }; @@ -1254,7 +1254,7 @@ in with self; { pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.22.0"; sha256="0371ns6702nk5s3pj59z04i2sjf24sj0wm3m4rj67q4p5v7v1ksz"; depends=[AnnotationDbi Biostrings ellipse]; }; pcaMethods = derive2 { name="pcaMethods"; version="1.70.0"; sha256="0ii235g0x0492kh8cfrf28ni0b6vd6fh7kizkqmczzqggd6b1bk8"; depends=[Biobase BiocGenerics MASS Rcpp]; }; pcot2 = derive2 { name="pcot2"; version="1.46.0"; sha256="1pymhr9ypp5g27bbnayrz4ks8rg5j634bf4l596m2b6c4q9d9rc5"; depends=[amap Biobase]; }; - pcxn = derive2 { name="pcxn"; version="1.0.0"; sha256="105mzgy6bcwmk1nsnlr44bik8pazyjc7zcqn56732g1dj5na5v5w"; depends=[pcxnData pheatmap]; }; + pcxn = derive2 { name="pcxn"; version="2.0.0"; sha256="1iq3i3cj7zq7xyprgjv4v4whycm67lzcrsz9p08lxyzz7ci2y6xn"; depends=[pcxnData pheatmap]; }; pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.42.0"; sha256="0cs47qzkpphixcwn3fl9pfrw1qans8y51y8lb9phikh4s8cdq061"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pdmclass = derive2 { name="pdmclass"; version="1.47.0"; sha256="1grc1fyn8yhwixi7638bsyb3zc6zhzzrbfh4hcpqk6gf653dls63"; depends=[Biobase fibroEset mda]; }; pepStat = derive2 { name="pepStat"; version="1.12.0"; sha256="0bnak90zfycd5a9qkz4lhwk4h61pr0pwn3hzaksxcv6c025h0mwm"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; @@ -1293,7 +1293,7 @@ in with self; { prot2D = derive2 { name="prot2D"; version="1.16.0"; sha256="1fp530fammi9xifx5g72jz8k7y3chjfg3mpybsbf5pzvva1429sj"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; }; proteinProfiles = derive2 { name="proteinProfiles"; version="1.18.0"; sha256="069ksj5md9m7zylqwy6pyj3p9pa4j04vn4ss4d2r8n7a5z8f7d1g"; depends=[]; }; proteoQC = derive2 { name="proteoQC"; version="1.14.0"; sha256="1kv8ah7pbfl1gbb1pnjlmdw5bskfyh0hsn0nxraz0ybvwzn3kdsl"; depends=[dplyr ggplot2 MSnbase Nozzle_R1 plotly plyr reshape2 rmarkdown rpx rTANDEM seqinr tidyr VennDiagram XML]; }; - psichomics = derive2 { name="psichomics"; version="1.4.4"; sha256="1h8vg90nlvjmpz8ific6n41xqc3fzs1133hvbyrjzqbwqy0cgqzp"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; }; + psichomics = derive2 { name="psichomics"; version="1.4.5"; sha256="0lvkbjkdg5m1ni6rrnzzq2d2p5j0156vp2q9i3c8ji40fp7rx0vv"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; }; psygenet2r = derive2 { name="psygenet2r"; version="1.10.0"; sha256="0xf03vjyjiz4093cqnvi3dm532scx3f17mcf0av96h052vy10qb7"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; }; puma = derive2 { name="puma"; version="3.20.0"; sha256="0pcwppa2zlzpfl5fafl4h5xcf0pnyvz3hkykl192hzp26wcjsc1i"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; pvac = derive2 { name="pvac"; version="1.26.0"; sha256="0lmwy5a74ikq0sl6zqw69kag6q3p092qwh1lzvv7rl2j9wm2yl46"; depends=[affy Biobase]; }; @@ -1382,7 +1382,7 @@ in with self; { seqbias = derive2 { name="seqbias"; version="1.26.0"; sha256="1i1zqslv0qws12x45c37h7fkgpz5wv3v87h72n4pw8gh80bgcafl"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; }; seqcombo = derive2 { name="seqcombo"; version="1.0.0"; sha256="0bkap2c1061yg2ws2m1fafxi37pqzkg9mzim5sqiq8sgcfmk6na6"; depends=[Biostrings cowplot dplyr ggplot2 igraph magrittr rvcheck]; }; seqplots = derive2 { name="seqplots"; version="1.16.0"; sha256="1plwmdq2hjcqs94l7s03h9amcxdimwdrmi11z03xn10dfn1xig70"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 Rsamtools RSQLite rtracklayer S4Vectors shiny]; }; - sevenbridges = derive2 { name="sevenbridges"; version="1.8.0"; sha256="1jlw69yxh697q3bwd54mvzfiqskg469jyyh97sqnlizjmm5hiw11"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; }; + sevenbridges = derive2 { name="sevenbridges"; version="1.8.1"; sha256="0v22pwyrgxh6mjqqcxz9ix7ripl5xds0l8p38w0w08ynbdns1w5b"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; }; shinyMethyl = derive2 { name="shinyMethyl"; version="1.14.0"; sha256="17w7shgr4s5w3y1ik8zgr9brv7q87dx9l6dfqywsyvfmmkddimwa"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.16.0"; sha256="17x0bq1kzvmqqf30y0dmmp9777i62525mp4ysyv2m6vb9bgrbc4y"; depends=[mixtools rTANDEM shiny xtable]; }; sigPathway = derive2 { name="sigPathway"; version="1.46.0"; sha256="18nn7rpg67dz30v1drm0lnsb1wnww7maxdg4gk960wayasp8hk2z"; depends=[]; }; @@ -1406,7 +1406,7 @@ in with self; { specL = derive2 { name="specL"; version="1.12.0"; sha256="03bkh0z3pd6jl47wq2h6zd73fvaggwnaj2b4ibijwkg1643mfiip"; depends=[DBI protViz Rcpp RSQLite seqinr]; }; spikeLI = derive2 { name="spikeLI"; version="2.38.0"; sha256="00fixl9jpjfm0qgsg1lwi0315sa53j1j9fbrl69j8y2gbr8kgg28"; depends=[]; }; spkTools = derive2 { name="spkTools"; version="1.34.0"; sha256="0vpyv78c6c58qrcz91mir7jh9gx2j2l48bclabvgi0k2156wpwn7"; depends=[Biobase gtools RColorBrewer]; }; - splatter = derive2 { name="splatter"; version="1.2.1"; sha256="0iap91mmfan5p8wcpkxmqrrlk4zhgcigl08js5k1kcizmqkiar5g"; depends=[akima BiocGenerics BiocParallel checkmate edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; }; + splatter = derive2 { name="splatter"; version="1.2.2"; sha256="05bqmck2hszxlvj0vb1j7fbyv4fp2q7bjv7ywlg6hs9bx7zk1iaj"; depends=[akima BiocGenerics BiocParallel checkmate edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; }; spliceR = derive2 { name="spliceR"; version="1.20.0"; sha256="1skwj4cqf4s14df42jgy5b9fxrb5c5np9khc0wkg732qddbdlagd"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; }; spliceSites = derive2 { name="spliceSites"; version="1.26.0"; sha256="19av0wkdvy4x4p0nkhy9ca450d6j0s68m2lp26116ydh4lzv4p8x"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; }; splicegear = derive2 { name="splicegear"; version="1.50.0"; sha256="0i47l91p77s4acgrx9c8ll2va7amysw1g2acs36mn99hpz86v4m4"; depends=[annotate Biobase XML]; }; @@ -1423,7 +1423,7 @@ in with self; { stepNorm = derive2 { name="stepNorm"; version="1.50.0"; sha256="10fd623pqy944q9l913bv1a3dh7wk4i0r211hvvzdr39kfhjl6mf"; depends=[marray MASS]; }; subSeq = derive2 { name="subSeq"; version="1.8.0"; sha256="1z9qwfclhnnvcp4r4zfi201rmgd0hj47rd77x958m1d6d3z65m34"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; supraHex = derive2 { name="supraHex"; version="1.16.0"; sha256="10lhdhlb33p91np6ldmxc8yqgxwly7p37nlacm77q35dp05a453n"; depends=[ape hexbin MASS]; }; - survcomp = derive2 { name="survcomp"; version="1.28.4"; sha256="185k9srpfzvr51xfbgq1xy39x40cxgcvvq772y9gdk1702fxvyw0"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; }; + survcomp = derive2 { name="survcomp"; version="1.28.5"; sha256="09winy33410hw6srybaw49m2nb5cyp3fx0ww9gyhhkh73cvb6xwb"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; }; sva = derive2 { name="sva"; version="3.26.0"; sha256="0q5xb68wfcnchy8rkv5ma67pmz1i91lsnvmwmj8f1c3w4xan3pgw"; depends=[BiocParallel genefilter limma matrixStats mgcv]; }; swfdr = derive2 { name="swfdr"; version="1.4.0"; sha256="0ls0w09bkxxqv1y50d5c1s0qpxb1xdyall8ypvky8awi7v6jlrcg"; depends=[dplyr ggplot2 reshape2]; }; switchBox = derive2 { name="switchBox"; version="1.14.0"; sha256="0mhkf4wwd3v3s1148nafbd6x6ys8j933glh4gp3wj24ddmmpxvb2"; depends=[gplots pROC]; }; @@ -1468,7 +1468,7 @@ in with self; { vtpnet = derive2 { name="vtpnet"; version="0.18.0"; sha256="02nws97nmlrpzwb5jqm3fmg38mp1qdf41hzwmmprhfhsymnmc4ch"; depends=[doParallel foreach GenomicRanges graph gwascat]; }; vulcan = derive2 { name="vulcan"; version="1.0.0"; sha256="1yxm6yg7d65wh9rl6k5b6831y4hr5l9nnmfi0azxz1h4x1ghqbdj"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; }; wateRmelon = derive2 { name="wateRmelon"; version="1.22.1"; sha256="08imbxhs4ikm6panz3y64b24d2ghy1s2ksgd8siff53hg2v59rqr"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; }; - wavClusteR = derive2 { name="wavClusteR"; version="2.11.0"; sha256="0f1lk45a9yqr0ysjq8kjpqys8qln2b8ix03nywcqnkl1lk2b5ymi"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; }; + wavClusteR = derive2 { name="wavClusteR"; version="2.12.1"; sha256="01b8aqwi7nd8l7mkiqgg9skvl0r6y1vwslwchyk95a9l4hkhxrz9"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; }; waveTiling = derive2 { name="waveTiling"; version="1.20.0"; sha256="1dlz548vjnarz15mscmj56jp2hn810w0dy7xprxx22n51h7kb7jg"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; }; weaver = derive2 { name="weaver"; version="1.44.0"; sha256="06fg8z4gp2mabiy9jrfwkrrz1r4qzzgjk3lxj6d53ii2xhq95vy6"; depends=[codetools digest]; }; webbioc = derive2 { name="webbioc"; version="1.50.0"; sha256="1kg6apnhq97ypmpx6qm2f7wip81f910mjlg9kmd9zzmhnkrhqamd"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; }; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 8e8085fdece5..ee3dcdef20c9 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2018-03-12"; }; +let derive2 = derive { snapshot = "2018-04-20"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; }; @@ -29,6 +29,7 @@ in with self; { ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; }; ADMM = derive2 { name="ADMM"; version="0.2.2"; sha256="0rwszi152nm6rrmgh23js2cv0yfrsa6vky4gmrgszxgx8sw221v9"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; }; + ADMMsigma = derive2 { name="ADMMsigma"; version="1.0"; sha256="141jzg7cvq1wlscrpb4hfkdshbm0vgzy4cas8vb6abh53j8h2g8q"; depends=[doParallel foreach ggplot2 Rcpp RcppArmadillo]; }; ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; }; AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; }; @@ -38,6 +39,7 @@ in with self; { AFM = derive2 { name="AFM"; version="1.2.2"; sha256="132zbxim3cbyxhv27l9i3jyhf5c47ckzsg4qndpwbyjhd0p9x7qh"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; AGD = derive2 { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; }; AGSDest = derive2 { name="AGSDest"; version="2.3.1"; sha256="10jakc2qs5gnbp0g4k05isy0ii73ric50gmwkbb1khf9x0b5v6dg"; depends=[ldbounds]; }; + AGread = derive2 { name="AGread"; version="0.1.2"; sha256="17jj6g0df3cldaq4brn1abdivfg7w5bwycbrs70ynmy6iqib8piy"; depends=[data_table dplyr magrittr seewave]; }; AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; }; AHR = derive2 { name="AHR"; version="1.4.2"; sha256="15khncbbnpbvj6rcn6rklzhv5a0mmfyjljv77bsx96zfis7mk2d7"; depends=[etm MASS Rcpp RcppArmadillo survival]; }; AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-1"; sha256="0y2lgvy0a78wdx4xcq85fkhl4hyvjdljrj199mibisfgkh61amb1"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; @@ -56,32 +58,34 @@ in with self; { AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; }; AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="0.1.0"; sha256="0wqz9akk5340k0z5791dh8zmh7bfrj7ln05xlw548dql47w0xnrk"; depends=[]; }; AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; }; - AMIAS = derive2 { name="AMIAS"; version="1.0.1"; sha256="17ay7dgi2c7ybps337ngyc1lg6fy84lxvkqfrr8nf5rjapw8mg6w"; depends=[limSolve Matrix zoo]; }; + AMIAS = derive2 { name="AMIAS"; version="1.0.2"; sha256="142bp8yaa87dpxkjrbcq57pr65x8q921hb5kxrcpghg157y5byn3"; depends=[limSolve Matrix zoo]; }; AMModels = derive2 { name="AMModels"; version="0.1.3"; sha256="1lhd15sh550z664qqxw6jpknnh628hm585d70ipx8s4mswi6g4hj"; depends=[unmarked]; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; - AMR = derive2 { name="AMR"; version="0.1.0"; sha256="1vp2l4xfd44sy14fqir2d7kq8835np6hnrzdhqkwxh5vjw8wkfyx"; depends=[dplyr reshape2 rvest xml2]; }; + AMR = derive2 { name="AMR"; version="0.1.1"; sha256="1kyy70g6nh37a1kfcc4p3d8yd61rhsk07rzh8hk0x5zyvc6gcs8l"; depends=[dplyr reshape2 rvest xml2]; }; ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; }; ANN2 = derive2 { name="ANN2"; version="1.5"; sha256="17b0dv1dl4kni7yvrrwk65cadk6f7qk7505r27j9v530pffyv1k3"; depends=[Rcpp RcppArmadillo robustbase]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; + ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; }; ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.3"; sha256="1cmps21lrmk6lh6gx0q9fz2736q7cibfcisvir6hnik3ablv70bn"; depends=[quadprog shiny]; }; APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; }; - APML0 = derive2 { name="APML0"; version="0.7"; sha256="1ivlyljyllkd53y3ckar7mrdykmd8fz3sg8i1xgfygrcnq79qz0i"; depends=[Matrix Rcpp RcppEigen]; }; + APML0 = derive2 { name="APML0"; version="0.8"; sha256="15qg0iapl2qh4llc8qazxc9qb4fi82snnw2agjgi29zcq7lzi2ww"; depends=[Matrix Rcpp RcppEigen]; }; APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; }; APSIM = derive2 { name="APSIM"; version="0.9.2"; sha256="0yyjz1kyvqpw9dh71ls2lf44gbb6r7bp9a22mr3z68k89azps5rc"; depends=[data_table lubridate plyr RSQLite sirad stringr]; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; - APfun = derive2 { name="APfun"; version="0.1.2"; sha256="0qw769ifcc7g9jq8ba2sxghcck52cspj3rpg8pkj2i185vg0lw77"; depends=[maptools raster rgdal sp yesno]; }; + APfun = derive2 { name="APfun"; version="0.1.3"; sha256="02p40n4l66r63wq8x7ygchfhxmnpaa7vgy4bjhkqx5gfi2v4psxd"; depends=[maptools raster rgdal sp yesno]; }; APtools = derive2 { name="APtools"; version="3.0"; sha256="0v5xgznc8hvw3gid8x5chksc62zpwbx34qsh64sv7d1kqmh5w26j"; depends=[survival]; }; AR = derive2 { name="AR"; version="1.0"; sha256="1h9rzlwnfm646s7423pcxz0zqykyadiw4sbxlygy2382la81x69x"; depends=[DISTRIB]; }; AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; + ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; }; ARPobservation = derive2 { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; }; ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; }; - ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; + ARTP = derive2 { name="ARTP"; version="2.0.5"; sha256="0lwvhf5lamw28sd41vrhyin8ab92rl93j1ahk0aacwvnikgmfkpj"; depends=[]; }; ARTP2 = derive2 { name="ARTP2"; version="0.9.32"; sha256="12mrxssjcj08svdsrxv2nm53mzsgy1k0whd5zzy6fz327bjyqsrz"; depends=[data_table Formula]; }; ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; }; - ASICS = derive2 { name="ASICS"; version="1.0.1"; sha256="0axjq2a99kl6qk05w5r9ddx3954m60739miarbwadlqwnsd5lkqk"; depends=[doParallel foreach ggplot2 plyr quadprog zoo]; }; + ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.1.0"; sha256="017m7cji04gbcn396jz428llik15zgdvbr6bf1c8scds692paz3n"; depends=[sp]; }; ASIP = derive2 { name="ASIP"; version="0.3.2"; sha256="0zrn3hnn46zxmvchicyzy7zz2jnv8y1249a6sdi3w9rw2d8q025g"; depends=[gdalUtils raster rgdal]; }; ASMap = derive2 { name="ASMap"; version="1.0-2"; sha256="0fhivq5i2py79jkwfms0my77p9x8lrkn5vn1lwbsawfkyar4dvkq"; depends=[fields gtools lattice qtl RColorBrewer]; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; }; @@ -107,7 +111,7 @@ in with self; { AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; - AdapSamp = derive2 { name="AdapSamp"; version="1.0"; sha256="1nww2c3kz1a62ivkvlcvhgx68wdk9ka8jhw1k8pilbgairxsbxgn"; depends=[pracma]; }; + AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; }; AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; }; AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.65"; sha256="0f92dgfiglbklr4lv5kqxks8d04f675jlj2xjy9aqk4cgdj264xk"; depends=[MASS mgcv nlme SemiPar]; }; AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.3"; sha256="0f6wk9ds8ayzi0fj1dz1m3755d1sjv4v5vc1hjhfxaim127kmbqh"; depends=[caTools ggplot2 shiny]; }; @@ -129,6 +133,7 @@ in with self; { Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; AmesHousing = derive2 { name="AmesHousing"; version="0.0.3"; sha256="1fr01ka8x8gdnky6cbd2bjlh1lx71gzq440zsknn9kxvf01s6pxm"; depends=[dplyr magrittr]; }; + AmigaFFH = derive2 { name="AmigaFFH"; version="0.1.2"; sha256="0749j6m8pvdq4lm0n46bn052nxvplh3nvp2miz4hagw8q2p5fsyl"; depends=[adfExplorer ProTrackR tuneR]; }; AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; }; AmostraBrasil = derive2 { name="AmostraBrasil"; version="1.2"; sha256="06y555gl9g89gygrv1rhg8j1bhb38m09mvvw67wvwhdl56j0fqbd"; depends=[foreign RCurl rgdal RJSONIO sp stringr]; }; AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; depends=[ggplot2 xtable]; }; @@ -138,14 +143,14 @@ in with self; { AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; }; AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; }; AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; }; - AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.0"; sha256="0vkb50v3by5z7qmaqpdb81zmbz23f315k09mpfy7qwsjfdgcpshv"; depends=[dplyr ggplot2]; }; + AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; }; AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; - AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.1"; sha256="1pdwb4zmvirbn3aikd66djhzwga18w50krgn43mlw5dpa9c7fvhv"; depends=[ape seqinr]; }; + AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.2"; sha256="1r52qry6xvn79b6qsbch35jhzg8y71kxqq9xm6gd302cv2xbwq7q"; depends=[ape seqinr]; }; AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; }; AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; }; - AnthropMMD = derive2 { name="AnthropMMD"; version="2.3.3"; sha256="1q8pjxlrba7dna647pkzyj41scq8xghx5h7ac3jamhrkdppf5fdk"; depends=[MASS shiny]; }; - Anthropometry = derive2 { name="Anthropometry"; version="1.9"; sha256="1d1grh952kfpanz4vpvdbnx4yn42kkc6z78cc601l70azar2p7zg"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; + AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.0"; sha256="0pp9ihrkjwzp6zyglkp81ry4fzm1s26r687bhxswx5iz1brzmhdn"; depends=[scatterplot3d shiny smacof]; }; + Anthropometry = derive2 { name="Anthropometry"; version="1.10"; sha256="1rny65070yrdxnny8frp5ryp811h59924z5pfwg0cmd2szxnxnz7"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; }; ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.2"; sha256="01h8hi76nlwn9hnfyvzyg2d25s2r0vgpl5rz37yqkhjs5xr3rpyi"; depends=[doParallel foreach stringr]; }; AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; }; @@ -157,10 +162,11 @@ in with self; { ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.3"; sha256="0012rjbk3bxf6j7p0skp02yrgqzl903dclnmm7c038f941krjcfq"; depends=[coda DT ggalt ggplot2 ggthemes hdrcde readr shiny shinythemes toOrdinal]; }; ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; }; ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; }; + Arothron = derive2 { name="Arothron"; version="1.0.0"; sha256="0fwxrjkqq8dkh38s3dcky0d6nggnmvfik0w3c4mzslzipnm84sin"; depends=[compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; }; ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; }; AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; }; AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; }; - AssetPricing = derive2 { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; }; + AssetPricing = derive2 { name="AssetPricing"; version="1.0-1"; sha256="0pbb1362dgdipbj3h50ykissl3gdqf1j1mpq53ixprvyc966c5h4"; depends=[deSolve polynom]; }; AssocAFC = derive2 { name="AssocAFC"; version="1.0.1"; sha256="0fxqsj2a9wi5py4sw3mzf27zx82nbj1q294vj1n0jh9ryc68wyh3"; depends=[CompQuadForm]; }; AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; }; AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; @@ -180,17 +186,17 @@ in with self; { BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; }; BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; - BALCONY = derive2 { name="BALCONY"; version="0.1.8"; sha256="0bnhwz319dy1wc9g2sxb5w2hn8ypzxgaghrg4r82yjl5xig8qmd5"; depends=[Rpdb scales seqinr]; }; + BALCONY = derive2 { name="BALCONY"; version="0.2.0"; sha256="0ddg5fy82yxnmh54dilpljwfziqpc8rjladmcdnn5p98n9a6ypvl"; depends=[Biostrings dplyr readr Rpdb scales seqinr]; }; BAMBI = derive2 { name="BAMBI"; version="1.1.1"; sha256="1jzvsaf9cn28ny40vg0wlvdqz6f4i7n6iyym8s0aj58aiazwsmh5"; depends=[label_switching Rcpp RcppArmadillo]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; }; BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.1"; sha256="1xs65drkpd1zmrvyrv0kndd5z5q4y425524w6mrh96qya9qjrmsx"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; }; BANFF = derive2 { name="BANFF"; version="2.0"; sha256="1c5wdwqqvkcm9910lhd387snd7myv9qzs9vfk87vzp3di7hdi4l6"; depends=[coda doParallel DPpackage flexmix foreach GGally igraph mclust network pscl truncnorm]; }; BANOVA = derive2 { name="BANOVA"; version="1.1.1"; sha256="11cvf7wjip1vn5qn9hwxvdh98i8li9ijydfywf2ks2hls2430qbk"; depends=[coda rjags rstan runjags]; }; - BART = derive2 { name="BART"; version="1.5"; sha256="0vhyxyp0bbbkyymkwhll8jck3n4mybglshmfs9bycn4xmmm5rq8j"; depends=[Rcpp survival]; }; - BAS = derive2 { name="BAS"; version="1.4.7"; sha256="0rpgfzwc41clkdf20mh6wdd2fari84rfgfgzxw04lb3b3s7hz8y4"; depends=[]; }; + BART = derive2 { name="BART"; version="1.6"; sha256="06a6bxrxspgjij8mgi1gzq7fbak9zqppprl55jbb91nkf13svbzq"; depends=[Rcpp survival]; }; + BAS = derive2 { name="BAS"; version="1.4.9"; sha256="0c0mj7ijgghbjmyrwr6qp2a3iidsxli3a0wb4njjaj5n7b7yggby"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; - BASiNET = derive2 { name="BASiNET"; version="0.0.2"; sha256="1qik3r52hygxldw3sw0sln7yw7z0bmybavf0kf9fmpkyir0z0xvn"; depends=[Biostrings igraph randomForest rgl rmcfs RWeka]; }; + BASiNET = derive2 { name="BASiNET"; version="0.0.3"; sha256="0kcmc4jpiwmdydbyjfm1jx4ravxkqzvqca3p5gp26nx14xglm9hi"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; BAT = derive2 { name="BAT"; version="1.5.6"; sha256="0m6yfxymhzi8n2l421ngy6cz3qa5v7yrd1jhpi8ymlnf8dysd57x"; depends=[nls2 raster spatstat vegan]; }; BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; @@ -214,13 +220,13 @@ in with self; { BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; }; BClustLonG = derive2 { name="BClustLonG"; version="0.1.2"; sha256="0w35pwv3y00pmi4qjnzii3q44k7lk13x0cmh1zq3cl42gpi31p7f"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; }; BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; }; - BDgraph = derive2 { name="BDgraph"; version="2.44"; sha256="055pmjf8pgfqih6bxjj34gz7gj78y4z3kldy561z7mi443kwphq6"; depends=[igraph Matrix]; }; + BDgraph = derive2 { name="BDgraph"; version="2.46"; sha256="1y3rcl0x1cvcsfp4p1v82v0i119izwa8hkvs5qang70slv973bbv"; depends=[igraph Matrix]; }; BEACH = derive2 { name="BEACH"; version="1.2.1"; sha256="0a6xwczw3d2jnksb5lpf7j859pnyfxcab4kfv4v7lmf9iasbyyf5"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat shiny WriteXLS xtable]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; }; BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; }; BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; }; - BEST = derive2 { name="BEST"; version="0.5.0"; sha256="178vn0ps6nr7qjayavnvmbyx6gq57dni5llsncl89kkz633mb2hg"; depends=[coda HDInterval rjags]; }; - BETS = derive2 { name="BETS"; version="0.3.3"; sha256="09xgf356casig06q7jys5h55y8kj0ndnr7mkymgzcvni7djc5gq3"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny stringr urca webshot xml2 zoo]; }; + BEST = derive2 { name="BEST"; version="0.5.1"; sha256="0yx3bkaaly0lriyd5xr7aay4c381a5iwanfixz9v37cmvs64rs4s"; depends=[coda HDInterval rjags]; }; + BETS = derive2 { name="BETS"; version="0.3.6"; sha256="0m32ad2ysb5dr4125fccrbi5cndal3qml0lflnp9kdbm6wwhqv85"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny stringr urca webshot xml2 zoo]; }; BGData = derive2 { name="BGData"; version="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; }; BGGE = derive2 { name="BGGE"; version="0.6.1"; sha256="1ndn4cj9mrkx2mrlh2dgyy3lpx526fmg91zqgvdcbvn99r5sl17j"; depends=[]; }; BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; }; @@ -230,7 +236,7 @@ in with self; { BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; }; BIEN = derive2 { name="BIEN"; version="1.2.2"; sha256="11bqbkw6v4yvlvpv0bhmn5q7ady12hmp9ziak5jzsc7p4d8azd5r"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; }; - BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.3-18"; sha256="0cf5nbqcfvx76v1iia2d48j6dg9sqscmjrl0r835xbssiv9xk5w4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; + BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.4-9"; sha256="0v9q2gxb7i9zgkkf8ka85r3l3ypg21fzl48paliqi5ac144l177q"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; BIGDAWG = derive2 { name="BIGDAWG"; version="2.1"; sha256="0zvy5sl94qi20gdrnxb2lmadfy7p0wqfngjsf6jc2cgwyzk4gnrj"; depends=[haplo_stats httr knitr rmarkdown XML]; }; BIGL = derive2 { name="BIGL"; version="1.1.1"; sha256="008f3x0hkmifra1wcv56hxjjf2rqc9qxsbpi23aq4pgk7mxdaax7"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; BINCOR = derive2 { name="BINCOR"; version="0.1.0"; sha256="0fzynq85zbjybylxrpk89sq4l1ccm8k4z1bn25b6rgnz5m18r8hs"; depends=[pracma]; }; @@ -238,14 +244,14 @@ in with self; { BIOMASS = derive2 { name="BIOMASS"; version="1.2"; sha256="1d9rwgh0ws27yd0p2la7pn49sb71lh9bg4f42fpx448ah8dimw17"; depends=[httr jsonlite minpack_lm msm raster]; }; BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; }; BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; }; - BIS = derive2 { name="BIS"; version="0.1.0"; sha256="0m9wvz4vg9vpw6dxjdxzi3vbkflvs4041xjrpic5jngw0jv8fjz0"; depends=[dplyr readr rvest tidyr xml2]; }; - BKPC = derive2 { name="BKPC"; version="1.0"; sha256="1c5n2vdpsk00slqyxxq2c8d7ix8jdbyigrh23ykd4b95mynp9kdv"; depends=[kernlab]; }; + BIS = derive2 { name="BIS"; version="0.2.0"; sha256="15wybfj03rzrxxdm19mm7b7c2l71lzs50n7vw8vnyx1n5w1k97jv"; depends=[dplyr readr rvest tidyr xml2]; }; + BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; }; BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; }; BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.5"; sha256="0wnxfyl8hz1a0k33v5nc3j1ziwcv1fnw8639l0xv92p5rn7n5nc5"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; }; BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; }; BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; }; - BMA = derive2 { name="BMA"; version="3.18.7"; sha256="095iwlbjklg1pkp5jiw0srg7jh9cn50g8z4namrs4xsmlh7if65z"; depends=[inline leaps robustbase rrcov survival]; }; + BMA = derive2 { name="BMA"; version="3.18.8"; sha256="1a32ghn17ymb3zdh9xv6zvqcxc81m4y478mk6z9bfndq7ihy1ih5"; depends=[inline leaps robustbase rrcov survival]; }; BMAmevt = derive2 { name="BMAmevt"; version="1.0.1"; sha256="1krx8isj2wp3panjcbc2ysrc2pxz2casj12qq9p18imaa326l53y"; depends=[coda]; }; BMRBr = derive2 { name="BMRBr"; version="0.1.0"; sha256="1z54annplzydnxvwd0rkhcw5rmfx8r99k28ld5rgh22xq3zdq825"; depends=[rvest xml2]; }; BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; @@ -263,12 +269,13 @@ in with self; { BNSL = derive2 { name="BNSL"; version="0.1.3"; sha256="1918dc73gasac45kzcf4pxvl8iaawzkqdi03ny0napbjr3z8rss2"; depends=[bnlearn igraph Rcpp]; }; BNSP = derive2 { name="BNSP"; version="2.0.2"; sha256="0vapcf8qxcdmragbmwai4yddpmwwm79mksf4zcych0d4a0ij39h6"; depends=[coda ggplot2 gridExtra plot3D threejs]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; - BOIN = derive2 { name="BOIN"; version="2.6"; sha256="0vg7rfypkqy8l0q9zyqhbciangv744rvylv9741rk87mdiwgjr8k"; depends=[Iso]; }; - BPEC = derive2 { name="BPEC"; version="1.1"; sha256="14bkpmi1rmpl728nb7kmbmd687s5cvlzj181cxzwcaz3yb8x58nw"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; }; + BOIN = derive2 { name="BOIN"; version="2.6.3"; sha256="0hvx75zjb5bj005ggj9j67p9f8hpq8p6c0ihidf3avfrirl8g98p"; depends=[Iso]; }; + BPEC = derive2 { name="BPEC"; version="1.2.1"; sha256="142x0iw3sanvqm0n2hfba8pwndfk8l5qzhgpca9gcya7wkcmmmf7"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; }; BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; }; BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; }; BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; }; + BSL = derive2 { name="BSL"; version="0.1.1"; sha256="0g8nqsnhrghan2kx5iciv01drzn8kbx5klmrvcjz0ajfqjdm8kg4"; depends=[coda cvTools foreach ggplot2 glasso gridExtra MASS Rcpp RcppArmadillo]; }; BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; }; BSagri = derive2 { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; @@ -280,7 +287,7 @@ in with self; { BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; }; BUCSS = derive2 { name="BUCSS"; version="0.0.2"; sha256="188d9f0gdhym28xvvk5z10amdbg50w6ab4ik2r9qfc3p1v7k10q9"; depends=[]; }; BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; }; - BVSNLP = derive2 { name="BVSNLP"; version="0.9.10"; sha256="06q7pdv0jc7q9m5ahyxj5dqv8bjc2zva3gjy8ys139mmv7i37pjv"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; + BVSNLP = derive2 { name="BVSNLP"; version="1.1.0"; sha256="09vffm27jwpfmil6dn7jbsrh9ys3199l0qpfqrjcvz21nsgd43hg"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BWStest = derive2 { name="BWStest"; version="0.2.1"; sha256="1kwd1s1dd21qca31np49aql839j8325y8bnxlcq84nw48vqv0jgc"; depends=[memoise Rcpp]; }; BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; }; BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; }; @@ -311,10 +318,11 @@ in with self; { BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; }; BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; }; BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; + BayesESS = derive2 { name="BayesESS"; version="0.1.12"; sha256="18dhswny8idj2wqpa66amz1yqk8yhk1vwazj4p70pk8jnpg8cdfy"; depends=[dfcrm LaplacesDemon MASS MatrixModels MCMCpack Rcpp RcppArmadillo RcppEigen]; }; BayesFM = derive2 { name="BayesFM"; version="0.1.2"; sha256="0fiw2x29cpv3prywsbvs1m8a588s2wpi3bwzzjisi2rafbl619xd"; depends=[checkmate coda ggplot2 gridExtra plyr]; }; BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-2"; sha256="17zfs8bmzp59zaxzcrzis2sxdnqxrv9h1kpb22112mp9l1alvwl4"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; }; BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; }; - BayesGOF = derive2 { name="BayesGOF"; version="2.1"; sha256="13frvpb3jl8vq1h545k2pbqdj7547k9zipxxiggryvk65l2p4v30"; depends=[orthopolynom VGAM]; }; + BayesGOF = derive2 { name="BayesGOF"; version="3.0"; sha256="15699lms3g9j9fwc6lng0bg1yngz18pvmvxwaqg8258qjwc79xlx"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; }; BayesH = derive2 { name="BayesH"; version="1.0"; sha256="0mjd1i3rkhyq3qcalq0ing0ap0igbhyvczaihl4pcfidgs70bci3"; depends=[]; }; BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; }; BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; }; @@ -324,7 +332,7 @@ in with self; { BayesNetBP = derive2 { name="BayesNetBP"; version="1.3.0"; sha256="01blqc48ssgr3dg5bk7yzwpa59n3ja1dggglwm2441dwjxf10vxx"; depends=[bnlearn doBy fields graph gRbase igraph qtl qtlnet RColorBrewer Rgraphviz]; }; BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; - BayesRS = derive2 { name="BayesRS"; version="0.1.2"; sha256="11xpkq8x4xcpr4kmflr5blq0pn0ssfi9204bs5xfihn7q3d9bzwy"; depends=[coda ggplot2 metRology reshape rjags]; }; + BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; }; BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; }; BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; }; @@ -356,7 +364,7 @@ in with self; { BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; - BiDAG = derive2 { name="BiDAG"; version="1.0.2"; sha256="1y91vb9g6642c0j7cr3g9fg999fxb7bhbfvm0bdlnaixpbnky6qa"; depends=[pcalg Rcpp]; }; + BiDAG = derive2 { name="BiDAG"; version="1.1.1"; sha256="1rncjsdyam7dnhd6ccdlvc85nnc79nsifcm24spc05k8rvx1836x"; depends=[pcalg Rcpp]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; }; BiG = derive2 { name="BiG"; version="0.1.0"; sha256="1wi2lyj3q1x47cpf1mdm5kqvjlcvbrliym6j5jbmwz7npc910vrb"; depends=[truncnorm]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; @@ -371,6 +379,7 @@ in with self; { BinNonNor = derive2 { name="BinNonNor"; version="1.4"; sha256="00405ww9mh910jqww60w7cb8qbjql2jn13m60ly0bnxilg44r0bb"; depends=[BB corpcor Matrix mvtnorm]; }; BinNor = derive2 { name="BinNor"; version="2.2"; sha256="03cggpk9fhndnk9vv5i6fzsq4wjxc5405xxlxg3l9gb618kj437f"; depends=[corpcor Matrix mvtnorm psych]; }; BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.4"; sha256="0qiy0wf9i9r44ycz1jl666nwpsv5yz7vzz1szdy22sk68lz984bv"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; + BinQuasi = derive2 { name="BinQuasi"; version="0.1-3"; sha256="0kxn71kfaldxji1a0zwnkalpjgrvw0jjfqm2f82gvj8cgcn69lgr"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog Rsamtools S4Vectors SummarizedExperiment]; }; Binarize = derive2 { name="Binarize"; version="1.2"; sha256="014iagr76y3v7ljn6zlbg1hxwbwdi889bqxa7hwmqrcybnla22ja"; depends=[diptest]; }; BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; }; BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.1"; sha256="1f4y1mrscy9z87yglbynnsis623ar0gqpda3dfm9isa2z10c24qr"; depends=[expm Formula lmtest numDeriv]; }; @@ -394,7 +403,7 @@ in with self; { BivRegBLS = derive2 { name="BivRegBLS"; version="1.0.0"; sha256="1fi399vv54dnfywxbc8yb1r58lrl7zpqkahvcx3f5svjy20dvvbw"; depends=[ellipse]; }; BivUnifBin = derive2 { name="BivUnifBin"; version="1.2"; sha256="0m4a2m7lvlm02hqqigwg3cd6sjzxnxqw1mchxj5g19whk34vwkwi"; depends=[BinOrdNonNor rootSolve]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; - Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.0"; sha256="0m5a41q56z6v0681y9093n5rdd33mg4fc904wjkqznlb4kn1156x"; depends=[]; }; + Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.2"; sha256="1clfknv56zfi9wgzi5bricchvis83mc33i5d4qk3yzf2ryzxag7q"; depends=[compound_Cox]; }; BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; }; BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; Blaunet = derive2 { name="Blaunet"; version="2.0.7"; sha256="19p2rqbg44pi0dz2iimjgr69zyrjf0dfsic6spph81dyrri1zyvh"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; }; @@ -404,8 +413,9 @@ in with self; { Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; }; BoSSA = derive2 { name="BoSSA"; version="3.2"; sha256="03m4l77mq1h7vxfwkkp2r9acnbwd46mq85z27iizmwixnh81pgxy"; depends=[ape jsonlite phangorn plotrix RSQLite]; }; BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; }; - Bolstad = derive2 { name="Bolstad"; version="0.2-37"; sha256="12ivpaqx46yhvpnmncvprn4dkqgk7aqfjyvi69j8v31c1al9h5d3"; depends=[mvtnorm]; }; + Bolstad = derive2 { name="Bolstad"; version="0.2-38"; sha256="1535cfpn202vb037q027dy51kc4yg5g9mpn4l6x2q1pwrvnnx18f"; depends=[mvtnorm]; }; Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; }; + BoltzMM = derive2 { name="BoltzMM"; version="0.1.1"; sha256="0jb81wn8b5lhvlkpv4rs66qdmryf57n2xmxgwl1qk0n8bfzy8ayi"; depends=[BH Rcpp RcppArmadillo]; }; BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.3"; sha256="1s64a46wfp31jsyfdg2m8269qaq7x798y2bj0dyk69di1nxx2daa"; depends=[igraph XML]; }; @@ -415,13 +425,14 @@ in with self; { BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; BootValidation = derive2 { name="BootValidation"; version="0.1.3"; sha256="097s6yd2g6ahc7rrdpzjarmvqajvzfz2dzawm8gijiami0dkfm9m"; depends=[glmnet pbapply pROC]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; }; - Boruta = derive2 { name="Boruta"; version="5.2.0"; sha256="111rp7lbq79p7c1w4dkzhb9wh32mns5p17xxq0qbjzaiv41377dy"; depends=[ranger]; }; + Boruta = derive2 { name="Boruta"; version="5.3.0"; sha256="181ldma4rfd14bnq5prhhsjji1hpr4jmn69b017cs08w7k0nqdi9"; depends=[ranger]; }; BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; }; BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-8"; sha256="09c6zdzf5k5x7zv5m6ygl4k5xbprlpb6s3lrq432mmv8rn2yi58z"; depends=[brglm gtools lme4 qvcalc]; }; BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; }; BrailleR = derive2 { name="BrailleR"; version="0.26.0"; sha256="1grqs3sb1xk28vmpcbidb6s805wqzkrrx41qqz7jc5y8vpspba51"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest pander rmarkdown XML xtable]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; - Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; + BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.4"; sha256="0d51i3dpdfay3562b87la0731jfc5bq5d04mxs1qdrzw6p69ijvn"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; }; + Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-5"; sha256="1ly9fx6mmiwrni52li0c23amsh4k36zjv9h5432igf0fgldhr3pq"; depends=[]; }; BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; }; Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; }; Brundle = derive2 { name="Brundle"; version="1.0.8"; sha256="1yj196x6xb75qgi16pgg3dyjmxmjklfjcpxymaki32drhmylf24z"; depends=[DESeq2 DiffBind lattice Rsamtools]; }; @@ -429,6 +440,7 @@ in with self; { BullsEyeR = derive2 { name="BullsEyeR"; version="0.2.0"; sha256="1p8b5w818zi7zs0n13cc3sw8z0z9mfr5cn5y5icsx1jam5amppci"; depends=[Matrix NLP slam tm topicmodels]; }; BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; }; + BusinessDuration = derive2 { name="BusinessDuration"; version="0.1.0"; sha256="0bx147qcf44q2bpl4rcyps18vk2dawcgn7870j8ljc8d86lqnvqd"; depends=[chron]; }; BuyseTest = derive2 { name="BuyseTest"; version="1.0"; sha256="1nfj2ajah2dg1p47g2z0zf9s24sxj4dfn3nny1h4qmqwcb4vs55g"; depends=[data_table lava Rcpp RcppArmadillo snowfall survival]; }; C50 = derive2 { name="C50"; version="0.1.1"; sha256="1pq1plsh7kf45f0ghrja0xjikaxgvq14k8k80ml5rkabyv11zg03"; depends=[Cubist partykit]; }; CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; }; @@ -440,10 +452,11 @@ in with self; { CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; }; CANSIM2R = derive2 { name="CANSIM2R"; version="0.12"; sha256="1r8fln9rqjsqhbnxvng9wpdnp6mb1gxlq3qkff4q2wbhf18wwn7w"; depends=[Hmisc reshape2]; }; CARBayes = derive2 { name="CARBayes"; version="5.0"; sha256="0kii28mf75m7ij1l0bz2w93h7m1wwq1xjvv3d3nf3ps9h8rxzi8d"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; }; - CARBayesST = derive2 { name="CARBayesST"; version="2.5.1"; sha256="10mzjcybj549wp07sigr7m0r93gjskmwd8i6i1017wyh1vv5vlyc"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; }; + CARBayesST = derive2 { name="CARBayesST"; version="2.5.2"; sha256="0jww40ghcfiq7laprdicynn1m34ykz9l9navi9rdx8p8d7k76ykc"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; }; CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles sp]; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; + CARRoT = derive2 { name="CARRoT"; version="0.1.0"; sha256="1zwc59pf0wpd9hy2apx723plag3dmas39sn7rf1cfkn7h9dm27iz"; depends=[doParallel foreach nnet Rdpack]; }; CARS = derive2 { name="CARS"; version="0.2"; sha256="1n8p4n9fbl20jps9g9pbspw54hq9y6kqbggc8h0i9pbm1b25ngrg"; depends=[np]; }; CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; }; CAST = derive2 { name="CAST"; version="0.1.0"; sha256="0mihpcknwk86m41x14j2g3f2s2ya20sh99ng85rcph57a4v6ar05"; depends=[caret]; }; @@ -452,10 +465,11 @@ in with self; { CATkit = derive2 { name="CATkit"; version="3.2.3"; sha256="1vl60m6x3mqgghqzpxq8aalpjpcagamjk5zg62mqpwx0vgdwv2fy"; depends=[assertr magic MASS png rtf season signal]; }; CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; }; + CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; CBPS = derive2 { name="CBPS"; version="0.18"; sha256="0dd63s9nrgra51w005j35scbswbknqgv9ppawh0311hpr7anrir9"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; }; - CCM = derive2 { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; }; + CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; }; CCMnet = derive2 { name="CCMnet"; version="0.0-3"; sha256="0mbw3yhlgnmq7q4wnwiff7rlmciq83cch7kkav3wll6nqvxcdiax"; depends=[ergm network sna]; }; CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; @@ -475,6 +489,7 @@ in with self; { CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; }; + CGPfunctions = derive2 { name="CGPfunctions"; version="0.1"; sha256="0zsvhhp5pgqrn518c1cmmxama1cadg7grscimz08cclzidcqq0w1"; depends=[car dplyr ggplot2 rlang tibble]; }; CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; @@ -482,12 +497,12 @@ in with self; { CHNOSZ = derive2 { name="CHNOSZ"; version="1.1.3"; sha256="07j1xvv6rn57hirxw1dajnvk9hmj3r9bgk4fckzmmpclf22z4mwq"; depends=[]; }; CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.2"; sha256="0s3a9ay0l9n5kc6q0wb7f9625vba4giz1pdg3ikq4h4zhp1ldq62"; depends=[Matrix mvtnorm numDeriv stringr]; }; - CIDnetworks = derive2 { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[igraph MASS msm mvtnorm numDeriv pbivnorm Rcpp]; }; - CIEE = derive2 { name="CIEE"; version="0.1.0"; sha256="1z4061rkryhnhf6qdxlna1w2dsy06pipx3sk1hswah4i2n7cc7sq"; depends=[survival]; }; + CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; }; CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; - CINNA = derive2 { name="CINNA"; version="1.1.3"; sha256="0y2xymk323xjkwpii1i13q38dsfi1ywlvw3ykq4928jb58f96121"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; + CINNA = derive2 { name="CINNA"; version="1.1.4"; sha256="0wq7kiycx4ly6pm9f81g0wjzrhb123zzflsx7mnxs7lc77ga2h2b"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; CINOEDV = derive2 { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; }; + CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; }; CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; }; CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; }; CLA = derive2 { name="CLA"; version="0.90-1"; sha256="1rpklm21i9rjw0vfhaz9brq9571yjynwfhpv6dp6fbl3cj7bwb8g"; depends=[]; }; @@ -512,7 +527,7 @@ in with self; { CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; }; CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; }; CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; - CORElearn = derive2 { name="CORElearn"; version="1.52.0"; sha256="01kby6kddfbv6qhmsja1q4gyqq57f7n9kk4555g258f9a6900c2n"; depends=[cluster nnet rpart]; }; + CORElearn = derive2 { name="CORElearn"; version="1.52.1"; sha256="0i37dpnphdq9pcb94rzpy80gw88zrfy8diiig94p1gdj0dk57b0f"; depends=[cluster nnet rpart]; }; CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; }; COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; @@ -550,6 +565,7 @@ in with self; { CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.2"; sha256="07g7ik3xb9ijghkz94qyk87c2d4q942h4d0yicwr1j1xzcv5qzsw"; depends=[]; }; + CaliCo = derive2 { name="CaliCo"; version="0.1.0"; sha256="1fz4sx6wsrkmcfjjgjn7z26m266m844qz8ms4vk6bnhx0h1rp6qa"; depends=[coda DiceDesign DiceKriging FactoMineR ggplot2 MASS Matrix R6 Rcpp RcppArmadillo testthat]; }; CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.0"; sha256="1r3318rzh29cgq72gdp16z60xkan7hyh1vj4gjg3pzbxy8zawqxx"; depends=[survey]; }; Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; }; CarletonStats = derive2 { name="CarletonStats"; version="1.3"; sha256="1a8ic2ny2zkqy6xsnzhlc3hybhk200d8jbdbjfy7jav7n757kr0y"; depends=[]; }; @@ -563,7 +579,7 @@ in with self; { Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; }; CePa = derive2 { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; }; CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; }; - CensMixReg = derive2 { name="CensMixReg"; version="3.0"; sha256="0ywqijwca4hkc0mz5gngqs9ivkvvjznrkflcv590diapxw52b2c5"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; }; + CensMixReg = derive2 { name="CensMixReg"; version="3.1"; sha256="1r7w84bjdxnkhiw7gh499scc6m3ba9b2a8cwayn6sg5a524yn9gs"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; }; Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; }; @@ -585,7 +601,7 @@ in with self; { ChoR = derive2 { name="ChoR"; version="0.0-3"; sha256="085p604zbk4l88q4ig2fnfhadxvsssyjl2r48g8s99yx49cvd9sx"; depends=[commonsMath rJava]; }; ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; }; ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; - CholWishart = derive2 { name="CholWishart"; version="0.9.0"; sha256="123m7byr4rcmg9h91g1p1v1aby5qpaidnjid9vg4gr1ywhbvjh63"; depends=[]; }; + CholWishart = derive2 { name="CholWishart"; version="0.9.2"; sha256="1dlq6a9j3ifhmw94w158czc72f31rns0xfw4zbfx4zcah678raq6"; depends=[]; }; CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; }; CircMLE = derive2 { name="CircMLE"; version="0.2.1"; sha256="031pmfyqwif16am7h1csk1dg9vhy0jgdc8w4z60kqqsgf3yk6il9"; depends=[circular]; }; CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; }; @@ -605,13 +621,13 @@ in with self; { ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="0.1.0"; sha256="1lqf2ksgchl1j5hfkz7r5yczvkjgi3238k8nkfkd70nyil9vjq06"; depends=[Rcpp]; }; CluMix = derive2 { name="CluMix"; version="2.1"; sha256="080gd6v8yj83djmf4wg7cwk6q6w6gsg4xfsgw5qd6z8h3kpyn45m"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; ClueR = derive2 { name="ClueR"; version="1.2"; sha256="17phjzpdx11sw259xk16h2w28xdaxxpzbh0sxli61icnssw35n7z"; depends=[e1071]; }; - ClusVis = derive2 { name="ClusVis"; version="1.0.0"; sha256="0d8s4gd5dl4mc1538rhy2pwk1xfgbq2ca76qaqrl2q3mswb1p6wp"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod]; }; + ClusVis = derive2 { name="ClusVis"; version="1.1.0"; sha256="17cn3hm37jv10aybaidy89kch6814hdi8g44s94xa9li7nixzass"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; }; Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.1"; sha256="18is8aa496qr7afmyqy12s267ans0hhzy0xs8nzr3qp70mwrbbh1"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr tibble]; }; - ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.3"; sha256="1znyj39mwdi02xhypvr2fsx2yp45w8br7r8qkn831d6fza5pkcyc"; depends=[]; }; + ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.9"; sha256="116rj2ynk37pc5ic6xlnh3gvzl6qasly8avchmwcdsg4w7i2z8l7"; depends=[]; }; ClusterR = derive2 { name="ClusterR"; version="1.1.1"; sha256="0b9x0a1s0d9nnkkcm417xsaciwb66771s14ir6n6mm7yq1g6x417"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; }; ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; @@ -624,6 +640,7 @@ in with self; { CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; }; CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; }; + CollessLike = derive2 { name="CollessLike"; version="1.0"; sha256="080mrvszysdqvx03sd4aczvhs1zmhc6fx8zp5nwrh7mmyajslxkx"; depends=[ape igraph]; }; CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; }; ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; }; ComICS = derive2 { name="ComICS"; version="1.0.3"; sha256="1jfs0ygr88532jjw2ablyn2r3sg3hfsv5yrm4gkdgzakychj3dy2"; depends=[glmnet]; }; @@ -644,7 +661,7 @@ in with self; { CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; }; CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; }; CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; }; - CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.9"; sha256="086yacr5fgqzgl1hh0m6qpx59smk66bsxglaic3ynd9n9k1n9p6c"; depends=[data_table expm Matrix]; }; + CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.0"; sha256="13gwxnqa0r805i1b5z3ym4pp297305jwvdn7b35pf2v9zlcnyh7c"; depends=[data_table expm Matrix]; }; CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; }; CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; }; Compind = derive2 { name="Compind"; version="2.0"; sha256="1qadyl96c9cmk1i763gc055hgv414ha59418lqk183kwl5sgbqy5"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; @@ -654,7 +671,7 @@ in with self; { ConR = derive2 { name="ConR"; version="1.2.1"; sha256="0k6761x5dfibbbzfzmkc73ahfmw54d5rpj0rj32232qdlk48hqk5"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; }; ConSpline = derive2 { name="ConSpline"; version="1.2"; sha256="16r0v0llj0pri69jqxribp8dpzh6yn6acpq20aaky14fyh3i4q7x"; depends=[coneproj]; }; Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; }; - CondIndTests = derive2 { name="CondIndTests"; version="0.1.1"; sha256="0n9ishrq9ilray5cq37q7fyizaffbwx36s5lf9z60mh6hn3dppha"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; }; + CondIndTests = derive2 { name="CondIndTests"; version="0.1.3"; sha256="1lmys6a3cwk8c3d08lpb2dny9madsdf2fnslx6qjx27cg95bhdcb"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; }; CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; ConfigParser = derive2 { name="ConfigParser"; version="1.0.0"; sha256="0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3"; depends=[ini R6]; }; ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; }; @@ -667,13 +684,14 @@ in with self; { ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; }; ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.0.0"; sha256="0ndb7k2lfv6014a7c61a2mmcsywpa478lk6fh7d0jkv55hmnzvs9"; depends=[lmtest sandwich]; }; ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; }; - CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-6"; sha256="1jhyb9hw10cpsac6jyrp21g9habpy0mqglg1aq6qyi59c4n95b46"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; }; + CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-7"; sha256="00x2ijyg1bj2xp679i453d4fd58qp7mfj3pvv3cddh0hl8yfns18"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; }; Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; }; CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; }; CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; }; CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; }; CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; }; CorReg = derive2 { name="CorReg"; version="1.2.1"; sha256="1c7vvlxza0r9r07rr464y3kfkrnzz15l4jc7s727wjrw2az8rnpy"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; }; + CorShrink = derive2 { name="CorShrink"; version="0.1-5"; sha256="03g5njb191nqiy0lmk8jrwyrnl3w733b8h0krkbsjh2zravyw1xc"; depends=[ashr corpcor corrplot gridExtra Matrix reshape2]; }; Corbi = derive2 { name="Corbi"; version="0.4-2"; sha256="0h088iplryaipnfp8svw3djh016z23lv66q51gfbqpvchvjdwypw"; depends=[CRF Matrix mpmi]; }; CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; }; CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; }; @@ -691,9 +709,9 @@ in with self; { CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; }; CovTools = derive2 { name="CovTools"; version="0.3.0"; sha256="0p5mfrdp4p5fz9ld0rqrd2kj73hi1dzx0iwl4rihhgfgdplzknhf"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; }; CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; }; + CoxPhLb = derive2 { name="CoxPhLb"; version="1.0.0"; sha256="1j8dvbjv4h0zdjvwvpswdlsb9pf3gxixh2rhl0m1kxm6f6h5ig0z"; depends=[survival]; }; CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; }; CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; - Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; }; CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; Cprob = derive2 { name="Cprob"; version="1.4"; sha256="1kjw5hhb3fy12xlyg01i8ynl78gx0r57kvmgafbqix1s3pg2hyw6"; depends=[geepack lattice lgtdl prodlim tpr]; }; @@ -709,6 +727,7 @@ in with self; { CsChange = derive2 { name="CsChange"; version="0.1.3"; sha256="08ss1dzwirmnlgw440g3k3vnrl1imhmd2gljnid8z2dzj5450alr"; depends=[boot Hmisc rms survival]; }; CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; }; Cubist = derive2 { name="Cubist"; version="0.2.1"; sha256="18w82l44b6jsmz19l34dmaqb22qvjcwhs4cddzhs6pzicvqw645k"; depends=[lattice reshape2]; }; + CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; }; Cyclops = derive2 { name="Cyclops"; version="1.3.0"; sha256="0sznzzz21qn1cxxfa3wiwvfza7lykzzf0xyqvawha9vzm8qzgqnq"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel survival]; }; CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.0"; sha256="1014r17krw74drykdlw24pgqylidp8yxa00zhf340ilcxfpacxyi"; depends=[curl httr jsonlite]; }; CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="1.0"; sha256="0hr74igy43d5ybzlgqpvx9ingw6h83w502b6k55cp6zqcv5rl8d5"; depends=[CytobankAPI]; }; @@ -724,7 +743,7 @@ in with self; { DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; }; DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; - DALEX = derive2 { name="DALEX"; version="0.1.1"; sha256="0nafdpfiawmlv6v43i4glhq1p3aaqph5f8ikcvi75l44n1rwkazk"; depends=[ALEPlot breakDown ggplot2 pdp]; }; + DALEX = derive2 { name="DALEX"; version="0.2.0"; sha256="0dls9v912bcww4csax35spxl9zx71g9ig9inzi9cr9ffinpw9rgk"; depends=[ALEPlot breakDown factorMerger ggplot2 ggpubr pdp]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; }; DAMisc = derive2 { name="DAMisc"; version="1.4-3"; sha256="1hic53vi7mj4fvggxjl4d3j4zw8wwczh6pldyi8idrhm45hw2nh4"; depends=[boot car effects gdata lattice MASS nnet pscl QRM sm VGAM xtable]; }; @@ -732,6 +751,7 @@ in with self; { DATforDCEMRI = derive2 { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; + DBHC = derive2 { name="DBHC"; version="0.0.2"; sha256="08sl6gv1dw2kpk1zylvyqqga6xvhzhpp5zxa9ql1hyzc2i43jivq"; depends=[ggplot2 reshape2 seqHMM TraMineR]; }; DBI = derive2 { name="DBI"; version="0.8"; sha256="16nf8flxr5vdz8yrpprfbzydy3ajixkp9hc8ibd9n7r9nc29waym"; depends=[]; }; DBItest = derive2 { name="DBItest"; version="1.5-2"; sha256="05wizjm2b97fsdha2i391h38xb0zrkhnd036qvdcm0r5l0y56sm8"; depends=[blob DBI desc hms R6 testthat withr]; }; DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; }; @@ -762,21 +782,22 @@ in with self; { DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; }; DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; - DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; }; - DHS_rates = derive2 { name="DHS.rates"; version="0.2.0"; sha256="0fhbsylm0j6s4ah5iam2rc0c716zljhqf8l87n3gll5kfh08427x"; depends=[reshape survey]; }; + DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; }; + DHARMa = derive2 { name="DHARMa"; version="0.1.6"; sha256="1b7yqy4id6ydvyqrgpl5zkmch64rl2b0jcj6ww5rq6afzgkfbfay"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; }; + DHS_rates = derive2 { name="DHS.rates"; version="0.3.0"; sha256="039pa3pln7vj2md4kcv9070qbm8v7aknhhgh49hs5xiwa682g1f7"; depends=[haven matrixStats reshape survey]; }; DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; }; DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; }; DIFtree = derive2 { name="DIFtree"; version="2.1.4"; sha256="16cyd634jflaszpfq0ymwlbv57ci1iyffwai641jczn8cny504zl"; depends=[penalized plotrix]; }; DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; }; - DJL = derive2 { name="DJL"; version="2.6"; sha256="1vvfh9hpanac2g22k4hqy3y7j3mn34mvasw0rx3y4vjbv3h05yw6"; depends=[car lpSolveAPI]; }; + DJL = derive2 { name="DJL"; version="2.7"; sha256="1p0jd2hn6an3kkc85xkkj36x7iwi43k1yrnmzy0mb5qrbvx07hlj"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; - DLMtool = derive2 { name="DLMtool"; version="5.0.2"; sha256="0fz8qy3328wmxqg5s13bl2qr4f54zc2bk4amb9kz490vf00by0iw"; depends=[abind coda devtools ggplot2 ggrepel gridExtra knitr LBSPR MASS mvtnorm openxlsx r4ss Rcpp RcppArmadillo readxl rmarkdown snowfall]; }; + DLMtool = derive2 { name="DLMtool"; version="5.1.3"; sha256="0n7sx577fffxbxfbwy19py2hm00rb403n4fvn9j6pcdi433mfx59"; depends=[abind coda devtools ggplot2 ggrepel gridExtra knitr MASS mvtnorm openxlsx r4ss Rcpp RcppArmadillo readxl rmarkdown snowfall]; }; DMMF = derive2 { name="DMMF"; version="0.4.0.1"; sha256="0fypj0a0kjzfghazs55mxkig9n3ngjmbi3xmdxkpa35jbn71bfdd"; depends=[raster rgdal sp]; }; DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; - DMRnet = derive2 { name="DMRnet"; version="0.1.0"; sha256="0p5iyj6zqrv1hsfdq7bp96ly8dkf2ky6gzilrha336lhm35ym7sr"; depends=[glmnet grpreg]; }; + DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; }; DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; }; DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; }; DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; }; @@ -789,6 +810,7 @@ in with self; { DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; }; DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; + DPWeibull = derive2 { name="DPWeibull"; version="1.2"; sha256="0s1c3pn8pivg4227xhis5scmh9zc6fq36inphy6226hriny6q0v9"; depends=[DPpackage matrixStats Rcpp truncdist]; }; DPpackage = derive2 { name="DPpackage"; version="1.1-7.4"; sha256="0lfw55kbjwr1dqkd98p6488p6c0nh5pkfkc9wpds8wsqm38siad6"; depends=[MASS nlme survival]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; }; @@ -804,10 +826,11 @@ in with self; { DT = derive2 { name="DT"; version="0.4"; sha256="06gsqz7p2fv6hc3fm3759gaa50krcfrqrmy7qbxyam6a36w9daix"; depends=[crosstalk htmltools htmlwidgets magrittr]; }; DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; + DTDA_ni = derive2 { name="DTDA.ni"; version="1.0"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; - DTRlearn = derive2 { name="DTRlearn"; version="1.2"; sha256="1dakwlafs27nkjsiknnwxnb2hgc2xdpi5mb6dmzpjig7hg2f8d3f"; depends=[ggplot2 glmnet kernlab MASS]; }; + DTRlearn = derive2 { name="DTRlearn"; version="1.3"; sha256="0ngzvjlzn20pff1ihw87nar7riiva4pnfih7hlsr0iszd3v3b1gq"; depends=[ggplot2 glmnet kernlab MASS]; }; DTRreg = derive2 { name="DTRreg"; version="1.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; }; DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.7"; sha256="1syxw49pzh36nfq0zfr83cwpac86fnj0b7nlqiin4jb00h8vrf6i"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; }; @@ -822,6 +845,7 @@ in with self; { Dasst = derive2 { name="Dasst"; version="0.3.3"; sha256="0nrcvcfzr2y1jc984rpi3fmggns65sphc6nqr9l91h5qvpdcw7cl"; depends=[]; }; DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; }; DatAssim = derive2 { name="DatAssim"; version="1.0"; sha256="120gazyyxda9faydv2lyqgvflhqi2fhih1szq0sy5v1gh4xb0hhy"; depends=[Rcpp RcppArmadillo]; }; + Data2LD = derive2 { name="Data2LD"; version="0.1-1"; sha256="1klvp4zjbv4g07rahfmwxdms0bh7ca064iap681r1w5jbyq8pkzx"; depends=[fda Matrix R_cache]; }; DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; }; DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; }; DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; }; @@ -852,7 +876,7 @@ in with self; { Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepthProc = derive2 { name="DepthProc"; version="2.0.2"; sha256="0n9hs6fp047gnd8y87rzx5qcr3hqg3pdck97hcbzkd8jsi1b1daw"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; Deriv = derive2 { name="Deriv"; version="3.8.4"; sha256="1la2afxr9nilb32s3nc1j3spxzgcqn48aywq96pckpjk8vypsjyy"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.23"; sha256="0y3br8s2kvvi552xv5ir2av810l8qknc06hw9x6bryjxj42ywa4i"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; + DescTools = derive2 { name="DescTools"; version="0.99.24"; sha256="1ns0vqpnfj995dq1l6pmah2wi6l8zacndha6brhy97hyn84mc83k"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.0"; sha256="1qyxbnmr2dycyfivdyvdqcbpk993q9glrixgp64pflx3sqz91yyk"; depends=[DescTools rstudioapi]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; }; DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.2.1"; sha256="0mb33ihqr8jj1ispykvyc7jn1wyaagb535ya5jgwlqrians41ihc"; depends=[jsonlite RCurl reshape]; }; @@ -880,9 +904,9 @@ in with self; { DirectEffects = derive2 { name="DirectEffects"; version="0.1"; sha256="0c9inxn624c5rxa86d8r8jhsrm42rcsm4xxrwg7h3lvpairiyil2"; depends=[Formula]; }; DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; }; DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; }; - Directional = derive2 { name="Directional"; version="3.0"; sha256="08m6yg2jpz8fcdw4dlbpb1679d72q059ab2sgc3wj53m7vqirm4a"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; }; + Directional = derive2 { name="Directional"; version="3.1"; sha256="0zx6wflc3hnal3n0ql427dsw8npd46sbz4v42lj53yax71cdg8lj"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; }; DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; }; - DisHet = derive2 { name="DisHet"; version="0.2.1"; sha256="1w0fpc73pk1fs05j328aw368qcabxfxz97zfqr5mda7wcmkwwnj3"; depends=[gtools matrixStats]; }; + DisHet = derive2 { name="DisHet"; version="0.2.2"; sha256="03jg7y8hd7c7bi9df37g1p7i28l7l2hyana4y2js7hgc88gv376l"; depends=[gtools matrixStats]; }; Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; }; DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; }; DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; }; @@ -903,7 +927,7 @@ in with self; { DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; }; Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; }; - Dominance = derive2 { name="Dominance"; version="1.0.17"; sha256="07xsyadmq47szvp1vnf53ijq43pwd9g7554fgl803fhkwq6b3jgh"; depends=[chron gdata igraph XLConnect]; }; + Dominance = derive2 { name="Dominance"; version="1.1.0"; sha256="1dzfj79hv3ds72dy4fn14bp68fiw06vdxkp4dvyvj37yrrqpcxyz"; depends=[chron gdata igraph XLConnect]; }; DoseFinding = derive2 { name="DoseFinding"; version="0.9-16"; sha256="0ncr95lf4mifmx6n2qkg8m3cn326zj9w4hr7afsdxg155l11w89z"; depends=[lattice mvtnorm]; }; DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; depends=[coneproj MASS Matrix]; }; DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; }; @@ -911,6 +935,7 @@ in with self; { Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; }; DrBats = derive2 { name="DrBats"; version="0.1.4"; sha256="0jzl1jklxsbqf5hv3a71lckk51jxi1lnbk5zmvd4x3y9b9azl2cq"; depends=[ade4 coda MASS Matrix rstan sde]; }; DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; }; + DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; DstarM = derive2 { name="DstarM"; version="0.2.2"; sha256="014xlj5kipl2jpcgcqs1ynw05x17wbsgc5mhfjn3p96bbp6pkzzy"; depends=[DEoptim ggplot2 rtdists RWiener]; }; @@ -921,6 +946,7 @@ in with self; { DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; }; DynTxRegime = derive2 { name="DynTxRegime"; version="3.2"; sha256="0a6s28vc7kf6r7qmy9xjmxm39fl0ijnbl01d8rzr4w9sbnr3n85l"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; + DynamicGP = derive2 { name="DynamicGP"; version="1.0-2"; sha256="1mgipnkf8mlxcr9b6naiy5nq90war1gdp2cm54681b4cx0fv62p2"; depends=[laGP lhs]; }; EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; @@ -961,6 +987,7 @@ in with self; { EML = derive2 { name="EML"; version="1.0.3"; sha256="04qz4rwq0amy9lp6358qjjql46ky2slqrvipngym5klqvm9vi0zi"; depends=[uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; }; EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-5"; sha256="1ys5kvns6jlw2lk9m6xcy71wx1d581cmphiaxnp3hsqimc8wz7hq"; depends=[MASS mnormt rgl]; }; + EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.0"; sha256="1jadasvngxczyyc7gxpcw3jxhxai3p88l8lmj1jmdns5vdi2n4rl"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; depends=[KernSmooth lattice mvtnorm]; }; EMMIXuskew = derive2 { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; }; EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; }; @@ -977,6 +1004,7 @@ in with self; { EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; }; EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; }; ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; }; + ERSA = derive2 { name="ERSA"; version="0.1.0"; sha256="063i9fmdccyrbap7fgas9371zv13gpcgzhlsphsn8jw9nmzpdii4"; depends=[broom car combinat dplyr ggplot2 leaps modelr purrr RColorBrewer shiny tidyr]; }; ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; }; ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; }; ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; @@ -986,7 +1014,7 @@ in with self; { ETAS = derive2 { name="ETAS"; version="0.4.4"; sha256="0s0j7r1nyf82qz3lavsvyd11hl0jkq69c70wh00nfy93n2ygp376"; depends=[fields goftest lattice maps Rcpp spatstat]; }; ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; ETLUtils = derive2 { name="ETLUtils"; version="1.4.1"; sha256="07wqrg7mnxmbdf2ibxj5kppl4sd3l608yfhbbsngkhpsrm203qva"; depends=[bit ff]; }; - EValue = derive2 { name="EValue"; version="1.1.1"; sha256="0fdihngqgl2m7385ih08zzh9y38aal1d9lv7358qf0z68i9bgfa2"; depends=[ggplot2 metafor]; }; + EValue = derive2 { name="EValue"; version="1.1.3"; sha256="0c3fsb3p277533gn6yw8ml7d6za211j8k46ga88fsh4mlg28hb6p"; depends=[ggplot2 metafor]; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; EWGoF = derive2 { name="EWGoF"; version="2.2.1"; sha256="0n1fx6k9ndb2s9ybzizbqz662c9s1f48q6v697pqhnfy9si1nplz"; depends=[Rcpp]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; @@ -1002,6 +1030,7 @@ in with self; { EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-4"; sha256="18l5v7zsmz35brnf6b8qfxbs8906rmyc2kkh9bm96x01m3vx8pkh"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; }; EcoIndR = derive2 { name="EcoIndR"; version="1.2"; sha256="1p2m4kramcf71xlm9hbk5l5mb8nmjfac1p3csai7m2gmikf559yj"; depends=[]; }; + EcoNetGen = derive2 { name="EcoNetGen"; version="0.1.1"; sha256="004y0l8hdl1kmph7y954m8k3rrqfgi6krdwywww136q0yfjdw27v"; depends=[ggplot2 igraph]; }; EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; }; @@ -1010,8 +1039,8 @@ in with self; { EdSurvey = derive2 { name="EdSurvey"; version="1.0.6"; sha256="1p8cxr69ckz6py0hmagm9aq7kp1q48ymffmnpwsvwh2yfkzl90yq"; depends=[data_table LaF lfactors Matrix NAEPprimer wCorr]; }; EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.0"; sha256="1pbpknz1v5k7fgwvzv5ldyxxshys4sx7d17hbwzph1z68jcmixzg"; depends=[editrules igraph Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-2"; sha256="1vkg5gi0gysnw0gz9ah8pdnnlkdfsz0jy53ps2jnnpy8lbr45zc9"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; - EffectStars = derive2 { name="EffectStars"; version="1.8"; sha256="0gcgwlywx7slbk8nyzv47r4wx837gimmshrb1kl2m4cl4xbm84jh"; depends=[VGAM]; }; - EffectStars2 = derive2 { name="EffectStars2"; version="0.1-1"; sha256="1yffwnr563vzdq0ph9xs3w0zg5c7l3ima6skn8cqiafr21w332ss"; depends=[miscTools VGAM]; }; + EffectStars = derive2 { name="EffectStars"; version="1.9"; sha256="15n5mrba2s0qxcg3zikfwpxqwv38h39zmvj8sz62ni4pdhrhhjh3"; depends=[VGAM]; }; + EffectStars2 = derive2 { name="EffectStars2"; version="0.1-2"; sha256="0121zb627zwkgbb84sn2dclph56dc5rkfjpci5xwd0w99vh3q66l"; depends=[miscTools VGAM]; }; EffectTreat = derive2 { name="EffectTreat"; version="0.3"; sha256="1y8b1867idjbd7i39hhryg4nyijlv6d828z0jspp80fka3sp8xpw"; depends=[]; }; EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; }; @@ -1044,8 +1073,8 @@ in with self; { EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; }; - EpiILMCT = derive2 { name="EpiILMCT"; version="1.0"; sha256="1s7f4g1d44mqp475z5cn97dqv6b1caxmfq1p6gr1w7jvgq0dfqp5"; depends=[]; }; - EpiModel = derive2 { name="EpiModel"; version="1.6.1"; sha256="0jmwrpcfrfwrw5zwvwl0cv961nvqfvxjggx93iyc8z8bd6mf1wba"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; + EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.2"; sha256="1rxq9z5lhcgzn02d9k6vgl2cb5x0s9gsly63byx4gg1h91bsvmp6"; depends=[coda]; }; + EpiModel = derive2 { name="EpiModel"; version="1.6.5"; sha256="1h9490x7vna8z2dib6vgkxhpqvbybg655k88jn48i6qkda8dzv54"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; EpiStats = derive2 { name="EpiStats"; version="1.0"; sha256="17i8i3v8qpwas4h6g8sbdl42syg20fm22c7p1bnv4nzx28p9yzhy"; depends=[dplyr epiR]; }; EpiWeek = derive2 { name="EpiWeek"; version="1.1"; sha256="19bvjiiz8qn9nlvf3nq238qi1hszlm6asrc03p8ykp6gpl2pi6js"; depends=[]; }; EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; }; @@ -1054,7 +1083,7 @@ in with self; { EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; }; EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.1.2"; sha256="148srhlpzh0scvnkjbkyia1pr8a2ridabm3dahw4zn7p3cryiyb1"; depends=[igraph qgraph]; }; - EthSEQ = derive2 { name="EthSEQ"; version="2.1.1"; sha256="10i2cwrsgi6q5fq9ksjrhrdwg6hjjd284xsjdiwlfcbfa59390dc"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; }; + EthSEQ = derive2 { name="EthSEQ"; version="2.1.2"; sha256="0w75d8kw1bf4mfgk8rrx6vzq002z2588kxgadyfag0vk9s4akxi3"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; }; EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; depends=[clinfun data_table plyr shiny VGAM]; }; EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; }; EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; }; @@ -1105,7 +1134,7 @@ in with self; { FGN = derive2 { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; - FHDI = derive2 { name="FHDI"; version="1.2.1"; sha256="12vw8l0jk2z3i9gz108l2wrha6psqrg508rv1d44r4fss3xa233l"; depends=[]; }; + FHDI = derive2 { name="FHDI"; version="1.2.3"; sha256="19480lp2hp0ss2mij1z2ikhdqlkxrfpyy66sz5i0jab48675l9v5"; depends=[]; }; FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; @@ -1132,9 +1161,9 @@ in with self; { FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.0.1"; sha256="05hcds1g1hkpr3fww1i462p633xlhwv594fpbphvw8fm10mc0hns"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; }; - FRK = derive2 { name="FRK"; version="0.1.8"; sha256="037rk9l9bl65wskrii07x4z0g0ic92fx7i0p522bgy53qxa3sbq0"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; }; + FRK = derive2 { name="FRK"; version="0.2.1"; sha256="042j6n3yx46123d0qsghbynjf1h0iri4kfd92z5nbcgv7wggk4d3"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; }; FRegSigCom = derive2 { name="FRegSigCom"; version="0.1.0"; sha256="02lvgxxr12rfs4k7dg3rl249nbvfkqaywas3k6jhm378j3j8yaaf"; depends=[fda]; }; - FSA = derive2 { name="FSA"; version="0.8.17"; sha256="1mpkbz5q4xbncmwqrylww679ghz52fsr81flavkksb8ljr4z6f7p"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; }; + FSA = derive2 { name="FSA"; version="0.8.19"; sha256="0sj928r3dx320q3684ckw8yny6s209n57j0sxdzk7bwl9syyp6ma"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; @@ -1149,14 +1178,14 @@ in with self; { FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive2 { name="FactoClass"; version="1.2.4"; sha256="0rzbzl32hk4mrs6njm4cnj84ifsf52ms5khy43m9bfmwwmadbilr"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.1"; sha256="09fnlqwnijg94yfm3q41pdck9yxaq037m7421g4hdxaigljjb6ml"; depends=[FactoMineR rmarkdown rrcov]; }; - FactoMineR = derive2 { name="FactoMineR"; version="1.39"; sha256="12m0yi4w3iw07gx8viwvy8v8l1qh3qr7ghv39cdb2g0zgmnivfxh"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; + FactoMineR = derive2 { name="FactoMineR"; version="1.40"; sha256="1s4mdmxp66ipnbqwzs1s2fyyr8vzbrxamr2sd9k5a6sqwy7pgjv8"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; FactorsR = derive2 { name="FactorsR"; version="1.2"; sha256="0y6r5ch0h0sag1xinvnjr7q4495naygvi5iiqq9bc51ijv228c0m"; depends=[]; }; Factoshiny = derive2 { name="Factoshiny"; version="1.0.6"; sha256="1rb16g4gqq9mmwgpp94j9g5iv5p1psjqllsp9qn7ccccmgn6nnw9"; depends=[colourpicker FactoMineR shiny]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; }; Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; }; - FarmSelect = derive2 { name="FarmSelect"; version="1.0.1"; sha256="1qpa46igan3dqgn4ny2lmj08y6jk7krp7pb27afi694nw5l3l97h"; depends=[glmnet ncvreg Rcpp RcppArmadillo]; }; - FarmTest = derive2 { name="FarmTest"; version="1.0.1"; sha256="0h829706ilq2czjnn48wpwb09ryx0nwbl953m6p6z1wp4a3dzcv4"; depends=[Rcpp RcppArmadillo]; }; + FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; }; + FarmTest = derive2 { name="FarmTest"; version="1.0.2"; sha256="1khf2l1rza1kayqrfxf17l365x1ckqs8wnqihqdq9l1jz77p7a7n"; depends=[Rcpp RcppArmadillo]; }; FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; }; FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; FastHCS = derive2 { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; }; @@ -1168,10 +1197,10 @@ in with self; { FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; }; FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; }; FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; }; - FateID = derive2 { name="FateID"; version="0.1.0"; sha256="0q2pq5w93n2zh0qz96b33pc9bbjfp1dqzsi1kcizi468a7jgkfmx"; depends=[caTools DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; }; + FateID = derive2 { name="FateID"; version="0.1.1"; sha256="1v861cfzbrva43b9w2qa9pb9xbrjj91wqcf4m5nvq5via55i14b4"; depends=[caTools DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; }; FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; }; - FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; }; - FedData = derive2 { name="FedData"; version="2.5.1"; sha256="1yvmy7y26rqrxqap8nicdfrh3s66nyrcn5lvasnairaz1fvx5qxs"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp stringr]; }; + FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.3"; sha256="0k8n3c0yiz6bb9rq6ra8z2hypb4hw4qcsdfbrgrw74kqivscs62i"; depends=[BH digest magrittr Matrix Rcpp]; }; + FedData = derive2 { name="FedData"; version="2.5.2"; sha256="0lr6q9j8rnjkn5vvk7z4irsxfhkzhi1s36pp5j8175dak240415h"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf soilDB sp stringr]; }; FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; }; Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; }; FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; }; @@ -1182,7 +1211,7 @@ in with self; { FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.3.1"; sha256="0f1zaclrcmpkdhcfc8a09f7lsf2b7gfyd7js3173qckn84a01f3w"; depends=[quantmod TTR xts zoo]; }; FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; }; FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; - FindIt = derive2 { name="FindIt"; version="1.1.3"; sha256="1d4cvd4651fdbwmj83q2x9vwvg92fbmq8112z7ian8n96n30rchd"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; }; + FindIt = derive2 { name="FindIt"; version="1.1.4"; sha256="1rnkxngkqsmqs0d0m8ihscpsigxbjgl5ga5nyfwf97b1hrbv4j37"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; }; FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; FinePop = derive2 { name="FinePop"; version="1.4.1"; sha256="06wabgrxfq11ncbll5d0f07kkh23w2hrvjx8k1vy55q9f1dwd3sb"; depends=[]; }; FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; }; @@ -1191,7 +1220,7 @@ in with self; { FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; }; FitARMA = derive2 { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; }; FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; }; - FixedPoint = derive2 { name="FixedPoint"; version="0.2"; sha256="1gmh9ipv010q4lgpnka1rwfza5c7llgjpn7yvcsvlxglmplh8969"; depends=[MASS]; }; + FixedPoint = derive2 { name="FixedPoint"; version="0.4"; sha256="07qhvaw4abd039dxlcfm5126lv6p5ybbw78qcmi4x51hvq6icals"; depends=[MASS]; }; FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; }; @@ -1204,7 +1233,7 @@ in with self; { ForecastComb = derive2 { name="ForecastComb"; version="1.1"; sha256="1ki769m3cw3kb8jhbrgiwssspszsipmg2hlbk4ifldi8s19l9m12"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; }; - ForestTools = derive2 { name="ForestTools"; version="0.1.5"; sha256="0yjyc5i2jhagvwpzg420zhhygs966ncjn9aggh4gd4zdsi0nzqcx"; depends=[APfun imager raster rgeos sp TileManager]; }; + ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; }; FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; Formula = derive2 { name="Formula"; version="1.2-2"; sha256="0ad49bzip1zqmpj1d8jajwl4bd81fm3k6dq8p26x6mvlzc04dvwd"; depends=[]; }; ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; }; @@ -1242,7 +1271,7 @@ in with self; { GADMTools = derive2 { name="GADMTools"; version="2.1-1"; sha256="1xlr3qa6li3izms51mf3g35hj0gximvgibx6d821ikxzp6892mha"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos scales sp stringr]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; - GAMens = derive2 { name="GAMens"; version="1.2"; sha256="1x1q6a5p2lsx0gbfm976ps4braqaxa26ii6g3iag9ssafyhb0r1f"; depends=[caTools gam mlbench]; }; + GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; }; GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; }; @@ -1252,17 +1281,17 @@ in with self; { GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; GBJ = derive2 { name="GBJ"; version="0.5.0"; sha256="07wrydd2vlvwc56hgcrqbass0d0qamn3rg5vsf9bamxa6pcg9s53"; depends=[BH mvtnorm Rcpp SKAT]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; - GCD = derive2 { name="GCD"; version="4.0.0"; sha256="05cn9g9pahx5g9qh2lyqqlaafd1jji9awi9wx6r9hm09g4bmqrba"; depends=[]; }; + GCD = derive2 { name="GCD"; version="4.0.1"; sha256="00rbj57km104yi39rid922qvw1xdavs4f82cnrsv1gnn9ic7fv3q"; depends=[]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; GCalignR = derive2 { name="GCalignR"; version="1.0.1"; sha256="1p1zxf5s75ckyj7a61n43ix314p3b99knyg6z5d4sn5n417h2m42"; depends=[ggplot2 pbapply readr reshape2 stringr]; }; - GD = derive2 { name="GD"; version="1.2"; sha256="10csmsf4xkd3w73nskd1sxm8c9i0rlrsxyb4dmjrv8l207cc80pb"; depends=[BAMMtools ggplot2 reshape2]; }; + GD = derive2 { name="GD"; version="1.3"; sha256="1bpcp048hphxjas3dhqyyvs1xbv0356495zhl4r0mgrk9969qkh2"; depends=[BAMMtools ggplot2 reshape2]; }; GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; - GDINA = derive2 { name="GDINA"; version="1.4.2"; sha256="14686mkyxk7gjp0ivz1wkmry15qrf50fcwwza1j98791yjkqsbyf"; depends=[alabama data_table ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp]; }; + GDINA = derive2 { name="GDINA"; version="2.0.8"; sha256="0mzs49hvns7bzs78ccdj6nzji0ci990sa2znsfnaqly6b38b7qaj"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; }; - GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.9"; sha256="1imq71nhr0bc08w8jvw57fvghczn1p3vb1n7xnk7i7n6aq23dzsx"; depends=[changepoint GENEAread MASS rpart signal]; }; + GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.11"; sha256="0xb9fvd7vyfdpshx1y7jcwrm9fbb4mlkvw2f7qk7isgz8dvyhzdn"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; GENEAsphere = derive2 { name="GENEAsphere"; version="1.4"; sha256="0z6qazcgjcs03zz26167dxg6mgjaq1z0qdsa4ggh32813l4k0ijw"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; @@ -1276,10 +1305,10 @@ in with self; { GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; GFD = derive2 { name="GFD"; version="0.2.5"; sha256="14bhqk5hi9w2078nn382ksgw37bx5r1jadizcrwbisglccxa0ncd"; depends=[magic MASS Matrix plotrix plyr]; }; - GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.2"; sha256="0xxxjhhngc23ac891pn6hwn4y4wqil4xb83s7pq92izz5mb05q96"; depends=[cmprsk joint_Cox]; }; + GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.3"; sha256="0pqx5fr039izhwi2kdzq9v6nlviyjclzddd092g8mkadj36diwk5"; depends=[cmprsk compound_Cox joint_Cox]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; }; - GGIR = derive2 { name="GGIR"; version="1.5-17"; sha256="0p452p9xcbd0r9w2aqdiw4i740xxxbgi9hk4k5xqifdlkfg4gvmb"; depends=[data_table Rcpp]; }; + GGIR = derive2 { name="GGIR"; version="1.5-18"; sha256="0v8i3rw5wxmzhfb3dawyykabypvfjskbsmr0phky994kx93zm604"; depends=[data_table Rcpp]; }; GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-12.1"; sha256="0nrkbai9jps54ldx3cvwd4x4wingfj73najwx4bv98z8zxpbnky5"; depends=[gtools lars mvtnorm]; }; GGUM = derive2 { name="GGUM"; version="0.3.1"; sha256="1dgnhg0ggnp3f8qwzrcnapwzaraddnk2xsksin6pzybz21hfdvxd"; depends=[abind psych Rdpack viridis xlsx]; }; @@ -1295,11 +1324,13 @@ in with self; { GLIDE = derive2 { name="GLIDE"; version="1.0.1"; sha256="02pmn0ydrmblgchz189avlrz3zaz0qfhy75d945yphpmvjf9f9m5"; depends=[doParallel foreach MASS]; }; GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; }; GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; }; + GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; }; GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; }; GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; }; GMCM = derive2 { name="GMCM"; version="1.2.4"; sha256="1y0yr6i4l28qw22drca7r4mzqjfbpm3jdssfb7p8pc664g6vmm81"; depends=[Rcpp RcppArmadillo]; }; GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; }; GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; }; + GMDH2 = derive2 { name="GMDH2"; version="1.1"; sha256="16jnpwr7sbfai0h5prr7768nsxz65qfds46gphdryi5nd65dbv60"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; }; GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; }; GMSE = derive2 { name="GMSE"; version="0.3.1.9"; sha256="02qzz4w99qissb3b95p7y5bk2wn43k01802vwnzxlq27swhkg17i"; depends=[shiny shinydashboard shinyjs]; }; GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; }; @@ -1312,7 +1343,7 @@ in with self; { GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-1"; sha256="1qlbs9xxdn7q90afh5zc6fgp213fxyh3xmmhz5dm6azbwx92x3la"; depends=[car caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos wordcloud]; }; GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; }; - GPGame = derive2 { name="GPGame"; version="1.0.0"; sha256="1ln3smlhr0hz5nkbdfhrpvz6cn0jz21w8p0d3xlcv4szlmkx8lx6"; depends=[DiceDesign DiceKriging emoa GPareto KrigInv MASS mnormt mvtnorm Rcpp]; }; + GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; GPM = derive2 { name="GPM"; version="1.0"; sha256="0k2mglgmq1hb0x9gdypvzgi7s3vkdpf6qcvgyd4qc3mfg3avbnmk"; depends=[lattice lhs randtoolbox]; }; GPPFourier = derive2 { name="GPPFourier"; version="2.1"; sha256="1wlzpiqlg5zx3rv29l1ql3apcaykvk72zc0anwxr152qlk910l2q"; depends=[mFilter Tides]; }; @@ -1321,7 +1352,7 @@ in with self; { GPoM = derive2 { name="GPoM"; version="1.1"; sha256="0n1fnmwiygispihqgcx762wkvp28pnm8kcwlx9vxhpafswsp112q"; depends=[deSolve rgl]; }; GPrank = derive2 { name="GPrank"; version="0.1.2"; sha256="0z9xhydnq04p872zl7glxhndmijjihfgffl6bijc9a0rs95zaacd"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; }; GPseq = derive2 { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; }; - GPvam = derive2 { name="GPvam"; version="3.0-4"; sha256="1vqvm9647jnw91vpf4dhjjp9rc05n5k6qgzilfpmcg4a7zzi917k"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; GRANBase = derive2 { name="GRANBase"; version="1.6.8"; sha256="1pcm0fy3jwwaifd4m7qyil1miaxmi6v7glp2krbkngp6f8qb0bph"; depends=[covr dplyr hexSticker htmlTable jsonlite RCurl sendmailR stringi switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; }; GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; }; @@ -1338,7 +1369,7 @@ in with self; { GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="1.1.2"; sha256="1zr19zik2ic38wg71gk9iapzmdh4z426djy8w4z25v148940liss"; depends=[curl dplyr magrittr purrr R_utils readr rgdal rlang sp tibble]; }; + GSODR = derive2 { name="GSODR"; version="1.2.0"; sha256="0zhj2c51mxkdy2z7bllas1qb5jg83263w9vv6iksy5j47vxm2py8"; depends=[curl dplyr magrittr purrr R_utils readr rlang tibble]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; GUIDE = derive2 { name="GUIDE"; version="1.2.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; }; @@ -1375,7 +1406,6 @@ in with self; { GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; }; GeneCycle = derive2 { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; }; GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; }; - GeneFeST = derive2 { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; }; GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; }; GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; }; GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; @@ -1407,7 +1437,7 @@ in with self; { Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; }; - GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.12"; sha256="1abpc03cfvazbwj2sx6qgngs5pgpzysvxkana20hyvb4n7ws77f0"; depends=[]; }; + GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.13"; sha256="04jvha0mafslqz5nr99xjylg9n2x31gj9v4mgyg7qcmfwpqyw3ch"; depends=[]; }; Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; Gmisc = derive2 { name="Gmisc"; version="1.5"; sha256="0jiyqi0mmwbb7v8jqksvm42r4sq1d5najqkapnpj5jzn6izq6vh5"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; }; @@ -1419,15 +1449,16 @@ in with self; { GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; }; GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; }; GraphKit = derive2 { name="GraphKit"; version="0.5"; sha256="1ip0rkrwxpjcd9mhz2z8n7lwdrjj1idymsafm8aac1hfbxr6c0xz"; depends=[Rcpp RcppArmadillo]; }; + GraphPCA = derive2 { name="GraphPCA"; version="1.1"; sha256="0x6j3lyd70zc0c1al1407ma8crzi174d5dqkz6lx4vx24knrlhbs"; depends=[FactoMineR ggplot2 ggplot2movies scatterplot3d]; }; GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; }; GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; }; GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; }; GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.1"; sha256="0r6b8hzzx0ja0skp4w4s49jpkkjbb3an62vp74qh5sf2wi1hx9x6"; depends=[rJava]; }; GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; }; - Greg = derive2 { name="Greg"; version="1.2"; sha256="19bzv2nknahzbdnl7n0pcnavsdlwgkprc0yk3ksqllfawnvi39f9"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; + Greg = derive2 { name="Greg"; version="1.2.1"; sha256="0li05w2nbqvabhwwmhxiwjalr1q79xad9yd2vycpz198c048kiqf"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.2.1"; sha256="0db5kv0rbsg077h2badw28x9363ymqkr52sw5wlg9x1bk9cczhi7"; depends=[inlmisc raster rgeos sp]; }; GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; - GroupSeq = derive2 { name="GroupSeq"; version="1.3.4"; sha256="0m127793gh00spj2ghapmysvf3dbxhpf2jlms3xxrflh7ajrmy5m"; depends=[]; }; + GroupSeq = derive2 { name="GroupSeq"; version="1.3.5"; sha256="0c74nlsqa5ly0kf6p4n7gfvd0ygkq78bx851ryniwpnnalvsq8l7"; depends=[]; }; GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; }; GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; }; GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; }; @@ -1457,7 +1488,7 @@ in with self; { HH = derive2 { name="HH"; version="3.1-34"; sha256="1srr195ha8n4va30impm12p2kamkl36whl8g10pl80hwgg20pbqk"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="2.2"; sha256="114nfpdjdisryil9l8cws885qdskgrjm2cclx543hh4cdhpnkxnp"; depends=[Rcpp]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; - HIBPwned = derive2 { name="HIBPwned"; version="0.1.6"; sha256="0ym62n1rmi8pjj37cxbrdmih7530nhmy77gxb8yylppjf3rikci4"; depends=[httr jsonlite ratelimitr urltools]; }; + HIBPwned = derive2 { name="HIBPwned"; version="0.1.7"; sha256="04l9309lmgn33gdwm162g6vywz8p9sdgmy2baxj98jv7x791wj3r"; depends=[crul jsonlite memoise ratelimitr urltools]; }; HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; }; HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; }; @@ -1504,19 +1535,18 @@ in with self; { Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; HelpersMG = derive2 { name="HelpersMG"; version="3.0.0"; sha256="1y5q4z9yxap16bkcjsybm2754wm0x31hfqdnp2bb4gbvhz1jhas6"; depends=[coda]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.0"; sha256="0ibb2nkjk1d59gc1ljihihsjai3jp4jsbbariv05h1z26pgpc9p3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; - HiCblock = derive2 { name="HiCblock"; version="1.2"; sha256="17d5jzswzjy7hwr9lyfd273xqa5ssm715wybk0zxd4gsnipvnbsk"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; - HiCfeat = derive2 { name="HiCfeat"; version="1.2"; sha256="01b8isvn4my41n3608k80d38vgd3waq7rxsx1v4p0rl1f3pxn7dn"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; - HiCglmi = derive2 { name="HiCglmi"; version="1.1"; sha256="1q47kayga6g4vczh92a63a4ni5hvmrc7477wsjkhp846j3wswm5j"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; + HiCblock = derive2 { name="HiCblock"; version="1.4"; sha256="07f94j9y5g6f09yi7iwag020ddfhpvrj5idfxwbr900hj3vgm1gm"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; + HiCfeat = derive2 { name="HiCfeat"; version="1.3"; sha256="1hf24g4cph13s0cbicll3dxvxycdzwbsy6cv297vlkw4sc574ixw"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; + HiCglmi = derive2 { name="HiCglmi"; version="1.3"; sha256="17vwdhnf36cg56vidq7d85s4vgk2pnn5py1y2wsl2dm41vdl0847"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; }; - HiDimMaxStable = derive2 { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; }; HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; }; HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-11"; sha256="1yh85pdb9r90qxcl5gxslyplxzrx8knrrsl2q65l57zfkqj185ja"; depends=[]; }; HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; }; HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; }; - HistDAWass = derive2 { name="HistDAWass"; version="1.0.0"; sha256="0si57vmgnkrhyilk3vv4189c093n6if6i5nv3jylvhpmbf5nvm7p"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; }; - HistData = derive2 { name="HistData"; version="0.8-2"; sha256="0qd3a1v3xg39nwqfw63k6210vqkpknq0j3r36sy1910hn0nr83fa"; depends=[]; }; + HistDAWass = derive2 { name="HistDAWass"; version="1.0.1"; sha256="1lc9pz3f6akzyisgwzfl4m5z400bailv1bmsb3snha8nhpqdk3nk"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; }; + HistData = derive2 { name="HistData"; version="0.8-4"; sha256="0qw8jrh7g9w49k6f8hsg9wvy8ms2pcsmiv2ysxfcr89v60q084rb"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; }; Hmisc = derive2 { name="Hmisc"; version="4.1-1"; sha256="160l50ppjs69ipcaya1mlcz29zbn5rmqg91r09dvzzvkvwfb47cr"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; @@ -1553,14 +1583,14 @@ in with self; { ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; }; - ICEinfer = derive2 { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; }; + ICEinfer = derive2 { name="ICEinfer"; version="1.0-4"; sha256="0fa5mxj224jgppp09bblyi9w9racz5lb1i20npvnccafcm36f7y1"; depends=[lattice]; }; ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; }; ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; }; ICRanks = derive2 { name="ICRanks"; version="1.3"; sha256="0n8gyqlwx38v2lfx7r49h43k2f4z4ml78x3lq0sc952n4rckzgiv"; depends=[multcomp Rcpp]; }; ICS = derive2 { name="ICS"; version="1.3-1"; sha256="0x3cwhvzcibgyb8gqy6dc6lgnvbf6x8425zai57g8yn5i6zzc1li"; depends=[mvtnorm survey]; }; ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; }; ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-0"; sha256="1vj1y4zw8pkghkg4qnmx0yk1yw4zzl9075n5czrna9ckk2p29fmh"; depends=[ICS moments mvtnorm]; }; - ICSShiny = derive2 { name="ICSShiny"; version="0.4"; sha256="02qcph5ax4gwz44zq8riv4yl4h0wdiwgxv7m96cpdh7gwfhwzgzr"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; }; + ICSShiny = derive2 { name="ICSShiny"; version="0.5"; sha256="0a13vps0mkv5qs6qnl7ar0mdbkbd7i1c6kgwahmkb3id3n9bw0cl"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; }; ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; }; ICcalib = derive2 { name="ICcalib"; version="1.0.7"; sha256="1p224srs1jakl7iyybcn9f6r9kcwxyrikdrfa9wjgkhz60pv88fs"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; @@ -1572,8 +1602,9 @@ in with self; { IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; }; IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; }; IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; }; - IDmining = derive2 { name="IDmining"; version="1.0.3"; sha256="1kvnp0y0837cgvjjwv2rmh64vksa7c6ififs60w7g05l690fkb9v"; depends=[data_table doParallel foreach]; }; + IDmining = derive2 { name="IDmining"; version="1.0.4"; sha256="1jjxw9pdhd3wx5qnjnssf0j3bg91li1ar5ps02dhv0c49hslg0x0"; depends=[data_table doParallel foreach]; }; IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; + IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; }; IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; }; IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; }; IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; }; @@ -1597,7 +1628,7 @@ in with self; { IPtoCountry = derive2 { name="IPtoCountry"; version="0.0.1"; sha256="1b10z93mc31cr1c5wxp9xz9cr3jm4n4g5kav09dyallpgw60rskp"; depends=[data_table devtools dtables ggplot2 install_load maps scales]; }; IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; - IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.0.8"; sha256="0imsssija6v91il3dw5ibzm09xyjbabp2xy9jp4ixj6x8295i5xg"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; + IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.1.0"; sha256="033j0dba1bzbbjn7q827h4d1rw91z8gbr2bb119lds4v8zkkfpxx"; depends=[dplyr IRISSeismic RCurl seismicRoll signal stringr XML]; }; IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.6"; sha256="1kccc4rbnyczdif7plvl3jfa3nfqfasybbbqmdkfiz0mhgvn1z4r"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; @@ -1641,7 +1672,8 @@ in with self; { Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; }; InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; }; InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.4"; sha256="145k4hggymra2jnxkcck795xk280yyldfzh9ls2irnsxmxfszr52"; depends=[boot dplyr survival]; }; - Infusion = derive2 { name="Infusion"; version="1.1.8"; sha256="084k36d9bgwmcnrp1bw2vvby9j14qmw2c99pzaps0nlg10j8k4hg"; depends=[blackbox Matrix mvtnorm numDeriv proxy rcdd Rmixmod spaMM viridis]; }; + Infusion = derive2 { name="Infusion"; version="1.2.0"; sha256="00l12balvdypcypqj8b61lfbksh6jnayai4bxchnxv99h3jq4l24"; depends=[blackbox mvtnorm numDeriv pbapply proxy spaMM viridis]; }; + InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.1"; sha256="13h2a95bzibszpbr6sjhm3hj03b4znrrczm8pvni70ln2lcskri0"; depends=[dplyr rlang tidyr]; }; InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.0.1"; sha256="1wirdbz4v7hk7znpjhw9j3l596lmfcrlr4wxayw7klbbdhcwq5qs"; depends=[MASS]; }; IntClust = derive2 { name="IntClust"; version="0.0.2"; sha256="1n0ywickky1w5m8swfidiprdnkrv0mrh9z5294bimxj5ppi1yl8v"; depends=[a4Core ade4 analogue Biobase cluster e1071 FactoMineR ggplot2 gplots gridExtra gtools limma lsa plotrix pls plyr prodlim SNFtool]; }; IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; }; @@ -1649,6 +1681,7 @@ in with self; { IntegratedJM = derive2 { name="IntegratedJM"; version="1.6"; sha256="0fv24z7vidhn09ljk09pjzkrlg2rlwxcrhfjc53ybjjgsgay99z6"; depends=[Biobase ggplot2 nlme]; }; IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.8"; sha256="0y3hagjx3pzhqyqm3pydl3s3f1g9d5yb2w3ybxll11913p3gll3i"; depends=[bootstrap caTools ggplot2 limSolve MultivariateRandomForest Rcpp]; }; InterVA4 = derive2 { name="InterVA4"; version="1.7.5"; sha256="0la99ylx8fnn4kpqa364nhs12y2hzp3sm0awsx5sfdv6n7m9js33"; depends=[]; }; + InterVA5 = derive2 { name="InterVA5"; version="1.0"; sha256="0lp75yinm1ph648s0jxgjixmn4q9g1rbky6hnppicpan2mk6d7ls"; depends=[]; }; Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; }; @@ -1666,8 +1699,8 @@ in with self; { IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="1.0"; sha256="0cf2y81s2sc2jqbr431hjv5i347m1q5c5dxrak7ns7s8d902729y"; depends=[MASS]; }; - IsoriX = derive2 { name="IsoriX"; version="0.7"; sha256="0b94s94axrqgv3dm9dbkdnh6imlzn245f2pi7wbj99nqhwa47ynb"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; + IsoplotR = derive2 { name="IsoplotR"; version="1.1"; sha256="0w1zsb6qjcgyig8mahmpw0plxzqm2yqvg7gnqf50q1mpvdani2f4"; depends=[MASS]; }; + IsoriX = derive2 { name="IsoriX"; version="0.7.1"; sha256="1x2vdgvnfkrgcrm7pdrdvr7m72y0274dab5cyhz31j8l2gqxw9la"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; }; JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; }; @@ -1677,8 +1710,8 @@ in with self; { JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; }; JGR = derive2 { name="JGR"; version="1.8-4"; sha256="0zfjfqlfrsz4wjdq78zasvgd3ldgcx20h16bbar1l7wv843j71ym"; depends=[JavaGD rJava]; }; - JM = derive2 { name="JM"; version="1.4-7"; sha256="1ajdmabifzg4jp74ghas5wf3vp4x2vnc6sh811n44a1ni727sb2n"; depends=[MASS nlme survival]; }; - JMbayes = derive2 { name="JMbayes"; version="0.8-70"; sha256="1xvzyy2h3p30wxvgrm6d4dmxwiqs4l7dafpanlnykgih9wmh7xsf"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; + JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; }; + JMbayes = derive2 { name="JMbayes"; version="0.8-71"; sha256="0vbw3z1njl3jm4qixzh5fs3gmiqz7n3kz3a4a9sdxj498z063svj"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.3"; sha256="0bjaiygn2sq40f2cwa1c6j73748j2cx5q69pd4jgfgbpm9r25r4f"; depends=[MASS Rcpp]; }; JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; }; @@ -1693,10 +1726,11 @@ in with self; { Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; JoSAE = derive2 { name="JoSAE"; version="0.2.3"; sha256="0b1jwplds5b7z15v6bvqj1rbn7zxpgvh2ykhqplxzv4mlaw6i0li"; depends=[nlme]; }; Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; + JointAI = derive2 { name="JointAI"; version="0.1.0"; sha256="0im17n3w6mhgd2lnjja0ca30b2yz06qn7frcsr9qbbhnc4p7pnv4"; depends=[coda MASS mcmcse rjags]; }; JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; - JuliaCall = derive2 { name="JuliaCall"; version="0.12.1"; sha256="1qw5qq35z525wrfrqlawm16bm4p0yzcabp2yzk8piiyhqpd7cma6"; depends=[R6 Rcpp]; }; + JuliaCall = derive2 { name="JuliaCall"; version="0.12.2"; sha256="1408pzvnsxc1mq31b0nf61qc5rby7ymnz3vpkab4xds7kh0fcqh9"; depends=[R6 Rcpp]; }; JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; }; JuniperKernel = derive2 { name="JuniperKernel"; version="1.2.3.0"; sha256="17r4ssjjayvnp9fp9jalklp3p8dadyx5hvi9z3bh3sw4b7kx4lyd"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; @@ -1718,9 +1752,9 @@ in with self; { KScorrect = derive2 { name="KScorrect"; version="1.2.3"; sha256="1i69glkyi3ydzfgd8d6zrbgjq7gy9laq00jdppbqnl13i1n14sp7"; depends=[MASS mclust]; }; KSgeneral = derive2 { name="KSgeneral"; version="0.1.0"; sha256="19rrm411c2fvx4bxi9qc6v9spqpf52k08i7gvhici9dx2hhm3134"; depends=[dgof MASS Rcpp]; }; KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; }; - KappaGUI = derive2 { name="KappaGUI"; version="2.0.1"; sha256="0l2kgh9bflag5s056ib8fkajl56yr8c0qsmd9ma56i9ay7i540da"; depends=[irr shiny]; }; + KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; }; KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; }; - KarsTS = derive2 { name="KarsTS"; version="2.0"; sha256="0mha0q5zvijrhrl0nsq229ipf6k2mhw2yqc21vvv8sifh9b9qp4y"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; }; + KarsTS = derive2 { name="KarsTS"; version="2.1"; sha256="1kpqp1icrinh8lr72ffcbnbgcxs8865nbmnjfcz5r7lyvhd4lbh9"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; }; KenSyn = derive2 { name="KenSyn"; version="0.2"; sha256="19xbdgxafrgxwz7swg7gzrkxszxy7ksgnmz96sar8ysmwrp7dz9i"; depends=[lme4 metafor nlme]; }; Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; }; @@ -1729,7 +1763,7 @@ in with self; { Kernelheaping = derive2 { name="Kernelheaping"; version="2.1.8"; sha256="03m5dwgm98x6ncifyyp2yxln4bm87rkrx84bdihywjd0x73pbklv"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; Knoema = derive2 { name="Knoema"; version="0.1.13"; sha256="10r7gpr39f32h4znmh8kywcs0l2g9ij75qqcyd3ai1fyif54wyqc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; - KnowBR = derive2 { name="KnowBR"; version="1.5"; sha256="18xcdlzr8ipsv4zxmk3424apqrgzgf87h00lwjw5ll2y99vy2ds5"; depends=[fossil mgcv plotrix sp vegan]; }; + KnowBR = derive2 { name="KnowBR"; version="1.7"; sha256="1h5xpj7cqj6130rwsd6bssvwmzc6ldb5wbjgqw7bc588ll1q5rsg"; depends=[fossil mgcv plotrix sp vegan]; }; KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; }; KoulMde = derive2 { name="KoulMde"; version="3.0.0"; sha256="01mczlrdrfwdp2cj10kdqay3qpg8xf2v7vym62pll9l8n595snrl"; depends=[Rcpp]; }; Kpart = derive2 { name="Kpart"; version="1.2.1"; sha256="0jx5rqiw0y9hc1czg75iy4jvd993d7dri90s4iiskbg6x6z65mi9"; depends=[leaps]; }; @@ -1737,7 +1771,7 @@ in with self; { KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; }; L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; }; LAGOSNE = derive2 { name="LAGOSNE"; version="1.1.0"; sha256="08sf4mm40gv9mr57pxsl1b62s2dqvbvrhy2irzqspyqk5ai2aw0m"; depends=[curl dplyr lazyeval magrittr purrr rappdirs sf stringr]; }; - LAM = derive2 { name="LAM"; version="0.1-22"; sha256="0gj4j5yqyllxbhz6iayh0w473hzq0xc1r9dlyxhh67k9mg951phb"; depends=[CDM coda Rcpp RcppArmadillo sirt]; }; + LAM = derive2 { name="LAM"; version="0.2-9"; sha256="0znkh25aa2vv3h3rfqdaadk58c2p7rwfw8xx5i8fs6dzyvx6c99l"; depends=[CDM coda Rcpp RcppArmadillo sirt TAM]; }; LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; LBSPR = derive2 { name="LBSPR"; version="0.1.2"; sha256="09jvdjagf4icnigbfw18z36ya4llg84fa6j2khd22cl60y81r5i3"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; @@ -1753,7 +1787,7 @@ in with self; { LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; }; - LDheatmap = derive2 { name="LDheatmap"; version="0.99-2"; sha256="0n80l4wl9rs4ps8h2bjpar5nidq7bg05d6675wiwanx24q6fc0bs"; depends=[chopsticks genetics]; }; + LDheatmap = derive2 { name="LDheatmap"; version="0.99-4"; sha256="1xdvpydnrlzb6q4hm0rcflf0vysww1xszj6ynly6a32xqmhg0sbq"; depends=[genetics snpStats]; }; LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; }; @@ -1775,23 +1809,25 @@ in with self; { LMest = derive2 { name="LMest"; version="2.4.2"; sha256="0a0azn3lyy0n1882c0zxf7f1b0h26rcck8mmsbh2wxg7r3nckkrd"; depends=[MASS MultiLCIRT]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.1"; sha256="0wjrnzki6mnar3lxfr2mcvk98b58qkqpbb9xx7vgrw567g1ga1ig"; depends=[MASS]; }; LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; - LNIRT = derive2 { name="LNIRT"; version="0.2.0"; sha256="02gaqn2pixry6qgybwszsv60pk6hzdd51axchkq3ma3gb6biw4fv"; depends=[MASS]; }; + LNIRT = derive2 { name="LNIRT"; version="0.3.0"; sha256="1xlfk3a0x8abs6xwsm9s50nvi53s1a7nhnskhvjbi3rdzkvkrwxl"; depends=[MASS]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOGIT = derive2 { name="LOGIT"; version="1.3"; sha256="1nx9ycrys0p08xr1n7bqgn47k5wz1zbp6w5pwsqk5c6f6did2rs1"; depends=[caret e1071 ggplot2 MASS pROC reshape]; }; LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; }; LPCM = derive2 { name="LPCM"; version="0.45-0"; sha256="15gpb59556s28npdsw1r821rld7b11y1m2m97m320n9k0z4vbk3i"; depends=[]; }; + LPGraph = derive2 { name="LPGraph"; version="1.0"; sha256="0hbcllrvjsgkapkf28957y47jrhajrk7j67iw36bxpbb25xfvl7i"; depends=[car SDMTools]; }; LPKsample = derive2 { name="LPKsample"; version="1.0"; sha256="0vxps8zd9zg1aw4p2qd8wamcjkbl68yvppnlvshm2ry5dahwz1wk"; depends=[apcluster igraph mclust]; }; LPM = derive2 { name="LPM"; version="2.7"; sha256="1anjgflj1272xrghn3s9a21f2dfggppnzjqh3p8zaid91bzg0g34"; depends=[fracdiff MASS QRM]; }; LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; }; LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; }; LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; }; + LPWC = derive2 { name="LPWC"; version="0.99.2"; sha256="1cir7w4rrpw7iqc1waf5aijk41hl19mdg1q7ml7mi0js88xy0a0y"; depends=[]; }; LPmerge = derive2 { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Matrix Rglpk]; }; LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; LS2W = derive2 { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; }; LS2Wstat = derive2 { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[geoR LS2W matrixStats RandomFields spdep]; }; - LSAfun = derive2 { name="LSAfun"; version="0.5.1"; sha256="0wj2j53jizg014sppag9zbs5hzc3mvpg1fx1s7l4ff6rabhgvlff"; depends=[lsa rgl]; }; + LSAfun = derive2 { name="LSAfun"; version="0.5.2"; sha256="114qhnx4dr7ywh3fzkjd35xygpnn74g5nv66ahj7hf5w0gg13ws9"; depends=[lsa rgl]; }; LSAmitR = derive2 { name="LSAmitR"; version="1.0-1"; sha256="0p1j4q1b7488wbwl2c9py6ldq2j7ri1dvnmmknx5lwvzv0xsawsd"; depends=[Hmisc lme4]; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; }; LSD = derive2 { name="LSD"; version="4.0-0"; sha256="0fsp3pwrnnic9mzkd6yxa4bnxbvg68712lb20vd42wf6jb39r2h3"; depends=[]; }; @@ -1803,7 +1839,7 @@ in with self; { LSTS = derive2 { name="LSTS"; version="1.0"; sha256="1vgdqyj6k50gqfffqfb4n3sw27jrq21nl2h8sz8942w4a8fn7sgv"; depends=[]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; }; LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; - LTRCtrees = derive2 { name="LTRCtrees"; version="1.0.0"; sha256="08wkhd7sqk0q9sahg6bd1m2xgl5yk9ldvripa6vyps0nni1h8lb6"; depends=[interval inum partykit rpart survival]; }; + LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; }; LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; }; @@ -1825,9 +1861,10 @@ in with self; { LeLogicielR = derive2 { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; }; LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; }; - LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; + LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; }; LearnGeom = derive2 { name="LearnGeom"; version="1.3"; sha256="0fqf5k3gsdxwyfcbkypqiq0ir8ay8r9bdy8iljhj308ammq0mxzk"; depends=[RgoogleMaps]; }; LendingClub = derive2 { name="LendingClub"; version="1.0.4"; sha256="03pgarbraj6in7pk7zaci98aq6dh52vsqb64my5p0bczgl2cpzmm"; depends=[dplyr httr jsonlite plyr]; }; + LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.1.2"; sha256="0ziy86l6q01l471lmpldhs48xqlyw1va75np5hkzaq5wapr9pfk4"; depends=[data_table quanteda scales stringdist stringi]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; @@ -1851,7 +1888,7 @@ in with self; { LocalControl = derive2 { name="LocalControl"; version="1.1.0"; sha256="0hfm8lllsg5h95ib0h89hbhwcnk2959y9i3kllwmxhmqbirvlpx9"; depends=[cluster gss lattice Rcpp]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; - LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; }; + LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-1"; sha256="1hy7fnahncpsgqxfy352lxk298i69w7drlspsgdvpzdbghca3y3i"; depends=[MASS mclust mvtnorm rgl tkrplot]; }; LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; }; LogicReg = derive2 { name="LogicReg"; version="1.5.9"; sha256="0rxzhbf51psdj7wb2dcah16y8f5q7y8p0yybz54rm00d1qagl6nq"; depends=[survival]; }; LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; }; @@ -1863,10 +1900,10 @@ in with self; { LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; }; - Luminescence = derive2 { name="Luminescence"; version="0.8.2"; sha256="0fk7vmgp0ws31azl7hazx925ddksqfgsmfwz2akfhbzi1y4bys3m"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; + Luminescence = derive2 { name="Luminescence"; version="0.8.3"; sha256="0mrmxz5b1px44h50ai25lza67k2ji78sdi1b6nd373kpmix5kxa1"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; }; MADPop = derive2 { name="MADPop"; version="1.1"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; - MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.2"; sha256="11031gmc6zrhn6vdzza4qqvwc48h09kbvkikqznqr9hhkysv7c11"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; + MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.3"; sha256="0xv4ldyjp6pa2jk81al5ldvm72ywzb9fmwim8l97xcbydm5wxjcx"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; MAINT_Data = derive2 { name="MAINT.Data"; version="1.2.1"; sha256="0fmlmb88005diqwbxlgkzzb7bvxpdkiqiadp649id3mgcz100kcd"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; }; MALDIquant = derive2 { name="MALDIquant"; version="1.17"; sha256="047s6007ydc38x8wm027mlb4mngz15n0d4238fr8h43wyll5zy0z"; depends=[]; }; MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11.1"; sha256="1aj6gakhbpis576b264s43w55dhmd5rszj54z910plybxq8hzmir"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; @@ -1878,7 +1915,7 @@ in with self; { MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; }; MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; }; - MARSS = derive2 { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; }; + MARSS = derive2 { name="MARSS"; version="3.10.8"; sha256="1cmkish5rbv7lpm8fnv6d33plkfvxis4r4p48bx10fll1ba11m7h"; depends=[KFAS mvtnorm nlme]; }; MARX = derive2 { name="MARX"; version="0.1"; sha256="1yanv7q5l8ybw3mh0rvhxyqi2sp8w4b9vnas7lpqflc06j4nnv4p"; depends=[fBasics matlab stabledist tseries]; }; MASS = derive2 { name="MASS"; version="7.3-49"; sha256="1yjbnj1p4z0vw84wga8q5fyqiw4n6r7pc6rdwam7vsbiamyzfcqs"; depends=[]; }; MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; }; @@ -1898,11 +1935,12 @@ in with self; { MBHdesign = derive2 { name="MBHdesign"; version="1.0.79"; sha256="1qz0igm8h3ij8yc9bg3vr3mkmf99h1kyxscdhkfphc66zaazhyw1"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; + MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; }; MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; }; MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; }; MCAvariants = derive2 { name="MCAvariants"; version="2.0"; sha256="0akff64v49d5r0wvspal0pz17jhz1ry4vdmj47m28gzjj69zcab0"; depends=[]; }; - MCDA = derive2 { name="MCDA"; version="0.0.18"; sha256="1m8kf8xxli3dbbabrcanpsmsmywf21ma0nb9jq2phz7ifgladdyi"; depends=[combinat glpkAPI RColorBrewer Rglpk]; }; + MCDA = derive2 { name="MCDA"; version="0.0.19"; sha256="0r8l6q5aisjfk0xpv4pyccnngjlkm3978lba62rspd9kyhjlz64n"; depends=[combinat glpkAPI RColorBrewer Rglpk]; }; MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; }; MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; @@ -1911,9 +1949,9 @@ in with self; { MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; }; MCMCglmm = derive2 { name="MCMCglmm"; version="2.25"; sha256="0crici0g6x2471kk9092f72gc6ghbwwqid3w8jsnsvy6ymmk2wih"; depends=[ape coda corpcor cubature Matrix tensorA]; }; MCMCpack = derive2 { name="MCMCpack"; version="1.4-2"; sha256="1nizmfxyyrp0sbmyprgm97xmi3amxwix1gj7p9v0sjjklv1djap4"; depends=[coda lattice MASS mcmc quantreg]; }; - MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.7"; sha256="0pbyg6v478di1w9cpp2rmhr4p5ncnwmks042981snqc5gnwysjx4"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; - MCMCvis = derive2 { name="MCMCvis"; version="0.9.4"; sha256="0pfj14pji0dqzlq6vy76prkh8m0hj784yjr5lz3p68kviwzrk9r6"; depends=[coda overlapping rstan]; }; - MCPAN = derive2 { name="MCPAN"; version="1.1-20"; sha256="0j36dhi3bf3q14bbcmrmipz2fcn6g9gsqidzm43i8x5r7hcvv2lh"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; + MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.8"; sha256="1qyhxljfcnyj7450vik4j81qilvphwc1b2xv48fnx1pnapfl45wz"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; + MCMCvis = derive2 { name="MCMCvis"; version="0.10.0"; sha256="1yw4xrbkl2mdylvibnqy14v211a1h5knqgpp0syplvjaysjk9irm"; depends=[coda overlapping rstan]; }; + MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; }; MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; }; MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; }; @@ -1927,6 +1965,7 @@ in with self; { MDSMap = derive2 { name="MDSMap"; version="1.0"; sha256="15557ca83bvsqcmsa48vispagg9a05658i22cqk706shjsp782n5"; depends=[princurve reshape rgl smacof]; }; MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; }; MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; }; + MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; }; MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; }; MEGENA = derive2 { name="MEGENA"; version="1.3.6"; sha256="0ylv7kbk0x3rm08aiwci4p3kma08qj4szlw2h1d6wcqmipy93v8s"; depends=[BH cluster doParallel foreach fpc ggplot2 ggrepel igraph Matrix Rcpp reshape]; }; MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; }; @@ -1936,6 +1975,7 @@ in with self; { MExPosition = derive2 { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; }; MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; }; + MFDFA = derive2 { name="MFDFA"; version="1.0"; sha256="1gy1v49525i2bhr14nvpz8rqcz3lchfnvm0g53qlln55jdndgsx4"; depends=[]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; MFT = derive2 { name="MFT"; version="1.3"; sha256="029apjg1fqrqfg98jczbxfy267m3f68qxvxqjzbsw1xisq4j7wc0"; depends=[]; }; @@ -1944,6 +1984,7 @@ in with self; { MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; }; MHCtools = derive2 { name="MHCtools"; version="1.1.0"; sha256="03y6m3a46bzazxkrxdrii2p1fyc26il09z5676c63rk8wz9wcxa0"; depends=[rlist]; }; + MHTcop = derive2 { name="MHTcop"; version="0.1.0"; sha256="1fhi7inv8zf3ygj4pf8am445ldq9qpwzi3ll4xqwz8d4s6ajx405"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; }; MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.0"; sha256="0w1hxa3qk8glijhc4h1wrl5xw54zflibgilhs1w872w9wrkxs5ih"; depends=[]; }; MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; }; MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; }; @@ -1954,6 +1995,7 @@ in with self; { MIIVsem = derive2 { name="MIIVsem"; version="0.5.2"; sha256="0i144v2qjqb26vjym1lh3hbikm882hrwx6kz2ajrica59gyryr37"; depends=[boot car lavaan Matrix numDeriv]; }; MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; + MIRL = derive2 { name="MIRL"; version="1.0"; sha256="1l52zpd00rm77vlk4lgnlviz18f7079a4n1gvlmr5syib7cvhfxs"; depends=[boot glmnet MASS mice]; }; MIXFIM = derive2 { name="MIXFIM"; version="1.0"; sha256="0m4fnmdd8lsdxq629f87lzz1cdc1q0j3q9hqna85ncpflyfwlvg9"; depends=[ggplot2 mvtnorm rstan]; }; MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; }; @@ -2016,7 +2058,7 @@ in with self; { MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; }; - MSbox = derive2 { name="MSbox"; version="1.0"; sha256="0r6bvw7ddb8lvz5cjvcng9vkc6pn765xgd4bws594jyc0avm0jkx"; depends=[stringr]; }; + MSbox = derive2 { name="MSbox"; version="1.1"; sha256="0hal7cqfmmcsckysxnwr2qsa2b61ck4zgbdl52w1iqkkvm8qq1x9"; depends=[stringr]; }; MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; }; MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; }; MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; @@ -2033,14 +2075,14 @@ in with self; { MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; }; MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; }; MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; }; - MVN = derive2 { name="MVN"; version="5.0"; sha256="1rpb9hxi4g87h6gvg6qdvk3f208cdayikmb8ib499ax3wv1zszhy"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; }; - MVR = derive2 { name="MVR"; version="1.32.0"; sha256="18arp9xh9dflbmc5zxafy132mnz5xwc6kb9hv51njz602kms70qg"; depends=[statmod]; }; + MVN = derive2 { name="MVN"; version="5.1"; sha256="1w0q42yqh6c0yl2mkcpn28da59i5svrqg18z2dndnxhvyl46ij3d"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; }; + MVR = derive2 { name="MVR"; version="1.32.1"; sha256="03dbd5nib8cx0rwdi4g9fihbkdxazpvbdjh7sfnavsyyrgnqa31m"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; MVar_pt = derive2 { name="MVar.pt"; version="1.9.9"; sha256="1lhy66k9x9ymj03d4f7wi6rdx60bwgy6gfv49jq3vr4cj8dv22i9"; depends=[]; }; MVisAGe = derive2 { name="MVisAGe"; version="0.2.0"; sha256="18w3qf85l81sbxhzxs61jbsng14lbd8vzvbprq0ywkxb2lsq16n2"; depends=[]; }; MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; - MXM = derive2 { name="MXM"; version="1.3.2"; sha256="0d3x773870ky6q36g6skcyfvywrwc264f5g55sh3229c6qpjgzq2"; depends=[doParallel energy foreach geepack hash lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; }; + MXM = derive2 { name="MXM"; version="1.3.3"; sha256="1xzw7ad3kpd8chfksgfsv0wdy7h1kzw5n410ndfhd1mx1cdfghj9"; depends=[doParallel dplyr energy foreach geepack hash knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; MagneticMap = derive2 { name="MagneticMap"; version="1.0"; sha256="1634bk6x92z01gyiy89c1g6z5cjsj8pf4f358y7rk2kppmfz4cf7"; depends=[scatterplot3d]; }; @@ -2050,8 +2092,10 @@ in with self; { ManlyMix = derive2 { name="ManlyMix"; version="0.1.11"; sha256="0vnx4cmx5vv8qh3pn75lz1mxap1ar4jnc5j15552vvi4i9pgmmar"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; }; - MapGAM = derive2 { name="MapGAM"; version="1.0"; sha256="1hzv3sy2szxl4fhnnzlwagh3qm4z22cbhiwi8whgn5ymwlnw0pca"; depends=[gam maptools sp survival]; }; + MapGAM = derive2 { name="MapGAM"; version="1.1"; sha256="0sh7qnzzahaz09nmld5p8df93my6k5vpvgmvqdlz84vghcfbfpa2"; depends=[colorspace gam maptools sp survival]; }; MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; }; + MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; }; + MarginalMediation = derive2 { name="MarginalMediation"; version="0.5.1"; sha256="1v7ly1yaglyh257b1q4vc7sfrk41lb4ar9dpwf5ppap581pgpz3f"; depends=[boot magrittr purrr]; }; MarkowitzR = derive2 { name="MarkowitzR"; version="0.9900.0"; sha256="1wyqlgmb376dsvx7nixpbynjzp7xpmsh4fx9s7nai6fhjb50mxha"; depends=[gtools matrixcalc sandwich]; }; Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; }; @@ -2061,8 +2105,8 @@ in with self; { MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; }; Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; }; MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; }; - Matrix = derive2 { name="Matrix"; version="1.2-12"; sha256="1wm45hg4x5ay15y03k6rmgkd1n9r01da72mszk24vafwd7pimr8n"; depends=[lattice]; }; - Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.6"; sha256="0aa225y6vqm0dqjfppfrc43wbq3ks9aszhmy73xbai2v12sh439g"; depends=[grr Matrix]; }; + Matrix = derive2 { name="Matrix"; version="1.2-14"; sha256="15hknim84nj3f54vkchca5ac0c3ip15v1by18k5parmn8wsl19j9"; depends=[lattice]; }; + Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; }; MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.2"; sha256="1205jxx5aj783r2dmpawiq4rr30b60fq1qf053i7wylw07pz6vba"; depends=[]; }; MatrixLDA = derive2 { name="MatrixLDA"; version="0.1"; sha256="19q6wl8fc6jzn7544qnlpzfh9v0xlg9cr78l6k8kx6kzjnbnyh9z"; depends=[glasso plyr Rcpp RcppArmadillo]; }; @@ -2079,7 +2123,7 @@ in with self; { MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.6"; sha256="0cx2bkz5m96dirqknfsi9944rhnn14wwdimw1hq1p8c073z40i7a"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; - Mega2R = derive2 { name="Mega2R"; version="1.0.0"; sha256="1rprbn7pkp0haahf34d1w7pmzn6hv8ci93gfp68hpyxxi6qm61g0"; depends=[AnnotationDbi DBI GenABEL GenomeInfoDb pedgene Rcpp RSQLite SKAT]; }; + Mega2R = derive2 { name="Mega2R"; version="1.0.2"; sha256="0v56sd0q8bxirjm851sjba52sb846ccqn7bihy0zm4fkqlfdm5m3"; depends=[AnnotationDbi DBI GenABEL GenomeInfoDb pedgene Rcpp RSQLite SKAT]; }; MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.3.0"; sha256="1nnj4nmzrvdj2arq74bg5ckhmll2z9ydnd75ds48njbhxla2645l"; depends=[ggplot2 iterpc knitr Matrix plotly rmarkdown robustbase]; }; MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; }; MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; }; @@ -2093,7 +2137,7 @@ in with self; { MetaComp = derive2 { name="MetaComp"; version="1.1.1"; sha256="0ndnjpg0c9k4171n190qwxmy79kw2ax4y5ap4xvaf0x561p072l6"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; }; MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; }; MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; }; - MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.1"; sha256="1m7h1bdk172zjx7xxlh4lac17ndx28vjpvdkyb352j5f4r4aq09g"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; + MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.3"; sha256="0zf45c6prr1g9xqsn4f5cxh30qvadbk0hzknz2hff6ljggjxxfia"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; MetaLonDA = derive2 { name="MetaLonDA"; version="1.0.9"; sha256="1iy7p91ln48fhym7gna8xmqrva6fcwxapqcyh1h6hqr0h3j392qd"; depends=[caTools DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr]; }; MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; @@ -2103,6 +2147,7 @@ in with self; { MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; }; MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; }; MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; }; + MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.0"; sha256="0crgdi7h8gl219lrb7i4f9jisgs7mkz45imwzh69acly4d2332ni"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rattle rpart]; }; MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; }; MetamapsDB = derive2 { name="MetamapsDB"; version="0.0.2"; sha256="0y5szb52karxcqr1f9mb050awprbk1ynckr987aw3d4ia6i9gcif"; depends=[base64enc cluster data_table DBI dplyr forcats future GenomicRanges ggplot2 gridExtra httr igraph IRanges lubridate magrittr Matrix purrr RCurl rgexf RJSONIO RSQLite shiny ShortRead stringr tidyr zoo]; }; Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; }; @@ -2130,10 +2175,11 @@ in with self; { MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; }; MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; }; MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.2.0"; sha256="1r6hamc4vanxdbmp37ib20drw49c4vxkskqb93qlagaqxgr9xch0"; depends=[stabledist]; }; + MixAll = derive2 { name="MixAll"; version="1.4.2"; sha256="1m3jkavamx1c2zzalh9j8psk69jmbh4lyl0sxn4x30whv0km5mvp"; depends=[Rcpp rtkore]; }; MixGHD = derive2 { name="MixGHD"; version="2.2"; sha256="1cq6mar6h56nscnd7xs6spf45mlqp48lssw2i57zfvi75f6s70p4"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; }; MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; }; - MixSIAR = derive2 { name="MixSIAR"; version="3.1.7"; sha256="0myn50sdmp83bhzm66sa61xwxv3lka427mv1ynhqshaqrb5flj35"; depends=[coda compositions ggmcmc ggplot2 lattice MASS R2jags RColorBrewer reshape reshape2 rjags]; }; + MixSIAR = derive2 { name="MixSIAR"; version="3.1.10"; sha256="0kc0apzl6aq9qjgrnnad78k71g91hzc1d7f3j0s1kpwzax2q6l2l"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 rjags]; }; MixSim = derive2 { name="MixSim"; version="1.1-3"; sha256="1mrzbax2inpmhxz26zlybci6ks5q780f10vcy1za638dmkz16fnv"; depends=[MASS]; }; MixedDataImpute = derive2 { name="MixedDataImpute"; version="0.1"; sha256="123c9i3znv53ikfnga1z9gq5bdl4vyww89967255wg5dzb7w00cn"; depends=[BH gdata Rcpp RcppArmadillo]; }; MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; }; @@ -2150,24 +2196,26 @@ in with self; { ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; ModelMap = derive2 { name="ModelMap"; version="3.3.5"; sha256="1rmm1a2nw91kzvxpvq9qhlag0dhihis7mgscgslqia6z8fr86qvs"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; }; ModelMetrics = derive2 { name="ModelMetrics"; version="1.1.0"; sha256="119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8"; depends=[Rcpp]; }; + Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; }; Modeler = derive2 { name="Modeler"; version="3.4.2"; sha256="0zf3z3y4w1jixmcbhkgrjh4dx7x3bfi66hrbzsxyfp7abk0p2d6l"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; MomTrunc = derive2 { name="MomTrunc"; version="1.41"; sha256="0az499xzvnczqnbh4g3h5jyz8isq0zdw0x654haac6v6045f5xav"; depends=[matrixcalc mvtnorm]; }; - Momocs = derive2 { name="Momocs"; version="1.2.2"; sha256="1a4y4zg9zd0pmhcjwvi5k1x36lyl1cw5i6bfm9qphd5bm438n70y"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; }; + Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; }; Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; }; MonetDBLite = derive2 { name="MonetDBLite"; version="0.5.1"; sha256="01gcwr5r47dkmr1y2q387xv1qr2fryq9574aijx1a39ywhvcm8pq"; depends=[codetools DBI digest]; }; MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; }; MonoPoly = derive2 { name="MonoPoly"; version="0.3-9"; sha256="130hv05fwsskk1bvr7fk8bmafq26vimkfgssjdk3zaz0hm3pxrp4"; depends=[quadprog]; }; - MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.2"; sha256="1lb5cvly7v45kn24m8pyfw036b8j7lq4my0igaj859r74ky3knw9"; depends=[abind codetools rlecuyer snow snowfall]; }; + MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.5"; sha256="0a62wq448kq10mf1nhdr0nybzzz7d63nxakggpzmkzz4fz0l67bd"; depends=[abind codetools reshape rlecuyer snow snowfall]; }; Morpho = derive2 { name="Morpho"; version="2.5.1"; sha256="1cxxsg7j0fq9drxkl6xlaw7j2cajzx9khcs9f3mb9l2ixd42hqnp"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; MortCast = derive2 { name="MortCast"; version="1.1-1"; sha256="077kk08pckm07rh7vxiw8whiyc4fbsj3qihih6mg09slaq8zr825"; depends=[wpp2017]; }; MortHump = derive2 { name="MortHump"; version="0.2"; sha256="1yhrdcwqf27v22mrysh51m3jcrnf74x21x7db25nic8q8fdmchj2"; depends=[demography HMDHFDplus Matrix minpack_lm MortalitySmooth RColorBrewer svcm WeightedCluster]; }; MortalityLaws = derive2 { name="MortalityLaws"; version="1.3.0"; sha256="1db4p7kl3kh3kdzqbbvyj3zxv6pz0jnc9fl7j2590ajwd5m9crg4"; depends=[minpack_lm pbapply RCurl]; }; MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; }; + MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; }; MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; }; - MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-1"; sha256="1f6gd227pkcs0sa9bwng0m617pjv3b0dm6rsij06a4n2gp50aysw"; depends=[boot coda digest gsubfn lattice pander plyr texreg xtable]; }; + MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-2"; sha256="0hy6g0fgidjpz7mn1qwwdnhyxjm0v2g9r3fl32zmkvix3852qx1r"; depends=[boot coda digest ggplot2 gsubfn lattice pander plyr texreg xtable]; }; Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; @@ -2189,7 +2237,8 @@ in with self; { MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; }; MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; MultiSkew = derive2 { name="MultiSkew"; version="1.1.1"; sha256="1s0k3z1vgdz1cxad007p246ghwx282w06inhrjjscbwliz1vg5ib"; depends=[MaxSkew]; }; - MultiVarSel = derive2 { name="MultiVarSel"; version="1.0"; sha256="0r1l7h2rm7vlvnrsq0khjdd5cb236g9xq1fb1vr15038kf0lmkij"; depends=[ggplot2 glmnet Matrix]; }; + MultiVarMI = derive2 { name="MultiVarMI"; version="1.0"; sha256="1mlaprg3cfmfwrq7wh64fmyv1wpdnil7wpcrcg3921qydk65py6z"; depends=[BinOrdNonNor corpcor CorrToolBox Matrix moments norm PoisNonNor]; }; + MultiVarSel = derive2 { name="MultiVarSel"; version="1.1.2"; sha256="07qdi43bg03xyr99361c0565m1i5kzqjbvlc2npnyjyc2ygr386d"; depends=[glmnet Matrix tidyverse]; }; MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; }; MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.1.0"; sha256="1g6yqp53dbd96jcjgmif39zb3a7f9zil10dhqi3vz3qv6r2vsnkj"; depends=[foreach MASS]; }; MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.17"; sha256="0s67w8ifd7g231aqq0qdia13kyb1cczhxrigsgrw48pqcfkv9208"; depends=[lpSolveAPI]; }; @@ -2211,7 +2260,7 @@ in with self; { NCSampling = derive2 { name="NCSampling"; version="1.0"; sha256="0bv93xffnzvbip86b3pg7apxzh3410mxff77q119m0z7f6vm3fam"; depends=[lattice randomForest yaImpute]; }; NCmisc = derive2 { name="NCmisc"; version="1.1.5"; sha256="1dq38ac97l8b6ys3yxqnndbrp8fa8zfw0lr4nq2421sn91769w22"; depends=[proftools]; }; NCutYX = derive2 { name="NCutYX"; version="0.1.0"; sha256="0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2"; depends=[fields glmnet MASS mvtnorm Rcpp RcppEigen]; }; - NEArender = derive2 { name="NEArender"; version="1.4"; sha256="1zdqil28j6jc6317dkpz5i1qj7b4i3lin4800n1kf14zg9nxjdyg"; depends=[MASS RColorBrewer ROCR]; }; + NEArender = derive2 { name="NEArender"; version="1.5"; sha256="006128psqxbyw3z4wqflc4xsir3d641r4flwkxmv836lp7fc2d9a"; depends=[hexbin MASS RColorBrewer ROCR]; }; NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; }; NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; }; NFP = derive2 { name="NFP"; version="0.99.2"; sha256="1wnllzlww8257sbrgvfyvd21qvhf7j17mcpf6d4p6binaw8svnsb"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; }; @@ -2224,7 +2273,7 @@ in with self; { NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; }; NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; }; - NLMR = derive2 { name="NLMR"; version="0.2.1"; sha256="0vyha5sx0mz2kky8qwylamqc6k0gnmbkyanapy3dqav66l98ki8b"; depends=[checkmate dismo dplyr extrafont ggplot2 igraph magrittr purrr RandomFields raster rasterVis sp spatstat tibble tidyr viridis]; }; + NLMR = derive2 { name="NLMR"; version="0.3.0"; sha256="0cqs48jy9ydivjpmx76dyxxdhh3lww7qrmx5s8jcsxxxnn93lq8m"; depends=[checkmate dplyr fasterize purrr RandomFields raster sf spatstat tibble]; }; NLP = derive2 { name="NLP"; version="0.1-11"; sha256="15v50gxzmpqx49wzkwxfpb5xjpg9y829a0ifys372kf1cfj521aq"; depends=[]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; }; NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; @@ -2234,8 +2283,9 @@ in with self; { NMOF = derive2 { name="NMOF"; version="1.2-2"; sha256="03286pp57m7imbgw334r34yg7c5zbaw3d1qxr0sbhmc2jxvv1arm"; depends=[]; }; NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.0"; sha256="02k766klw2fssiii5f4291qvs144ab9i5b6pmqvhyr87zdb87nf9"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.3.8.3"; sha256="0qyb8y54hxy5ac6m0mqyqbfjc4r3m4qvb83nw2vp4mb49fiinwxx"; depends=[data_table rgl stringr]; }; + NNS = derive2 { name="NNS"; version="0.3.8.6"; sha256="0dfnqy2i306vvqah40p3mj7yyxr9gxrgw8555p6shjiwhqp8rdaq"; depends=[data_table rgl stringr]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; + NOAAWeather = derive2 { name="NOAAWeather"; version="0.1.0"; sha256="077c7z13y2lhjzk2fbb9yfa1ay31dfryxmyg76z7l1a03h20xrvb"; depends=[dplyr ggExtra ggmap ggplot2 gridExtra jsonlite lubridate RCurl scales tcR tidyr]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; }; @@ -2255,7 +2305,7 @@ in with self; { NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; }; NSM3 = derive2 { name="NSM3"; version="1.11"; sha256="0lnmzpmh3i4lh5lfba6rhacf4zadbcrs7ify354h5245j0gxp1bv"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; - NScluster = derive2 { name="NScluster"; version="1.1.1"; sha256="1w63abh4q0wgv3x7inl2xyp9qgr9m223r2p7nfiqnxk9y259kh04"; depends=[]; }; + NScluster = derive2 { name="NScluster"; version="1.2.0"; sha256="04mn9lh4cl1hkz27z7ldqnfwmrvqi7m1zrvscpywdcilpjmcryv0"; depends=[]; }; NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.1"; sha256="1grz2yxrklqglw9027c8k01jnb42p453fcd38arw4wd85y5hbam4"; depends=[snowfall]; }; NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; }; NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; }; @@ -2279,25 +2329,28 @@ in with self; { NetworkChange = derive2 { name="NetworkChange"; version="0.3"; sha256="1brpa6fhmrgafmk1iw19g0pppwxi0ld0nyhx9c0fgnkn9m82isjk"; depends=[abind ggplot2 ggvis LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; }; NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; }; NetworkDistance = derive2 { name="NetworkDistance"; version="0.1.0"; sha256="0k11crn1wiisw4qrc2yidrhdvscx59skqy4ckxdiykpb1jh5a7s4"; depends=[doParallel foreach igraph Matrix network Rcpp RcppArmadillo Rdpack RSpectra]; }; + NetworkExtinction = derive2 { name="NetworkExtinction"; version="0.1.0"; sha256="1scza639kf3zzz2yd9q31wsvxpvpq8hbx82a206jkxlxb4dq6vxr"; depends=[broom dplyr ggplot2 magrittr network scales sna tidyr]; }; NetworkInference = derive2 { name="NetworkInference"; version="1.1.2"; sha256="0lydfkpgsi842fbapnggpngarvqc8arhy4qn13x47myk1mmkkisj"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; }; NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; }; - NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.0.0"; sha256="1z0l8fdxvyxgajq0j6sx6mvr15sxd45kavy8ywk3hnlwcz1xy7m8"; depends=[corrplot devtools fdrtool graph hypergeo igraph MASS Matrix psych pwr qgraph R_matlab RBGL RColorBrewer]; }; + NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.1.1"; sha256="19gn50f96nnccgv68vp6850pjdcl433lmppshc2imcjw4hn45fra"; depends=[corpcor corrplot doSNOW fdrtool foreach graph hypergeo igraph MASS Matrix ppcor psych pwr qgraph R_matlab RBGL RColorBrewer]; }; NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.1"; sha256="1dsjv0vm45skw74x1fz3gd7g6p52ayfwz85bh92j29mfxbnacbnn"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; - NightDay = derive2 { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; + NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; }; Nippon = derive2 { name="Nippon"; version="0.6.5"; sha256="187jzqsabg0vfvipbaig6nsdwclk5p3hgkvg0yid2ip8qc5qcmdw"; depends=[maptools sf sp stringr]; }; NipponMap = derive2 { name="NipponMap"; version="0.1"; sha256="09cvzw32f0kwlwvrv7r6cx2x2jkc2wv843aip8r3iziixmcy7vxq"; depends=[sf tibble]; }; NlcOptim = derive2 { name="NlcOptim"; version="0.5"; sha256="0chrf9ac3x1a0b86lf6wjzdsjcv5n08rav88b7xf4c31lflf1rd1"; depends=[MASS quadprog]; }; + NlinTS = derive2 { name="NlinTS"; version="1.3.2"; sha256="1isr6ci6dsbbx804y3hc8aqvhggfs7ix5yiz32dby69i85b6lj5a"; depends=[Rcpp Rdpack timeSeries]; }; NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; }; NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; - NonCompart = derive2 { name="NonCompart"; version="0.3.3"; sha256="0f66p122rdibn8k79wjhvslgankhxk4dq9sfvq0gcabmi1skfqgq"; depends=[]; }; + NonCompart = derive2 { name="NonCompart"; version="0.4.1"; sha256="0a701lx83vf79pvym2igg2wbkhnx0jykfiglwhic4hvl1lw0f4g2"; depends=[]; }; NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; }; - Nonpareil = derive2 { name="Nonpareil"; version="3.3"; sha256="0bli88salj7mxmnh3b8wims1jlfzlq2lxd4kn2bp2vi58ij9v9pm"; depends=[]; }; + Nonpareil = derive2 { name="Nonpareil"; version="3.3.1"; sha256="0ldl90h499wwm992cj71phf3ryqvjnq0ygarcxf7h85krr4j3sx2"; depends=[]; }; NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; }; + NormPsy = derive2 { name="NormPsy"; version="1.0.7"; sha256="1v6jlbxiapkygivx5vv4ravs86n94qxlmj4q940jjfbbk24bssdc"; depends=[lcmm]; }; NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; }; NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; }; - NormalizeMets = derive2 { name="NormalizeMets"; version="0.24"; sha256="0n75swaybsggrawplkncb1vnnyy2imz1b4wy74crdgfg02bzzz2r"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; }; + NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; }; NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; Numero = derive2 { name="Numero"; version="1.0.3"; sha256="1jj269b5cw7w4bgp6qvh0b3kpj32fjpsb2nbhyhjlkf7m03gnwwv"; depends=[Rcpp]; }; @@ -2318,7 +2371,7 @@ in with self; { OOBCurve = derive2 { name="OOBCurve"; version="0.2"; sha256="1dr2mp2wi2dir1h5w3rw17154byfy3gx02x2kz1r67l9dfgrr505"; depends=[mlr randomForest ranger]; }; OOR = derive2 { name="OOR"; version="0.1.2"; sha256="1zw7g0365znyn828qqsn83l2a837wwj9cx7dzcbns28vhqmsn6hm"; depends=[]; }; OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; - OPDOE = derive2 { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; + OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; OPI = derive2 { name="OPI"; version="2.7"; sha256="0mmk8alpwm4vmq2yr4qkri2zkh4lxfvrp70j0zljinxcynaraqzn"; depends=[]; }; ORCI = derive2 { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; }; ORCME = derive2 { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; }; @@ -2332,7 +2385,7 @@ in with self; { OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.1"; sha256="0mjjfndc67gzkqskcq4sxpr8fwx3lm3wjgapgg64rbj5x4i1w4rp"; depends=[]; }; OUwie = derive2 { name="OUwie"; version="1.50"; sha256="1gzgwax9kmcr6rl6nv10xn536nbkjhmg6sqax58xxinc00ykdx75"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; }; - Oarray = derive2 { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; }; + Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; }; OasisR = derive2 { name="OasisR"; version="3.0.0"; sha256="0dk8asv5v0qiqqf45r3hhh67sa03qdkpgsss649mp2pxzm8chv1y"; depends=[measurements outliers rgdal rgeos seg spdep]; }; OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D plot3Drgl rgl shape]; }; Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; }; @@ -2352,7 +2405,7 @@ in with self; { OpenImageR = derive2 { name="OpenImageR"; version="1.0.8"; sha256="1j7p1wrzznrisbzw8j1qsxyyv3zr5hk6q9yxw97y6lrfh3c26ig1"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; }; OpenML = derive2 { name="OpenML"; version="1.8"; sha256="04m2gi35hykqs4iy3ipvi41cmkv8vg145cpafjrsf98kj7jg4pmv"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; }; - OpenMx = derive2 { name="OpenMx"; version="2.8.3"; sha256="0kz1x3x43jf326x7l8lb7rlnng4r5cp11vrs1pnnxkmbhqzbbwy8"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.9.6"; sha256="0141q6rwppwab426fn65vcnj06nivibl11aqi8dp32rcxgi5s9y8"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; }; OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; }; Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; }; @@ -2360,7 +2413,7 @@ in with self; { OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; }; OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; }; - OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.2"; sha256="0yf3wk0y650cyp5x8jvjr4ncq34phka8z0r9zk9cjn1k0ic2zmjc"; depends=[car clisymbols crayon dplyr e1071 lme4 MASS nnet nortest rpart]; }; + OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.4"; sha256="0f1szin0isji60gvb0zi240gri6fc4y1s71n96dn5wacdx5b8mhb"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; }; OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; }; OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; }; @@ -2413,10 +2466,10 @@ in with self; { PCDimension = derive2 { name="PCDimension"; version="1.1.8"; sha256="1359cmswynv9xqbfb60kh32ifm9wgm20iplkdfzf5v2c4vxd0rmf"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; }; PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; }; - PCICt = derive2 { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; }; + PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; }; PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; }; PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; - PCPS = derive2 { name="PCPS"; version="1.0.3"; sha256="1ys3xp1nripy5zkq25byak9k6yf5rdbfnww8j13yc469428ip8q0"; depends=[ape phylobase picante SYNCSA vegan]; }; + PCPS = derive2 { name="PCPS"; version="1.0.5"; sha256="1v5173zskkyc79b68a3x0b1harq5xp4igisf94ajgqqmkpf61qcp"; depends=[ape phylobase picante RcppArmadillo SYNCSA vegan]; }; PCRedux = derive2 { name="PCRedux"; version="0.2.5-1"; sha256="1p5qmz09ajbm1iypyz5rn9bwzbbx57gc6a0xzrm900dw2r2cf7ph"; depends=[bcp changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR robustbase testthat visdat zoo]; }; PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; }; PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; }; @@ -2433,10 +2486,11 @@ in with self; { PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; }; PGRdup = derive2 { name="PGRdup"; version="0.2.3.3"; sha256="1s0v44922zpxl3w9kzn9xzvs5jldg35gjrnlf89f89i3rs59gg98"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; - PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; }; + PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; }; PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; + PINSPlus = derive2 { name="PINSPlus"; version="1.0.0"; sha256="1vyn6hz4b0gzpvs6m0lbs09vv8531z74vkm2ss1244gn991p7iif"; depends=[cluster doParallel entropy foreach pbmcapply]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; }; PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; @@ -2454,14 +2508,15 @@ in with self; { PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; }; PMCMR = derive2 { name="PMCMR"; version="4.2"; sha256="1dqfn68034xkik4xfl8mlqsh7x427f7cwna5axj8gvjcj9l48x8c"; depends=[]; }; PMCMRplus = derive2 { name="PMCMRplus"; version="1.0.0"; sha256="11sliznixsrrlr0y365hxpg64jfva8l1ilrnkdd32ddy8713sin7"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; - PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.0"; sha256="1lr7ycsjp9dimkbxfapl1qpvlvl0771rdipaf26sgi7iabqpz5b4"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; }; + PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.1.1"; sha256="038xylgq3mp1nl5rf11swprv08khvzfw0jg5bmd0yvqmygr082jq"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; }; POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; }; POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; }; POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; }; PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; }; PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; }; - PPCI = derive2 { name="PPCI"; version="0.1.1"; sha256="1f3jmrkszjq6ajbl0kjf5rghiliim96wz53mfrjjvpc6piajs5ym"; depends=[rARPACK]; }; + PPCI = derive2 { name="PPCI"; version="0.1.2"; sha256="1k6kbln0h1wkzg594k1db6r3nk5dqwhg8gm1hgval05dsdhp8j8b"; depends=[rARPACK]; }; + PPRL = derive2 { name="PPRL"; version="0.3.5"; sha256="1j8qfa6ipk9x6w7g5y0lz14cf72s2zpkrp5gk2qbvx1pm3w1zyh6"; depends=[Rcpp settings]; }; PPforest = derive2 { name="PPforest"; version="0.1.0"; sha256="1s0g8icyx30sih2xbdihp9xbmygfgd1hs642qdl5559fqshylbzs"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; @@ -2475,9 +2530,8 @@ in with self; { PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; PRROC = derive2 { name="PRROC"; version="1.3"; sha256="03hvh92lq4i4w4mla9bvwrwb4626f4hvlxgdn57hamp70960vjyc"; depends=[]; }; - PReMiuM = derive2 { name="PReMiuM"; version="3.1.6"; sha256="14y3c5l050szdm2zh88byzawrfc224j4dr4msc5a5vh10bsa1wd9"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; }; + PReMiuM = derive2 { name="PReMiuM"; version="3.1.7"; sha256="1l2ibwn5z647dwhrjzgrz3qqzdbkqk3zrpn95hy4ysa32pdz300n"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; }; PResiduals = derive2 { name="PResiduals"; version="0.2-5"; sha256="05jk543lv8isbxv24cbzqh80l6xs05lx2k9xzz7s0121vb2yd3v4"; depends=[Formula MASS rms SparseM]; }; - PSAboot = derive2 { name="PSAboot"; version="1.1.4"; sha256="1zfqpq0ibgazwppbxbmqvkvh9j5421xmj9132zghxki0xdy655ss"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; }; PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; }; @@ -2491,10 +2545,10 @@ in with self; { PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; }; PTE = derive2 { name="PTE"; version="1.6"; sha256="0y2zqvm2d9minpc22ndq6mar3brbv9k6s1apl19zwpc8h5g3jx5l"; depends=[doParallel foreach survival]; }; PTXQC = derive2 { name="PTXQC"; version="0.92.3"; sha256="1spkbjji36s2dlhm5b8svpnjmana2jy1ppa0pfgjg7rpsp3369xq"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; - PUlasso = derive2 { name="PUlasso"; version="2.2"; sha256="0chk26ll134fqvaqdwdnm49vbvklbrxm0j0qkcydm166p24k8n2z"; depends=[BH Matrix Rcpp RcppEigen]; }; + PUlasso = derive2 { name="PUlasso"; version="3.1"; sha256="0cnnv9laga24h01aqkk7kzmmv2x5cgcq5l45w8vj5pvfyhvm4067"; depends=[BH doParallel foreach Matrix Rcpp RcppEigen]; }; PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; - PWEALL = derive2 { name="PWEALL"; version="1.2.0"; sha256="0h7azgns88qwgdp41v35v6293xqs2hksbr82p15n754ci2hsvzja"; depends=[survival]; }; + PWEALL = derive2 { name="PWEALL"; version="1.2.1"; sha256="08a7ih9yyp0dqw89n1qhwbxhgiks91c3wjbaz08b6ck6cv6gzy6k"; depends=[survival]; }; PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.16"; sha256="015zqbq9wsg0wc1y5s4x8vc7klkfa928xcl23v732vy28j0jf20h"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps sp stringr xts zoo]; }; PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; }; Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; }; @@ -2534,7 +2588,7 @@ in with self; { PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; }; PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; - Peptides = derive2 { name="Peptides"; version="2.2"; sha256="0fdc8xd0c6x1m1r3bj9098m6g5ay15ig53z0wib2lvxlcnh2xpjs"; depends=[Rcpp]; }; + Peptides = derive2 { name="Peptides"; version="2.3"; sha256="17nbjh06vi4syb0hlg7y646xik4csp3fs6r6z0c676k5sxs33mrd"; depends=[Rcpp]; }; PerFit = derive2 { name="PerFit"; version="1.4.1"; sha256="0mzd9yrgsswxlhljlk8nxi0dhy3k4a9jax9w9c9s29j4m7z9jf01"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; }; PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; }; Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; }; @@ -2545,7 +2599,7 @@ in with self; { PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; }; PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; }; PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; - Phase123 = derive2 { name="Phase123"; version="1.4"; sha256="1iw0xgfsvfzrhcnfxvq6rcwfcycyvc2bbg8d7g2spvvjk7aa4bwd"; depends=[Rcpp RcppArmadillo survival]; }; + Phase123 = derive2 { name="Phase123"; version="1.5"; sha256="05yvzx0sf6dq47nr5bk1kd2icndf20z39y9fj90zqdm3ay2hi586"; depends=[Rcpp RcppArmadillo survival]; }; PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; }; PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.2.0"; sha256="1vnissx2p10w2w435vr2jqw50cs5518l1gpq4pkyyxckcrd300w9"; depends=[data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; }; Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; }; @@ -2555,10 +2609,10 @@ in with self; { PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.1.0"; sha256="0ji78zx0gp1nd5assrmwxdkxryfjijnn9g34w2g2qv32s1fdj6ak"; depends=[ape capushe foreach glmnet grplasso LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; }; PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; }; - PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.1"; sha256="0agy9jp5vbh6cj5mipbmn11m69w4ydz91nprph0jyf1drl92730h"; depends=[Rcpp RcppArmadillo]; }; + PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.2"; sha256="04l1id872mlgpid746l8dz2wdcjxh79cqw835gsph6ngxg0g8qp6"; depends=[Rcpp RcppArmadillo]; }; Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; PivotalR = derive2 { name="PivotalR"; version="0.1.18.3"; sha256="14l7y57zmfr7h4bq01j83am2plxx320kkhbsh0x2ypif9dni4rf2"; depends=[Matrix]; }; - PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-2"; sha256="0lzgffw5kbx9psd68r7yigqv8dszjb2xkayxm3rhfs8jv9309yr0"; depends=[igraph MASS Matrix partykit psychotools qvcalc rARPACK sandwich]; }; + PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-3"; sha256="1w2ihclnh3x83ip4hh95bchv5j832cqy6n140q5q1dbfz6fy1bxv"; depends=[igraph MASS Matrix partykit psychotools psychotree qvcalc rARPACK sandwich]; }; Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; }; PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.6.10"; sha256="1dqc6k7mq9k6g9gndgjm6cf61mgl0liy4qwpzragbhq6lym8hw6w"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; }; @@ -2579,7 +2633,7 @@ in with self; { PoloniexR = derive2 { name="PoloniexR"; version="0.0.1"; sha256="1qik272z5lmzv9k1kfr5v0m8sydbdhbrc732n1zpwnqc1spfqb20"; depends=[anytime digest httr jsonlite RApiDatetime xts zoo]; }; PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; }; PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; }; - Polychrome = derive2 { name="Polychrome"; version="1.0.0"; sha256="09yxrwh7a5hgq52jv2d0b0jvwbgm1f1dg6w4vziwdx5cwyny9psl"; depends=[colorspace rgl]; }; + Polychrome = derive2 { name="Polychrome"; version="1.1.0"; sha256="1a0ifbvkw85sxwc8zjj8hy88avmqyjsfxk2cd16qsp0p9wfn872y"; depends=[colorspace scatterplot3d]; }; PolynomF = derive2 { name="PolynomF"; version="1.0-1"; sha256="0sr5v43hp1ydy2230vm3mrg4pnnv7nivhnp3zni9svc8g0bd8z8p"; depends=[]; }; Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; @@ -2595,21 +2649,20 @@ in with self; { PortfolioOptim = derive2 { name="PortfolioOptim"; version="1.0.3"; sha256="1s9msqjxqxqafhncc3hi5prhzl5cj0incd5rc9fxc23l5l4n9xjx"; depends=[Rglpk]; }; PottsUtils = derive2 { name="PottsUtils"; version="0.3-3"; sha256="165k4sjh3kqkb8bzi68wx00yl77yfbgs70fcbpzmsmcw4g4hdpzn"; depends=[miscF]; }; PoweR = derive2 { name="PoweR"; version="1.0.6"; sha256="0p2v07wp1hqmmbf7b3mh0v4n5hbbcms9xkdhjzdfxkkbafxybc24"; depends=[Rcpp RcppArmadillo]; }; - Power2Stage = derive2 { name="Power2Stage"; version="0.4-6"; sha256="1fzzvv3c7z9fb63l0wz9i0vd413mfn1dzw19kw7rnldv773lwir1"; depends=[mvtnorm PowerTOST]; }; + Power2Stage = derive2 { name="Power2Stage"; version="0.5-1"; sha256="155w5yp0pdq4g3638m0c54i81lfk0g0f339hzbxpkxhs8ds7g2zv"; depends=[cubature mvtnorm PowerTOST]; }; PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; }; - PowerTOST = derive2 { name="PowerTOST"; version="1.4-6"; sha256="0fy9g1zkkxx45pz7axyhv9v9yajfwi19pxcr2bc9dih3j41kazjr"; depends=[cubature mvtnorm TeachingDemos]; }; + PowerTOST = derive2 { name="PowerTOST"; version="1.4-7"; sha256="02k6jn5dw70518g55bchax0l5gkci827lqwwyxwnn6rzs3mx4ybs"; depends=[cubature mvtnorm TeachingDemos]; }; PowerUpR = derive2 { name="PowerUpR"; version="0.2.3"; sha256="046p4mrw50k1a0m672i2zx5vxfpyggiazp95qz8kx6bnq472ixp2"; depends=[]; }; PracTools = derive2 { name="PracTools"; version="0.8"; sha256="0hmdsm1ya6fw0f2fv4b85bkr35vlqmjf1sd9jmw1d4izpifv187h"; depends=[]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.4"; sha256="0zvy7wx9wfsdcvnjdr1angh0shqwhlm48byc0ymciqlx6xagaw0b"; depends=[oompaBase]; }; - PreciseSums = derive2 { name="PreciseSums"; version="0.1"; sha256="14d42n1wby1srrjyi0yc565g2ldmxy3r3z5bf7ki2x6snj569n0g"; depends=[]; }; + PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; }; PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; }; - PredictTestbench = derive2 { name="PredictTestbench"; version="1.1.3"; sha256="14np4zvr0labhqxzsv07iqzldfxmnsfk91qpfqz7vyiq0vwcymp4"; depends=[forecast ggplot2 imputeTestbench PSF reshape2]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; PrevMap = derive2 { name="PrevMap"; version="1.4.1"; sha256="1hmvfk5zpflwncaiy2rr0jr2gr2gk66na6ks82b6dfgk8xdc8xmk"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; - PrivateLR = derive2 { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; }; + PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; }; ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; ProFit = derive2 { name="ProFit"; version="1.1.1"; sha256="0krnxdf9dddry4a5k1dag43va7lii1ykk0857kk1dfnl56sm3l51"; depends=[celestial fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; }; ProFound = derive2 { name="ProFound"; version="1.0.1"; sha256="0ym8ggzm0b8zpfsq8xjjnwa09826gssaqhrqjyq88pwbhzh0y4pl"; depends=[celestial data_table FITSio magicaxis]; }; @@ -2636,11 +2689,11 @@ in with self; { PtProcess = derive2 { name="PtProcess"; version="3.3-13"; sha256="0vk1n7hk6v592fi5ld70db6m92zgpjx97axs5h8p53c29984qhwz"; depends=[]; }; PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; }; PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.5"; sha256="0vpd48daamd9q3mdr59sx7zj86qcq2yx8bnrzblyx0ryqx6jnq8m"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; - Publish = derive2 { name="Publish"; version="2017.10.24"; sha256="14zbbchff4mjvsxs9c2bypqdsfbnnl6lvr0k5v50wkd00avnv9s7"; depends=[data_table lava multcomp prodlim survival]; }; + Publish = derive2 { name="Publish"; version="2018.04.17"; sha256="0dbcql2mi2qsxzcgcqa58yqynfq1800fa06ikyay2dm6gdyf0apq"; depends=[data_table lava multcomp prodlim survival]; }; PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; - PwrGSD = derive2 { name="PwrGSD"; version="2.2"; sha256="0z42l7vb3yya59g9rymypfzjbbs5zkknwgcl710rqa64l421sp8z"; depends=[survival]; }; + PwrGSD = derive2 { name="PwrGSD"; version="2.3"; sha256="1iisib4bnb3fp0nwxnal13fgd0fs1vckchr4cj716k72jh6k7slm"; depends=[survival]; }; PythonInR = derive2 { name="PythonInR"; version="0.1-4"; sha256="0krr5k0y9rggzq8f74nc6pyf47g8va1lvva31vc774hbb0rmr7gf"; depends=[pack R6]; }; - QCA = derive2 { name="QCA"; version="3.1"; sha256="1nfwfv19rjqba28kmz9yk78zaq9jiiap8yhr0qcpf41q7381sn7q"; depends=[fastdigest shiny venn]; }; + QCA = derive2 { name="QCA"; version="3.2"; sha256="1bjsc24b3g7xdb1fi3f4y1297g185gasl3xsgqxibck2zjlagl11"; depends=[fastdigest shiny venn]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; }; QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; }; @@ -2659,26 +2712,26 @@ in with self; { QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; }; QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; }; QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; }; - QRegVCM = derive2 { name="QRegVCM"; version="1.1"; sha256="01dhc0r1nialwv7dp2108znyc3ip1hswkcbpf3kmabxxj5y4vyvx"; depends=[quantreg SparseM truncSP]; }; + QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; }; QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; QTLRel = derive2 { name="QTLRel"; version="1.0"; sha256="0hlnh04w45imf0f7rm9pg1whlps5zxh00qvvn81hip16bv48cw79"; depends=[gdata lattice]; }; QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; }; QZ = derive2 { name="QZ"; version="0.1-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; }; QoLR = derive2 { name="QoLR"; version="1.0.3"; sha256="1z3wicybqsyczgjjd84g95bjxw80l5y8b68ayp300bm5jd4f2pha"; depends=[survival zoo]; }; - Qtools = derive2 { name="Qtools"; version="1.2"; sha256="0432ip73aldblq3yyig8d47a56j12fs30fpz8sxvfj186ssawych"; depends=[boot MASS mice quantreg]; }; + Qtools = derive2 { name="Qtools"; version="1.3"; sha256="1vbjydacgczjlsf8b8id25n3k0cq74i43nsvax22k8hbvj4g0b94"; depends=[boot MASS mice quantreg]; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; }; Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; }; QuantNorm = derive2 { name="QuantNorm"; version="1.0.3"; sha256="1kc8qfa5fwdmk4nfzlkd22968zn44ggr65ysm1l31bhbgjh59ly3"; depends=[]; }; QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; - QuantTools = derive2 { name="QuantTools"; version="0.5.6"; sha256="0ykfxrg4chq4n24spfj2v6cqiw5y7wps2rmnd0150fa6fqk7nd2k"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; + QuantTools = derive2 { name="QuantTools"; version="0.5.7"; sha256="069rvh4yfar5dh6aj6p0q61gasvs9wr72x9pnj00lvyjlnv06p5n"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; }; QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; R_cache = derive2 { name="R.cache"; version="0.13.0"; sha256="1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k"; depends=[digest R_methodsS3 R_oo R_utils]; }; R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; }; - R_filesets = derive2 { name="R.filesets"; version="2.12.0"; sha256="16djdiwl4rpyhc75q2dpyfpzf2gwqkg9rbk99fbx69my1if0vs7w"; depends=[digest future_apply R_cache R_methodsS3 R_oo R_utils]; }; + R_filesets = derive2 { name="R.filesets"; version="2.12.1"; sha256="0grd3wk5xh7jgp10m78knj0snqyxqv7yir6wvz2wq5rabvcn9mab"; depends=[digest future_apply R_cache R_methodsS3 R_oo R_utils]; }; R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; R_matlab = derive2 { name="R.matlab"; version="3.6.1"; sha256="013qi3iikikgib23cqg74vpp2ymsbw1zd6zny7m1km2js6gmfchh"; depends=[R_methodsS3 R_oo R_utils]; }; R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; }; @@ -2696,13 +2749,13 @@ in with self; { R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; }; R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-5"; sha256="09p8xrxhcf6biy1mffv31p2hlr19s51f3n67az52f3xv5lyp9wm8"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; }; R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; }; - R2STATS = derive2 { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; }; R2SWF = derive2 { name="R2SWF"; version="0.9-2"; sha256="1f7bj2jqm7ys3rimgpsn252j39mw0xd008p3zqi77x1flisla0z3"; depends=[sysfonts]; }; R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; }; R2admb = derive2 { name="R2admb"; version="0.7.16"; sha256="0s8p82avxdp5zmkz7amvnphn3lcyhha31mbjghibnhm9g16k0b84"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; }; R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; }; R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; }; + R3port = derive2 { name="R3port"; version="0.1.1"; sha256="0ww0sqjx0la03qx353h0y5wr5qpc5fir3gjy4fsxkw6jrsyx9vaz"; depends=[plyr reshape2 whisker]; }; R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; }; R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; R6 = derive2 { name="R6"; version="2.2.2"; sha256="13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8"; depends=[]; }; @@ -2721,7 +2774,7 @@ in with self; { RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; }; RATest = derive2 { name="RATest"; version="0.1.2"; sha256="0cxb82kzmywgslf6hfjl6v015s64jh483bzxnhph420mcp3ysbfk"; depends=[ggplot2 gridExtra quantreg]; }; - RAdwords = derive2 { name="RAdwords"; version="0.1.15"; sha256="0f0j5fllkxwa63gpwgaks0sbsq9a68jw6g9djydq4c3jfzw1sqyl"; depends=[RCurl rjson]; }; + RAdwords = derive2 { name="RAdwords"; version="0.1.16"; sha256="1a7r600s7r4pp0wwcsgyzkc6v7nywbsv3s0q118wmx2ig5rsyihw"; depends=[RCurl rjson]; }; RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; RAppArmor = derive2 { name="RAppArmor"; version="2.0.2"; sha256="18zmqqh4rnbnaiwi60jfp4xi8fp63ydr3jk9w4ijmy6s4hkpp75g"; depends=[]; }; @@ -2746,23 +2799,23 @@ in with self; { RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; }; RCurl = derive2 { name="RCurl"; version="1.95-4.10"; sha256="02pyh6kvsfbwgccf8v77aa3ky21kps1rpgaii20wmridrgqj90vg"; depends=[bitops]; }; - RCzechia = derive2 { name="RCzechia"; version="1.1.1"; sha256="070k93aj694jyvjmr5rbdzkdmi1sx69fild06dqf8idrkh3i2a55"; depends=[httr]; }; + RCzechia = derive2 { name="RCzechia"; version="1.2.3"; sha256="18x1561l5hnaayvv8mca8gncqfgn4bbqx69gkb0jk3wa6s11y2qk"; depends=[httr]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; RDS = derive2 { name="RDS"; version="0.8-1"; sha256="18xn0ci35xs2myzj8rny6pp08cn8ljl3l4fdgaqp05fphgb5fh8j"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales]; }; RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; }; RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; }; RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; - RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; + RDieHarder = derive2 { name="RDieHarder"; version="0.1.4"; sha256="0p37r45fy75a0is2mycvhrz705707acdb2858yd9qx70n6sg3jph"; depends=[]; }; RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; }; RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; }; - REAT = derive2 { name="REAT"; version="1.3.2"; sha256="1vp103jwq6zf3w6bn3xvbh4zcgsdrwiycp23ab8mj42axk8pw5li"; depends=[]; }; + REAT = derive2 { name="REAT"; version="2.0.0"; sha256="0al0502h1iyd03c4hsy35nxz3nbvvfshi5jxxvxlh1x4bxvpy1vs"; depends=[]; }; REBayes = derive2 { name="REBayes"; version="1.3"; sha256="0byd7587vddffplzp8kc2aakab61pck2r25rajxfn0rsvl5yvxyx"; depends=[Matrix reliaR Rmosek]; }; RECA = derive2 { name="RECA"; version="1.3"; sha256="1v9ff2inxwpq91pjl6g9bpl9nmlyryp030g6abydikkhkcq3n74b"; depends=[]; }; REDCapR = derive2 { name="REDCapR"; version="0.9.8"; sha256="14psw0sxlyig4nf968n997djwf80hgy5ia2g0bp8rdpn8lrj01g6"; depends=[data_table dplyr httr magrittr readr tibble tidyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; - REIDS = derive2 { name="REIDS"; version="0.0.1"; sha256="1pzbwmbz2agqlj28qpm7msahnk5viih5bqkimq3j8wp2pp580gwz"; depends=[aroma_affymetrix aroma_core data_table lmtest MCMCpack RColorBrewer]; }; + REIDS = derive2 { name="REIDS"; version="0.0.2"; sha256="1njyvc818rwwg109ry8nb2p05rf9yh6zsydvww2ribynlsr2rir1"; depends=[aroma_affymetrix aroma_core biomaRt data_table GenomeGraphs lmtest MCMCpack RColorBrewer]; }; REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; }; REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; }; REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; @@ -2787,7 +2840,7 @@ in with self; { RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; }; RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; }; RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; - RGF = derive2 { name="RGF"; version="1.0.1"; sha256="1kj67sc10khzl9xxk8ss366hcnmqiad0ap1xsc738ya6bv4xrr5w"; depends=[Matrix R6 reticulate]; }; + RGF = derive2 { name="RGF"; version="1.0.2"; sha256="06qvilx9z659q0kad5h1r6mdf4vc8lmr8bzw5nrjsjpb92v5crh5"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; }; @@ -2795,16 +2848,17 @@ in with self; { RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; }; RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; }; RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; }; + RGreenplum = derive2 { name="RGreenplum"; version="0.1.0"; sha256="19wb85npy27r011yfp90y1dvl8qk2yh2qks8zg207nac0vngz4y1"; depends=[DBI RPostgres]; }; RGtk2 = derive2 { name="RGtk2"; version="2.20.34"; sha256="1yhdcd7f987bdd2y08dcx95i1hbfakgd8v1c606jxwr2dclyhx70"; depends=[]; }; RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; }; - RH2 = derive2 { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; }; + RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; }; RHMS = derive2 { name="RHMS"; version="1.3"; sha256="0pp67p8i6nsh9nvxsd1m453735s0whlril8l640m888zl6a3463j"; depends=[Hmisc pso]; }; RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; }; RHRV = derive2 { name="RHRV"; version="4.2.3"; sha256="09rcf9da04195myh4mwva3hqcd483k0wwcn84jgbkj8a5z1zxqc6"; depends=[lomb nonlinearTseries tkrplot waveslim]; }; RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; }; RHawkes = derive2 { name="RHawkes"; version="0.0"; sha256="0qi32f6im6fsgvjs8bravc5z21557zn2d0a7i88dy0rri7czm5p7"; depends=[IHSEP]; }; RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; - RIA = derive2 { name="RIA"; version="1.3.0"; sha256="0wz2c770faravsmlp3ivbw136x82l1i14ilikrdn7cn49bz0r5mh"; depends=[oro_dicom]; }; + RIA = derive2 { name="RIA"; version="1.4.0"; sha256="0whwja54mmd23sbljgvjnlgz3hlmgpdh53w04bcpgbmvcs281f5l"; depends=[nat oro_dicom oro_nifti]; }; RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; }; RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; @@ -2812,7 +2866,7 @@ in with self; { RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; }; RInside = derive2 { name="RInside"; version="0.2.14"; sha256="1ks9hs78s2vgdp9nfpzwifkqnh3vnaqwand51yh9r1zyjc4k9rcd"; depends=[Rcpp]; }; RItools = derive2 { name="RItools"; version="0.1-15"; sha256="0f7g0w8bnbxryll48rnn7blgskgcdqqx9xv4fqmwcbkbasjz37va"; depends=[abind SparseM survival svd xtable]; }; - RJDBC = derive2 { name="RJDBC"; version="0.2-7"; sha256="0db2s3qkkv16a4xskym8q3lv5s5jscwd5hh1pgl9bndb91wm9qj7"; depends=[DBI rJava]; }; + RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; }; RJSDMX = derive2 { name="RJSDMX"; version="1.9-3"; sha256="0myjhimx1p8ndyk60qgaw6csq58s4rxr67hgx9a5i1swsmlkwciz"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; }; @@ -2820,9 +2874,6 @@ in with self; { RJafroc = derive2 { name="RJafroc"; version="1.0.1"; sha256="16a8j4bw754ci8mxfhh3c3y5g53f2hr1l1mh05xw31asqcxzafrm"; depends=[bbmle binom caTools ggplot2 mvtnorm numDeriv Rcpp stringr xlsx]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; RKEAjars = derive2 { name="RKEAjars"; version="5.0-3"; sha256="0sm7dkdprmqh319jc43ra7qbk4qq0b2kdj9zs9mjcjz58gcrkl7s"; depends=[rJava]; }; - RKEEL = derive2 { name="RKEEL"; version="1.1.22"; sha256="1k0xdy23za38lmav7hh9zchy9x61nkdm34s3cqrclzhf4nnlndfi"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; - RKEELdata = derive2 { name="RKEELdata"; version="1.0.3"; sha256="1imz5qsr04hkhblivax30jlvbvjxya6h0z9x7s0llgqssfxbawpy"; depends=[]; }; - RKEELjars = derive2 { name="RKEELjars"; version="1.0.15"; sha256="06wc4x6lhk9akaghqi5bfkfs3yxg29lbga074a5nwadiz2fbnmkv"; depends=[downloader]; }; RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; }; RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; }; RLT = derive2 { name="RLT"; version="3.2.1"; sha256="14im1lvsfpl1vlhc3fmmi4vq41br48mlgqqnwnj0qqxawzzs5738"; depends=[]; }; @@ -2832,8 +2883,10 @@ in with self; { RLumShiny = derive2 { name="RLumShiny"; version="0.2.0"; sha256="0gchhgpdr9fb29apqni9yg72rh3hvvk7ap0869fp459hnygfcl7q"; depends=[data_table googleVis Luminescence readxl rhandsontable shiny shinydashboard]; }; RM_weights = derive2 { name="RM.weights"; version="1.0"; sha256="0757p4174j913k8xh90zg6fpxh25b9415zap1i7ym9ab78kn0k3i"; depends=[Hmisc psychotools]; }; RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; + RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; }; RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; }; RMC = derive2 { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; }; + RMCriteria = derive2 { name="RMCriteria"; version="0.1.0"; sha256="19i7idpkl7ipqcib6rlmbi77n1il9v2hy6s9yyia6m9sz1smxakl"; depends=[dplyr ggnetwork ggplot2 gridExtra linprog lpSolve network pastecs Rcpp RcppEigen RcppNumerical]; }; RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; }; RMOA = derive2 { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[rJava RMOAjars]; }; RMOAjars = derive2 { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76cyjm27qq1clxppc5h16li2m8x68fvpjq"; depends=[rJava]; }; @@ -2841,21 +2894,22 @@ in with self; { RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; }; - RMariaDB = derive2 { name="RMariaDB"; version="1.0-4"; sha256="0xzy1af1w0cjym48zlgdsngksp8j90b0197v78s5jkm1vxmr0ada"; depends=[BH bit64 DBI hms plogr Rcpp]; }; + RMariaDB = derive2 { name="RMariaDB"; version="1.0.5"; sha256="1fykcsb81pdp3v46sjphldj7nizcdp5m7a3j3p1psx0ppgg57r2d"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.4"; sha256="1vns8bl3fnk6hkwmm0wl2c6lgyv3vabsk07kkxrxrl1nzy11wj3a"; depends=[coda matrixcalc msm]; }; RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; RMixpanel = derive2 { name="RMixpanel"; version="0.6-3"; sha256="025fg36jwq44y5m7msmjql3m0avc0hl0iw49wap0fvmzy5qn24qq"; depends=[base64enc jsonlite RCurl uuid]; }; RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; RMySQL = derive2 { name="RMySQL"; version="0.10.14"; sha256="01891kn263b02y6addgpy3gn5axg7m10bqbqv7dg9yx9k85am590"; depends=[DBI]; }; RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; - RNAsmc = derive2 { name="RNAsmc"; version="0.1.0"; sha256="02r8y43hrhjyhmim2yf7s4c46q8ys6b8qla9vwjqpmx5104v5v5g"; depends=[RRNA]; }; + RNAsmc = derive2 { name="RNAsmc"; version="0.3.0"; sha256="15k88skwqcd0m4m502fipdl1iind4mzizqdz4h63izpqfxijl3iz"; depends=[RRNA]; }; RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; }; RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; RNCEP = derive2 { name="RNCEP"; version="1.0.8"; sha256="0nkx33997c5rgc3ch5a2bb6rrw5xw1y71rliygw5k1ldi335rsm7"; depends=[abind fields fossil maps RColorBrewer sp tgp]; }; RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; }; + RNGforGPD = derive2 { name="RNGforGPD"; version="1.0"; sha256="11n7fl1rrgnknn61qw6dh74amhakkjk5wyg0rms554lw9cn86x2v"; depends=[corpcor Matrix mvtnorm VGAM]; }; RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; }; - RNOmni = derive2 { name="RNOmni"; version="0.1.5"; sha256="1lahwala3j0rcxdq1aswngqp89d4za167nrmsbj1lqscd7bn6qkd"; depends=[abind foreach mvtnorm RcppEigen]; }; - RNRCS = derive2 { name="RNRCS"; version="0.2.0"; sha256="1wg7ld6g94wby5lagf68h19qgx2mf0pc8rfvmnz4fac7xpdsg9s8"; depends=[ggplot2 magrittr rvest xml2]; }; + RNOmni = derive2 { name="RNOmni"; version="0.3.0"; sha256="0gddpfv0ggbfxids42npnd0q2bkwz81v3x7h1898qyzql3dg9pwv"; depends=[abind foreach mvtnorm plyr Rcpp RcppEigen]; }; + RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; RNeXML = derive2 { name="RNeXML"; version="2.0.8"; sha256="0ikdv60nkhiv70x1crd21xd92iq2gshj6248m896v1l276513g5j"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; }; RNentropy = derive2 { name="RNentropy"; version="1.2.0"; sha256="19zbjy2xrrsz674qhi6dfzppsgfdy9hp93bqj14p1w3z6smh0k8c"; depends=[]; }; @@ -2895,7 +2949,7 @@ in with self; { ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; }; ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; RObsDat = derive2 { name="RObsDat"; version="16.03"; sha256="06d4svg4crgscn3wyg1fi8v46wlhlrgdrbfiv8ak4a5k5z0gws94"; depends=[DBI e1071 sp spacetime vwr xts zoo]; }; - ROlogit = derive2 { name="ROlogit"; version="0.1.1"; sha256="1bmhq3vcrfxl7flr28x5yhk8akfv59c0xs10s73dchf1qqjfz5ld"; depends=[evd survival]; }; + ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; }; ROpenDota = derive2 { name="ROpenDota"; version="0.1.1"; sha256="0d9a8c008bgzcd1hqly2h010f25xgs2s430hk90yq7vvqr3lmxl7"; depends=[jsonlite RCurl]; }; ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; }; ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; }; @@ -2914,13 +2968,13 @@ in with self; { RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; }; RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.5"; sha256="0cf4mb7mjp7x3k7083c8n8fjbvrmcgq359wh6pdyj817mgkanqzv"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; }; - RPostgres = derive2 { name="RPostgres"; version="1.0-4"; sha256="0ymlz5av86xy434mr319p2sw7gl42dpj5vfi83wfiq1qri2vvx23"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; }; + RPostgres = derive2 { name="RPostgres"; version="1.1.0"; sha256="1h540z1zfzgkayggy28q07r0xnblr3vnp6j5j7la6xbz141gns38"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; }; RPresto = derive2 { name="RPresto"; version="1.3.0"; sha256="01w832ia4c44nhir5rzw33qa8h7afmf04vkfdlg32jaqi1gv5861"; depends=[DBI httr jsonlite openssl Rcpp stringi]; }; RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.11"; sha256="0q05hdlbgbjydi0x80kgfayfkisalvmb9wy1n6afcw66pbikyb4l"; depends=[Rcpp RCurl]; }; RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; }; RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; }; RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; }; - RQDA = derive2 { name="RQDA"; version="0.3-0"; sha256="0p060wilvmz5wyahbga6gxkhs49rw8nb093bfrha7vhqhxnmdyqk"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; + RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; RQGIS = derive2 { name="RQGIS"; version="1.0.3"; sha256="0wrzjfxwciirl838lakcw7f6qyqyykqd999c9krll5krqzyq7c3c"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; }; RQuantLib = derive2 { name="RQuantLib"; version="0.4.4"; sha256="1pki0c265nmgph9dbz2pyrq8h7295mxswavfdwsr7m1lpbpzk8s5"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.7"; sha256="1nxwqb0ybia8cglqlrbwnm9xzab6ayrn5f3j3l0kqszq1rvkfw95"; depends=[]; }; @@ -2929,12 +2983,14 @@ in with self; { RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; }; RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; }; RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; }; - RRreg = derive2 { name="RRreg"; version="0.6.5"; sha256="1hn69zqcafiq1fb38fl4gah90kim8pc2m35sbi1cgkgcbzz1vg16"; depends=[doParallel foreach lme4]; }; + RRphylo = derive2 { name="RRphylo"; version="1.0.0"; sha256="1h167w16lky8aa18fc90rgclx1by3qa9d69n72dxmjzy0d14zjc6"; depends=[ape doParallel foreach geiger lmtest mvMORPH phangorn phytools pvclust R_utils rlist scales smatr]; }; + RRreg = derive2 { name="RRreg"; version="0.6.7"; sha256="0v0rzyknqwrnj3dx5lvifzllv1syzflnnby6mjmnsqqb2cgyscrf"; depends=[doParallel foreach lme4]; }; RSA = derive2 { name="RSA"; version="0.9.11"; sha256="1hsjy755r78my6ib9s9da7mibcjxd5svh2kq0v7a466m60cyfrss"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; RSAGA = derive2 { name="RSAGA"; version="1.0.0"; sha256="1023br8q0i6w18kmn261kf4ql32061hq7xngl1w5mamvvp17d6b1"; depends=[gstat plyr rgdal sf shapefiles]; }; RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; }; - RSCABS = derive2 { name="RSCABS"; version="0.9.2"; sha256="13l4ql40ahm06yi5a9zys62h5452fchkkhlhqh9gzh3pbpyjawgc"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; + RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; }; + RSCABS = derive2 { name="RSCABS"; version="0.9.3"; sha256="08ykkqx9rdx5s6wg2idxz35ddpsz1lir22vrjs92k51zq0jrkhv9"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; RSDA = derive2 { name="RSDA"; version="2.0.3"; sha256="18rka6g93yksgnwgzy4planjvsmc4d5xzf4fxarv57v6frg37y98"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve RColorBrewer RJSONIO rlang scales scatterplot3d sqldf stringr tidyr XML xtable]; }; RSEIS = derive2 { name="RSEIS"; version="3.7-8"; sha256="0f065jkdz91gi6l8y5y4m95vwgjsagrxx6r5982jbafi7zyqxm7j"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; }; @@ -2944,10 +3000,10 @@ in with self; { RSNNS = derive2 { name="RSNNS"; version="0.4-10"; sha256="1khsv1sy8jgsl9s5fypcg77lzj811xzrygwnq6ki9v375sk383gh"; depends=[Rcpp]; }; RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; - RSQLServer = derive2 { name="RSQLServer"; version="0.3.0"; sha256="1p3qds1ni8dm7cb45n4z5ppn3vsjk8mmqlvw76d301qfp3ja5zll"; depends=[assertthat DBI dbplyr dplyr purrr rJava yaml]; }; - RSQLite = derive2 { name="RSQLite"; version="2.0"; sha256="1xpg1i1jkzkzv44k512k90c2vvl960pl2d4a3spwcha6yclyc3vz"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; + RSQLite = derive2 { name="RSQLite"; version="2.1.0"; sha256="0hknfqcgijdapx1ryy20zy68qmm8wsb1hjx4n4hmkgl552z82q5d"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; RSSL = derive2 { name="RSSL"; version="0.6.1"; sha256="03f0i0v0nygkcci42h4bh7jngxz15wsd78cn2zkzbrqadz1c61r5"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; }; + RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; }; RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; }; RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; }; RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; }; @@ -2962,11 +3018,11 @@ in with self; { RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; - RStoolbox = derive2 { name="RStoolbox"; version="0.1.10"; sha256="0qz9k7qjwhgw2hm4b6iys365y8dnd9b9js2yzyxpyqwdwmvmkxjj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; + RStoolbox = derive2 { name="RStoolbox"; version="0.2.1"; sha256="1lvjiaamd2jz1m1prk429lwfwqbm3dcyq6v8hddkynd0k28qbw6s"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; }; RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; }; RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; }; - RSurvey = derive2 { name="RSurvey"; version="0.9.2"; sha256="0mg0g93bli2v5nsm3jqbbm3qxk1kk0ngf8fkdq4z9n8k291shx25"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; }; + RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; }; RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0"; sha256="0p57pb3p6j0g4ngzikys9i4d02p4dc4k0s8k7r1wgdmdy2rak3k2"; depends=[downloader dplyr ggplot2]; }; RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; @@ -2991,14 +3047,14 @@ in with self; { RWeka = derive2 { name="RWeka"; version="0.4-37"; sha256="1q0riy7w2ighyy7fh1hj3q4wa0vbbn6h7nisgkyzwkcxkfq3n2pw"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.2-1"; sha256="006n7m3qxnzvfhkzcr0nbwqdlhygzdhyp8x3534dx6075bm00v0f"; depends=[rJava]; }; RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; }; - RWildbook = derive2 { name="RWildbook"; version="0.9.2"; sha256="1bzdj55v7g2vlffpdsxpl8gv4k1xxd3xl7h1whvq6q5x76lprw0g"; depends=[data_table jsonlite marked]; }; + RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; - RXshrink = derive2 { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; }; + RXshrink = derive2 { name="RXshrink"; version="1.0-9"; sha256="0lzh2asgxk7vjvb8zkshnhh49ybvj1rgca1mspg7hj3012rw6kjn"; depends=[lars]; }; RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; }; RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; }; - RZigZag = derive2 { name="RZigZag"; version="0.1.4"; sha256="1p0p9imdv40vw59m95x00zv9a3knl4m4gwlrbd2v93yzdc1n2a26"; depends=[Rcpp RcppEigen]; }; + RZigZag = derive2 { name="RZigZag"; version="0.1.5"; sha256="0cawn24z0rm78dn8l86k3zfh4z3xp1i910dzxp7xqjzlh3spp4ar"; depends=[Rcpp RcppEigen]; }; RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.4"; sha256="1ri6ybzhfdgbrbfcy12mmvv2ipg61az7vwp1dbjyzs8mgsc1cxb5"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; @@ -3011,7 +3067,7 @@ in with self; { RandVar = derive2 { name="RandVar"; version="1.0.1"; sha256="0vj0p46xmj4129m6r5zg85fnvb5kx1ardwwk55nqypkxd0v58a4j"; depends=[distr distrEx startupmsg]; }; RandomFields = derive2 { name="RandomFields"; version="3.1.50"; sha256="0j7852wvclglp820y2x5r19gsr6ciygbbpl5qvwj1khnlz1hfsid"; depends=[RandomFieldsUtils sp]; }; RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.25"; sha256="0nxk7jhr61l9h76hf96f7ypakl4wip144c0gzr6rqsja6m75rjz3"; depends=[]; }; - RankAggreg = derive2 { name="RankAggreg"; version="0.6.2"; sha256="1hblxvx5symysqfrmapw8ma7ghhmc01rzzc7kpq8vckch2k9x8kb"; depends=[gtools]; }; + RankAggreg = derive2 { name="RankAggreg"; version="0.6.4"; sha256="1bskq723jx87xczw416pijajna73zhjjmbrvh3n6djxy8yjxhrq5"; depends=[gtools]; }; RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; }; RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; }; @@ -3019,7 +3075,7 @@ in with self; { Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; }; RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; }; RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; }; - RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2"; sha256="0bw2j2wx0l56wp0k6fg8dddphggz0fycjzjydsd55rkg4zq6gpf3"; depends=[ggplot2 pROC]; }; + RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.1"; sha256="0dcyajh3vgdl9ssdwgaf3sshq61bqqhjz30f9c99aqnpv3k4k76x"; depends=[ggplot2 pROC]; }; Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; }; Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; }; @@ -3031,15 +3087,16 @@ in with self; { RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; }; Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; Rchoice = derive2 { name="Rchoice"; version="0.3-1"; sha256="1mx50270vbhvng4vdcc6w94f3l890vjl41y07bqkv40n93fxvffw"; depends=[Formula maxLik msm plm plotrix]; }; + Rclean = derive2 { name="Rclean"; version="1.0.0"; sha256="065jq957xsk9p1nnzf8ilp9swjfxhydgc7xg57lfcg9hz99ckwfr"; depends=[formatR igraph jsonlite]; }; Rclusterpp = derive2 { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; }; - Rcmdr = derive2 { name="Rcmdr"; version="2.4-2"; sha256="0027s3g7wzjaqnx3yhn9whpxsrvz7ar70r1a0lwd5hs6g008m8ja"; depends=[abind car effects RcmdrMisc relimp tcltk2]; }; - RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-8"; sha256="1lc26k2f6r37id85baii7rr5m36vy34p6xxl1fjs87s94zifkfsp"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; }; + Rcmdr = derive2 { name="Rcmdr"; version="2.4-4"; sha256="0n15wkhn8hfhcpz0n2ngxkfaysjsizksxxr1fhpfjmlpy4wxxnx0"; depends=[abind car effects RcmdrMisc relimp tcltk2]; }; + RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-10"; sha256="1fxcm0iwxdqh9qv2g6w7sqbg23zgl5z5ib2x69j5n10fglx89m8f"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; }; RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; }; RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; }; RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; - RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.36"; sha256="0yj9z9x185p4kqn10hm6mrl6i64dwyaaywzlmbgzd51m1112fp6r"; depends=[Rcmdr]; }; + RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.37"; sha256="1l990nv5xb6slpk7s5k662ln5gp190g0rr3qxrbh44z0j9vnxl2p"; depends=[Rcmdr readstata13]; }; RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; }; RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; }; @@ -3059,7 +3116,7 @@ in with self; { RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; }; RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; }; RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; }; - RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-2"; sha256="1gg6gi0l0vzcp29c3s8law68bgyms0hczpk41wzzcvvvkhdbr7xi"; depends=[car randtests Rcmdr TeachingDemos tseries]; }; + RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-4"; sha256="0wzcqmrv9qvdcrcz0vcp5fl8f71zg6c355qrr9476524aidb29my"; depends=[randtests Rcmdr TeachingDemos tseries]; }; RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; }; RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; }; RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; }; @@ -3079,7 +3136,7 @@ in with self; { RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.9"; sha256="0nacpipaimb1348rhv1rma85gnd38wsg741pz7xpvn347wnnc0wz"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; }; - Rcpp = derive2 { name="Rcpp"; version="0.12.15"; sha256="1pnv6sl4vdn69ygmgrb1b3gsigfdcfb56wnzikic93l8gkvdsvxv"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="0.12.16"; sha256="1rm8hcy72p1jvxikvmkwg20pjqmvmfvqb45lfghmddp2adp67qfl"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; }; RcppAlgos = derive2 { name="RcppAlgos"; version="1.0.1"; sha256="0668anb3kjw3h71n2hjqqjrmiz4dwrgw71ikviq0imw2v5030392"; depends=[Rcpp]; }; @@ -3088,10 +3145,10 @@ in with self; { RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; RcppBlaze = derive2 { name="RcppBlaze"; version="0.2.2"; sha256="0hi7gh7xlmdcyzxsis8wl841d6czbcgb8qdg8y822am1mvc0wmb7"; depends=[BH Matrix Rcpp]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; }; - RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.8"; sha256="0fwz942pd1r7jcxwqjbagcai153kv7csflhg7agwhxyj49m97i82"; depends=[Rcpp]; }; + RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.9"; sha256="0c6vdrf16f8fyaczzwapzn513wrdklsc8izmzfmfbc58s5500gvk"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.1.7"; sha256="13iax4kr5gchm483gib3cdjcbvkymhiwbpnj705c325fbsfk5rj7"; depends=[Rcpp]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.9"; sha256="102gi1l6hxdkz50iy9xbpb57iy5j7flv78sdq36pn9zi8x4k8k95"; depends=[Rcpp]; }; - RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; }; + RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; }; RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; }; RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.4.0"; sha256="1m6ssq6lvi36ggf26y4hhq996583pxxdb978jnn1x6r9gdb0q0hi"; depends=[Matrix Rcpp]; }; @@ -3110,8 +3167,7 @@ in with self; { RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.2"; sha256="1si5njb8g4g6fjrkqbp3y6z23yxs901nq9kmiwwbqs8di6svc5q3"; depends=[BH Rcpp]; }; RcppRedis = derive2 { name="RcppRedis"; version="0.1.8"; sha256="05c4c65ayiqyzmkj2mrgwwflgjk54rf9nmb3rhickj16yy9b071q"; depends=[BH RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; }; - RcppSMC = derive2 { name="RcppSMC"; version="0.2.0"; sha256="063ds546hd5dfsickiawm5c92sw2kb6n79fqz4gy4hvnbkf00q84"; depends=[Rcpp RcppArmadillo]; }; - RcppShark = derive2 { name="RcppShark"; version="3.1.1"; sha256="0dy6zksxcsbzjyz0f147rk2amwjsrjdcyl6jn767pw9ij9vdzh6r"; depends=[BH checkmate Rcpp]; }; + RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; }; RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; }; RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; }; RcppTOML = derive2 { name="RcppTOML"; version="0.1.3"; sha256="0krw4104m8drgyf53aq22kl5q0abrd0y4j1fvrwsj1dkbkybas05"; depends=[Rcpp]; }; @@ -3128,7 +3184,7 @@ in with self; { Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; Rdimtools = derive2 { name="Rdimtools"; version="0.3.2"; sha256="0wk6sv2ahxscy4nsk826c9rlq8vxgnflg9banwdxhs6qlqhipnlb"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo Rcsdp Rdpack RSpectra Rtsne]; }; Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; }; - Rdpack = derive2 { name="Rdpack"; version="0.5-5"; sha256="19rib96758r2zkq4wlys0gfj60zff34gv1wpb8d7pa34h81gpi9p"; depends=[bibtex gbRd]; }; + Rdpack = derive2 { name="Rdpack"; version="0.7-0"; sha256="0j8jh5zj4nhcchl3xr6n6bvc4m0irjz44mw5690f7iqfi3mzkii6"; depends=[bibtex gbRd]; }; Rdrools = derive2 { name="Rdrools"; version="1.0.3"; sha256="1y805j2xrv8kgh42s5lig07mb76fcz5yrxal0zaykj16cvid8287"; depends=[Rdroolsjars rJava]; }; Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; }; @@ -3148,8 +3204,8 @@ in with self; { RefManageR = derive2 { name="RefManageR"; version="0.14.20"; sha256="18g2w32ldfakmnmlk1gaxq64jhx4iy7kil1s7g6lnvv1fygxpg8k"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; }; RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; }; - RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.0"; sha256="02mf1iy3npa5611kc9ifqcl9ap2bhab9qq5pn6cfyw9lxa3q1if0"; depends=[ggplot2 gtools psych RGCCA]; }; - ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.1"; sha256="12qah22gq9360mw7z2bpcaqyqan10qqbnzyqmkafbkb5jq6fnfx9"; depends=[data_table ggplot2 hash]; }; + RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.3"; sha256="1d7rzvai36h7nmfvi6fdabba3rfa68x53li9jdrlk77mgpgr9vhw"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; }; + ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.2"; sha256="1khk3yi0ixs4lzvng9pjmyyiy86bh5bx7wdyr915p1nbhq6yl2cl"; depends=[data_table ggplot2 hash]; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; }; Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; @@ -3162,8 +3218,8 @@ in with self; { RepeatABEL = derive2 { name="RepeatABEL"; version="1.1"; sha256="00bq9ls4d0kczdv752xasqbavb11bjfvpriggfc8dw3g3i7pizpg"; depends=[GenABEL hglm]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; Replicate = derive2 { name="Replicate"; version="1.0.1"; sha256="110pvissyv3dx1wpwpngcg18mpmpml49gcmdykip55s1d3ljf791"; depends=[metafor]; }; - ReporteRs = derive2 { name="ReporteRs"; version="0.8.9"; sha256="1wsqbn231xqs87dmcry13bdkvv09y17jfqkdnpigcsiivbh3zr3x"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; }; - ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.3"; sha256="0rn000xkkda08kfh1b1l01piw596j3rca8sv4r23q52indrm7vzs"; depends=[rJava]; }; + ReporteRs = derive2 { name="ReporteRs"; version="0.8.10"; sha256="18ivgd3736zcrimcyzfkh5d6h9s1srh7xdz597y596dsssx1lmc6"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; }; + ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.4"; sha256="0q11jcbkv9ibmkqr3mka0w5d797s8xb0155kcs5inlcacirp6wvy"; depends=[rJava]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; }; ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-2"; sha256="08b1aa3183k1y30dwabnd6x353mdp2sn5b908cpv84bs3fdzlrdp"; depends=[MASS Matrix pbapply]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; @@ -3173,14 +3229,15 @@ in with self; { Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; }; Rfmtool = derive2 { name="Rfmtool"; version="2.0.0"; sha256="1a8s4a4mdblzy76ljslfvz8zav2639plhby0ib5ccjnpz2sxhc7s"; depends=[]; }; Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; }; - Rgb = derive2 { name="Rgb"; version="1.5.1"; sha256="136mhxwnw7jkfnmb5gxjr2xfnly79xfp6a6f9c8lj7s6wrgkl02a"; depends=[]; }; + Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; }; Rgbp = derive2 { name="Rgbp"; version="1.1.2"; sha256="1g5v22zjgykzcg5jk7fi03xfn3jzz1yf38izjzhx2433d97hasr7"; depends=[mnormt sn]; }; Rglpk = derive2 { name="Rglpk"; version="0.6-3"; sha256="03v4cav465dkznm7d3bwwpx3qprhq25sp1rb5ncx2lka6inr1vzd"; depends=[slam]; }; Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; }; RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.1"; sha256="0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq"; depends=[png]; }; - Rgretl = derive2 { name="Rgretl"; version="0.2.1"; sha256="07a83nmx3q0yl7fbwqmkmnzxm5rrh8p4nrayv3rj18s1r98i4jph"; depends=[lubridate png xml2]; }; + Rgretl = derive2 { name="Rgretl"; version="0.2.2"; sha256="18jyp4bxs96ri1a4ifd52aj0q6kd2dygz8pkajbd9whq7bn5ick6"; depends=[lubridate png xml2]; }; Rhpc = derive2 { name="Rhpc"; version="0.18-12"; sha256="095mrr6g05y9g8h88k1nf19zmjvg8hnmf5b3r6krqs4cxhp2qls2"; depends=[]; }; RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-12"; sha256="14qypi76h73iv3xwbb860r4f7516jyb88j92lmkifw03x86lx2b3"; depends=[]; }; + Ricetl = derive2 { name="Ricetl"; version="0.2.5"; sha256="0q87cxzqkkp2bk92q3wnxxsqlkafkd37lp5pki7f87a5vcxlcrak"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; Rilostat = derive2 { name="Rilostat"; version="0.2.1"; sha256="058qz5kn7p8wn3lvw92c11cqpkz9brgf1igmawfkb0lqvj366vyd"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; }; @@ -3188,13 +3245,13 @@ in with self; { Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; }; RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.1"; sha256="1kn0vb4nhm3bxlmk5y2nl5m7a7hdvz3nz0yp8rdigpl6b2dp79w1"; depends=[MASS nloptr quadprog]; }; Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; }; - RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.0"; sha256="0qs21qz1zc0wsykd7qhry93il6qz255mgxyxnrdmxf5989k5mvxi"; depends=[]; }; + RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.1"; sha256="06cd1m4liv2bsh2sxplq2zl45g9zq8gsgvh14d0zr0pqm8z4dsyw"; depends=[]; }; Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; }; RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.2.0"; sha256="1gzywhbdkd4f392fasa91ral8wg7jr51b4n1kll7r8hvyjz7bmgy"; depends=[httr Rcpp rjson]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.2.1"; sha256="1nsaab7nysld1gdqnpxd9g68vzs363szyinbfn6j2c7ch0vqcrka"; depends=[httr Rcpp rjson]; }; Rlda = derive2 { name="Rlda"; version="0.2.4"; sha256="01dh6x0yh9y7q8c8qy0zkkn2y18wzg5y90v4gcawdb1adz46izg2"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.0"; sha256="0nnkblrgycvfwn0lb9j92f5wpln69kk54z4irwi35rrfl31f689m"; depends=[Rcpp]; }; Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; }; @@ -3208,7 +3265,7 @@ in with self; { RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; }; Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; }; Rmpfr = derive2 { name="Rmpfr"; version="0.7-0"; sha256="0jpj3nl76jd6vc2p1xwr8jl62q8ckwsdaxqnk9b20srkq63mfrig"; depends=[gmp]; }; - Rmpi = derive2 { name="Rmpi"; version="0.6-6"; sha256="184skad8m4y4pzk8v98b7k7prqxm9mg1b2pfxbknyvzakq6aizv1"; depends=[]; }; + Rmpi = derive2 { name="Rmpi"; version="0.6-7"; sha256="1b62gs7w1xqadqd7ir41jnxlcf14gcqfxd0915kn9ckdlsdrh0sw"; depends=[]; }; RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; }; RndTexExams = derive2 { name="RndTexExams"; version="1.4.1"; sha256="1gi96hfd7dkvmbvy6hj25g1l7nwk4yhxkdjx1l3ws3c2zpi27cvj"; depends=[CopyDetect data_table stringi stringr]; }; @@ -3225,11 +3282,11 @@ in with self; { Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; }; RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; }; RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.0"; sha256="1pkgwglnb68563hiirkagz33jfksbzj3cvdyv13brrzx6jzcvw11"; depends=[Rcpp RcppEigen RobustGaSP]; }; - RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.4"; sha256="1zq62vx5bq2wbdh9irmcfpbpr83qqr9m9icbpksxc8bp9zdsdzkq"; depends=[Rcpp RcppEigen]; }; + RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.5"; sha256="0asxhzybpfmz3zzhr32hvcxrdmdsjlqjvxiihrxc8f4w3qwnzb82"; depends=[Rcpp RcppEigen]; }; RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; }; Rodam = derive2 { name="Rodam"; version="0.1.2"; sha256="0fxsjzillr2v3sxbph13q3wrly6dx6m8rm276qzfvx1md044z14y"; depends=[RCurl]; }; - RonFHIR = derive2 { name="RonFHIR"; version="0.1.0"; sha256="14a5s9w77gb8v4ak5rv22m38d7ga4p4nnqqqhp41jj1snqqw45h3"; depends=[httr jsonlite R6]; }; + RonFHIR = derive2 { name="RonFHIR"; version="0.2.0"; sha256="1kcbv8ibqh7jb3dpj4p73vd168c6vlwi08s9cshl4w6hqbz1pklg"; depends=[httr jsonlite R6]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; }; Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; }; @@ -3239,9 +3296,9 @@ in with self; { RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; - Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.1.0"; sha256="06i8pmvn7fl8likxzzqzkggqf7x20pwi10mcv4x46cacil80ir2z"; depends=[futile_logger R6 rgl stringr testthat]; }; + Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.2.4"; sha256="1klianmsm3msgy5sbigxzx1mzsl915hmam6h2llr274r5gqhg4wh"; depends=[futile_logger R6 rgl stringr testthat XML]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; - Rprofet = derive2 { name="Rprofet"; version="1.1.0"; sha256="1aflqic2jfx9y6mxj155n0900xp20g1lliq8ad4nd4z2k0rfcpi2"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf]; }; + Rprofet = derive2 { name="Rprofet"; version="2.2.0"; sha256="1s0jkq83vfc9jsggnwm31r366b10n6sri2vzpwxybzpjq3d3w5qr"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; }; Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; }; Rramas = derive2 { name="Rramas"; version="0.1-5"; sha256="0wy0flzp68mikq4v9k5pv6hbzx0w9mpa74dwx79i3iiddn0ylby6"; depends=[diagram]; }; Rraven = derive2 { name="Rraven"; version="1.0.2"; sha256="0mhf0vv58la1xh8vc31ak1wfi47zsqbjgxy7zz4bjk90g6110jyp"; depends=[doParallel dplyr foreach kableExtra pbapply pbmcapply vegan warbleR]; }; @@ -3266,9 +3323,9 @@ in with self; { Ruchardet = derive2 { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; }; Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; Runuran = derive2 { name="Runuran"; version="0.24"; sha256="1528jzpg0m4gya63xjf7ya4x1c96anm6bpzjgsa1vq1a4dz9m4y9"; depends=[]; }; - RunuranGUI = derive2 { name="RunuranGUI"; version="0.2"; sha256="0k3vgn027c2zbrk7pc2wcy2h6dn2djhdi70m8fi1qpz6vg7k8c7x"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; }; + RunuranGUI = derive2 { name="RunuranGUI"; version="0.3"; sha256="1h2bcc443z8vp4hjf4vss4ds5n6zc6x70kmw13b2431f56jq12fa"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; }; Rvcg = derive2 { name="Rvcg"; version="0.17"; sha256="0ssmi8mqmq82qrw0hzrmfqpwnkxwdlfa6j049r4l3gn28cfqhg1j"; depends=[Rcpp RcppArmadillo RcppEigen]; }; - Rvmmin = derive2 { name="Rvmmin"; version="2017-7.18"; sha256="14jzwqwi1zd8sg1vb18hgvbvsax38hdqjy540qqhn2xb4z8qx3hy"; depends=[optextras]; }; + Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; @@ -3276,7 +3333,6 @@ in with self; { RxODE = derive2 { name="RxODE"; version="0.6-1"; sha256="1dkz6kq9wq7q2xw2wdzii5682w9f7rmgq28g7pfh8ivimfg1q4bi"; depends=[brew digest dparser inline magrittr Matrix memoise R_utils Rcpp RcppArmadillo rex]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; Ryacas = derive2 { name="Ryacas"; version="0.3-1"; sha256="13qvd5gpdrjgzf6isk3529khd02852y3ajmpp5vl8vn9k1jxp86v"; depends=[Rcpp XML]; }; - Rz = derive2 { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; }; SACCR = derive2 { name="SACCR"; version="2.1"; sha256="184mw9q25b06zar4ii3na7c4x28ly922d5csfqkw9b07mdp81k3h"; depends=[data_tree jsonlite Trading]; }; SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; }; @@ -3338,9 +3394,10 @@ in with self; { SGCS = derive2 { name="SGCS"; version="2.6"; sha256="09czgfc0mg64qcigp36kjaf52zlmrpz3m2d1dp42d9hhlciliqf5"; depends=[spatstat]; }; SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; SGP = derive2 { name="SGP"; version="1.7-0.0"; sha256="0jjrrza8s6sj3gmmldnyxshfmcaf8xhp4g50vc3rcwnkg1jhzkg8"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; }; - SGPdata = derive2 { name="SGPdata"; version="17.0-0.0"; sha256="1pjilyqwhgisz1iiy50l86dwc4dg3c8dzlpx7mm7n75049vzp2xq"; depends=[data_table]; }; + SGPdata = derive2 { name="SGPdata"; version="20.0-0.0"; sha256="0fxv7nnxiaq6z9wii9x5qiy0vd2z8jw3gcwl5fj9m29ja7j3900g"; depends=[crayon data_table]; }; SHELF = derive2 { name="SHELF"; version="1.3.0"; sha256="0qhkp1ypbimiq9r8yv95bipbmhm7b38ibbk9nmhdckrr6ymd2w35"; depends=[ggExtra ggplot2 MASS shiny tidyr]; }; SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; + SI = derive2 { name="SI"; version="0.1.0"; sha256="11ywmyz4mamk30p4m9qvgmba237s1xvabablh91rwq13089x8nxm"; depends=[]; }; SIBER = derive2 { name="SIBER"; version="2.1.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; }; SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; }; SIDES = derive2 { name="SIDES"; version="1.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; }; @@ -3400,6 +3457,7 @@ in with self; { SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; }; SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; }; SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; }; + SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; }; SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; }; SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; }; SPOT = derive2 { name="SPOT"; version="2.0.2"; sha256="17apfbsh4qv3yhv7jpmmyz7whwx4ilm0krspxyc4knm3yxxw26bp"; depends=[DEoptim MASS nloptr randomForest rgenoud rsm]; }; @@ -3407,13 +3465,13 @@ in with self; { SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; }; SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; }; SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; }; - SPUTNIK = derive2 { name="SPUTNIK"; version="1.0.1"; sha256="1b8rawkcq15r4cyji245x59l1m3qkj0n31nhs1bjd3286zpdcg7b"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; }; + SPUTNIK = derive2 { name="SPUTNIK"; version="1.0.2"; sha256="0hf6g3s17ri1qzl1180s4akyhp98lj6zx5ix1z6rh53gk6dvxb5l"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; }; SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; }; SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; }; SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; }; SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; }; SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; - SQRL = derive2 { name="SQRL"; version="0.2.1"; sha256="01nad4j2q20agi62zay0n731ljwgil7ql0gick5s7f9khhciilf6"; depends=[RODBC]; }; + SQRL = derive2 { name="SQRL"; version="0.3.0"; sha256="1d4wnm03a900gyhayxkrqpwyxmj8mbqadhi3bzqvi6wb01517a0r"; depends=[RODBC]; }; SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; @@ -3426,24 +3484,26 @@ in with self; { SSN = derive2 { name="SSN"; version="1.1.12"; sha256="1c2dx7d9izd4z76pvsbbfb0r1a6w45x96mv4vb9h99yafcw380nv"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; }; - SSrat = derive2 { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; }; + SSrat = derive2 { name="SSrat"; version="1.1"; sha256="1mmwla7yqqldv0s5hqljq2k2qljdfhq97m5128gvf3iy7n2yjzgj"; depends=[plyr sna]; }; SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; }; STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; }; STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; }; - STARTS = derive2 { name="STARTS"; version="0.2-10"; sha256="16d578rgl13x29lbv95g7qrcf0lmxjcz8mxrrd5cb7405bl4a1rq"; depends=[CDM LAM sirt]; }; + STARTS = derive2 { name="STARTS"; version="0.3-24"; sha256="13963x27y81ahwnhzghq3wadlkkq8k8mga2ap2knx5p980fj1jb7"; depends=[CDM LAM sirt]; }; STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; }; STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; }; STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; }; STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; }; STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; }; STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; }; + STV = derive2 { name="STV"; version="1.0.0"; sha256="034d9qnvgmk97ah7r9w2hvnw39f7mxs2ml6y8dad94p8phl52gfw"; depends=[]; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; SUMMER = derive2 { name="SUMMER"; version="0.1.0"; sha256="14dq64h931l8r4pfhdg3i8wabb08n1fnnp8ql1bmhl1z4dqbggfl"; depends=[classInt ggplot2 maptools RColorBrewer sp spdep survey survival]; }; SVMMaj = derive2 { name="SVMMaj"; version="0.2-8"; sha256="13d9v1l85md1v6qyfrdc3l36yanw5canskngjr1sh0hmyla182bz"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; }; SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; SWMPr = derive2 { name="SWMPr"; version="2.3.0"; sha256="1z6gg8ih1m5nxm1kilpwxj4xvlbyqr67la7idrfa722y6f6264rf"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; - SYNCSA = derive2 { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[FD mice vegan]; }; + SWMPrExtension = derive2 { name="SWMPrExtension"; version="0.3.12"; sha256="1l79576a4v7kdgnb3skmakbfgnxfr069dn60v31x1fjq75k2lklq"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp stringr SWMPr tidyr]; }; + SYNCSA = derive2 { name="SYNCSA"; version="1.3.3"; sha256="1g00jzghvvhnj2npplh87bwbm479mwldskhard0vjlfmagbhjm8p"; depends=[FD permute RcppArmadillo vegan]; }; SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; @@ -3474,31 +3534,31 @@ in with self; { Segmentor3IsBack = derive2 { name="Segmentor3IsBack"; version="2.0"; sha256="0c7ag9svd1xlm60padg41gvz7qnbcp41kg3cz2dvi9hy2yrqw0qd"; depends=[]; }; Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; }; - Select = derive2 { name="Select"; version="1.2"; sha256="0ljlh7zj4r3izns47sa8bx17ll0ki6p02fpjxwghy1hz9k6ak9ir"; depends=[lattice latticeExtra Rsolnp]; }; + Select = derive2 { name="Select"; version="1.3"; sha256="0gl0rba9d2l3r70wnxlc3d9s8lcgxl9scsb27x4zid5a3y7n7mpw"; depends=[ade4 FD lattice latticeExtra Rsolnp]; }; SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; - SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.8"; sha256="1f4cpqjb737fz6iiadhdi1ansfi5wj1zl403b3xw7l20k4f39952"; depends=[MASS survival]; }; + SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.0"; sha256="1f1rv48qpmgg0z25vmz48ziimj6bwnxlzf2k4i1xwb53qxxyysxw"; depends=[Formula MASS survival]; }; SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.3"; sha256="1qfsy88bd07xk3gy2r7cjcs6fhx9889aqn1494d92msxmc6zvcz7"; depends=[MASS numDeriv Rsolnp]; }; - SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; }; + SemiPar = derive2 { name="SemiPar"; version="1.0-4.2"; sha256="0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w"; depends=[cluster MASS nlme]; }; SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; }; SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; }; SensMap = derive2 { name="SensMap"; version="0.6"; sha256="0j52aplvdlwwfswyrij0vv7zsdr015cn5931c6631rlps94gka0w"; depends=[doBy factoextra FactoMineR fields ggdendro ggplot2 glmulti lattice MCMCpack mgcv plotly shiny]; }; - SensMixed = derive2 { name="SensMixed"; version="2.0-10"; sha256="0r2lga40xr782n1viyxc4wn9gzgm7g2ick45pfnkgq6m60wx9rfh"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; }; + SensMixed = derive2 { name="SensMixed"; version="2.1-0"; sha256="0ykg94amnm9clf8d3naap8fmv9qqc6j1q52wnb83zk7ry44dp7dh"; depends=[doBy ggplot2 Hmisc lme4 MASS plyr reshape2 shiny shinyBS xtable]; }; SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive2 { name="SensoMineR"; version="1.23"; sha256="0a1s2wrb86a0y2faxj5ax8fa6vfcclgg7bcff4j7jb40ilxnxhn4"; depends=[AlgDesign cluster FactoMineR ggplot2 gtools KernSmooth reshape2]; }; SensusR = derive2 { name="SensusR"; version="2.2.0"; sha256="0ahgy6mvlxfdavdarmfmb1ld1pykhbrjgg8mdh5q71b3a75vbp47"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; }; - SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-0"; sha256="098w4kcd6xsgwi996plm06nmyg8f7sg9wjphymmfl29k5y2zyz4s"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; }; + SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-2"; sha256="18vycj9vpb32610sn321sbwdnjldyjm9idjw9spggdzj7gsiwwk3"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; }; SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; }; - SeqBayesDesign = derive2 { name="SeqBayesDesign"; version="0.1.0"; sha256="0426v7lf7z0r8lc9clwnq6n977m27cd7l218i5dfssllkv17h88k"; depends=[MASS Rcpp]; }; SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.6"; sha256="0y06am4q9cgf8cfycw9ym5qys0g99ks3cfxgk0mss34i5vhbfjfr"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; }; SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; }; + SeqKat = derive2 { name="SeqKat"; version="0.0.6"; sha256="0idxyn84rqsg26y6ml218g037qxrx9755ikasyn212qacc36in39"; depends=[doParallel foreach Rcpp]; }; SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; }; SequenceAnalysis = derive2 { name="SequenceAnalysis"; version="1.3"; sha256="0jrpq5ryw7rwkv99w0a5p3r0vj8nbzj6adlcsr84d9ffgxafmhif"; depends=[XML]; }; Sequential = derive2 { name="Sequential"; version="2.3.2"; sha256="01zvgvdj57js08krskahk1ng3wkv9iblmirslgrmllf4q18zwsdr"; depends=[]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; SetMethods = derive2 { name="SetMethods"; version="2.3"; sha256="10xzvr7xfv2vwa3byw4qb3v8gi8d36w9drjzqsxx52ffnjb95670"; depends=[betareg fmsb lattice QCA]; }; SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; - SetTest = derive2 { name="SetTest"; version="0.1.0"; sha256="0b5lkdhaymi3vsx9acdn9jxvqwwsac9lbdr43c44c06gglqlvk47"; depends=[]; }; - Seurat = derive2 { name="Seurat"; version="2.2.1"; sha256="1sr82nf38hq07avrfn8vlrzjq7dfm4pcr8l1nh6mnglcql2bk9z2"; depends=[ape caret cowplot diffusionMap dplyr dtw FNN fpc gdata ggplot2 ggridges gplots gridExtra Hmisc ica igraph irlba lars MASS Matrix metap mixtools pbapply plotly ranger RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; }; + SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; }; + Seurat = derive2 { name="Seurat"; version="2.3.0"; sha256="0kp3lw1s896zkjd6x2wp8qcg7wnm5b40g8vihps13f1m7j4nx7r0"; depends=[ape caret cluster cowplot diffusionMap doSNOW dplyr dtw fitdistrplus FNN foreach fpc gdata ggplot2 ggridges gplots gridExtra Hmisc ica igraph irlba lars lmtest MASS Matrix metap mixtools pbapply plotly png ranger RANN RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; }; ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; }; @@ -3506,7 +3566,7 @@ in with self; { ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; }; ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.6"; sha256="126rvy7pra60fz7pmc6n9liahhwrq313gbqrkvcpcwdv807l39c8"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; }; ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; }; - ShortForm = derive2 { name="ShortForm"; version="0.3.0"; sha256="03yxn535yv11l5ckw26jd0maf2k0xpvichid5vwn0vb1f6ryk1xn"; depends=[lavaan MplusAutomation]; }; + ShortForm = derive2 { name="ShortForm"; version="0.4.0"; sha256="0fvv42n2dsl4602scad74w11vj1id9dzsj5szv7xnbgv8lzaawjm"; depends=[lavaan MplusAutomation]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; }; SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; }; SiMRiv = derive2 { name="SiMRiv"; version="1.0.3"; sha256="1kzvbzmqcxs0sh23nmjd39zkg68kbnc5djpbjhqhn55qjdfx5776"; depends=[mco raster rgdal sp]; }; @@ -3529,9 +3589,11 @@ in with self; { SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.1.0"; sha256="1krdz4gxnqxj3wabc5hn7ayfqdfmpgg66zj09b3jnngcdaxkjlwb"; depends=[dplyr kinship2]; }; SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; + SimRepeat = derive2 { name="SimRepeat"; version="0.1.0"; sha256="1vq82wlnas0jkl8hlj7dnnbn4y1a56lmszs4w7wya7acri92gkqm"; depends=[BB ggplot2 MASS Matrix nleqslv SimCorrMix SimMultiCorrData triangle VGAM]; }; SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; + SimilaR = derive2 { name="SimilaR"; version="1.0.1"; sha256="1icm34g15c616q5ckf1d664kk6fchjbn4mw2d0bjshqsvlvn89ji"; depends=[BH Rcpp stringi]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; @@ -3540,7 +3602,7 @@ in with self; { SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; }; SimultAnR = derive2 { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; - SixSigma = derive2 { name="SixSigma"; version="0.9-51"; sha256="0101zdz2dqlazg7k8li762g58z0xds76s8nzjjfb3y2j5nqkbjga"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; + SixSigma = derive2 { name="SixSigma"; version="0.9-52"; sha256="07s4an2az2pgqhq9c08jrf6b95nrs1b3r1092d53n1ps8wbdmbln"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; }; SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; }; SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; }; @@ -3548,6 +3610,7 @@ in with self; { SkyWatchr = derive2 { name="SkyWatchr"; version="0.8-2"; sha256="0if44d79j2hlxdccn3jd7lrfbhrr09rfhfgds132syxprwkcb2mr"; depends=[htmlTable httr sp]; }; Sleuth2 = derive2 { name="Sleuth2"; version="2.0-4"; sha256="18mh1svmb96hw3rjmgxlwzs7kdcvjkxf4zm8k4w0sxz94ks062i7"; depends=[]; }; Sleuth3 = derive2 { name="Sleuth3"; version="1.0-2"; sha256="0b4g7j8a204wyvh0q9n1l4zrl9rk7ibyfijd49mjjdyg9zz4kbna"; depends=[]; }; + SmartEDA = derive2 { name="SmartEDA"; version="0.1.0"; sha256="1wxj71fa91q2nxnl8l5iikgw6bqwphp8ymcnqisll1kp1w5f2g22"; depends=[ggplot2 gridExtra ISLR rmarkdown scales]; }; SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; }; SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; @@ -3556,6 +3619,7 @@ in with self; { SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; }; SmoothWin = derive2 { name="SmoothWin"; version="1.0.0"; sha256="19yd3gnanv8q8ab0x8ds61rznm5w71dri0liknylikiqgbqwxrcn"; depends=[msgps]; }; SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.7"; sha256="1i8g0p51mp0j46434zzhmijwwk1v6my7rdw8j41ac3b4as3g0c73"; depends=[jsonlite Rcpp stringr]; }; + SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; }; SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; }; SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; }; @@ -3589,7 +3653,7 @@ in with self; { SparseM = derive2 { name="SparseM"; version="1.77"; sha256="0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"; depends=[]; }; SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; }; SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; }; - SpatMCA = derive2 { name="SpatMCA"; version="1.0.0.2"; sha256="1xm29ybbdxspj2ylkkd9qh17sizz1gkc3l34y3d0ivmxz64vn6pj"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; }; + SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; }; SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.0"; sha256="12b9ijbzzkhwrs7q0z5srawiskr3gdjvgdsrmsn4dhyqdzdbi8b6"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; }; @@ -3598,7 +3662,7 @@ in with self; { SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-6"; sha256="14clsb7w7p39ak00127lfa7irl67vqydvafkj8vs8qn9i3kaj6iz"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.0.3"; sha256="14nbl0kb4c46kxvw900d972n78x6q0y9039l6p4r9w2i9ir7g1yh"; depends=[fields reshape2]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-2"; sha256="048zzyy3hav8qg0zad2fsv5z1avdppwwdcv0rc6j635wzhdmsl1j"; depends=[]; }; - SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; + SpatialPack = derive2 { name="SpatialPack"; version="0.3"; sha256="12mx62drwqx351x4jfvv87rxr28ggz7iw83firkzr5xwfwfgr02c"; depends=[]; }; SpatialPosition = derive2 { name="SpatialPosition"; version="1.2.0"; sha256="140fg3bjj7383nrdbgnk9lccj4yjq65rkprqpmf4q0mwbc89mmqc"; depends=[raster rgdal rgeos sp]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVx = derive2 { name="SpatialVx"; version="0.6-2"; sha256="12kwwhxlvlkss1rg9ipaw97l5kw50m7crpcpv1y420sf14873j7r"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; @@ -3612,7 +3676,7 @@ in with self; { SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; SqlRender = derive2 { name="SqlRender"; version="1.4.8"; sha256="08q9h6aca7vzgy1ipvghvrspdvmzlgmvhjgibcn38lfyl09xyfas"; depends=[rJava]; }; StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; }; - StMoMo = derive2 { name="StMoMo"; version="0.4.0"; sha256="0zkcp19a76dm29fba5r96dxly709sic2k5p9hzc70cvwjhwhfr7v"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; + StMoMo = derive2 { name="StMoMo"; version="0.4.1"; sha256="1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; }; StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; }; StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; }; @@ -3622,7 +3686,7 @@ in with self; { StanHeaders = derive2 { name="StanHeaders"; version="2.17.2"; sha256="11fcc59z63rkgk6pp5vhb5avjlbhbjs2v5mn496ai9jms4223ivc"; depends=[]; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; - StatCharrms = derive2 { name="StatCharrms"; version="0.90.7"; sha256="082pwqn08b9ij0vmc68sf43fin2hp16mlpi3d0i9ynpda9v22nr8"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; }; + StatCharrms = derive2 { name="StatCharrms"; version="0.90.9"; sha256="1r11zzfzhps234nzkpxw0qw0phjcdww8dkh2l6z6qkvc4495x0zh"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; }; StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; StatMatch = derive2 { name="StatMatch"; version="1.2.5"; sha256="1162yqqrxkbpchdxdibpk5ccv55krvh9j150jgr047zzghr9ansa"; depends=[clue lpSolve proxy RANN survey]; }; @@ -3650,7 +3714,7 @@ in with self; { StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; }; SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; }; - SubTite = derive2 { name="SubTite"; version="2.0.1"; sha256="1wmsks2dn3lv2m818g57115aqi821bs6ik94hx75knkfvw1835ys"; depends=[Rcpp RcppArmadillo]; }; + SubTite = derive2 { name="SubTite"; version="2.0.3"; sha256="1i95f3x1nkhx9kqzxwvi15x6yq7mcdihzjxh60la6jvq5nscfi3l"; depends=[Rcpp RcppArmadillo]; }; SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; }; SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; }; @@ -3660,9 +3724,10 @@ in with self; { SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.0"; sha256="184s0pnwv9irqjlv24svfz3ami559ln03wjknyj67pwi4pfbzz87"; depends=[]; }; SuperGauss = derive2 { name="SuperGauss"; version="1.0"; sha256="1yqskaz4zsx87mcb9p7081h2lilaiwa3213yxlkyihyans7gnmp8"; depends=[fftw Rcpp RcppEigen]; }; - SuperLearner = derive2 { name="SuperLearner"; version="2.0-22"; sha256="1yajqqsxfrp9ybaa8ffwdrbwm3rfy5pgp6ma1ak43qg3plclllyr"; depends=[cvAUC nnls]; }; + SuperLearner = derive2 { name="SuperLearner"; version="2.0-23"; sha256="04bsgxdczw5gr8mkyxgzrsawv2zfcab5jd85azac3m2n08402v44"; depends=[cvAUC nnls]; }; SuperRanker = derive2 { name="SuperRanker"; version="1.1.0"; sha256="19cfz89557ygf5dvvqykmxcr72sfa0s2d37pplp6iwbhkl4wfw04"; depends=[prodlim Rcpp]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; }; + SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="0.1.0"; sha256="0cw2nsqc9dx36svb49pqkmrxwk5hhbih206mwwkzfyavswxd2lpv"; depends=[gstat gtools raster rgdal rgeos sp]; }; Surrogate = derive2 { name="Surrogate"; version="0.6"; sha256="18cqcnzf64wk33qshsamija0r9xpnca0w2a8qz1ikj9r21vabhhw"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; }; SurrogateTest = derive2 { name="SurrogateTest"; version="1.0"; sha256="0dw8ic2rskwhj9f013q0j5my7qfsqihfis93frrlz4qag68jddqn"; depends=[survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; @@ -3672,19 +3737,19 @@ in with self; { SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.4"; sha256="0ipr7lajnrklk963lrlgx946l6r191q3bfif4njkdmw0x797nzm2"; depends=[numDeriv survival]; }; Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; - SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-2"; sha256="1997nbczgf5xkvj257fa211wxl85lq4jpybjl2q4hajn05ahq7yp"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; + SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-4"; sha256="1b0h1jfywsrfdj8dkbnlzvh7654rycagxij9jbzb65g6swss6ajx"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; SweaveListingUtils = derive2 { name="SweaveListingUtils"; version="0.7.7"; sha256="04yxhphf069y29b40i34kr4hvlcv8kgr6kqc2vdz2a40564fdsjb"; depends=[startupmsg]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; }; - SympluR = derive2 { name="SympluR"; version="0.1.0"; sha256="11ni1x2k24b8g62gga0wvfxhjjf0pm4bir8sjspk97sii4l19037"; depends=[httr jsonlite plyr]; }; + SympluR = derive2 { name="SympluR"; version="0.3.0"; sha256="0a3irbk5bh3af8rv4l4sh3ymj3icyqjv5akzmx6rrp6pr3mgq6c6"; depends=[httr jsonlite plyr readr]; }; SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; }; SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; - TAM = derive2 { name="TAM"; version="2.9-35"; sha256="0n49g642xn3c82843l03rhksjbdq81bibj084aihw1nnby1l67k4"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; }; + TAM = derive2 { name="TAM"; version="2.10-24"; sha256="1ax7b7q4slwcjamapbmnaaahrwdhrcbasjjgycdk5d7gzrzyygnx"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; }; TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; }; TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; }; @@ -3695,7 +3760,6 @@ in with self; { TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; }; TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.2"; sha256="1fgjmz297jckdb0xsly1scq5n8y8awfgdkr4yfml4lim2mkdsigx"; depends=[httr jsonlite]; }; - TDA = derive2 { name="TDA"; version="1.6"; sha256="1i0jgj72rpxn7icgl5f43c7lyq4jghmz4r9jn7bxa5kbavc8asy3"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; }; TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; }; TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; }; @@ -3712,7 +3776,7 @@ in with self; { TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; }; TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.6"; sha256="1892jmgqywm0jp5l5k88brp4h8szkbi9bxi0v1jni1929qnsmqyf"; depends=[Rcpp]; }; TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; - TFisher = derive2 { name="TFisher"; version="0.1.0"; sha256="1fvqgy9djhcyrnvvbb3r4p7p3206qsm6yrnv444x48gmadl3mfym"; depends=[mvtnorm sn]; }; + TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; }; TH_data = derive2 { name="TH.data"; version="1.0-8"; sha256="17csnwyk2f3d47nghkfy9wly5kff8zhdcfwfml7509hjrjgi13s7"; depends=[MASS survival]; }; TIMP = derive2 { name="TIMP"; version="1.13.0"; sha256="0b6g2afwjz2m7bnfhx1pjmq6x1ghjxgrwi6hz1l867qa4i2yx5hx"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; }; TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; }; @@ -3721,12 +3785,12 @@ in with self; { TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; }; TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; }; TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; }; - TMB = derive2 { name="TMB"; version="1.7.12"; sha256="06gky76x5bc95l22ygnnamgdym7ysnqg42fa213ic9ws2rjv40ni"; depends=[Matrix RcppEigen]; }; + TMB = derive2 { name="TMB"; version="1.7.13"; sha256="1cbm8vgjfd00678h011jzf0zjkvbv427nkp0924g2xmiai6c15xc"; depends=[Matrix RcppEigen]; }; TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; }; TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; }; TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; - TOSTER = derive2 { name="TOSTER"; version="0.3"; sha256="0yjvxb2a2vx1zjg8sqsbz5p1qpnv6kbxrnkz76m08s3hn6ql4jpx"; depends=[ggplot2 jmvcore R6]; }; - TP_idm = derive2 { name="TP.idm"; version="1.3"; sha256="1j1s48342kg2lvydfy0250lyyzchj9qr6qi7d4rwy5xpvx8sy2b0"; depends=[]; }; + TOSTER = derive2 { name="TOSTER"; version="0.3.2"; sha256="1sfb01cvm9h3gd2x3bs8014czlgbnnwl5gy4frknz3b9qyazi2cy"; depends=[ggplot2 jmvcore R6]; }; + TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; }; TPD = derive2 { name="TPD"; version="0.1.2"; sha256="1h8lgcrlsk68x2y01vgcn7dpq5q5180khz4csr8jbscbcdwljcl9"; depends=[ggplot2 gridExtra ks mvtnorm]; }; TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; }; @@ -3772,6 +3836,7 @@ in with self; { TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; }; TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; }; TUWmodel = derive2 { name="TUWmodel"; version="0.1-8"; sha256="0c00jd2bq4i5fd55hj7l2grkpn990p0kmhbsh95b2zrzhbwgcjp6"; depends=[]; }; + TVsMiss = derive2 { name="TVsMiss"; version="0.1.1"; sha256="1lvswq3syp2mfcf0higmyg5k5qhg1q6jaz8g75az3xajn4jylm0k"; depends=[glmnet Rcpp]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableMonster = derive2 { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; }; TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; }; @@ -3785,7 +3850,7 @@ in with self; { Taxonstand = derive2 { name="Taxonstand"; version="2.1"; sha256="0dvhiqggbv1by284fg38rcvvrxr9q3zp5gh51p1dh0129h73qj7i"; depends=[pbapply]; }; TcGSA = derive2 { name="TcGSA"; version="0.10.5"; sha256="14gnlk2r0q9zjc3431v97s7ydcyycvl0xh8bmz08mhzi20snrkpq"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; }; Tcomp = derive2 { name="Tcomp"; version="1.0.0"; sha256="0ddswvww9yk31gh8qb9nh0glf9w2mp3ny7zps79kdcnvbkrpcbfs"; depends=[forecast Mcomp]; }; - TeXCheckR = derive2 { name="TeXCheckR"; version="0.4.4"; sha256="1dbs9i5py9amnx8l6z74py12v52d1b0wl0azcwqsgd8n76xlfqg1"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr readr rstudioapi stringi zoo]; }; + TeXCheckR = derive2 { name="TeXCheckR"; version="0.5.1"; sha256="18p3hyrrglgn2fdn5q9p1ayb58nznpdr5sy9mniybzsxrmfhghax"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; }; TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; }; TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; @@ -3804,6 +3869,7 @@ in with self; { ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-0"; sha256="075cn99k06lgdd0cwl1i9242fcxwmd5malcyks0mmwjf9kzw00z2"; depends=[MASS numDeriv]; }; ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; }; ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; + Thresher = derive2 { name="Thresher"; version="0.12.3"; sha256="1lrydxrv67ga73bzxyvnibmggr9kixq2jb6as4cv35rm93vs5mrg"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; ThresholdROC = derive2 { name="ThresholdROC"; version="2.6"; sha256="0ah102z6v9k5pxp3kbj5ffa9vhb7vi7axjkrg5qy5b4spnb71qsg"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; @@ -3815,13 +3881,13 @@ in with self; { TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; }; TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.2"; sha256="1a44fb29yacwgdiwaf5fpxzc5222cpi5mkv7l0dh43b6lh8f0j5k"; depends=[forecast jsonlite locfit trend tseries]; }; - TimeVTree = derive2 { name="TimeVTree"; version="0.2.1"; sha256="0657y6s4w83yda36q1isr3zwd8vv9wminljdpivs8c89p0cwm3yb"; depends=[survival]; }; + TimeVTree = derive2 { name="TimeVTree"; version="0.3.1"; sha256="124kg9zcq4b2j4qvg9f6gykbmzf69qjnnw54nv213ip2h4rdkv32"; depends=[survival]; }; TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; }; Tinflex = derive2 { name="Tinflex"; version="1.2"; sha256="0rx4aj0bxiaaap3f43jzf3rlmrjp0g8aplg1ybccdyahx4p727bn"; depends=[]; }; - TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-7"; sha256="1lc63xghjny45nkrppf06lxvhbqnw9w5i06bmncm90hm0kam092b"; depends=[DescTools mclust TeachingDemos]; }; + TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-8"; sha256="1yx4jyh3a5s4h8anvd6pc73fzzcfdll4kp89b2xi0i01yswx22pd"; depends=[DescTools mclust TeachingDemos]; }; TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; }; Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; }; - Tmisc = derive2 { name="Tmisc"; version="0.1.17"; sha256="11i807ma7mhx9ba675ifs42b5gr2dgr2z2zx35ga0jav464n9vk0"; depends=[audio dplyr rstudioapi tibble]; }; + Tmisc = derive2 { name="Tmisc"; version="0.1.19"; sha256="148kgy1pgn03f9h72i0zg62lamdnjl1hbwkzgrnr8p0zw5i0v1xm"; depends=[dplyr rstudioapi tibble]; }; Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; }; ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.2"; sha256="0x05phwm6gqw1pmars1ypg86sggflffw9g2d0lc5gfsy93nrg0rv"; depends=[calibrate HardyWeinberg MASS]; }; TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; }; @@ -3839,7 +3905,7 @@ in with self; { TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; }; TreeBUGS = derive2 { name="TreeBUGS"; version="1.3.1"; sha256="0zwbp7z31hw6krwhf21wpy5ryfhf0hhipjrsmvbrb7d4sx9am2vb"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; - TreeSearch = derive2 { name="TreeSearch"; version="0.0.8"; sha256="1w65pw2qj5jcpg2v41kyhp0zq7pr56rxw1vrshxcpwxlwjj1sii6"; depends=[ape memoise phangorn R_cache Rdpack]; }; + TreeSearch = derive2 { name="TreeSearch"; version="0.1.2"; sha256="0q25zw53whp1v57pkc50h2j7jb64jpip00s0qnmvdgncbrs4zhx5"; depends=[ape memoise phangorn R_cache Rdpack]; }; TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; }; TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.2"; sha256="0ymlgalddnfnb55s31bysm68yh823ys0rr5fgiic4a2ipnbfd8qf"; depends=[pROC rms]; }; @@ -3857,6 +3923,7 @@ in with self; { TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; }; + TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; }; TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; }; UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; }; UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; }; @@ -3864,7 +3931,7 @@ in with self; { UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; }; UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; }; UPMASK = derive2 { name="UPMASK"; version="1.1"; sha256="1qxajvld8g2mii12agypcm50fps9bai6d2wx6l0bv3srk80in7ai"; depends=[DBI MASS RSQLite]; }; - USAboundaries = derive2 { name="USAboundaries"; version="0.3.0"; sha256="0rza1np6320xm9ppn458cwgz4zaq173m3g0ylvxbx1fxq716lqj6"; depends=[]; }; + USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; }; USCF = derive2 { name="USCF"; version="0.1.3"; sha256="00ynxfd4lg8g4mspz5izxvgkj27l2i1cnp0z0dnkhsbxsg0161mj"; depends=[]; }; USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; }; UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; @@ -3878,8 +3945,8 @@ in with self; { Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; }; Umpire = derive2 { name="Umpire"; version="1.3.4"; sha256="0kxndg96ah6sk1m216f2dmkg73w10lyg3rv7qsrnn145mznsdlw1"; depends=[]; }; UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; - UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.6"; sha256="17xirpichh4c9qajkz4xywd8881wqdni6d3pqvsy2h13fvidb83q"; depends=[nloptr reshape2 rootSolve]; }; - UniDOE = derive2 { name="UniDOE"; version="1.0.1"; sha256="1hjraksvxvxz4xbrq97x6xf3r0f90c484ix92zapylyxvkifx628"; depends=[Rcpp]; }; + UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.7"; sha256="0b7mx919lbj12zrj8l01wfrdpqiq7s7p9q25alp7yf4jpv9w4vfa"; depends=[nloptr reshape2 rootSolve]; }; + UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; Unicode = derive2 { name="Unicode"; version="10.0.0-1"; sha256="1kj4b29gj3p0wzlzxqn7lwzabair6np705va0nxissfybpmwalgk"; depends=[]; }; UnivRNG = derive2 { name="UnivRNG"; version="1.1"; sha256="0vjsqc1y24z7zlclglh55kkxjhy0dc5gjsy427zdv95j58jbxa66"; depends=[]; }; @@ -3887,7 +3954,7 @@ in with self; { UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; }; V8 = derive2 { name="V8"; version="1.5"; sha256="155389k8laa48akg0bfsz65s4ddmpk0xpi1ha56z1sayv01vrrgc"; depends=[curl jsonlite Rcpp]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; - VARSEDIG = derive2 { name="VARSEDIG"; version="1.5"; sha256="07zc1k3h9bh0vlqmxqgpniq8ccsfv99bp18h9x9gjl24dppc0xz7"; depends=[]; }; + VARSEDIG = derive2 { name="VARSEDIG"; version="1.6"; sha256="1iddpll0fdspzxxf2g1d6zwfs0xrnbq5zrch2a9flrfz2iam6brk"; depends=[]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; }; VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; }; @@ -3908,13 +3975,13 @@ in with self; { VNM = derive2 { name="VNM"; version="6.1"; sha256="195fcgs6rzpji250j5kikim4k2rfg1gqgz65f2vgfbmz76wi4za6"; depends=[Rcpp]; }; VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; }; VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; }; - VSURF = derive2 { name="VSURF"; version="1.0.3"; sha256="0fgy1qk1jkrnil4cirkp2lj21xjwbpgjgxqrsjs321s69rw2dy1j"; depends=[doParallel foreach randomForest rpart]; }; + VSURF = derive2 { name="VSURF"; version="1.0.4"; sha256="1sby2ls8yhxv4hx0y508pypsj1sbc0d269yl0xnqbxz44bhj8zzm"; depends=[doParallel foreach randomForest rpart]; }; VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; - VWPre = derive2 { name="VWPre"; version="1.0.1"; sha256="1q6i1ijw9sx5k9k1gpmhsm99hwgsj6kjkak3lnq7458563vd640m"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; + VWPre = derive2 { name="VWPre"; version="1.1.0"; sha256="1ccrim9nx5fmmadg687gz9qrfkyxp48rskg1n2pxfwd3h10c9js1"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; }; VarReg = derive2 { name="VarReg"; version="1.0.1"; sha256="00ygs9gk2719fnhb47z1pj7qacapzg9qs1li2206vsfrmqxjvj1a"; depends=[sn survival]; }; - VarSelLCM = derive2 { name="VarSelLCM"; version="2.0.1"; sha256="08kpnppa5mm1xjbdgl354py9jy57x4r0nbv8z4skzc1k972qrgy9"; depends=[mgcv Rcpp RcppArmadillo]; }; + VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.1"; sha256="0yy07fj0jkrninpwgnkw4h25yvbnb9z8kc02056nyh21kpj59vkl"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; }; VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.7"; sha256="1sb31338r2p0jsa3k72q9lc5f57cybywmda7q2j8byngh1fjvgyz"; depends=[curl RISmed stringi stringr XML XML2R]; }; VariableScreening = derive2 { name="VariableScreening"; version="0.1.1"; sha256="03l929qhgr1bd721488xx0il1hlswv3zdad518ki94ghq9c4nmg3"; depends=[expm gee MASS]; }; @@ -3923,7 +3990,7 @@ in with self; { Vdgraph = derive2 { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; }; VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; }; VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; }; - VennDiagram = derive2 { name="VennDiagram"; version="1.6.19"; sha256="0f0kw5rvxl6v39yhgrz819hk1j0xd48iz5wfl91qd1vjw1kg9fn2"; depends=[futile_logger]; }; + VennDiagram = derive2 { name="VennDiagram"; version="1.6.20"; sha256="1ic1jaxzw98si2p4n1fl4n3myhd7fpw0njb634cwhviwybzv6775"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; }; @@ -3941,7 +4008,7 @@ in with self; { WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; }; WCE = derive2 { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; }; WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; - WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; }; + WDI = derive2 { name="WDI"; version="2.5"; sha256="0wm3b844pn33047wfd8yp22c6ysdsi8qx71fm1h5rq5vm9mcg9cp"; depends=[RJSONIO]; }; WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; }; WGCNA = derive2 { name="WGCNA"; version="1.63"; sha256="1225dqm68bynkmklnsxdqdd3zqrpzbvqwyly8ibxmk75z33xz309"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; }; WHO = derive2 { name="WHO"; version="0.2"; sha256="0rpk7ddpkjcqs0m7cgxs55k178js0d70ccfximp2vqrsw0igkmk9"; depends=[dplyr httr]; }; @@ -3952,9 +4019,9 @@ in with self; { WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; WRS2 = derive2 { name="WRS2"; version="0.9-2"; sha256="0szjq9ffckjqa128avs4cymqvxk7dhldzj620kcq7q59aagrnj04"; depends=[MASS mc2d plyr reshape]; }; - WRSS = derive2 { name="WRSS"; version="1.1"; sha256="1iv6msack3ha2i8l4c7p9964b9f3c2qza1yxjsyx9sn1wzfxs6fj"; depends=[Hmisc]; }; + WRSS = derive2 { name="WRSS"; version="1.2"; sha256="0nml5sv0c4fflxvhhf7zwxdz45iid4n7v8kyc4l1qhn0wi2hihdk"; depends=[Hmisc]; }; WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.0"; sha256="0yyhls0qzwwj4sz5d1nvzfiacx28dmf2hgjc7xgfi2qjkckg40hs"; depends=[caret dplyr EnvStats fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; - WVPlots = derive2 { name="WVPlots"; version="0.2.8"; sha256="1d9016k05s3v3gmxsig6xk87npmgni9mfyqcwcvd522zisfx2g6z"; depends=[cdata ggplot2 gridExtra mgcv plotly replyr seplyr sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="0.3.1"; sha256="19ddgkblyqfvnx4a9c7i8nfvcfrmnsbbb3s61hqp16j59p5gfk3x"; depends=[ggplot2 gridExtra mgcv sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; }; WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; }; @@ -3962,15 +4029,18 @@ in with self; { Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; }; WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; }; WaveletArima = derive2 { name="WaveletArima"; version="0.1.0"; sha256="1f8g6r9qmhr2y7sf7x2vphv2sab5rywpfjvhsxfmzljjmirf2v3n"; depends=[forecast fracdiff wavelets]; }; - WaveletComp = derive2 { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; }; + WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; + WeMix = derive2 { name="WeMix"; version="1.0.2"; sha256="1wj1jxw65i94xf5zk9phgkwybvl2h05ynq0zhdc7q3j6b90mv9hn"; depends=[lme4 MASS minqa NPflow numDeriv Rcpp RcppArmadillo Rmpfr statmod]; }; WebGestaltR = derive2 { name="WebGestaltR"; version="0.1.1"; sha256="0cdpfwp4whx8pff73acxga072lwbibl44hxdjs9jsb5i21h55vbr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; }; - WeightIt = derive2 { name="WeightIt"; version="0.3.1"; sha256="0iadn4hpmfpih75nz17kligh3avjzs1cfi3pkkgx378ml64kdz8m"; depends=[cobalt]; }; + WebPower = derive2 { name="WebPower"; version="0.5"; sha256="184wig66bcg7vsppaijq5jpq2hffl3bhshdx4ilz5hw98mimxg13"; depends=[lavaan lme4 MASS PearsonDS]; }; + WeibullR = derive2 { name="WeibullR"; version="1.0.9"; sha256="13qkfnfp2pbvb78mj7fg8cgjnbrxv6dbms70wvn9f3mc70djmrb3"; depends=[Rcpp RcppArmadillo]; }; + WeightIt = derive2 { name="WeightIt"; version="0.3.2"; sha256="13rswk3qr01y3ikpa2d9z7l5wicgsmiqmmhx7cbnyi4jny316sa3"; depends=[cobalt]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; }; - WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.0"; sha256="10rnfwq3f6msrzmgifm33dqwnncfhybiah8czh1z7g3iw2859qbc"; depends=[mgcv oro_nifti]; }; + WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.1"; sha256="1qyv06ai83b1idfg4bgr97askyzlwi2dv8d5wkivb5czp7crdri1"; depends=[mgcv oro_nifti]; }; WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; }; WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; }; WikiSocio = derive2 { name="WikiSocio"; version="0.7.0"; sha256="1rc90cidc8mj8x7vw82vx41ivwnmil3cmc1whc8ghxrwli256w32"; depends=[httr igraph pbapply plyr RCurl stringr XML]; }; @@ -3981,23 +4051,23 @@ in with self; { WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; }; WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; - WordR = derive2 { name="WordR"; version="0.2.2"; sha256="1q8im3v30xil5qg4m1hypmj439rsx5g2x4mfxsgkz4xz2hwlfh4f"; depends=[dplyr officer ReporteRs]; }; + WordR = derive2 { name="WordR"; version="0.2.3"; sha256="0sn14s4vnmj6zs8mc8mj5ph78m9z9yr29lknqma3wrphb7cla50w"; depends=[dplyr officer ReporteRs]; }; Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; }; - WufooR = derive2 { name="WufooR"; version="0.6.2"; sha256="1k5nmg8mg8m9salcb0jr87ws548ydc597v8m94y4qrrfchy623rg"; depends=[dplyr httr jsonlite]; }; + WufooR = derive2 { name="WufooR"; version="0.8"; sha256="0nwf66y1jb7dw4yhkdl9g4brh59ky4q4x6j9zbqdn70pcj9hq9jx"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; - XGR = derive2 { name="XGR"; version="1.1.2"; sha256="0zvqsd7ff8a46w58qklp2w0w785y8nhpx4mcvp27r0k8j9y5yji7"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; }; + XGR = derive2 { name="XGR"; version="1.1.3"; sha256="01czagfjx5w212l5h29klrrsg0qiprlsiwpz7pfqh44haifnq4pz"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; - XLConnect = derive2 { name="XLConnect"; version="0.2-14"; sha256="06c88rkyavjv3p90hr3cz4y9jx3g6ik3sannjynjnms7d793w0fi"; depends=[rJava XLConnectJars]; }; - XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-14"; sha256="0ckkvm8i2r60npx0zb36h98gmzgqig9d806cn6r5cghczz6g0xf6"; depends=[rJava]; }; - XML = derive2 { name="XML"; version="3.98-1.10"; sha256="1faza9bbllp67lf1yv1sllxc3iv8llz52m9diazhq322iqbh97m1"; depends=[]; }; + XLConnect = derive2 { name="XLConnect"; version="0.2-15"; sha256="1cvq677m09gwpwhj3fy15mbfn0s0b1y35w95pjnijiwpcpdxiq96"; depends=[rJava XLConnectJars]; }; + XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-15"; sha256="1ipqyjgsh5a1ygsbhyqxyj9wfjv1f73cyfrpx6jvf0is5jklhvxx"; depends=[rJava]; }; + XML = derive2 { name="XML"; version="3.98-1.11"; sha256="18izvlg2x9mzr6yb3yf02ghwbyn00frki3av4lpc44r22m4djnsh"; depends=[]; }; XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; }; XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; }; XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; }; - XR = derive2 { name="XR"; version="0.7.1"; sha256="1wly2wpjvmfjjng5kjr9rq1by550amigz10rfpl8iibv5b9kvzjy"; depends=[jsonlite]; }; - XRJulia = derive2 { name="XRJulia"; version="0.7.6"; sha256="1bvkrx4nvni858qw3p51bm2pidlfqdmk2pbmhwmb61pcbls3gpk8"; depends=[XR]; }; + XR = derive2 { name="XR"; version="0.7.2"; sha256="0j8rkjw9y7mb0yj24nlisfd84148pnnakz8i2y35y2b8gmh5zhvz"; depends=[jsonlite]; }; + XRJulia = derive2 { name="XRJulia"; version="0.7.7"; sha256="07332hv7kp5bk1wm24cf2fa9yz5l4mni1gw0ry1qnwh1zx5v8jcd"; depends=[XR]; }; XRPython = derive2 { name="XRPython"; version="0.8"; sha256="0alg33spiaqf3jwg1qn543nxvbfaqv8gvf5px3grhbgrcmi5mcmj"; depends=[reticulate XR]; }; XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; }; @@ -4008,11 +4078,12 @@ in with self; { YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; }; YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; }; YuGene = derive2 { name="YuGene"; version="1.1.5"; sha256="1f1bia1q1z2rzp4pw218zglf02x1m9zpz5gqllrd77ggw8ilqfjc"; depends=[mixOmics]; }; + ZIBBSeqDiscovery = derive2 { name="ZIBBSeqDiscovery"; version="1.0"; sha256="12g9rga9z6318ni6x6q9hdqlgl93y2xn8vf3gc6sm97fz8pliswx"; depends=[mcc]; }; ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; }; ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; }; ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; - ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; }; + ZeBook = derive2 { name="ZeBook"; version="1.0"; sha256="06dg3jk37y64mdcb8hpxgj8rclgxqm96dalm7y5zjb7nrj9jfydk"; depends=[deSolve triangle]; }; Zelig = derive2 { name="Zelig"; version="5.1.6"; sha256="142kjmgma25pvr525y0mjiwivnmq8y8s1abw4kyqipcmphmgh3an"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; }; ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; }; @@ -4020,6 +4091,7 @@ in with self; { Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; }; aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; }; aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; }; + aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; }; aRxiv = derive2 { name="aRxiv"; version="0.5.16"; sha256="1dghv40waprld9gg81p2is72sk0z6fla0pfiqzzfhky8lazaih01"; depends=[httr XML]; }; aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; }; @@ -4038,12 +4110,13 @@ in with self; { abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; }; abjutils = derive2 { name="abjutils"; version="0.2.1"; sha256="0qrsc4if7aif73qp95lw6b5986c2r0jn7m39123zij8k15vc935b"; depends=[devtools dplyr glue httr magrittr plyr progress purrr rstudioapi scales stringi stringr tibble tidyr]; }; abn = derive2 { name="abn"; version="1.0.2"; sha256="0jxpw5mplnpc57jjg9w3zrik40g7va6s8m9zbfsyf0vqn645wfwq"; depends=[Cairo]; }; + abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; }; acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; }; accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; accelerometry = derive2 { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; }; - accelmissing = derive2 { name="accelmissing"; version="1.1"; sha256="0s2vy16zcpvbqyqz4ifdqccs6bfp8sf7azvfy8jjcm73xncv6ij3"; depends=[mice pscl]; }; + accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; }; accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; }; accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; }; acebayes = derive2 { name="acebayes"; version="1.4.1"; sha256="0wkygvhwf0y5jzkcj6prjmr9dlak1xgsbswlixqwrx5b48iqxgwh"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; @@ -4061,14 +4134,14 @@ in with self; { activity = derive2 { name="activity"; version="1.1"; sha256="1lqajgxfps2h6amz1791vp3f52rs9ghmanq1nqfxqd2jmk3idkrx"; depends=[circular overlap pbapply]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; - actuar = derive2 { name="actuar"; version="2.3-0"; sha256="0qzzsc9s25l29fi1xgd5ypb4j1l08ghx180n0q5k9p2fn36zjz27"; depends=[expint]; }; + actuar = derive2 { name="actuar"; version="2.3-1"; sha256="0i0w5y0bgma42p4cbrbv0bxkambp7hgqqlsg90p5skfvg7r1n3bk"; depends=[expint]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.6.5"; sha256="0jy8g5604alaqbi5ynj95ig07igzbgk8x03a4x1rzkvfwvydfflz"; depends=[]; }; adapr = derive2 { name="adapr"; version="2.0.0"; sha256="1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw"; depends=[archivist devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard versions]; }; adaptMCMC = derive2 { name="adaptMCMC"; version="1.3"; sha256="08v11rl0p4w94knb0yzs1ysj42xillya62yaw3zm40d4pqv7vcky"; depends=[coda Matrix]; }; adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; - adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.1"; sha256="1jhkiz0gdjvgclqfksm10zza9iwy1z6k5wpviwa4r9a936f1i88k"; depends=[ape ggplot2 phyloseq shiny]; }; + adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; }; adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; }; addhaz = derive2 { name="addhaz"; version="0.4"; sha256="0i3czmv538m8s3pnxrhh2a1mrdv9m3hgzjkb25p7hygwnzz54drg"; depends=[boot MASS Matrix]; }; @@ -4077,12 +4150,11 @@ in with self; { additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; }; - ade4 = derive2 { name="ade4"; version="1.7-10"; sha256="0zk81x0yn30gbyc0jpzyw1nxd08ccihl6vyk0ijvj3aw3nr5flc6"; depends=[MASS]; }; + ade4 = derive2 { name="ade4"; version="1.7-11"; sha256="0wm54wcpn87rdh6vyw04cr8vgba899y6jsl61f22bmlvx6d7kkac"; depends=[MASS]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; }; adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; }; adegenet = derive2 { name="adegenet"; version="2.1.1"; sha256="0ynfblp0hbd3dp3k86fn1wyhqr28lk6hs2bg4q7gyf0sfdfzwhrh"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; }; - adegraphics = derive2 { name="adegraphics"; version="1.0-9"; sha256="1fscmisvfd3j9fy1562pjsfpgx16fhr5xwmkzmssxhgyia19f4sr"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; - adehabitat = derive2 { name="adehabitat"; version="1.8.20"; sha256="18z4a8168a2c7248s15hwkjj70dzlkif360cy28jry4a61cm6d81"; depends=[ade4 shapefiles sp tkrplot]; }; + adegraphics = derive2 { name="adegraphics"; version="1.0-10"; sha256="0vig5c8hmsa6xapqzb8l4sm05qw7zc5s6b796bspffxj0crg3l3v"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.15"; sha256="1bwx2mfkzfknr6fjjkbx2xnm4gksd78i8fz0bcizqyi1zhg5hd0c"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.13"; sha256="158a6qzks0hml6hk4f1vr66gvwdn09792i2ca3k23061i3j3xp75"; depends=[ade4 adehabitatHR adehabitatMA sp]; }; adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.23"; sha256="0hf6wpwhsvfp906xk5sadfnvz524zmm05d0h2zxpx6089c6hnw3j"; depends=[ade4 adehabitatMA CircStats sp]; }; @@ -4100,13 +4172,13 @@ in with self; { adlift = derive2 { name="adlift"; version="1.3-3"; sha256="0q4ipk9yax4wqp3jckpx6ihriqaaaz0knxd19cm20qzdx37vz4id"; depends=[EbayesThresh]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; adnuts = derive2 { name="adnuts"; version="1.0.0"; sha256="0jy9wq269r7s70bwld6ngxc6vmaj9vplq4wn97x4f3c6lqy42swc"; depends=[ellipse rstan]; }; - ads = derive2 { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; }; + ads = derive2 { name="ads"; version="1.5-3"; sha256="1k1japzcf0mafxkv9dlzaqz9n4c749lsx0lja4wj327ninpdcfy4"; depends=[ade4 spatstat]; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; adwave = derive2 { name="adwave"; version="1.2"; sha256="1fnaq9v84y52kb66aq4g0xiqgllk7mi0is5qiafqf546hck3kzz6"; depends=[waveslim]; }; aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; }; afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; - afex = derive2 { name="afex"; version="0.19-1"; sha256="10qbwqwashddj93ivvwlkf3lk14411lmxp24cn7sahqr9lm714f7"; depends=[car coin emmeans lme4 lmerTest pbkrtest reshape2 stringr]; }; + afex = derive2 { name="afex"; version="0.20-2"; sha256="150zf3lzsybpj7hm3ry0x4lliscgmmxpq92iab9fbcrvaqyaibn8"; depends=[car coin emmeans lme4 lmerTest pbkrtest reshape2 stringr]; }; affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; }; afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; }; @@ -4114,7 +4186,7 @@ in with self; { agRee = derive2 { name="agRee"; version="0.5-1"; sha256="1hmqvpcz4vnpcl9f92q5fy1ca89l9sq25fnsw2mxfsa0yqbyxpw6"; depends=[coda lme4 miscF R2jags]; }; aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; }; - agriTutorial = derive2 { name="agriTutorial"; version="0.1.2"; sha256="0zcyawmhflm4rbxnyf6gdwrnff4f13yajc81n13ykw7bfi8xphqi"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; }; + agriTutorial = derive2 { name="agriTutorial"; version="0.1.3"; sha256="1ihz92f10p7nq0rw01hka5wg2svf2hgx9f39604ab0j99z0f99hz"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; }; agricolae = derive2 { name="agricolae"; version="1.2-8"; sha256="1c6n52jralp33hl3nmpv9fc9vsvs6lcz9j75f2zbz0r4sqd2mw89"; depends=[AlgDesign cluster klaR MASS nlme spdep]; }; agridat = derive2 { name="agridat"; version="1.13"; sha256="1029n2jkbvybvkbf4pwdjrw6m05xyzn5xyqyfziqb7xnw51ksm2p"; depends=[]; }; agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; }; @@ -4126,14 +4198,16 @@ in with self; { aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; }; aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; airGR = derive2 { name="airGR"; version="1.0.9.64"; sha256="08nw07v5d5pljk839i5j5wgrc5lny7v6kl8m2hd6bm9aijql7hg4"; depends=[]; }; - aire_zmvm = derive2 { name="aire.zmvm"; version="0.5.0"; sha256="14n2wycfxpj8wb45671pysqxr434b3wgrnbx2vfpsxw46lkqid0i"; depends=[dplyr httr lubridate readr rvest sp stringr tidyr xml2]; }; + airGRteaching = derive2 { name="airGRteaching"; version="0.2.2.2"; sha256="13alnmazf8n7sgfzh0hfq6i4cd2pl414vwrakgp36q365fkgzpnc"; depends=[airGR dygraphs htmlwidgets markdown plotrix shiny shinyjs xts]; }; + aire_zmvm = derive2 { name="aire.zmvm"; version="0.6.1"; sha256="1a6aq1fkjj053mi36ibykncd1hmcl0f5c0l2fi0cbx6hcysc28ic"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; }; ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; - alakazam = derive2 { name="alakazam"; version="0.2.8"; sha256="0lilldxynwhp1i538k3xb9c73956agxj6v8zickxkba1sx4k5zrc"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; }; + alakazam = derive2 { name="alakazam"; version="0.2.10"; sha256="0bfqc7rbchmj0dby8c8xlxff9gk18kq1v8zqfj3s7h3yddrr7znr"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; }; + albopictus = derive2 { name="albopictus"; version="0.2"; sha256="1ils7y0i9dvhpnwyi31y7dvn02pcyn4dk0165ck81s08k96v3r1z"; depends=[]; }; ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; }; - alfred = derive2 { name="alfred"; version="0.1.5"; sha256="0slqmfv5nsjb463n86qf540dd8airzqc98946kbs24xmyi9npyb8"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; + alfred = derive2 { name="alfred"; version="0.1.6"; sha256="07x012lj33m0pmxdwk39ywrlvlfkp7mb203dwv8v88cxplhbaiq3"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; }; algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; }; alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; }; @@ -4148,7 +4222,7 @@ in with self; { alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; }; alphavantager = derive2 { name="alphavantager"; version="0.1.0"; sha256="02vv0mks73rih4xwabsnk8rkl3cipd27k5lak9lp1rl0agp8g68v"; depends=[devtools dplyr glue httr jsonlite lubridate purrr readr stringr tibble tidyr]; }; - alr3 = derive2 { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; }; + alr3 = derive2 { name="alr3"; version="2.0.7"; sha256="0975m657ri8ad4djrwfdv4cslw8inykq35aj5m00kmsc8gb624j0"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; alterryx = derive2 { name="alterryx"; version="0.3.0"; sha256="0y76xy7m7dklvkhfr2czq54ffgj2j5zhnm2kza7m463j1w1mkcqz"; depends=[base64enc digest httr jsonlite]; }; altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; }; @@ -4156,11 +4230,11 @@ in with self; { ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; ameco = derive2 { name="ameco"; version="0.2.8"; sha256="1i2ap11z1awalw71hai719xh57banpfgj1nllca66zf781x80di9"; depends=[]; }; amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; - amelie = derive2 { name="amelie"; version="0.1.0"; sha256="19cn8rhc5lzy9x9wslljjdnmli76bnam2yg5v9l87jvzb712vl6p"; depends=[]; }; + amelie = derive2 { name="amelie"; version="0.2.0"; sha256="01v93dswr9nk0kvq50jri4568w17pwkcn64xbpzn2p4c7w6gqkhh"; depends=[]; }; amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; }; aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; - amt = derive2 { name="amt"; version="0.0.2.0"; sha256="1w6rdyzyzxsa5qxmcpm1ahgz65z72nil3ay51m8g9qjk7v1xrj8p"; depends=[broom circular dplyr fitdistrplus FNN geosphere lazyeval leaflet lubridate maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr tidyverse]; }; + amt = derive2 { name="amt"; version="0.0.3.0"; sha256="1a9hvvqh7359bs2x031qgkq364d07kf60jgn13kz5nva36c5wl8v"; depends=[broom circular dplyr fitdistrplus FNN geosphere lazyeval leaflet lubridate maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr tidyverse]; }; anMC = derive2 { name="anMC"; version="0.2.0"; sha256="1j6dah49sgfsb7bj4xys5rcaqw12rrkqhqryqz2xhdkazjmz3gpq"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; analogsea = derive2 { name="analogsea"; version="0.6.0"; sha256="1fcvf3yci3szm155pnk89q36dgc55wdlffvll642zn26zc5d1y5n"; depends=[aws_s3 httr jsonlite magrittr yaml]; }; @@ -4182,11 +4256,13 @@ in with self; { annovarR = derive2 { name="annovarR"; version="1.0.0"; sha256="0l2csp06m5f3i1b4h0pvl8mmzx25c0b411c5sdc3qszirbplh038"; depends=[AnnotationDbi BioInstaller configr data_table DBI futile_logger glue ngstk RMySQL RSQLite stringi stringr vcfR]; }; anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; + anomalize = derive2 { name="anomalize"; version="0.1.1"; sha256="1szxjc8bh616z2xc50hcggh4ky1b7343i3xmg81rbssvkl2gghlh"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; }; anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.5"; sha256="132wb0xz04zib3x7802b2q546rkf097rsxyi9mi86g6vv7yyw9z1"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; }; anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; }; + antaresProcessing = derive2 { name="antaresProcessing"; version="0.15.1"; sha256="0x2rcj4cfw0rsyzdc98j8yk8mp8cnbpx4qj587wszxlyf90yzgfa"; depends=[antaresRead data_table]; }; antaresRead = derive2 { name="antaresRead"; version="2.1.0"; sha256="1khvwh55gfd62avaj9vl709nrcykyc4zn11fxikbqqgwm9mq7835"; depends=[data_table lubridate plyr shiny stringr]; }; - antitrust = derive2 { name="antitrust"; version="0.99"; sha256="0j76kbb8l0n3lq74nacymgilf4xzs8g1x2g1jw55v6avqnwyps6p"; depends=[BB evd ggplot2 MASS numDeriv rhandsontable shiny]; }; + antitrust = derive2 { name="antitrust"; version="0.99.7"; sha256="0si9vnbk6rcpp913cyfh5h4a5fx9kzafr5x5chb3gakzrbzz0hav"; depends=[BB evd MASS numDeriv]; }; antiword = derive2 { name="antiword"; version="1.1"; sha256="0nbx2l0d2y4qvcw4dw3m26zfkgdmav4cq0l00gib7l3y9pqxzjh5"; depends=[sys]; }; anytime = derive2 { name="anytime"; version="0.3.0"; sha256="1byhgplskj17d0gib9sajfnzyv8p9slgq1vy8fq9j2ibirl86a91"; depends=[BH RApiDatetime Rcpp]; }; aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; }; @@ -4194,17 +4270,18 @@ in with self; { aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; aop = derive2 { name="aop"; version="1.0.0"; sha256="1i3mixiwcvqygbcvj6f9vm223plmydzmixpy6nhis2zv9d90vakd"; depends=[ggplot2 graph igraph plyr Rgraphviz rjson]; }; aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; }; - apTreeshape = derive2 { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; + apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; }; apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; }; apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; }; apaTables = derive2 { name="apaTables"; version="2.0.2"; sha256="0b3vaknj0a9znrgr98v35ka0lf5y1wcy1x0yv249gysikncn9mjc"; depends=[boot broom car dplyr tibble]; }; + apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; }; apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; apcluster = derive2 { name="apcluster"; version="1.4.5"; sha256="0ipg5m3d7fnbvvlavbv8q8ixyrcgdspzwkv00q93f4biybza27x6"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; - ape = derive2 { name="ape"; version="5.0"; sha256="0q59pmxawz498cb9mv5m49lhiwxib8ak94yyydz7qg8b6lpd4bn3"; depends=[lattice nlme Rcpp]; }; + ape = derive2 { name="ape"; version="5.1"; sha256="0vm2065993wf4hdqarxqykhfz9aaj0rrb98alhkq4qw1d2kdrmdp"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; }; apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; - aphid = derive2 { name="aphid"; version="1.0.1"; sha256="1s41ph6i28l14h8s5vvgmx6kby378x27y3vwbz25f2jmq8i7fqi2"; depends=[openssl phylogram Rcpp]; }; + aphid = derive2 { name="aphid"; version="1.1.0"; sha256="0mf2v7b915hpasic2yqxi0g5fcrwac4d1ycikwzcd9hb9qngcb0n"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; }; apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; @@ -4222,13 +4299,13 @@ in with self; { apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; }; aptg = derive2 { name="aptg"; version="0.1.0"; sha256="06z8041h1k9v0ymd7azn11xzhqxb8lda4r7nyg51h8z3i8mpq1ba"; depends=[ape brranching phytools taxize xml2]; }; aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; - aqp = derive2 { name="aqp"; version="1.15"; sha256="0hgz2m3nn45marvx49n62xmq1d1xhy9cf6wb829cvxczisvlakgy"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; + aqp = derive2 { name="aqp"; version="1.16"; sha256="11ksjvvwazan2xk535ygrk8qs66ny6fywfgw2mpy8kv2637l9pay"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; }; - arc = derive2 { name="arc"; version="1.1.4"; sha256="1qzj5bzn2dfssjz1r464ys7c0wab0la23hcrbjbmn93iqm2a648g"; depends=[arules discretization Matrix R_utils]; }; + arc = derive2 { name="arc"; version="1.2"; sha256="1advs0aqxh84c5n9akww8cdafh7npgaibrb42wncwhv9nfi7wy1v"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; }; archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; - archiDART = derive2 { name="archiDART"; version="3.0"; sha256="0yh9asf45l2fxxm67vg9snaqbvs1bb24lm2xsrb6xrr62avdrqlq"; depends=[rgl sp TDA XML]; }; + archiDART = derive2 { name="archiDART"; version="3.2"; sha256="08jam0nbqvrgrxjqj24k7f0dybyi935w977yi1qk34q1p48462ph"; depends=[rgl sp XML]; }; archivist = derive2 { name="archivist"; version="2.3"; sha256="0rwdk2scmd06j428zadcxmvshvssf421265632595hvcacqz6yy4"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; }; archivist_github = derive2 { name="archivist.github"; version="0.2.2"; sha256="04xb2i47y12ic87gb2l30bldil0505h7s9601hq0afjg3npx6jq7"; depends=[archivist digest git2r httr jsonlite]; }; areaplot = derive2 { name="areaplot"; version="1.2-0"; sha256="0xzfgbnzqsvnq46nsxwyqrwldbaqns3h5np0f5wxpjda9cy2rna1"; depends=[]; }; @@ -4239,9 +4316,9 @@ in with self; { argparse = derive2 { name="argparse"; version="1.1.1"; sha256="0fzrbj87b274vf96azdnsjxk2nf45d5wy58vzmlah4b4h7q4j524"; depends=[findpython getopt jsonlite proto]; }; argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; }; ari = derive2 { name="ari"; version="0.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; }; - arm = derive2 { name="arm"; version="1.9-3"; sha256="00773z8ai07s9wa2annzjqrxml3z13fh9zqls0z1n7s3h8fwrvqw"; depends=[abind coda lme4 MASS Matrix nlme]; }; + arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; }; arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; - aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.0"; sha256="1slbmqr0qd8r9lrms7b86fhvn612g4yjbm604zahjr335q6d7h03"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; + aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.1"; sha256="1x2lwdabvh7cjdy57jrnbdb7s9vxs18zyvfzwavi2pgldqz6v2aw"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; }; aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; }; aroma_core = derive2 { name="aroma.core"; version="3.1.1"; sha256="0mbhk818m8if6cr7g42yy7ba13jh2xs66xkx4zh7dqlwrrmgjnk1"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; @@ -4249,9 +4326,9 @@ in with self; { arrangements = derive2 { name="arrangements"; version="1.0.2"; sha256="0vqxx0pzvvqnbklpxrcq7d5ppicwbwk3gb2846in0gqjhn4ya4g1"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; }; ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; }; - arsenal = derive2 { name="arsenal"; version="1.0.0"; sha256="0fv3zq0i28sbdvwh589c27j4k734vr90aik3gxdablgasrhdjfza"; depends=[testthat]; }; + arsenal = derive2 { name="arsenal"; version="1.2.0"; sha256="1glh8vyms5hcplzzn5n6fynr8jyryy65xb2y9lf6nv7kziwqr5fk"; depends=[testthat]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; - arules = derive2 { name="arules"; version="1.6-0"; sha256="14gbq5k2zkx4wc7kkfazz313ngij89qp1xmyxfg3nq3v1s84c3sl"; depends=[Matrix]; }; + arules = derive2 { name="arules"; version="1.6-1"; sha256="0glfqgxr87900kigmkby2ff7qrjvd6aq595q85y056i5ckjcp615"; depends=[Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.1.3"; sha256="0dpa9v8xksq21lyv6g7m81ccpd08lq816vfy5ga8g3blkg1qfrf2"; depends=[arules caret discretization Matrix testthat]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; }; @@ -4269,7 +4346,7 @@ in with self; { ashr = derive2 { name="ashr"; version="2.2-7"; sha256="1bgkzab7f7fqi259vxrpkxq8yzhh1sl3mqdzc73dk54c5849b2pz"; depends=[assertthat doParallel etrunct foreach Matrix pscl Rcpp SQUAREM truncnorm]; }; asht = derive2 { name="asht"; version="0.9.3"; sha256="075gzxly8sqkbwnznxcr4z3zs1qvlyl8c4ishgxk035ik1w6p16n"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; - asnipe = derive2 { name="asnipe"; version="1.1.8"; sha256="10pza52bcfdj9412hr69lcv4n43y0n91hfkbq8338fsqpad98ilz"; depends=[MASS Matrix]; }; + asnipe = derive2 { name="asnipe"; version="1.1.9"; sha256="0r6hajdvasvik2ij58xm5kvlcz2gqzgqbvw0ypghrp0qkfqxkrla"; depends=[MASS Matrix]; }; aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; @@ -4293,7 +4370,7 @@ in with self; { assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; }; assertr = derive2 { name="assertr"; version="2.5"; sha256="17j5aw19cp9csbxhf277yrr4vlr2c5sk70v9a4fnch0c2q14l5f3"; depends=[dplyr lazyeval MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.0"; sha256="1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp"; depends=[]; }; - assignPOP = derive2 { name="assignPOP"; version="1.1.3"; sha256="12ldcm1v1s311n3c9sysaw5ba2z8yrzrf95rl7ip6fl2q8g0fv6b"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; + assignPOP = derive2 { name="assignPOP"; version="1.1.4"; sha256="1w13ls4d7gvp17dz0jafwnw9kqn3kl670vs0wf50rladg2fmh7af"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; @@ -4324,10 +4401,11 @@ in with self; { audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; }; audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; augSIMEX = derive2 { name="augSIMEX"; version="1.0"; sha256="1d13kh9xfkpwy2285awhvgfkwyqlsdk2bypm0i1jjf10avrynxvf"; depends=[MASS Rcpp rootSolve]; }; - auk = derive2 { name="auk"; version="0.1.0"; sha256="042yygs00vya9xynl2i9bwhwwns3ba25ajp5zlgpv1zw6csby9ml"; depends=[assertthat countrycode dplyr rlang stringi stringr tidyr]; }; + auk = derive2 { name="auk"; version="0.2.1"; sha256="18vqvjksnllbkwfskiv8cv0dbw92nzkxwb0rj14sxxw8y55hybyy"; depends=[assertthat countrycode dplyr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; }; autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; }; + autoFRK = derive2 { name="autoFRK"; version="1.0.0"; sha256="10vmgcpj2n5w9g4bjq2g3bz3n3x9b6h35w4qfr13v2sdzp3gz5da"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS Rcpp RcppEigen RcppParallel RSpectra spam]; }; autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; }; autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; autoimage = derive2 { name="autoimage"; version="2.0"; sha256="102f7wkrglsvdrsmyy79v0w7za5b79sn59czxzhriwrp4mrpdl47"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; }; @@ -4336,22 +4414,25 @@ in with self; { automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; }; autoplotly = derive2 { name="autoplotly"; version="0.1.1"; sha256="1pm1760dd9p0h66q7y1v9icfhz1lk6i5akjda06jc2f0rq7mzlj0"; depends=[ggfortify ggplot2 plotly]; }; autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; - autothresholdr = derive2 { name="autothresholdr"; version="1.1.2"; sha256="0gkab2fnavjfb7h2fd2jbk5phz10hc18kf3l6r2zvvmq3gfhh2db"; depends=[checkmate ijtiff magrittr Rcpp RSAGA]; }; + autothresholdr = derive2 { name="autothresholdr"; version="1.2.0"; sha256="09wpyirsqw0s4b5221ksr0v0srrq24c6ca8kr5m4hr4ps728np0p"; depends=[checkmate filesstrings ijtiff magrittr Rcpp]; }; autovarCore = derive2 { name="autovarCore"; version="1.0-2"; sha256="0yvz3nn792xdam8hgnkdrhcyaf9idp0shb1s0yfj1xigknlinn9n"; depends=[Amelia jsonlite Rcpp urca vars]; }; available = derive2 { name="available"; version="1.0.0"; sha256="0w4i0ajw0p71k717v8hg9d8az08m8yl97w5lly87kli36p7mv30h"; depends=[cli clisymbols crayon desc glue jsonlite memoise purrr SnowballC stringdist tibble tidytext udapi yesno]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; }; - aws_alexa = derive2 { name="aws.alexa"; version="0.1.4"; sha256="1dqfmmmvdmlpk9ld563f65chwp2ahhlnrvbzsj9m5rfjs0bw6yny"; depends=[aws_signature httr plyr XML]; }; + aws_alexa = derive2 { name="aws.alexa"; version="0.1.6"; sha256="0c2yl023g2m4kqhhv4nbysjmp103aj3pk17dwyb9nrkpj9qm8zsh"; depends=[aws_signature dplyr httr xml2]; }; aws_cloudtrail = derive2 { name="aws.cloudtrail"; version="0.1.5"; sha256="0p7qj9ivs14ska11a9qni4n0f8d05c1p126zvlxj9038c9p0y1wx"; depends=[aws_s3 aws_signature httr jsonlite]; }; - aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.2"; sha256="1ycxir3l7jcnxp6hdpr3zqf885hl8zb1yvjyr09cq3ql82vi95ml"; depends=[curl jsonlite]; }; + aws_comprehend = derive2 { name="aws.comprehend"; version="0.1.2"; sha256="0480ggfdmcv2pkjzmwh40h4nd87qswrpwr6h3j959f9y8zmzfd7n"; depends=[aws_signature httr jsonlite]; }; + aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.4"; sha256="08l1gnqn2l6f6rkh21v1my2jp5bbzwnq38swymwl94jbnvnlrasw"; depends=[curl jsonlite]; }; aws_iam = derive2 { name="aws.iam"; version="0.1.7"; sha256="0hag8j5g8rqg39x4f6d8vwwzhz98cx7549xixfl9cxiff7x9sz2c"; depends=[aws_signature httr jsonlite xml2]; }; aws_lambda = derive2 { name="aws.lambda"; version="0.1.6"; sha256="16vis596clxn6h9j1k66224ikacsg0f9xrzqi5987nqlzrwskjgk"; depends=[aws_signature base64enc httr jsonlite]; }; aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; }; - aws_s3 = derive2 { name="aws.s3"; version="0.3.3"; sha256="1vk4ykgfdyfispd9nkk1qc1jjhvjhxqzhd48g5ddqz09wm0wx4w3"; depends=[aws_signature base64enc digest httr xml2]; }; + aws_s3 = derive2 { name="aws.s3"; version="0.3.11"; sha256="0zb219xib86980gq00sam804m91448lsmcy4a3ac322sifmrpasc"; depends=[aws_signature base64enc digest httr xml2]; }; aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; }; - aws_signature = derive2 { name="aws.signature"; version="0.3.5"; sha256="1ijzdxv46x5iydmhgbri4lfpdhhlhz1ybhwwdcy4m4mjz9s74yhk"; depends=[base64enc digest]; }; + aws_signature = derive2 { name="aws.signature"; version="0.4.1"; sha256="094d0jwg6433bdfkvs3r9mjvg61k78ff4ck0zhgyaz4aivlchm9j"; depends=[base64enc digest]; }; aws_sns = derive2 { name="aws.sns"; version="0.1.7"; sha256="0i8nn5jnykhsjwn4nsqdqbagankjc09zs8and54rkirdigzdny8v"; depends=[aws_signature httr jsonlite xml2]; }; aws_sqs = derive2 { name="aws.sqs"; version="0.1.10"; sha256="09sh3injb4kfrq5al7hmbnqdn5v5hnjkqqsz86vpi4154435ymdg"; depends=[aws_signature httr jsonlite xml2]; }; + aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.2"; sha256="12qz7j535aqxcvcawj4iqycbcmlba32sdl8qj2cw6rq5rgm55xaz"; depends=[aws_signature httr jsonlite]; }; + aws_translate = derive2 { name="aws.translate"; version="0.1.3"; sha256="0qr38f2ywrmccg0k080lhfvvf9zkmclvpmfcwjizls6qkwfww3il"; depends=[aws_signature httr jsonlite]; }; awsMethods = derive2 { name="awsMethods"; version="1.1-0"; sha256="1xywcadpjyzlw5f2k9sbr8fvrj3kcr1r6swi23lc952yrl3gvpkl"; depends=[]; }; awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; }; awspack = derive2 { name="awspack"; version="0.1.6"; sha256="0pf6g9w2r2rm887sa3v0gfwia2w2q94m40m76sq66gb3spkmngd5"; depends=[aws_alexa aws_cloudtrail aws_ec2metadata aws_iam aws_lambda aws_polly aws_s3 aws_ses aws_signature aws_sns aws_sqs]; }; @@ -4359,7 +4440,7 @@ in with self; { b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; bReeze = derive2 { name="bReeze"; version="0.4-2"; sha256="04zapsxb4lsi85m9qgrsm49yasf0b8wk0djdpa7xks4hjvmskfhq"; depends=[]; }; - bWGR = derive2 { name="bWGR"; version="1.5.1"; sha256="0dkpj9xskflnhqr92bi54cg3qckjja1jj5vjypzijikwqimz879h"; depends=[Rcpp]; }; + bWGR = derive2 { name="bWGR"; version="1.5.2"; sha256="1ijz72zxxykscbsr4n1k66zjcy6zs9azgdyf2s5w8j291zy43gw6"; depends=[Rcpp]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; }; @@ -4372,12 +4453,12 @@ in with self; { badgecreatr = derive2 { name="badgecreatr"; version="0.1.0"; sha256="070zb5jw817s9ykqc3dvzjqk48612gydkdc31svc0ji01s1y1545"; depends=[stringr]; }; badger = derive2 { name="badger"; version="0.0.2"; sha256="15qnb0a6rqsf1dbb1cf9ag2z5f4zhf8b8psxbsdhh42qrg8g3mma"; depends=[dlstats rvcheck]; }; bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; - bairt = derive2 { name="bairt"; version="0.1.1"; sha256="1i0y7bkhx0rsv93j32i2v3g2h3csxvnkkkx9kvkdnkcwzffps5x2"; depends=[coda mvtnorm shiny shinyjs]; }; + bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; }; baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; }; - ballr = derive2 { name="ballr"; version="0.1.1"; sha256="1n2kaindpr6ba2fc1zvkl78jxl24y1gxn9dxv10c8m594l8shbxw"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; }; + ballr = derive2 { name="ballr"; version="0.2.0"; sha256="1f5fclmgp0pznahr3ix7xiixqah01jmh2g6fvrqyi6xcin8ynwqc"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; }; bamboo = derive2 { name="bamboo"; version="0.9.19"; sha256="1k81r06kw50w6lm0vi6xwjymc4l13abagrn5b6czcyki3i6pwqc2"; depends=[rscala]; }; bamdit = derive2 { name="bamdit"; version="3.1.0"; sha256="148ikj7mly8m6kxs2n4gidi7kb70i3x2vbf9xsllrf0cgvrjccps"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; - bamlss = derive2 { name="bamlss"; version="0.1-2"; sha256="1d5pinyq16y0ljjgf23mpabzpsx4n2vh91c89qmzclcw7ns0l7xw"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp spam survival]; }; + bamlss = derive2 { name="bamlss"; version="1.0-0"; sha256="0wa54f5zyjyplys29cqhrasc6qa8p5znfal2ihp0qhhs46wzsk4y"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; }; banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; }; bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; }; @@ -4385,28 +4466,29 @@ in with self; { banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; }; bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; - bartMachine = derive2 { name="bartMachine"; version="1.2.4"; sha256="09w3gb7lh12ls8hmmnssvmlmp3lkbr2j0jqdihfb6049cgl31m60"; depends=[bartMachineJARs car missForest randomForest rJava]; }; + bartMachine = derive2 { name="bartMachine"; version="1.2.4.1"; sha256="0awshy5djs6f6v77g9f4xcmg9pg3zs650bzql3nvfxw5d0zdnbzb"; depends=[bartMachineJARs car missForest randomForest rJava]; }; bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; }; basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; }; + base2grob = derive2 { name="base2grob"; version="0.0.2"; sha256="0mknr1kdy2vpa8cj18crr98sp22qj27bb1g3mrm64azchsqr5k64"; depends=[gridGraphics]; }; base64 = derive2 { name="base64"; version="2.0"; sha256="1labh0ycdm2xcjssj8bhnyjvbk44mcdsi0rb2p8rfqa428mrq9cf"; depends=[openssl]; }; base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; }; base64url = derive2 { name="base64url"; version="1.3"; sha256="1azik4yqafay4m2panbnyyf7cq5qb2qjv74ikhb8rljbsgv2xchd"; depends=[backports]; }; baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; }; - basefun = derive2 { name="basefun"; version="1.0-0"; sha256="1a2ksmxki1jg0g9359zxzxignpcz7lcahqf6k3nclv7s0p22vb42"; depends=[Matrix orthopolynom polynom variables]; }; + basefun = derive2 { name="basefun"; version="1.0-1"; sha256="0qiszm71alh7p3inhiv9prdl4f5l45ny8plz2fm7l5h51z5xj54r"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; }; basicTrendline = derive2 { name="basicTrendline"; version="1.0.1"; sha256="0rsmlp70ylpkqv437jcy3skwbfkj4xwkpjb2q79b9n8kw2ir0716"; depends=[]; }; basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; }; basictabler = derive2 { name="basictabler"; version="0.1.0"; sha256="1m4cgghfh3aixsnwjlbaj3prnnqxhij60bakz9vdr5dvnqg92an9"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; }; batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; - batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; + batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; }; batchtools = derive2 { name="batchtools"; version="0.9.8"; sha256="1ch03hj8ahkfc9sr4gv985s6zzxk5xm2dbm0hm8xjygkqkd8r5n9"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; bayesAB = derive2 { name="bayesAB"; version="1.1.0"; sha256="0g74n6jvpmb2sbmywcagb10rk8sd3pxzkw9s8s6qpg34q58v01a6"; depends=[ggplot2 Rcpp]; }; bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; - bayesDP = derive2 { name="bayesDP"; version="1.3.0"; sha256="1g7d64brln5p2gindc18jk4wqmh6phqr4zhs8jhl0yk9g4jhsqzn"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; + bayesDP = derive2 { name="bayesDP"; version="1.3.1"; sha256="175g75cpynccyzcbzca4h6xa2708985h8dhq34kvkpfhv35pc64d"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; }; @@ -4414,10 +4496,11 @@ in with self; { bayesImageS = derive2 { name="bayesImageS"; version="0.5-1"; sha256="1p4l3i57xm8yrczdiz4nxmd8qv0pv0chlrpvndfn3fnjbcx2cfa2"; depends=[Rcpp RcppArmadillo]; }; bayesLife = derive2 { name="bayesLife"; version="3.2-0"; sha256="1a3x3y77542hgndvymhnyg6dys0s5rimkgprl8psflsgsrxnbmcv"; depends=[bayesTFR car coda hett wpp2017]; }; bayesLopod = derive2 { name="bayesLopod"; version="1.0.1"; sha256="0v9yy75mvr74jc0fz10qj1acwxjy0lbqkdqaj1hn88v294r9dw3q"; depends=[BH inline raster Rcpp RcppEigen rgeos rstan rstantools slam sp StanHeaders]; }; - bayesPop = derive2 { name="bayesPop"; version="6.2-3"; sha256="1znjf8mihip0dl7dyk8h3nbkzihz8lnf7kxvhf1l363v449s0bff"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; }; + bayesPop = derive2 { name="bayesPop"; version="6.2-4"; sha256="1z8s5lbvz642hxl10b4cv361izw82akq40dav3mknqqcgv1vlrk6"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; }; bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; bayesSurv = derive2 { name="bayesSurv"; version="3.2"; sha256="1zp302pfi64nnqdiqldvfi1lm0wv2dplz5sfjp0ydl1qc16z0axp"; depends=[coda smoothSurv survival]; }; bayesTFR = derive2 { name="bayesTFR"; version="6.1-2"; sha256="092sl8xk82kybpp0v06j0dxh4zal0d6j2na42ghl2ri36iy6wqvx"; depends=[coda MASS mvtnorm wpp2017]; }; + bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; }; bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; }; bayesboot = derive2 { name="bayesboot"; version="0.2.1"; sha256="0gd3in9z8kx3d29dvyd8blmhlc7wxxl5b2hxnrrq0w13jcnsn57w"; depends=[HDInterval plyr]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; }; @@ -4426,12 +4509,13 @@ in with self; { bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="2.1"; sha256="02aw7fgvdsnqasmvljh1pd5nks1hjys7n3kmlwnkr5a6w476v1q9"; depends=[forestplot metafor]; }; + bayesmeta = derive2 { name="bayesmeta"; version="2.2"; sha256="15pqa1plcnl8pbzs38cw22y3qq1v7f9vla4zy0154crvbrbp8kwf"; depends=[forestplot metafor]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; - bayesplot = derive2 { name="bayesplot"; version="1.4.0"; sha256="0izp2v734n4pcdlfjrhasl2srlnhccsf93ni6hfhl5l5xyf02043"; depends=[dplyr ggplot2 reshape2 rlang]; }; + bayesplot = derive2 { name="bayesplot"; version="1.5.0"; sha256="1f0kgrgr87fp9576ssrygkp5n4186zq1rw5iwzhqr8s81is352li"; depends=[dplyr ggplot2 ggridges reshape2 rlang]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; bayou = derive2 { name="bayou"; version="1.1.0"; sha256="1ndd7lygphngvn4a432616f6anmhxbdzmkksrhpl76xvrw5agwkc"; depends=[ape coda denstrip fitdistrplus foreach geiger MASS mnormt phytools Rcpp RcppArmadillo]; }; + baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; }; bazar = derive2 { name="bazar"; version="1.0.6"; sha256="12b1x218x1yh9iadv8ciyncr841s0arvj4pbn74bryhcgbvmbwqm"; depends=[kimisc]; }; bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; @@ -4441,9 +4525,10 @@ in with self; { bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-2"; sha256="0v1zjbgpalr5ag97s9rxcd2z0r7qpw8yhc4lw4p4i3xkw2paf5zh"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; }; + bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; }; bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; }; - bcmaps = derive2 { name="bcmaps"; version="0.17.0"; sha256="18rn9zlagp5f0268m8azcbl52jcyx33jjxaqpg05cz853fxib24h"; depends=[httr rappdirs sf]; }; - bcp = derive2 { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; }; + bcmaps = derive2 { name="bcmaps"; version="0.17.1"; sha256="12hca67n7fqplis8g954hj588zl9kj8gmph86mxhcy151qpyh927"; depends=[httr rappdirs sf]; }; + bcp = derive2 { name="bcp"; version="4.0.1"; sha256="1cw7gnkskzwql55bxfrxajsi828zj7rjn7my7dk8lkdqz7n3lsgb"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; }; bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; bcrm = derive2 { name="bcrm"; version="0.4.7"; sha256="0s0xmmphrrsqnrsnnsqh9ska6afl4jyk0s0290w6askrlqdzjgil"; depends=[ggplot2 mvtnorm]; }; @@ -4452,7 +4537,7 @@ in with self; { bda = derive2 { name="bda"; version="10.1.9"; sha256="06ycxqjpnsywakjkjxf1czhxsbdzbpwa11m69gad5538z066d24x"; depends=[]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; bdlp = derive2 { name="bdlp"; version="0.9-1"; sha256="1ydb5hsaj1bfdz7hcdkc74qlk608kf0xrbpw247klkxrhsh9ba2p"; depends=[DBI GenOrd MASS MultiOrd rgl RSQLite stringdist]; }; - bdots = derive2 { name="bdots"; version="0.1.15"; sha256="1a665f9f18wajf4y6jp17icg9w6wx698xfnlry2sm5pq6nrkmwln"; depends=[doParallel doRNG foreach mvtnorm nlme]; }; + bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; bdpv = derive2 { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; }; bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; }; @@ -4463,15 +4548,17 @@ in with self; { beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; }; beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; }; beadplexr = derive2 { name="beadplexr"; version="0.1.0"; sha256="1aw75v4bjxrf22x0bm57qqp6r7cz8zmkd1hmk4amlxypbxd2479f"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; }; + beam = derive2 { name="beam"; version="1.0.1"; sha256="1xp8hqs1asg2a2lqzn88cxj0gs6qfwak54sy3kzc64kjp0r9lbl9"; depends=[fdrtool igraph knitr Matrix]; }; beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; beanz = derive2 { name="beanz"; version="2.1"; sha256="0lnjaka2cmkgc7id8njclmmkjb22v6gz9bkncq5n6zidawrczqp0"; depends=[BH loo Rcpp RcppEigen rstan StanHeaders survival]; }; - beast = derive2 { name="beast"; version="1.0"; sha256="1j4afp8cm6psxqidanvcfqrz6zy1klkzjkm7ia5w5qlvgll2micz"; depends=[RColorBrewer]; }; + beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; }; bedr = derive2 { name="bedr"; version="1.0.4"; sha256="052sn90gjr34hjgyndzvcl66pv22q0kjqbx95y1pdydiwhwmhpa3"; depends=[data_table R_utils testthat VennDiagram yaml]; }; beepr = derive2 { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; }; beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; }; beginr = derive2 { name="beginr"; version="0.1.0"; sha256="0zi2c6agkxx6aq7ih2c1z4r93fsjmqp2iymxllld0d7jcpp5qbv6"; depends=[cranlogs jsonlite]; }; + behavr = derive2 { name="behavr"; version="0.3.1"; sha256="18rpln7db8cnaj6f47vjgh7q2xbcjmd0vhfbmvm82fr7qhdnnyc0"; depends=[data_table]; }; belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; - belg = derive2 { name="belg"; version="0.1.1"; sha256="0bbp413q6y24g05xsk49lpz7b2i6n9fb791h05ml39x8r9lapif6"; depends=[Rcpp RcppArmadillo]; }; + belg = derive2 { name="belg"; version="0.2.1"; sha256="0yl4d2zq01r0wcxdjz3v0zmhdj1g7nbw1kn56883vsv5izdliksv"; depends=[Rcpp RcppArmadillo]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; }; benchmarkme = derive2 { name="benchmarkme"; version="0.6.0"; sha256="0w98q4b814bz3q0vqdfnwqrgfrky3ggsyyzmdiz17kv6xk17qds8"; depends=[benchmarkmeData doParallel foreach httr Matrix]; }; @@ -4479,9 +4566,9 @@ in with self; { benchr = derive2 { name="benchr"; version="0.2.0"; sha256="042ijh6726s116z7w2cky5l105p3dj7xsfmlwkigsbrmya8x5d37"; depends=[Rcpp RcppProgress]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.4.1"; sha256="0acbjjavbvsaigy78b5k9qhj8011751116lqln8j0v8w1k3vqwqm"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; - benthos = derive2 { name="benthos"; version="1.3-4"; sha256="015p9wxykr2g29r95wdslw1d2klc9ps4wznjrv1rxm5mazdbb2wv"; depends=[dplyr lazyeval readr]; }; + benthos = derive2 { name="benthos"; version="1.3-5"; sha256="1mzhqqy4dblwv70v1ky5gzrr3jyky9k4wibbp589jjjrga2vhq2a"; depends=[dplyr lazyeval readr]; }; ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; - berryFunctions = derive2 { name="berryFunctions"; version="1.16.3"; sha256="0bwqp999niakmihhj4wp9q63bg4mr4gsygxzss0dl276q7ma8x5i"; depends=[abind]; }; + berryFunctions = derive2 { name="berryFunctions"; version="1.17.0"; sha256="13wslhr3xm9davx3s69as41r53m3x0gm3mrnwrbsqcbmf9n0zbv3"; depends=[abind]; }; bestNormalize = derive2 { name="bestNormalize"; version="1.0.1"; sha256="0mlvaa35nsp19154g894xvfd6wg99lwxnfissf8yykwfl7fb265x"; depends=[LambertW nortest]; }; bestglm = derive2 { name="bestglm"; version="0.36"; sha256="1das1qnczgw46hrjplfhw00wqjd8gxqsdr9s4zmc3k8qlzhb3ych"; depends=[glmnet grpreg lattice leaps]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; @@ -4504,17 +4591,18 @@ in with self; { bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; }; bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; }; + bhrcr = derive2 { name="bhrcr"; version="1.0.0"; sha256="0rqn9wkd25d7l295n55idsf1zch1niz5f05qnsbd1gqrq7nw42xn"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; - bibliometrix = derive2 { name="bibliometrix"; version="1.9"; sha256="1yzdbh5h3fvc6agr551g9n10mlr72cbsrw9mpigfhxb953wvda54"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="1.9.2"; sha256="0xv371k1n00awk3w7cjbiyf3wxkk5vch3hf7lp2yz3fsdy2jh91s"; depends=[factoextra FactoMineR ggplot2 ggrepel igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist stringr]; }; bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; }; bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; }; biclique = derive2 { name="biclique"; version="1.0.1"; sha256="0wxvqjxc11ccvfnlnnb6gv6r74a48pg3yabsjynrg1m2kbynnqjf"; depends=[]; }; biclust = derive2 { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; }; - bifactorial = derive2 { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; }; bife = derive2 { name="bife"; version="0.5"; sha256="0lzij8sazfdr687bi5lfp5ndvwlx18vyzr3svc0zv9mnv8s8vfvd"; depends=[Formula Rcpp RcppArmadillo]; }; bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; - bigKRLS = derive2 { name="bigKRLS"; version="2.0.4"; sha256="027p1v89fpi2rgxca035nyzk51dxv0x04sy3mqb5z38rvj8r08k9"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; + bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.0"; sha256="1ik5daj2yc2shjkqypl4y6d53nmz170jvx0bdxn3hpm3g5crg1wd"; depends=[gmp]; }; + bigKRLS = derive2 { name="bigKRLS"; version="3.0.0"; sha256="043lm32cams2hc0fg1mvq08r4ippy4s5z62n1616vndfmqsn41v8"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; bigQueryR = derive2 { name="bigQueryR"; version="0.3.2"; sha256="0l61yvvjlv1zgb1vyf1q3sj4dff1vi6lkf61hc9kqs5cvhqbf87y"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigRR = derive2 { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; @@ -4522,8 +4610,9 @@ in with self; { biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; }; biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; - bigleaf = derive2 { name="bigleaf"; version="0.3.0"; sha256="1y1z9hi23w0n374jvndr0prry7msp6lfzkwzdr7ivpi89af0h027"; depends=[robustbase]; }; + bigleaf = derive2 { name="bigleaf"; version="0.5.2"; sha256="13x79i15jvv1bx4xnl9jakjmbxviac0gnrprax61c5afkaqxfxh4"; depends=[robustbase]; }; biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; + bigmatch = derive2 { name="bigmatch"; version="0.1.0"; sha256="15qrm3kdp9wglmpsy58z117nj85j8zc6cmf5w1kydamk2c8x49c9"; depends=[liqueueR mvnfast plyr rcbalance]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; }; @@ -4541,14 +4630,14 @@ in with self; { billboarder = derive2 { name="billboarder"; version="0.2.1"; sha256="0xmkj6l3cpyyq23hp6jhfqllpg7gkksajnq25wyccqmypxjik8jv"; depends=[ggplot2 htmlwidgets jsonlite magrittr scales]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; - binGroup = derive2 { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; }; + binGroup = derive2 { name="binGroup"; version="2.1-1"; sha256="1rwmsrm4ghpvb1vldph2frwglfvajwyj7bzi1f6mhnm9mrg80blj"; depends=[partitions]; }; binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; }; binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; }; binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; }; binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; }; bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; }; - bindr = derive2 { name="bindr"; version="0.1"; sha256="0d95ifm0x4mrfzi20xf39f5pzd7rfzqsld0vjqf6xzga5rhnd8fc"; depends=[]; }; - bindrcpp = derive2 { name="bindrcpp"; version="0.2"; sha256="0l1l22zl87wiyl79m3gj2vlxmkhxvrkl4alhyy08h55q7hqs3vyh"; depends=[bindr plogr Rcpp]; }; + bindr = derive2 { name="bindr"; version="0.1.1"; sha256="1l05fpk2yql3jka321c0bdgx6mqq9pvfrg2844lbjfpbgjkmqy3w"; depends=[]; }; + bindrcpp = derive2 { name="bindrcpp"; version="0.2.2"; sha256="0rz4ibjdjsxl99ff3ha79z7cnjmilx4rx58fk9kk7ld9xc4hf4s8"; depends=[bindr plogr Rcpp]; }; binequality = derive2 { name="binequality"; version="1.0.3"; sha256="0hhcmw1mq785zylcxghfnazi3xvnl7sqpqll8fqdk064a4drqkw1"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; }; binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; }; bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; }; @@ -4566,14 +4655,14 @@ in with self; { binsmooth = derive2 { name="binsmooth"; version="0.1.0"; sha256="1zlw4zmkckg7rwf4hx8wyr2yl644xkdkazayysy99saysr9pk2c9"; depends=[ineq pracma triangle]; }; binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; }; bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; - bio3d = derive2 { name="bio3d"; version="2.3-3"; sha256="0cw6nhkj5mxh89lfrnhrmv0rwxkmh05g6nd6rvd7ahcaxd3mid7l"; depends=[Rcpp]; }; - bioOED = derive2 { name="bioOED"; version="0.1.1"; sha256="18b66s5dn8a67iwb0g1bmbi856ip81yfa57m40kf7phsga52ncg1"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; }; + bio3d = derive2 { name="bio3d"; version="2.3-4"; sha256="1zmswa9xs81lbrlkkgi8dvv9xpf0ynqjqwy1k36szvfb8ar9mczr"; depends=[Rcpp]; }; + bioOED = derive2 { name="bioOED"; version="0.1.4"; sha256="1rjcqrni5xag97pxfsf40isr2c8pkqsvihf86phak8ngwl7qdgmc"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; }; bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; biofiles = derive2 { name="biofiles"; version="1.0.0"; sha256="1bglgl2jcp6jy3f7xwndil56i98xx4kn518s3fqdixw7n5ibmqd2"; depends=[assertthat BiocGenerics Biostrings foreach GenomeInfoDb GenomicRanges IRanges iterators Rcpp RCurl reutils S4Vectors XVector]; }; biogas = derive2 { name="biogas"; version="1.10.0"; sha256="1il4r71h2a0xqpjs7q97ypdd12jmdnh0kqcs6j5gpjxdsmgnhlsy"; depends=[]; }; biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; }; - bioimagetools = derive2 { name="bioimagetools"; version="1.1.0"; sha256="0ws99rx7bhqi448qqy08jsl3c4vbq96gigqb85yv1mzrc82sg62p"; depends=[EBImage httr tiff]; }; + bioimagetools = derive2 { name="bioimagetools"; version="1.1.3"; sha256="1xl5q45s4amvinfzysf5za0myq1f76xvqhyza0b191bky5vk8qq1"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.2.1"; sha256="1dxpa549y6dqzmi8nk57x0blqmcz51v9hj0sy3g9laj9aj0rmyzz"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS rlang]; }; biolink = derive2 { name="biolink"; version="0.1.3"; sha256="0cy9s9wg5rgwczqjfw6xp9ragqcj9gzp7icpm0nqwrdghsj7azjv"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; biomartr = derive2 { name="biomartr"; version="0.7.0"; sha256="1gjl4xh9ryxsf3lhn4fqa3zw10yc0mwrfgkrbq117njsw988kms7"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite purrr RCurl readr stringr tibble XML]; }; @@ -4581,7 +4670,7 @@ in with self; { bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; - bioset = derive2 { name="bioset"; version="0.2.0"; sha256="1cv4sgmbvxghwa22qwvgp5zgbfcyhljsh6c6k7gakxsv0wz1xq46"; depends=[dplyr magrittr rlang tibble tidyr]; }; + bioset = derive2 { name="bioset"; version="0.2.2"; sha256="1l2iss3rbzc69360r9i9j7nf0nn4fkj3j7bgc1hdabr32i19jkhh"; depends=[dplyr magrittr rlang tibble tidyr]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; biospear = derive2 { name="biospear"; version="1.0.1"; sha256="03wsyzlxmqff6xvr10jy49p229xr6jjvr8kk93wm7wil7q6b7z42"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; }; biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; }; @@ -4592,6 +4681,7 @@ in with self; { birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; }; birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; }; + bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; }; bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; bisoreg = derive2 { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; }; bit = derive2 { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; @@ -4601,11 +4691,11 @@ in with self; { bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; bivrp = derive2 { name="bivrp"; version="1.0"; sha256="0q00k24fssvjkgpndg84vdm7w9hswq593k6yjha4pl0a8bmnv6f8"; depends=[MASS]; }; biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; - bizdays = derive2 { name="bizdays"; version="1.0.4"; sha256="0vl9anlwvnnaiz67h256r386gy57fbbygjahsjaiaw8zrp84fj3p"; depends=[]; }; + bizdays = derive2 { name="bizdays"; version="1.0.5"; sha256="0yw53qzi2wbc33q5snmf7xsisfnknvf6pqr20npkwbh3999i1gk0"; depends=[]; }; bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; blackbox = derive2 { name="blackbox"; version="1.1.7"; sha256="1qdj6wsgr623wnhc573krnhjx65d4k9y8i3n2l2lj1qpqd538ygw"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; }; blandr = derive2 { name="blandr"; version="0.4.3"; sha256="03w1k646izbrygcsynrzrph7crpqdqn58544mmm9zxfvkmsilpmi"; depends=[ggplot2 knitr]; }; - blastula = derive2 { name="blastula"; version="0.1"; sha256="0i306x0xm34r9fz7iq8frjbcvfbgg64fm5nn7mbk29a58kn91axp"; depends=[commonmark ggplot2 glue htmltools httr knitr magrittr mailR rJava stringr]; }; + blastula = derive2 { name="blastula"; version="0.2.0"; sha256="11vaqsfm0kszx3iq38c8vbqnwkfk77lv5021l2zq9iaxz9d83s7k"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr knitr magrittr purrr rlang stringr tibble tidyr]; }; blavaan = derive2 { name="blavaan"; version="0.3-1"; sha256="1r5kararl5d8fk6zlawhyjpi1sc3xp1pd2cf83qmh9wbvdsfphwg"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; @@ -4616,22 +4706,22 @@ in with self; { blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; }; blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; }; - blob = derive2 { name="blob"; version="1.1.0"; sha256="05pazzcyz3c3vd2l70zq9cf172cgjff4dnf419zigfnxycyn1mhn"; depends=[tibble]; }; + blob = derive2 { name="blob"; version="1.1.1"; sha256="0lsg91hk508dd95ivig2lwg62qafwnarjw68110kx63cfk4zkjxc"; depends=[prettyunits]; }; blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; }; blockcluster = derive2 { name="blockcluster"; version="4.2.6"; sha256="0dskcwdh89a24j1lr829p9rrs88l13738b1gvsmsqrcrg9z955xc"; depends=[Rcpp rtkore]; }; blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; - blockmodeling = derive2 { name="blockmodeling"; version="0.1.9"; sha256="1rd8ifwv5q9yl0ayzkgi0h4k79w3r46dr164l73iz1ny77a78fn9"; depends=[]; }; + blockmodeling = derive2 { name="blockmodeling"; version="0.3.0"; sha256="188m35gpf1lbs3yhqrdiz9zfmf3p4v6v0grzmax3d9w9n5g7rx2y"; depends=[doParallel doRNG foreach Matrix]; }; blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; }; blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; - blocksdesign = derive2 { name="blocksdesign"; version="2.7"; sha256="0pkkp1i6dsj4q4p6529qkbyy8mqmw9zhs1ww1y55yn1adkkwfd4z"; depends=[crossdes]; }; + blocksdesign = derive2 { name="blocksdesign"; version="2.8"; sha256="0wgdgy705wpq0lh3k46ba7y8dzajgyfzcr87yvvzh610wr8vnsam"; depends=[crossdes]; }; blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; - blogdown = derive2 { name="blogdown"; version="0.5"; sha256="1i34vynvb496w638g0mip30vrxcx60nbr48g1nfkmgiw1nrvr8c5"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; + blogdown = derive2 { name="blogdown"; version="0.6"; sha256="02ahyzcapsjaanjiz1j9jx2wh8w2fa7dwbraj5w7bl7bln87cs16"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; blsAPI = derive2 { name="blsAPI"; version="0.1.9"; sha256="1p7s799kix396fbx8ap9vy9akwpaps37awr18qbj53n9qcm74wkp"; depends=[RCurl rjson]; }; - blscrapeR = derive2 { name="blscrapeR"; version="3.1.1"; sha256="1s76d6511ifhh17dnwhrd8hzmfnb26qal68pn4v4smz35srgfa9j"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; }; + blscrapeR = derive2 { name="blscrapeR"; version="3.1.2"; sha256="1k5g1j4n071pmh2z5lpgkll2i1abpq1h9qialdszak794x8km605"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; }; bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; - bmixture = derive2 { name="bmixture"; version="0.5"; sha256="144nd1s18nyii135jfr2f65szyzw8hi4zg57z85dnmr2xwas22qb"; depends=[BDgraph]; }; + bmixture = derive2 { name="bmixture"; version="0.7"; sha256="0x876wsahm0k3v900rkvvl2sma3awkhbrsfygikk1wskh3snqbsj"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; bmlm = derive2 { name="bmlm"; version="1.3.5"; sha256="091yjllx4kfngaam1ac8rxcx547k7s7qa75pb5350qkr096pvsvs"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; @@ -4642,7 +4732,7 @@ in with self; { bnlearn = derive2 { name="bnlearn"; version="4.3"; sha256="11zp8vf79h5a6dyijazld199pzp1lsgk3x049ykgy0bqjx2ivfvq"; depends=[]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; - bnpmr = derive2 { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; + bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; }; bnpsd = derive2 { name="bnpsd"; version="1.0.1"; sha256="0f9w3qcdmf6qx5k01vddmxj1vadx6d9zcgw6prpbmcf3cdy3fwg0"; depends=[]; }; bnspatial = derive2 { name="bnspatial"; version="1.0.3"; sha256="018rb5wacjk8igyc0qbp9rk3vjz3lffx81awlba8d2npiaxq6jbv"; depends=[doParallel foreach gRain gRbase raster]; }; bnstruct = derive2 { name="bnstruct"; version="1.0.2"; sha256="0n4gn1vhka694wdzignawyaca0rx2l0wjgw09fw42bkrswfjvxy1"; depends=[bitops igraph Matrix]; }; @@ -4651,7 +4741,7 @@ in with self; { bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; }; boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; bold = derive2 { name="bold"; version="0.5.0"; sha256="0gdmb3zsspcp594d32yzqhdpw4dwg7a3pfm7kgbghz368yw662gl"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; - bomrang = derive2 { name="bomrang"; version="0.1.1"; sha256="1r1k8ridclmlsbrwlrjh7syw4fy3q1hf2rpi2xssh7gg2n709cjb"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; }; + bomrang = derive2 { name="bomrang"; version="0.1.4"; sha256="00pzhqqk037hc8zl52f185lnj058vg2adzg0fsndvp83h2wghnd7"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; }; bookdown = derive2 { name="bookdown"; version="0.7"; sha256="1b3fw1f41zph5yw3kynb47aijq53vhaa6mnnvxly72zamyzdf95q"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; }; bookdownplus = derive2 { name="bookdownplus"; version="1.3.2"; sha256="0vkivgjfmqy2xfs75w8ylkpgcvca294q61jrhbpg24vnll3c281n"; depends=[bookdown knitr yaml]; }; boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; }; @@ -4675,7 +4765,7 @@ in with self; { bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxcoxmix = derive2 { name="boxcoxmix"; version="0.15"; sha256="0qvlk3kcvqzrak2rvf41fs8421fpfh3ch51rq0c9ac62x2dkfidh"; depends=[qicharts statmod]; }; - boxoffice = derive2 { name="boxoffice"; version="1.0.1"; sha256="0s8zx6n203l2cszq4xrwvazpw1fl36g1cln8n9sh20vyqrdcbgvh"; depends=[rvest xml2]; }; + boxoffice = derive2 { name="boxoffice"; version="1.1.0"; sha256="08b897dp5cfv6f30k2pdvh8y5n1981msnjr6lfs4dzfc1i6y2zfy"; depends=[httr rvest]; }; boxplotdbl = derive2 { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; }; boxr = derive2 { name="boxr"; version="0.3.4"; sha256="0wx3x65rk1ma8bw5h4yskr7ii95ynkm7il22l1bj34kv9f4bfyj3"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; }; bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; }; @@ -4694,7 +4784,7 @@ in with self; { brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; }; brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; }; brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; }; - breakDown = derive2 { name="breakDown"; version="0.1.4"; sha256="0mxn38pg95ih2p2gk2nayzwn6h8dhvsk46g0ndrhrr3l9nkbij3w"; depends=[ggplot2]; }; + breakDown = derive2 { name="breakDown"; version="0.1.5"; sha256="0m9lpd42ypspkwgwfi0pxkhg4xkrnzirm9d9rjxxf1a6y741ijl2"; depends=[ggplot2]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; }; breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; }; @@ -4703,7 +4793,7 @@ in with self; { breathteststan = derive2 { name="breathteststan"; version="0.4.0"; sha256="13wqb33gvzmjpgzqyyadydz5hnqcran80azaxbixj7wga0c35pqq"; depends=[BH breathtestcore dplyr purrr Rcpp RcppEigen rstan StanHeaders stringr tibble tidyr]; }; brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; brglm = derive2 { name="brglm"; version="0.6.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; }; - brglm2 = derive2 { name="brglm2"; version="0.1.7"; sha256="04hfvb0s6xjswv9f1z2aa80j490jcpf3jlplb4s576hc3fd8qqda"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; }; + brglm2 = derive2 { name="brglm2"; version="0.1.8"; sha256="017m7nlh29p271dhvx19l6042qfs48hqs947kjmpc7ykzv5461y3"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; }; bride = derive2 { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; @@ -4711,21 +4801,21 @@ in with self; { briskaR = derive2 { name="briskaR"; version="0.1.1"; sha256="0w614lb94vim6wlzj13gnfgkq0vg9fjlvwvvs11pnqq501qn2hzl"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; }; brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; }; - brms = derive2 { name="brms"; version="2.1.0"; sha256="1ahm539add6g26vfj8szmpcwkhnkjcqqqq35mfryrp94yslb6a8n"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="2.2.0"; sha256="1wdf5bka51pwdzniwmi6vwry1lms27124zbrmzm7f7b9k6bsqv3k"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; }; broman = derive2 { name="broman"; version="0.67-4"; sha256="1jv1543zq74zjdrmhkcrjwxhn9bmsmmwadd9rjnn18svnrbnlq0g"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; - broom = derive2 { name="broom"; version="0.4.3"; sha256="119pc2jnxvm13cvd77c7d14p3bn68f4jm310vj3yfck40101n9if"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; }; + broom = derive2 { name="broom"; version="0.4.4"; sha256="081x87sy6dmfvkgwfjrl5ax51k77ciyzg9x3xql25vdi92rmwj3m"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; }; brotli = derive2 { name="brotli"; version="1.1"; sha256="1jdhc03ycafjm6zfl9m95pd3krkb94mq2lhfjchfjc876mbam8x6"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brranching = derive2 { name="brranching"; version="0.2.0"; sha256="0y99px2m02rl60qgf6pjbjv6isp8v1w9sny6p2icgsx4bwxjxmns"; depends=[ape curl httr phytools taxize]; }; - brt = derive2 { name="brt"; version="1.1.0"; sha256="11a6zpdml5vz3kcdcajw5zcck1zbp4kfdkqm3y6q7qj8ym2f12q5"; depends=[ggplot2]; }; + brt = derive2 { name="brt"; version="1.2.0"; sha256="04srx4xfx89lg79krckazlfq0hqph39h01sg6fk1ra8fv2xrcnw4"; depends=[ggplot2]; }; bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; bsamGP = derive2 { name="bsamGP"; version="1.1.2"; sha256="037xgkmcli24jiqahxcingyx97q0jci2ahahcpn3xbzixa161rvf"; depends=[ggplot2 gridExtra MASS]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; }; bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; - bsplinePsd = derive2 { name="bsplinePsd"; version="0.2.0"; sha256="0fxm53sdlxjrvwvlihar8iwzin7ajkzvnm3h3nbzh37lf00gz0sb"; depends=[Rcpp]; }; - bsplus = derive2 { name="bsplus"; version="0.1.0"; sha256="1hpjrmsn66brf1hpwfmg55jbpwbhvkz7sbr160z1cgq3hdhqm7r8"; depends=[htmltools lubridate magrittr purrr rmarkdown stringr]; }; + bsplinePsd = derive2 { name="bsplinePsd"; version="0.5.0"; sha256="1ddvkn182r48fbjqkiskb94afy942bnl953n0cghza4wkbkdfprd"; depends=[Rcpp]; }; + bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; }; bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; }; bssm = derive2 { name="bssm"; version="0.1.4"; sha256="0wrai7s5sdjykiz8c5qrlcscm1awfz9cjaggarrs83h9fcs3n38x"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; }; @@ -4740,7 +4830,7 @@ in with self; { bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; }; bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; - bupaR = derive2 { name="bupaR"; version="0.3.2"; sha256="08xkf88fx8wn22vzn2ghm1jagh09pafqgmx41k99vrqkl3nrfm58"; depends=[data_table dplyr forcats glue magrittr miniUI purrr rlang shiny tidyr]; }; + bupaR = derive2 { name="bupaR"; version="0.4.0"; sha256="197ibs7jmbn823skg18zm1kqr2p35bxrd6bw22vjlj6b10r4nqhi"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; }; burnr = derive2 { name="burnr"; version="0.2.2"; sha256="1b5ys0jm2dmiz1jd5f3907dhv44wh60kmfdfhj3fzx8rk7zllm06"; depends=[ggplot2 MASS plyr reshape2]; }; bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; @@ -4752,16 +4842,15 @@ in with self; { c212 = derive2 { name="c212"; version="0.93"; sha256="10gwkr2w05bi27zwvspm3g31a1dpqbh1i52vyrfaamqkxypa11nh"; depends=[coda]; }; c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; }; c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; - cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; + cAIC4 = derive2 { name="cAIC4"; version="0.3"; sha256="1y12y2hk5fjhqfjbrkxl62nk0y0n1x5dh3zmiw7hqbka6i2bzsy7"; depends=[lme4 Matrix]; }; cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; }; cOde = derive2 { name="cOde"; version="0.3"; sha256="1r49q7qansn86wrxbhxqnn1dccd9av4lh4h5pn9kk42pls9q60nf"; depends=[Rcpp RcppArmadillo]; }; - cRegulome = derive2 { name="cRegulome"; version="0.1.0"; sha256="0yf5kx583k483rs3vw614qfv92k3c8gld8vsw16j1vlsbrasbiah"; depends=[DBI dplyr ggplot2 ggridges httr magrittr purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; }; + cRegulome = derive2 { name="cRegulome"; version="0.1.1"; sha256="0rhi4f1wkl03vh9m6hsba08cfvqjfn99xyxsykv625bgxra817bd"; depends=[AnnotationDbi clusterProfiler DBI dplyr ggplot2 ggridges httr magrittr org_Hs_eg_db purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; }; cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; }; ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; }; caRamel = derive2 { name="caRamel"; version="1.0"; sha256="0al4yk77a4bh8rjdpl841bnnjvs0sjyxqswqwik1n6y0bfr8f7pl"; depends=[geometry]; }; caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; }; - cablecuttr = derive2 { name="cablecuttr"; version="0.1.1"; sha256="1v3zhaxkp1h6lack2qk0v4zxh6fd0ymjnikw6bs7k540w2vrbs1g"; depends=[httr jsonlite]; }; cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; }; cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; depends=[binhf]; }; @@ -4771,7 +4860,7 @@ in with self; { calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; }; calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; }; calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; }; - callr = derive2 { name="callr"; version="2.0.2"; sha256="0m51p39vfwldxv6h8x4y9w3laf8q9bldhfqhlcrlx3xhy3irb1bp"; depends=[assertthat crayon debugme R6 testthat]; }; + callr = derive2 { name="callr"; version="2.0.3"; sha256="1k3mflgn10hcvy74y4pbigpv74zb66fz1phfd3c8isqmn88xbxzi"; depends=[assertthat crayon debugme R6 testthat]; }; calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; camel = derive2 { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; @@ -4781,23 +4870,23 @@ in with self; { cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="0.1.1"; sha256="14g7wl4p9bgwf5jm48mp676z0pwlsd2xgxjwzixri7mxxh0ivfh1"; depends=[CHNOSZ xtable]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.18.5"; sha256="052qwymd28pi4c5pkdrwb85r1f1342y46fpirz2mrspx9r877d7h"; depends=[htmlwidgets]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.19.0"; sha256="1cxfadvrm3gkrdfibwi1b7kqlc3hczyc0g72v5gkgc9hssb8j46i"; depends=[htmlwidgets]; }; cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; }; - caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; }; + caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; }; capm = derive2 { name="capm"; version="0.11.0"; sha256="1yw7h1r5m4md8yv0fn1j4wxvhwybifqyvrn8ip3fl32kxbwsmnvz"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; }; capn = derive2 { name="capn"; version="1.0.0"; sha256="14vfk00xyx0az3whmxjpcv1785lf0gx81w7qc54i3wcfp3i22kcr"; depends=[]; }; captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; }; captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; }; capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; - car = derive2 { name="car"; version="2.1-6"; sha256="14l4d9j87xnb0bz2wgqqbxnlnbcdfb5vx2fw6kdxj91kyrk6lhnj"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; - carData = derive2 { name="carData"; version="3.0-0"; sha256="1ggz4py77bgwlpl6rsv7vlxj1kjs6c10dskizwwjps910r76pd79"; depends=[]; }; + car = derive2 { name="car"; version="3.0-0"; sha256="1ks2jaav8lbxhzw56vpbnysjk3pvpmqh6avd574k0bha1226k81h"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; }; + carData = derive2 { name="carData"; version="3.0-1"; sha256="193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j"; depends=[]; }; carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; }; cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; }; care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; - caret = derive2 { name="caret"; version="6.0-78"; sha256="0h1nxzii2h80aslp1zsjczrlfmaks44sskabk4yq9c5rafc7ka6y"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; }; + caret = derive2 { name="caret"; version="6.0-79"; sha256="1i6sjw279g6mj83vz5gv99x0nljcbpy7v0nbl72lmd80sf7rjshl"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; }; caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; carfima = derive2 { name="carfima"; version="1.0.0"; sha256="0bxk254q916w5h5zyyp2bs6nvbmbzqfx3jr4a80fkgbmr49chzzp"; depends=[DEoptim invgamma MASS numDeriv truncnorm]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; @@ -4809,13 +4898,13 @@ in with self; { caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; - castor = derive2 { name="castor"; version="1.3.2"; sha256="0pz02wbm9w3mkp2gmnl92zgv1b63dvcp6j374hqjgxxpc79aw30m"; depends=[naturalsort Rcpp]; }; + castor = derive2 { name="castor"; version="1.3.3"; sha256="0n7d4225g28c3i4w4n9bdd8zz91kr80vvnajpn5433db71bqrrv8"; depends=[naturalsort Rcpp]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.13"; sha256="1xzxgf9d33h46qxz6a8d71mi673yzdnvxcxj073z7y19hjss3pkw"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; }; catcont = derive2 { name="catcont"; version="0.3.0"; sha256="1gz7bh3xi7x7clbwa7qvy64nqx5g6dfkyxysick2razr47dac0y1"; depends=[]; }; - catdap = derive2 { name="catdap"; version="1.2.4"; sha256="0vvrlbdjml1cxf6jafjycv0k3kzd2xy1zcwjv0rh3cswxmvpnh3a"; depends=[]; }; + catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; }; catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; }; catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; }; @@ -4833,6 +4922,7 @@ in with self; { cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; }; cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; }; cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; }; + cbinom = derive2 { name="cbinom"; version="0.0.0"; sha256="1bg4jq67wr4hd6bxf5477wcmns3r956sgw2lm9gw1d4znvz5x3vf"; depends=[Rcpp]; }; cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; }; cbsodataR = derive2 { name="cbsodataR"; version="0.2.5"; sha256="1dc4hbida1fbxin22paa31c0f4xj1pqzcc4649p7lbygqvf1fhqh"; depends=[httr jsonlite whisker yaml]; }; ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; @@ -4850,12 +4940,12 @@ in with self; { cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; cctools = derive2 { name="cctools"; version="0.1.1"; sha256="1baqijxg75wr90y38d5g1gg8jmpz8ji7zv51wp9n1knif27rg348"; depends=[qrng Rcpp RcppArmadillo]; }; - cdata = derive2 { name="cdata"; version="0.5.2"; sha256="0l0vqmvizvb7h31796yjbyd0wspxvl3zx64xarkqpq8vwqwkfv51"; depends=[DBI RSQLite wrapr]; }; + cdata = derive2 { name="cdata"; version="0.7.0"; sha256="1s35wibqs2bklyi8y4j2jxfj7b5jjap2rib3pmh92da3n5jx049l"; depends=[wrapr]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcfluview = derive2 { name="cdcfluview"; version="0.7.0"; sha256="00yc3q28y20l2ppqxy6h53p9fvwhvpkc8m7csmp2lizqh787i2cc"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; }; cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.0"; sha256="1z9a2rivi1i56369hkz94azfhyqch8wph819lgrxlrr4mcpl6k2p"; depends=[Formula MASS pracma]; }; - cdlTools = derive2 { name="cdlTools"; version="0.11"; sha256="0jqr0j6hwqwx574659i3mfzf4hcmmxfd3x28d52dwgpwsv0r10gn"; depends=[raster RCurl rgdal XML]; }; + cdlTools = derive2 { name="cdlTools"; version="0.13"; sha256="0zcw7k936mxk7ysjaqj9z3lw3vycbcnp6jhwqqysvd8n62nph24n"; depends=[httr raster]; }; cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; cdparcoord = derive2 { name="cdparcoord"; version="1.0.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; }; cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; }; @@ -4866,7 +4956,7 @@ in with self; { cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; cellWise = derive2 { name="cellWise"; version="2.0.8"; sha256="1xahayqlpylysdiqggzqh7z75r3ldi79bx124ky84r1vab659lm7"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 scales]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; - cem = derive2 { name="cem"; version="1.1.17"; sha256="1jnhsrc1jhax3zlw9ynla7g9z5i4w01iar7f7hmv92kp1cwh8rbd"; depends=[combinat lattice MatchIt nlme randomForest]; }; + cem = derive2 { name="cem"; version="1.1.19"; sha256="17i6jp6czjgchg16zndnh828hs8v28x25gy5f8mkzfhc5pfjd8mq"; depends=[combinat lattice MatchIt nlme randomForest]; }; cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; @@ -4888,7 +4978,7 @@ in with self; { cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; }; cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; }; cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; }; - cgam = derive2 { name="cgam"; version="1.9"; sha256="0hc8q6mdd8fy2229biknissmg95b88kryr4c33yv5j77z6gw3s4y"; depends=[coneproj Matrix svDialogs]; }; + cgam = derive2 { name="cgam"; version="1.10"; sha256="19q90bg32vn7f7znd93a7fz1pjmw1nmfxf4y5y2wfd14qmpwfk36"; depends=[coneproj Matrix svDialogs]; }; cgdsr = derive2 { name="cgdsr"; version="1.2.10"; sha256="1xyhw7mhmjichr1l6f9y1qvfj9wm87kfbm87ji7lcwf36gxh5g23"; depends=[R_methodsS3 R_oo]; }; cggd = derive2 { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; }; cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; }; @@ -4906,7 +4996,7 @@ in with self; { checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; checkmate = derive2 { name="checkmate"; version="1.8.5"; sha256="1q6igk50lq4fp5d3imgcn1j063h3gsp214ra4nlf534hf4wjlkg9"; depends=[backports]; }; checkpoint = derive2 { name="checkpoint"; version="0.4.3"; sha256="0r7v7ijyq92yd95ssxxbdlp5dv1sd09yvxr8c0yihf48kzw65s63"; depends=[]; }; - checkr = derive2 { name="checkr"; version="0.1.0"; sha256="01071y7jgvang5yi00304wr4p4040b8fc4ncfj6qfmk0bc97h51b"; depends=[]; }; + checkr = derive2 { name="checkr"; version="0.2.0"; sha256="1fy00mxdjfyw37l95gy9qc0ny5v9kn16hv261c8sl1kgnp8zv4a9"; depends=[]; }; cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; }; chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; }; chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; }; @@ -4919,15 +5009,16 @@ in with self; { chillR = derive2 { name="chillR"; version="0.70.2"; sha256="01hn2b88ra7kadjylj2y840lpkapm93kdracnamy15c6f5f27kmb"; depends=[fields httr Kendall pls raster RCurl readxl RMAWGEN sp XML]; }; chinese_misc = derive2 { name="chinese.misc"; version="0.1.8"; sha256="0c2qhdia7wpkv4x2qnq2lyvgnr0n37brd7m579hcl6zq7dw4y2m7"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; }; chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; - chngpt = derive2 { name="chngpt"; version="2018.1-3"; sha256="0x4jifap8y4gs7mdzawxyvfdfjg245zak2zljdl6351ppslzaj6z"; depends=[boot kyotil MASS survival]; }; + chngpt = derive2 { name="chngpt"; version="2018.3-29"; sha256="0m1va7rknp2lmqdfhlfndhwb6ysn9vi567cc34f33829pdh0y4w3"; depends=[boot kyotil MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; - cholera = derive2 { name="cholera"; version="0.3.0"; sha256="08ijini3d4ir26di655315lvs9vjscixpawv8r7499idcb1jz87i"; depends=[alphahull deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; }; + cholera = derive2 { name="cholera"; version="0.4.0"; sha256="0pm5kbaqkxkwzyda4ms90yivx0iv7hcn2z65xfqcqlsxsjbvlmhs"; depends=[deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; chopthin = derive2 { name="chopthin"; version="0.2.2"; sha256="1ixmgq6igd2ji88qba7scny1j8rrizcf76dk4ymk3hah5dln97fz"; depends=[Rcpp]; }; chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; }; choroplethr = derive2 { name="choroplethr"; version="3.6.1"; sha256="11f529zcflbqbchnp3v5yw2vwrlhyfib5pn2j6l60x0gdfxp07bb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps scales stringr tigris WDI]; }; choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; }; choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; }; + chorrrds = derive2 { name="chorrrds"; version="0.1.3"; sha256="1f4mrf5i5cddgv639cv45b35ff4r96hw7xh47zx04lgm295s5rvy"; depends=[dplyr httr jsonlite magrittr plyr stringr XML]; }; chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; }; chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; }; chron = derive2 { name="chron"; version="2.3-52"; sha256="185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4"; depends=[]; }; @@ -4944,19 +5035,20 @@ in with self; { citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; }; - civis = derive2 { name="civis"; version="1.2.0"; sha256="10idsjq5grg9mw18f8v2wqz1rg95s12dsfglkrg7jar1782yq822"; depends=[DBI dbplyr devtools dplyr future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; }; + ciuupi = derive2 { name="ciuupi"; version="1.0.0"; sha256="1c72crf0his7vzmh86isvcvi0ahxnqdq4i6ms84hk20jmlz2hxin"; depends=[functional nloptr pracma statmod]; }; + civis = derive2 { name="civis"; version="1.3.0"; sha256="1897b2s23clgwh35r9nvbgd3xbznbn4yxswwwy5rwc3w8yip5brj"; depends=[DBI dbplyr devtools dplyr feather future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; }; cjoint = derive2 { name="cjoint"; version="2.0.6"; sha256="1bhzw751ll43qbyif589yxmi3m1pbm206lqnsc5zcxsnxjf4li5n"; depends=[ggplot2 lmtest Matrix sandwich survey]; }; ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; }; ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; }; clam = derive2 { name="clam"; version="2.3.1"; sha256="1n30fvx4macyawhzv17bzvc1s4qdn51p9mx28apfjbf80qck24g9"; depends=[]; }; - clampSeg = derive2 { name="clampSeg"; version="1.0-1"; sha256="0y0yxdv75xqmv7v6q8q8v1qj6xr8i7ik4nkh759rpyn0da7qq076"; depends=[Rcpp stepR]; }; + clampSeg = derive2 { name="clampSeg"; version="1.0-3"; sha256="06j0778qzw7lkdf7wrzshn9pikr57xymb3kbxvxcywz6db5c4k47"; depends=[Rcpp stepR]; }; clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; }; class = derive2 { name="class"; version="7.3-14"; sha256="173b8a16lh1i0zjmr784l0xr0azp9v8bgslh12hfdswbq7dpdf0q"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; - classInt = derive2 { name="classInt"; version="0.1-24"; sha256="18ng9y647jwb855pkmz555zdrznjgw4ynppaw43xm8qf8n291p7k"; depends=[class e1071]; }; - classiFunc = derive2 { name="classiFunc"; version="0.1.0"; sha256="0rgl7yzdia2wl4b03zny8fyz6mn9lr3l2lf2134kcsfvw63apc12"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy]; }; + classInt = derive2 { name="classInt"; version="0.2-3"; sha256="1afiw3d5vpxky5scngj63095453xr95wrjj8kw36zsz71hrlgx11"; depends=[class e1071 spData]; }; + classiFunc = derive2 { name="classiFunc"; version="0.1.1"; sha256="1qaima3sii394741p5n06lcqkk4fiv9apb7qqnpi6srx5h02lfl5"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy rucrdtw zoo]; }; classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; classify = derive2 { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; }; @@ -4969,7 +5061,7 @@ in with self; { cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; }; clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; - clhs = derive2 { name="clhs"; version="0.5-7"; sha256="0n7zy8wf78lka1l0zm42zxwi24bvavfy3irfqcnz5nslqkg61il2"; depends=[ggplot2 plyr raster reshape2 scales sp]; }; + clhs = derive2 { name="clhs"; version="0.6-0"; sha256="1vw8z4kmmpd8sbx7n8fzdd7lhg10qpnnx31nnjhv4dbd6v2nqii9"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; cli = derive2 { name="cli"; version="1.0.0"; sha256="07as3dr7vwx02p3qgzlmxz1dlrd3x3lysrzp222ip9jcjpydp8wg"; depends=[assertthat crayon]; }; clickR = derive2 { name="clickR"; version="0.3.38"; sha256="1qlc4lz2y2ls5qx1rqiswl5qr5qqkn6l30cp5ikhzr3ffvwp3nym"; depends=[beeswarm boot brms lme4 lmerTest ReporteRs xtable]; }; clickstream = derive2 { name="clickstream"; version="1.3.0"; sha256="01bii527xy7hdph1pm6f1g4qnwa5yf3mwz01rjg1h2gc12s5vzgg"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; @@ -4984,18 +5076,18 @@ in with self; { clinDR = derive2 { name="clinDR"; version="1.7"; sha256="0xnrnmwg4y2vlxsmhj5pzpyiqk90xjxl91i9nn3lv90xszmdh0x2"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; }; clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; - clinfun = derive2 { name="clinfun"; version="1.0.14"; sha256="13ip144qzgx9bg9pvdgz7y4v21sjvyjjixbm8mnvn6a6k62ycgmf"; depends=[mvtnorm]; }; + clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; }; clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; }; clipr = derive2 { name="clipr"; version="0.4.0"; sha256="1bz841r3kmv16r6zxmlkvasp4nyldam00n6gh7zf8lyy9ymz38j4"; depends=[]; }; clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; }; clogitL1 = derive2 { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; }; clogitLasso = derive2 { name="clogitLasso"; version="1.0.1"; sha256="1mm815w31n0jvbh2rwq15ja1mzvjaz1x846xq1949aj4pb692zrl"; depends=[foreach lassoshooting]; }; clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; }; - clordr = derive2 { name="clordr"; version="1.2.0"; sha256="0i04wx3gablbhc8g6591pgb13hhj4gr9jbswv477x3s3rw30mv6s"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; }; + clordr = derive2 { name="clordr"; version="1.3.0"; sha256="16cw6i91azi3xw9slzy2v8vpdkqik8k02mvgvcl9a3irbl7wgz10"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; depends=[]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; - clubSandwich = derive2 { name="clubSandwich"; version="0.3.0"; sha256="1az4q95swknjjbaisg0whcqyyrfxs8vhax3af9bnm6n2l2czihvk"; depends=[sandwich]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.3.1"; sha256="1ga7f2s2jrj7xhrqz86bfsby8a6gsp9fqbfv0mjb2iaybi0is8d9"; depends=[sandwich]; }; clue = derive2 { name="clue"; version="0.3-54"; sha256="1fnl1wi0g8f243ra5krlpyz69pg8s8m2wwxa53hb086k7hqv74af"; depends=[cluster]; }; clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; }; clusrank = derive2 { name="clusrank"; version="0.5-2"; sha256="168xad5dyz46yxm139q09n9vp1304yrhikxz5bcfzhm3psyv5fbf"; depends=[MASS Rcpp]; }; @@ -5004,7 +5096,7 @@ in with self; { clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; clustMixType = derive2 { name="clustMixType"; version="0.1-29"; sha256="01rc84ppy5mw3cdcx15xs6061lg1mwh6kxa80rnj3ax3g10x37sh"; depends=[RColorBrewer]; }; clustRcompaR = derive2 { name="clustRcompaR"; version="0.2.0"; sha256="151xq8qf1mrl35kyhdliwl2jpdkpkbl3gdnrvrybanihry2p0kqg"; depends=[dplyr ggplot2 ppls quanteda]; }; - cluster = derive2 { name="cluster"; version="2.0.6"; sha256="1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"; depends=[]; }; + cluster = derive2 { name="cluster"; version="2.0.7-1"; sha256="1grxbifbc4nwig25dmjgkympnbzb4al0w6k1c0ibdhpk1h4l20di"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.7"; sha256="13smdm8dmp4795qqn8an3k22l7xs4i4kgazyjzxdbzkg742akk7q"; depends=[]; }; clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; }; @@ -5021,9 +5113,10 @@ in with self; { clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; }; clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; }; - clustrd = derive2 { name="clustrd"; version="1.2.0"; sha256="029z46ihr2c57wan03c201d9kpaiyhhfvny41fjc2mvvc50rh2z7"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; }; + clustrd = derive2 { name="clustrd"; version="1.2.1"; sha256="05lsicz4br81fv20151j4j2bp1pfddcvywfqkagflc33z954a3z1"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; }; + clustree = derive2 { name="clustree"; version="0.1.1"; sha256="0y6i4z9xzmw7jf6c9kl87zims3gs5akyl355jc539534vhmsi73a"; depends=[checkmate dplyr ggplot2 ggraph igraph rlang viridis]; }; clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; - clustvarsel = derive2 { name="clustvarsel"; version="2.3.1"; sha256="04jhywv15xqb284nwi80sinxkhadd590vvjbg1immywy2md9gfgc"; depends=[BMA foreach iterators Matrix mclust]; }; + clustvarsel = derive2 { name="clustvarsel"; version="2.3.2"; sha256="11xd3pgr4i15q9rcim8y6ybi1iijv59k7f8wh0b2368kz3kz54cj"; depends=[BMA foreach iterators Matrix mclust]; }; clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; }; cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; @@ -5033,7 +5126,7 @@ in with self; { cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; }; cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; }; cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; }; - cmsaf = derive2 { name="cmsaf"; version="1.9.0"; sha256="1r0cny0i3wi3xfi38l5ls6zycnp0q1a0s00qrdgi1956yrmnm5x1"; depends=[fields ncdf4 raster sp]; }; + cmsaf = derive2 { name="cmsaf"; version="1.9.1"; sha256="02l1g5l42lxg3wlpjg5qm6h8mfr1bdcpi052z8masxf6xf4l0abr"; depends=[fields ncdf4 raster sp]; }; cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; }; cna = derive2 { name="cna"; version="2.0.0"; sha256="0cfr4g63wwqkkz2xxz76m82p0am2kyazal6sqp7gnrc48x9lv8im"; depends=[Rcpp]; }; cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; @@ -5042,8 +5135,9 @@ in with self; { coRanking = derive2 { name="coRanking"; version="0.1.3"; sha256="1ss00l0c99fi9p6gcimb31nrl5iflps6lvplnjjqwcqjkb2pjh9p"; depends=[Rtsne scatterplot3d]; }; coala = derive2 { name="coala"; version="0.5.2"; sha256="1rj9my20ba79alkhszh5lfvb9gjr6vcgiwqk2szawkpd1np3lpsr"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; + coalitions = derive2 { name="coalitions"; version="0.6.2"; sha256="0plzrjjsbbr5mw6wqirxp1wgpl2bw2kh0gdalr8c8v2z7hc1d9r6"; depends=[checkmate dplyr forcats gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="3.2.1"; sha256="1ip8d2inr3369iq4bpx52fbvfwy31c0mzg1rpydj8x4m3jfh83fz"; depends=[ggplot2 ggstance]; }; + cobalt = derive2 { name="cobalt"; version="3.2.2"; sha256="1hjfhbx8pjxf87bbp41xkq03srixv5p30nw2dk1f8if7xcyzjp97"; depends=[ggplot2 ggstance]; }; cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; }; cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; }; cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; @@ -5052,8 +5146,9 @@ in with self; { coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; }; coda_base = derive2 { name="coda.base"; version="0.1.8"; sha256="05bbmfswajmjc8l3g2clwj3hyj06y9v7camq910b881frl2xj584"; depends=[MASS Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; - codemetar = derive2 { name="codemetar"; version="0.1.4"; sha256="0klwwf4ws2l15iq33d3jk7whp4inql6if7yai5z7493zs9c30z3x"; depends=[devtools git2r jsonld jsonlite readr stringi]; }; - codep = derive2 { name="codep"; version="0.7-1"; sha256="1icj9mijp3x93rn7xbi0aivj7r4rlgiclsa920b1x9ws8b3jrv06"; depends=[]; }; + codebook = derive2 { name="codebook"; version="0.5.8"; sha256="0zz4vw5r5dw3vfd0j71jzgdf1z1ll0sgcwqq7qrnxn1s4ya4d0v4"; depends=[dplyr DT future ggplot2 haven knitr likert mice pander psych purrr readr rlang rmarkdown skimr stringr tibble tidyr]; }; + codemetar = derive2 { name="codemetar"; version="0.1.5"; sha256="164cjcqi0pz2h3v4i8llgjjif1gyrvisg0pqz04s4glbbf2pkz80"; depends=[devtools git2r jsonld jsonlite readr stringi]; }; + codep = derive2 { name="codep"; version="0.8-1"; sha256="1ip84285kcqgniabw5da7az1p508wx961gr4hiqf8c24flyw08br"; depends=[]; }; codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; }; codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; }; codyn = derive2 { name="codyn"; version="1.1.0"; sha256="0s8ssaq59vddilz0fin9sgr8fir70c220cffbsy2l0qn34q48627"; depends=[assertthat permute]; }; @@ -5077,7 +5172,7 @@ in with self; { colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.1"; sha256="1321675wz1vn7rcd2sm4c9h183nwnmp0lqww5nykjf792ijyaal8"; depends=[BMA flashClust ggplot2 reshape snpStats speedglm]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; - colorSpec = derive2 { name="colorSpec"; version="0.6-2"; sha256="153jps1l0wv0b726b0l7bhsg7g45jdfsralg6k8nvyij4yw1dqi1"; depends=[MASS]; }; + colorSpec = derive2 { name="colorSpec"; version="0.7-3"; sha256="1gg55872ap3h15h5ris1qhjgyq4q55x702z9v0xsigz87fcr300s"; depends=[MASS minpack_lm]; }; colordistance = derive2 { name="colordistance"; version="0.8.0"; sha256="0fqj8apgfvk021cs1m79nk9kx294zxbj55jqylcrg3hadxy4plkf"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scatterplot3d spatstat]; }; coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorednoise = derive2 { name="colorednoise"; version="0.0.2"; sha256="0y2a86fwndcgkaxr4jmls7a9d1ipij4zi3r4nchwda0bynlw6mq4"; depends=[dplyr purrr Rcpp]; }; @@ -5105,12 +5200,12 @@ in with self; { commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; commonmark = derive2 { name="commonmark"; version="1.4"; sha256="1vb8r9khpvcf0q7acv8rsplfjjwcll302bg5kp596cvn6aacypl6"; depends=[]; }; commonsMath = derive2 { name="commonsMath"; version="1.1"; sha256="0v9jlk75ihh8yjhq5ybighvndp0hn1d6rqh78jkh4g6ylhbpvcw0"; depends=[]; }; - comorbidity = derive2 { name="comorbidity"; version="0.1.0"; sha256="0j2znk4w4vr1swnqp2pldhzrg28sb13ykzan15l1c1p3yg8pp35w"; depends=[checkmate]; }; + comorbidity = derive2 { name="comorbidity"; version="0.1.1"; sha256="0xb3k2ql3ikdbyx8l73wsrwi62ayapszbrygk8arw1g2n0yqz2f4"; depends=[checkmate]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; - compareDF = derive2 { name="compareDF"; version="1.2.0"; sha256="09y8bh9d9m2pf9j7qqyk1s07pp7rgbhzbkswl12vnx2cm24lp525"; depends=[dplyr htmlTable tidyr]; }; + compareDF = derive2 { name="compareDF"; version="1.3.0"; sha256="0idra4qsr73sx4rcnm3d6arfz8mrcc072jiw3lljjmwidsfdnjvr"; depends=[dplyr htmlTable tidyr]; }; compareGroups = derive2 { name="compareGroups"; version="3.3.3"; sha256="18v5as6037ndihsslk25455y553wcbrdriav1p6zbbc52lqcf0a3"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparer = derive2 { name="comparer"; version="0.1.1"; sha256="1nmvqzrvyxdsidkr243qdn0lj2s7j3jv1sh0mdlxm2v5063nyryr"; depends=[progress]; }; @@ -5123,7 +5218,7 @@ in with self; { complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; }; compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; compositions = derive2 { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; }; - compound_Cox = derive2 { name="compound.Cox"; version="3.8"; sha256="0sskkcillpdxyibph4y35nhk67zmxylbql8igy5lq2r86wfsrp5a"; depends=[numDeriv survival]; }; + compound_Cox = derive2 { name="compound.Cox"; version="3.10"; sha256="0xk7r7dvcm5kwvimap9v4h60nxrk6hk72hm7258pm0x32ygwidcw"; depends=[numDeriv survival]; }; compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; comtradr = derive2 { name="comtradr"; version="0.1.0"; sha256="0az61xsrwzr4g1s6g52vm9fivh985c6s06y3rb1c9ic0my385zhx"; depends=[httr jsonlite magrittr purrr]; }; concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; }; @@ -5132,7 +5227,7 @@ in with self; { concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; }; concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; }; - cond = derive2 { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; }; + cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; @@ -5142,12 +5237,12 @@ in with self; { condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; }; condvis = derive2 { name="condvis"; version="0.4-2"; sha256="0l515wpsmh7g4q4w29gb1gv5kafwzfhb8as0ml8vbbrh6xcgmz9q"; depends=[MASS]; }; - coneproj = derive2 { name="coneproj"; version="1.12"; sha256="1937sf7b9s2y421gf2srjjdpv2knxrr03xyq5vg5j77z73kh9s6d"; depends=[Rcpp RcppArmadillo]; }; + coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; }; conf = derive2 { name="conf"; version="1.0"; sha256="0skfmk1vz8ry52l811rxnk6a8hicajza8m5ycfg7p0xb8ssyj6gi"; depends=[]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; }; - config = derive2 { name="config"; version="0.2"; sha256="1p0gaqrqhcrdkp5cr3rn4i5ny8mr96b3q1fwgs0i8lk5riljkk20"; depends=[yaml]; }; + config = derive2 { name="config"; version="0.3"; sha256="0l67nfpm42ssnk0bl4jmq6bibz8hawgfgh2s14s5c8mnimv6mpjs"; depends=[yaml]; }; configr = derive2 { name="configr"; version="0.3.2.1"; sha256="184iafdsj0k8i4n877g00fsnqmdq7k4y1azwn4d18gq2l7kg3qn1"; depends=[glue ini jsonlite RcppTOML stringr yaml]; }; confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; @@ -5158,7 +5253,7 @@ in with self; { conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; }; - constellation = derive2 { name="constellation"; version="0.1.0"; sha256="1q6kv8gg89xk80y24ma0zp8zy3cy4i93bjzax524cjbfnhpknx1k"; depends=[data_table fasttime]; }; + constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; contfrac = derive2 { name="contfrac"; version="1.1-11"; sha256="0vmcazjlg0p3xaksai3k7yb9bbqkd4lhmbvxf2qymr2asqm51mdi"; depends=[]; }; conting = derive2 { name="conting"; version="1.6.1"; sha256="0vw6gwiajxzaai6ky0b89l2jg4kd4c6xxzb1cmzxlcdrhwmhz402"; depends=[BMS coda gtools mvtnorm tseries]; }; @@ -5187,14 +5282,13 @@ in with self; { corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; }; - corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; cordillera = derive2 { name="cordillera"; version="0.8-0"; sha256="0cpysfivwmim36gcqn1i7450a33hv4pdbvil7syb0hr7vdm083dd"; depends=[dbscan yesno]; }; coreCT = derive2 { name="coreCT"; version="1.2.1"; sha256="19aq5snv5kin913rf0a1n9z0cg2l1jn2hnxbd0h05p1qrsysx52b"; depends=[igraph oro_dicom plyr raster]; }; coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; }; coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; }; coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; }; - corehunter = derive2 { name="corehunter"; version="3.2.0"; sha256="12bwmhl6mmjz7xggh03933k1ax5k5dri3bp4p73y6bh1rk22p5l2"; depends=[naturalsort rJava]; }; + corehunter = derive2 { name="corehunter"; version="3.2.1"; sha256="0cxvhmi768kz3q8hydb6y9nqvc8hvkmq8nc5yfry4k94whk12wax"; depends=[naturalsort rJava]; }; corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; }; corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; @@ -5202,21 +5296,22 @@ in with self; { corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; }; corpustools = derive2 { name="corpustools"; version="0.3.1"; sha256="0723n7gjk4yrnbvars6c6a805cqpx21z9yn9745wbvfgq7a8c4hy"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi wordcloud]; }; corr2D = derive2 { name="corr2D"; version="0.2.0"; sha256="02z9k0j6j8jyjfgff55amkzsa5w0xbr9nqm1247qylsh8sl2rqcz"; depends=[colorspace doParallel fields foreach mmand rgl]; }; + corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; - corregp = derive2 { name="corregp"; version="1.0.3"; sha256="07zsbxhvh7n4ma6lgsmg0kkmgcs5afa02k6cq57afaqvxisw18l3"; depends=[diagram ellipse gplots rgl]; }; + corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.12"; sha256="1z0h2mkf4805w3wnhy31cf1gm9miliapxchgc4ksg3kx2799gv91"; depends=[seriation]; }; corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; }; corrr = derive2 { name="corrr"; version="0.2.1"; sha256="1d04nk92fjmk4kc5zipjqjhhmb1w97kid7l2jz5a8pkwiccn5byc"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr seriation tibble tidyr]; }; corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; - cosa = derive2 { name="cosa"; version="1.1.0"; sha256="1fdyxc3c5wknxkjmz9xcyf4yri8nh0zkim1prn3xgblwab98b5sv"; depends=[nloptr]; }; + cosa = derive2 { name="cosa"; version="1.2.0"; sha256="1g2n9l79bi6pr5m9f4c0byw2ls9nhykkaaivssxbx4m6qpqlqg54"; depends=[nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; cosinor2 = derive2 { name="cosinor2"; version="0.1.0"; sha256="0pxkkp8dxhzqp2v3pfzigh1ka7ardf168k5p41z289xgar9p33g0"; depends=[cosinor ggplot2 Hmisc matrixStats]; }; cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; }; cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; }; - costat = derive2 { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; }; - cotrend = derive2 { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; }; + costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; }; + cotrend = derive2 { name="cotrend"; version="1.0.1"; sha256="14yzfq5a3wi26gn45mp2zm2yn6gic90csk9by66m08fgpzznz4dq"; depends=[xts]; }; couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; countrycode = derive2 { name="countrycode"; version="1.00.0"; sha256="1b2ijbf74bxvi01f53lbb2b9jya2rlyazvzacxpj79y1dbs600s6"; depends=[]; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; @@ -5243,7 +5338,7 @@ in with self; { coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; }; coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; }; - coxphw = derive2 { name="coxphw"; version="4.0.0"; sha256="02xiwrvc3gbwwjcz9kwy2g91jrjpawch5r4pq6l4lyvl556w296l"; depends=[survival]; }; + coxphw = derive2 { name="coxphw"; version="4.0.1"; sha256="116dp6zispa8k7y6jrn4v9ipf0jqdhj68w9qqc2qwcapawvrd0nh"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; cp4p = derive2 { name="cp4p"; version="0.3.5"; sha256="16pkl0brm415v153ln41nyy13fsp4i0jy8349lsffkv5mvp7vklc"; depends=[limma MESS multtest qvalue]; }; @@ -5257,7 +5352,7 @@ in with self; { cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; }; cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; }; cpt = derive2 { name="cpt"; version="1.0"; sha256="0cfjsni8m3sx2vh5cxiwqh50gl65nag5zp757jy75sx44rky63m8"; depends=[glmnet MASS nnet randomForest]; }; - cptcity = derive2 { name="cptcity"; version="1.0.0"; sha256="0gvgjy8m5bcihkcxzdzvxxawpk74zvd185ds28vbwvdibx8kjvph"; depends=[]; }; + cptcity = derive2 { name="cptcity"; version="1.0.3"; sha256="1axysyarmf68cmwadqwz9106zs5jj1bvrwhkg86maixj5aaqpim5"; depends=[]; }; cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; }; @@ -5267,6 +5362,7 @@ in with self; { crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.1"; sha256="0lnbdkyk5mdy0qlvkx2hakqrisrxsdp5r3gif6f46pf4d9cpfj8v"; depends=[DBI debugme desc RSQLite]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; }; + cranly = derive2 { name="cranly"; version="0.1"; sha256="1q6x6v77z6y540shyqpiq0p78rp02mmhdmnq79hvlm9ykqblzrcr"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; }; crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; crawl = derive2 { name="crawl"; version="2.1.1"; sha256="0dr9z8y8rvc3wn1gjb6mh5wmszng9j1r2a9ks6p5am8ghf754sps"; depends=[dplyr gdistance mvtnorm raster Rcpp RcppArmadillo shiny sp]; }; crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; }; @@ -5279,7 +5375,7 @@ in with self; { crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; - crmPack = derive2 { name="crmPack"; version="0.2.6"; sha256="0jpf0626nkl3inbgb8hcgkhilrd1bkxjhm3jzscxrdghpzwvzw6h"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; + crmPack = derive2 { name="crmPack"; version="0.2.7"; sha256="1d0ydllcbykwip9dw3arvn6lv4h88n5nkm3ms122gfrf44f6h2c0"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; crminer = derive2 { name="crminer"; version="0.1.4"; sha256="1vnl01q5sw13g6qhvn61w9i40zpg9cszisgi0h8d6q6rr23iws9w"; depends=[crul hoardr jsonlite pdftools xml2]; }; crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; @@ -5297,6 +5393,7 @@ in with self; { crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; }; crplyr = derive2 { name="crplyr"; version="0.1.4"; sha256="1z50hplp6m4zgjfhmf2j8b22np6kjzqnprrdc0qx8408cb9vc9zr"; depends=[crunch dplyr lazyeval tibble]; }; crqa = derive2 { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; }; + crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; }; crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; }; crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; @@ -5308,11 +5405,11 @@ in with self; { crunch = derive2 { name="crunch"; version="1.20.0"; sha256="1hsya10ba6mb3xd1lvbn2d74g9glm0l98fbh130phq5wdnn8lpx9"; depends=[crayon curl httpcache httr jsonlite]; }; crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; }; cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; }; - crypto = derive2 { name="crypto"; version="0.1.4"; sha256="1b3i0f2ll6cj5z8xmws1g6c8zgwz1ip9qwgi205ncxc0nq9xlqlc"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2]; }; + crypto = derive2 { name="crypto"; version="0.1.5"; sha256="0yqdn14mv8cbn2nmxflhyn46fqbrk3iknjg3bqxyj5k426q3zqx4"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; }; - csampling = derive2 { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; + csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; }; cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; }; @@ -5335,14 +5432,14 @@ in with self; { ctv = derive2 { name="ctv"; version="0.8-4"; sha256="0yl20b1j8c11b1g0q6qv0wsaivxpikwslhky4lckbm3rwbn5vbb2"; depends=[]; }; cubature = derive2 { name="cubature"; version="1.3-11"; sha256="06f6gsvbb732p80r6hxvzh4ik546icxfvx21dyh65ypmw3kgm64k"; depends=[Rcpp]; }; cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; }; - cubing = derive2 { name="cubing"; version="1.0-2"; sha256="00fch9vgxcaasxgrz79x21wb54yspnw5ysdjcdfym4qjknh9m3b6"; depends=[rgl]; }; + cubing = derive2 { name="cubing"; version="1.0-4"; sha256="11aln47l8ni33k3mmadccnphsv1rad4n5llg9ff5lpjyk9gn3am8"; depends=[rgl]; }; cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; }; cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; }; cudia = derive2 { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; }; cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; }; cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; }; - curl = derive2 { name="curl"; version="3.1"; sha256="15fbjya2xrf2k9hhvg3frisrram4yk5wlfz67zj1z8ahpsb2a3r7"; depends=[]; }; + curl = derive2 { name="curl"; version="3.2"; sha256="15hmy71310hnf9yqvz0icx4cq939gv6iqaifzlfdh2ia8akawdhn"; depends=[]; }; currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; }; curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; }; curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; }; @@ -5352,10 +5449,13 @@ in with self; { cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; }; customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; + cutpointr = derive2 { name="cutpointr"; version="0.7.3"; sha256="09pcja8kp3sdsz2vp32s5vl7m5cz14rlbp9aa00y4qd21nyckyj9"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; }; cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; - cvequality = derive2 { name="cvequality"; version="0.1.1"; sha256="0pqvaz8vfwd0x433rrdwdwjp3hgsw1nb5nzsxci5zibjksk14kgp"; depends=[]; }; + cvar = derive2 { name="cvar"; version="0.1-1"; sha256="0aqv42wbhdql1v0mxspr5ms2mwkk6yw0snzzjg5qg682m5f13ghn"; depends=[gbutils Rdpack]; }; + cvcrand = derive2 { name="cvcrand"; version="0.0.2"; sha256="1gclzn6qqjylxg3v263x5cfg1wjkqviqb3fzzb7w0ckpld2his0v"; depends=[tableone]; }; + cvequality = derive2 { name="cvequality"; version="0.1.3"; sha256="19mpf2vjj2hfgdr3mx5y1i0ldb0byvv2ii7lyanhc6c2a3mirs38"; depends=[]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; @@ -5375,7 +5475,7 @@ in with self; { d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; }; d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; - d3r = derive2 { name="d3r"; version="0.7.1"; sha256="1v25jh4gfp921q5cgjzxyar1sx2q842slkkshq1lnb31zkzidygq"; depends=[dplyr htmltools tidyr]; }; + d3r = derive2 { name="d3r"; version="0.8.0"; sha256="1zx351g4kl45dlva8q4ah3wdjvxjzssjpa280ljypfml3iqkzx70"; depends=[dplyr htmltools tidyr]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; }; dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; @@ -5400,7 +5500,7 @@ in with self; { dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; data_table = derive2 { name="data.table"; version="1.10.4-3"; sha256="12caklgr19vy9wprdks6zh825vr1iw1cajgwcnbpyvmijqdlz2xs"; depends=[]; }; data_tree = derive2 { name="data.tree"; version="0.7.5"; sha256="07mavj30pqgk831dw5nj0z0jri6fq8wx9a6nyx0q873if7q3j52w"; depends=[DiagrammeR R6 stringr]; }; - data_world = derive2 { name="data.world"; version="1.2.0"; sha256="0bw1yi5qwnm3fx8d7j2q9r9fyzf4c10z3m4yxs1srp3z77i8v6d9"; depends=[dwapi httr ini miniUI shiny stringi]; }; + data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; }; data360r = derive2 { name="data360r"; version="1.0.1"; sha256="1g245zg70ch81zjmd1ng16lks38qr0a6m63y582w558mza7v148g"; depends=[curl data_table jsonlite reshape2]; }; dataCompareR = derive2 { name="dataCompareR"; version="0.1.1"; sha256="06nba2yir2yz1189bsag9yavdf9hfmpswxdy92dlnbz9d27jjsic"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.1.0"; sha256="1scpyc0c4rcb0hk1dnzaqprb59n9vrngkg2h1h1knl5klxabkj2y"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase whoami]; }; @@ -5415,7 +5515,7 @@ in with self; { dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.2.1"; sha256="16l6ssprsvnpzxlfnqj7r061x700704s5gdci5x9ixdjmglakmdd"; depends=[caret GA Rcpp]; }; datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; - datamaps = derive2 { name="datamaps"; version="0.0.1"; sha256="1y44adffpwwfv905qmwx1kkmakh6vfyvrblgjjaqqssp6v597wrq"; depends=[htmlwidgets magrittr]; }; + datamaps = derive2 { name="datamaps"; version="0.0.2"; sha256="01pjv5f764vw8krq9mrwnih8a8akkqa5779igh4ddh0av32gswd8"; depends=[htmlwidgets magrittr]; }; datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; }; dataone = derive2 { name="dataone"; version="2.1.0"; sha256="0vpa4gb30dvxax4sxbnbn8gblnzdfcf2k0v5js3gqwjb95ah4w4y"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; }; @@ -5426,26 +5526,28 @@ in with self; { dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="0.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; }; datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; }; - datastructures = derive2 { name="datastructures"; version="0.2.1"; sha256="05m9zrqil1qmjax3r86wn6k1fq4v7x3hwq2hs9n36lyhj06r031y"; depends=[BH Rcpp]; }; + datastructures = derive2 { name="datastructures"; version="0.2.5"; sha256="0vg7s6l0d9x768j0b6nw93914raybkym0f3l7f0jpwbj265isfs1"; depends=[BH purrr Rcpp]; }; datasus = derive2 { name="datasus"; version="0.4.0"; sha256="18mvgdzk2f2plzgz9w47w4zxbdz24rymxvjv08j0cm242pcl11l7"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; }; datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; }; dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; }; dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; }; date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; }; - datetime = derive2 { name="datetime"; version="0.1.2"; sha256="0qbd1makidkbpr26wkxchnb8rpwzm4l42j4vipwwmfwv3gpslmjx"; depends=[]; }; + datetime = derive2 { name="datetime"; version="0.1.3"; sha256="1grl6ygfwmi8a307fibdlkqv4mnzixjfzmi1vl0svx1w4d527bv9"; depends=[]; }; datetimeutils = derive2 { name="datetimeutils"; version="0.2-12"; sha256="023jxsih2zlfv9yldn68cbrdl7jw5rpbz4cc9y0z530bb1fs8d1k"; depends=[]; }; datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; }; + datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; }; dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; }; dawai = derive2 { name="dawai"; version="1.2.3"; sha256="18dg81d1018f8ibm4p43ih6fjgm6r0qs5phqbp7pqrixjj3ydk58"; depends=[boot ibdreg mvtnorm]; }; + daymetr = derive2 { name="daymetr"; version="1.3.1"; sha256="034yhyq58ihb9faqsqqwbhhrp64kxim0ix6nwiyx7cxahikvdsiy"; depends=[httr ncdf4 raster rgdal rgeos sp]; }; dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; }; dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; }; dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; - dbarts = derive2 { name="dbarts"; version="0.9-1"; sha256="15z70wzkp88r5djq9y6ckj2yqkasbbz0zfx7mmc6w8an7j8flhdg"; depends=[]; }; + dbarts = derive2 { name="dbarts"; version="0.9-3"; sha256="0mxpvfaily4712k8q5wiby7rhvqm28qqi1v4b3csnlm9f0260gzi"; depends=[]; }; dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; }; dbhydroR = derive2 { name="dbhydroR"; version="0.2-4"; sha256="189yzc7nchl31203jadf6qs3w1d3s01ifn9y6403c11qm4y63fpf"; depends=[httr reshape2 XML]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; }; - dbmss = derive2 { name="dbmss"; version="2.5-1"; sha256="1giwbzjgz2qiry9mmqyby1jxpdsxaifv1p227i9jyq9d46gs9qiy"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; }; + dbmss = derive2 { name="dbmss"; version="2.6-3"; sha256="0b3vbsb01rz46mspfk8v9dgwqkxnjkv5d6152zg1zsvyv0z9wvqd"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; }; dbplot = derive2 { name="dbplot"; version="0.2.1"; sha256="1ksjxvq8y5n5vwnpvxwbdmcywnld9fnkmq63ckcv7nbgbiyi5wgw"; depends=[dplyr ggplot2 rlang]; }; dbplyr = derive2 { name="dbplyr"; version="1.2.1"; sha256="1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; dbscan = derive2 { name="dbscan"; version="1.1-1"; sha256="09rh3x4g3xv5f1p8wbc847z8khj7v2r5vz9yf1lfdiy23q2w3xp1"; depends=[Rcpp]; }; @@ -5458,13 +5560,13 @@ in with self; { dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; }; dcmodify = derive2 { name="dcmodify"; version="0.1.1"; sha256="1a909v6jhihwwmq7lzv2xazrkfa1553kbrjsbjfsh1qrqdiam3sr"; depends=[settings validate yaml]; }; dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; }; + dcurver = derive2 { name="dcurver"; version="0.9.0"; sha256="16qb5lvwxzkffv1gf0gp8dsvaxipwhgnl3y6qqg0h0qx8gynf217"; depends=[Rcpp RcppArmadillo]; }; dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; - ddR = derive2 { name="ddR"; version="0.1.2"; sha256="00mb9xq69dvl50v5429nw0mjazgjwh2sp98w8n2cwhhamjgp42k9"; depends=[Rcpp]; }; - ddalpha = derive2 { name="ddalpha"; version="1.3.1.1"; sha256="13w8ir5rd80rka4mq343zd4wn93vfw870lzfqrd3cxgwb1bwcw7y"; depends=[BH class MASS Rcpp robustbase sfsmisc]; }; + ddalpha = derive2 { name="ddalpha"; version="1.3.2"; sha256="1i2zcz20zy9xd42kdz09njbkq07mj2pp6f07z6dnwi5hrmvhbh9r"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; }; ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; }; ddpcr = derive2 { name="ddpcr"; version="1.8"; sha256="11bk4mhiqn73sjji2wz47v7jqqg9kq3amci9m6a88h4fvvgmpcz4"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; }; ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; }; - deBInfer = derive2 { name="deBInfer"; version="0.4.1"; sha256="05khyjpyxwrm9q8jsysffgsjpjbw76w9rrl7i8ia0yc9lv0bzjc9"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; + deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; }; deSolve = derive2 { name="deSolve"; version="1.20"; sha256="18nx3maww979a8p8ly4hv63y65mnjx8vbj2fpipd6rhcbf1lbsan"; depends=[]; }; deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; }; @@ -5473,6 +5575,7 @@ in with self; { deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; }; + decido = derive2 { name="decido"; version="0.1.0"; sha256="1d53qcpy165f9izaj0x5x5d5h7jvihhk6mghs9g52dfxrvpndfgn"; depends=[oz Rcpp]; }; decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; }; decisionSupport = derive2 { name="decisionSupport"; version="1.103.6"; sha256="1lfv1a9pcf1f7la1vxpwvw8abk4jbq7cmalp374l0xasfyin2mr5"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; @@ -5487,14 +5590,15 @@ in with self; { deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; + define = derive2 { name="define"; version="0.2.7"; sha256="0m5nk6shfak43zw68vzc9ncl0a3rrrkhc5ckhb5yhjllj6g5yigf"; depends=[encode Hmisc latexpdf SASxport spec]; }; deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; }; degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; - degreenet = derive2 { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; }; + degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; }; deisotoper = derive2 { name="deisotoper"; version="0.0.3"; sha256="1263cgwzgl3dnv1y9qhzjl4b7r69h59x38ggb7c8zn7g6qbdc0kc"; depends=[rJava]; }; dejaVu = derive2 { name="dejaVu"; version="0.2.0"; sha256="1cnbgssdnvl092vz0j2n4bamvysrr0n9wy6ycz2mkm5wvf4r296i"; depends=[MASS]; }; - deldir = derive2 { name="deldir"; version="0.1-14"; sha256="12cjr4r50rdrh2l0105cvd42rqwzsmmiqcax3sbqk1ggh2lnblw9"; depends=[]; }; + deldir = derive2 { name="deldir"; version="0.1-15"; sha256="0407wfnjcfg7ca6ani96bbg5ksx8jkyijaprv7n4g7w21311242p"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; - deltaPlotR = derive2 { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; + deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; }; deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; }; demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; }; deming = derive2 { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; @@ -5502,7 +5606,7 @@ in with self; { demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; }; demography = derive2 { name="demography"; version="1.20"; sha256="097k0chs8shm1r9ny6jdx2kp2shyxsivjw1n1rhb3bs0m0l3vm9r"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; dendextend = derive2 { name="dendextend"; version="1.7.0"; sha256="1krvqadnnh53xx5ql7bwzxaif6a317jzbs1m00gnc6jnj03rfl5d"; depends=[fpc ggplot2 magrittr viridis whisker]; }; - dendroTools = derive2 { name="dendroTools"; version="0.0.6"; sha256="0mqzlysp0kihs9ymz8y3agvjl6ihn996cmpw331c4jb5n7vhjx0r"; depends=[brnn caret dplyr ggplot2 gridExtra MLmetrics oce randomForest reshape reshape2 RWeka scales]; }; + dendroTools = derive2 { name="dendroTools"; version="0.0.7"; sha256="1wij1jwhbn0zs15zh2raa7xa1zfklchlyihv6baf7gkk5cmy87zg"; depends=[brnn dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly reshape reshape2 RWeka scales]; }; dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; }; dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; }; dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; }; @@ -5510,10 +5614,10 @@ in with self; { denoiseR = derive2 { name="denoiseR"; version="1.0"; sha256="094nknr3hyx4kv18vnpdzrcpmfb4r7x9jgrp3p6x4nwrgzdh3r95"; depends=[FactoMineR irlba Matrix]; }; denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; - denseFLMM = derive2 { name="denseFLMM"; version="0.1.0"; sha256="0sckr9r2wylncpsq5yz2vww35imcc0zw8ghz8prqw2n20233gqj1"; depends=[MASS Matrix mgcv mvtnorm]; }; + denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; densratio = derive2 { name="densratio"; version="0.0.3"; sha256="07da5spbzr8x7sv6pdknc64a5zhs3dgnpcx4s2v68vc31xsd0gqd"; depends=[]; }; - denstrip = derive2 { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; + denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; }; depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; }; depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; }; depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; }; @@ -5521,12 +5625,12 @@ in with self; { depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; }; depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; }; dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; }; - derivmkts = derive2 { name="derivmkts"; version="0.2.2"; sha256="00bcffqzzsm2h4gfwri772q8i7h40xhv07wl8xj682fnlk246ggs"; depends=[mnormt]; }; + derivmkts = derive2 { name="derivmkts"; version="0.2.2.1"; sha256="02q3vc70rvh83zqjaql46n4qkfmn0x2kfg9ikyps34vg7clsaqs3"; depends=[mnormt]; }; desc = derive2 { name="desc"; version="1.1.1"; sha256="0k07qighac1xzmm8k988zi7i88a0yfvia3gk5hbz0fyvb2v9kzrj"; depends=[assertthat crayon R6 rprojroot]; }; descomponer = derive2 { name="descomponer"; version="1.4"; sha256="12zpkixclm6jmrgzvcy48c1mdqh9dgadzf9026wjyamphxkkjbip"; depends=[taRifx]; }; descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptr = derive2 { name="descriptr"; version="0.4.0"; sha256="1v21fb90vhh7mjx9q29cbdvbxyi8sjcfbvdxf0xd8n7fkd6gd4yj"; depends=[dplyr forcats ggplot2 magrittr rlang scales shiny tibble tidyr]; }; + descriptr = derive2 { name="descriptr"; version="0.4.1"; sha256="1jpcfpidi49lyn02sl0hwsixzln9frrz03vrap1aq0phjcln39hh"; depends=[dplyr forcats ggplot2 magrittr rlang scales shiny tibble tidyr]; }; desctable = derive2 { name="desctable"; version="0.1.1"; sha256="188pw8fjgm2g88nraagmxbnpv4gg89vm6mxm9w9vk88iq4hgbhjc"; depends=[dplyr DT htmltools pander purrr]; }; deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; }; desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; }; @@ -5535,14 +5639,14 @@ in with self; { designmatch = derive2 { name="designmatch"; version="0.3.0"; sha256="1i8xdc6z01x59gvxdmi6qjqwqi8s9zzgfaxwd7xj49r4cl6h81pd"; depends=[lattice MASS Rglpk slam]; }; desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; }; desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; - desplot = derive2 { name="desplot"; version="1.3"; sha256="06aa4ijxk34z9v309jnsapa7bc95wx2g2hbasljwrb90f2z87wq9"; depends=[lattice reshape2]; }; + desplot = derive2 { name="desplot"; version="1.4"; sha256="0brmdp095zcwx7gncng1ls972kr67ldwiq081wyafn9jm9z461ix"; depends=[lattice reshape2]; }; detect = derive2 { name="detect"; version="0.4-1"; sha256="0hq3imp4w6bd8x4njcfrvcs5lf0vrfnags1zdph86d7hlrwfds62"; depends=[Formula Matrix pbapply]; }; detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; - detpack = derive2 { name="detpack"; version="1.0.1"; sha256="00qyjhv7y5mk4h0a428i780fsvlamqnxv12kl6lqs776rhf0skfv"; depends=[]; }; + detpack = derive2 { name="detpack"; version="1.1.0"; sha256="11l863yr15db0v6r3fmsk3hvvx6xiidw876009x9gp5fwrv7l1cv"; depends=[]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - detrendr = derive2 { name="detrendr"; version="0.4.0"; sha256="0syxd5bds81ihm692bgps7wwl4n5fvi08jwd90hxaddksdskf2p6"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr purrr Rcpp RcppParallel rlang RSAGA stringr]; }; - detzrcr = derive2 { name="detzrcr"; version="0.2.1"; sha256="1y1lbckm4a4m50x2a47r1wk47z4m4pvkslwgzcvw00nch47h9d8s"; depends=[ggplot2 MASS shiny]; }; + detrendr = derive2 { name="detrendr"; version="0.5.0"; sha256="0fmyssnwqqi36lklyv7dx9rv37ca8x0iq8nisx9q831yqxvd4lhm"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr]; }; + detzrcr = derive2 { name="detzrcr"; version="0.2.2"; sha256="1bv4l4aharp3gjj9ldri7ip3bfzhq57kkmihmlzdbvnk8ajdggwy"; depends=[ggplot2 MASS shiny]; }; devEMF = derive2 { name="devEMF"; version="3.6"; sha256="1n5i68f1j3d5yp0p0845zsvr4xhjrvj610wsb5rrlf90jwnarsx2"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.1.6"; sha256="0wm6nqnr76azpwg00cspi4n8r4w5qfkvm5qqp0kshv701pnbsjbp"; depends=[]; }; @@ -5553,13 +5657,14 @@ in with self; { dfcomb = derive2 { name="dfcomb"; version="2.4-2"; sha256="163sc18ka4wkf208ml7ghjsn43b3mbyf9zm4id563az6ckkzw45p"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; dfcrm = derive2 { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; }; dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; + dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; }; dfmta = derive2 { name="dfmta"; version="1.6-2"; sha256="0icpgsxhzd9y0d3xv82cy807wylxck7zn31g0b3nv0nq3jxy04jk"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; - dfoptim = derive2 { name="dfoptim"; version="2017.12-1"; sha256="03sh92ks29hcdy4ma1b5rs29f65q65wi30j1pxkmsjxkp8179jgf"; depends=[]; }; - dfped = derive2 { name="dfped"; version="1.0"; sha256="0xhyh5sm1a009pwfn2yb3vg2hr4sfpf9ifg09hqcvjx56pxfd8zh"; depends=[ggplot2 rstan]; }; + dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; }; + dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; }; dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; }; - dfpk = derive2 { name="dfpk"; version="3.4.0"; sha256="0fvvyn1zc0s0z4xaqinf8im2ynmbs7irh9q9h66ym1pxmrqhb5zw"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; + dfpk = derive2 { name="dfpk"; version="3.4.1"; sha256="1nmn5ir20wx3qvcf9rvnwnni5kqbn8adhc2354fb5gcvbnxlc7mc"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; }; - dggridR = derive2 { name="dggridR"; version="2.0.1"; sha256="1af5sn3py3my543vn6izqmlsc80rvyx7dqxprylk4pzsmc8yyx4c"; depends=[dplyr ggplot2 Rcpp rgdal sp]; }; + dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; }; dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; }; dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; }; dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; }; @@ -5568,8 +5673,9 @@ in with self; { dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; }; dhglm = derive2 { name="dhglm"; version="1.7"; sha256="09wasgvjw0xc9k68m6a8lx372p2hywk4j6ikr9wjjjfl6f17j1cw"; depends=[boot MASS Matrix numDeriv]; }; - di = derive2 { name="di"; version="1.1.3"; sha256="1i3s1rw62iy49141b3lqy5d97iwcj6ihdhsz2716v2497c39qhhy"; depends=[scales]; }; + di = derive2 { name="di"; version="1.1.4"; sha256="1w2gjhyi410z98d8wnhbd69jxm69nz4pmnr4fb09i70a90f53s25"; depends=[scales]; }; diagis = derive2 { name="diagis"; version="0.1.3-1"; sha256="1cagcr5znhrg4fp96d79ly0z7bs3hhh3zfspclyfc88p2p3qsd96"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; + diagmeta = derive2 { name="diagmeta"; version="0.2-0"; sha256="1qdpsn0c4g459p8p90p2a9fghiwjqqmmanz3zsa5a3lv7zxmk496"; depends=[lme4 meta]; }; diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; }; diaplt = derive2 { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; }; @@ -5577,6 +5683,7 @@ in with self; { diceR = derive2 { name="diceR"; version="0.4.0"; sha256="1pxkwrbm69b97jia7nc18sprvxqxwwvvvzmxh147wgpqlmgqq47m"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen largeVis magrittr mclust NNLM pheatmap progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; }; dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; + did = derive2 { name="did"; version="1.0.0"; sha256="0fgwassb8m92iij78f045fl8441f1x9dhf4hnc93wl16yv5hh7g7"; depends=[BMisc formula_tools ggplot2 gridExtra knitr MASS pbapply]; }; didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; dief = derive2 { name="dief"; version="1.1"; sha256="0x3dwlfi130wmbsmm8vf66qxqn001b07yaiq6mp1s707dnl131mc"; depends=[flux fmsb ggplot2 plyr]; }; dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; @@ -5594,7 +5701,7 @@ in with self; { diffobj = derive2 { name="diffobj"; version="0.1.9"; sha256="1adqn472qbwrfb8m2iy3sfvj2n8g3d4h6xc3hqxpbv03yyfia2c2"; depends=[crayon]; }; diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; }; diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; }; - diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; }; + diffractometry = derive2 { name="diffractometry"; version="0.1-10"; sha256="09mkqg6avky26c2dsnhpcmby76hfqg0pwmnjhkbp4px2k6c9inrc"; depends=[]; }; diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; }; diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; }; diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; }; @@ -5610,10 +5717,10 @@ in with self; { diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; }; directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; }; directlabels = derive2 { name="directlabels"; version="2017.03.31"; sha256="01ahw0c56mnzwl611s8hnghicww4c4dgf5v2wv6bl1s1pramw9pr"; depends=[quadprog]; }; - dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.0"; sha256="1q6rnrzyvkz9hn9czlm9sha80qsmrz7n4l3r8r1plkgrnf0biajv"; depends=[ggplot2 gtools mvtnorm]; }; + dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.1"; sha256="0ip7mcjddqg7z9hqrvbxixvkqp9j4d92zgpk6hn6acd4fxhb17r6"; depends=[ggplot2 gtools mvtnorm]; }; dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; - discSurv = derive2 { name="discSurv"; version="1.1.7"; sha256="0shxwxbvbbgp0qphpbih582d5psqj5n0izv7zvcw97vh82bzra4l"; depends=[functional mgcv mvtnorm]; }; + discSurv = derive2 { name="discSurv"; version="1.3.1"; sha256="0vq3g42xy97ksgsghhz232spkbkr2zs8i9nm7xwdabysi9fgqdsv"; depends=[functional mgcv mvtnorm]; }; discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; }; disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; disclapmix = derive2 { name="disclapmix"; version="1.6.2"; sha256="01pn8hy3xbf1b1fbbsd4n2hv7gs97zalgq858xsrr4a0nqrvxmn5"; depends=[cluster disclap Rcpp]; }; @@ -5627,9 +5734,10 @@ in with self; { diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; }; disp2D = derive2 { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; }; + dispRity = derive2 { name="dispRity"; version="1.0.3"; sha256="1swix45fcr0hn21pvy2dwsnbr60bvsdjk8vwh432p0s69c372m3l"; depends=[ade4 ape geiger geometry geoscale paleotree phangorn phyclust vegan]; }; disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; }; displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; - dispmod = derive2 { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; }; + dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; }; disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; }; dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; dissever = derive2 { name="dissever"; version="0.2-2"; sha256="0s4g84lq15i00vpaafwmcbspdqy23cbj2fbyfnq60mzllyzgs0n2"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; }; @@ -5661,6 +5769,7 @@ in with self; { divo = derive2 { name="divo"; version="1.0.0"; sha256="0xy4yxvx2grskdzb5z73mhgrq0nfhdkm2hxahdns7pb1fgajxyjx"; depends=[cluster]; }; dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; }; dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; + dkanr = derive2 { name="dkanr"; version="0.1.0"; sha256="05sw0rdfl5fr9v67lixbk2jmsxi2gdbyb6bzkf80ynp1y1izxyzq"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; }; dlib = derive2 { name="dlib"; version="1.0"; sha256="0d6p28r86jq7gwqh3njnsfgl6mmgx7famqx7p1xmra91cdlp3hqj"; depends=[Rcpp]; }; dlm = derive2 { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; }; dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; }; @@ -5677,7 +5786,7 @@ in with self; { dnet = derive2 { name="dnet"; version="1.1.3"; sha256="1av4kbcbhpj1ivz6ln26p80z5fd170971mrcy59zm67h6kdi56az"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; dng = derive2 { name="dng"; version="0.1.1"; sha256="04r06k6mmif7kbpham52dq2zv5rijjnsdc3sgxz6kbh5mqdn6jfq"; depends=[Rcpp]; }; dnr = derive2 { name="dnr"; version="0.3.2"; sha256="0f5xahd86x196mg7c9zrhxj7c8cg7mrnd4nzyr02xcym6cff6vqm"; depends=[arm ergm glmnet igraph network sna]; }; - doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; }; + doBy = derive2 { name="doBy"; version="4.6-1"; sha256="1y02awzid23bxz8hx6j8pxd6i7jaq8pdw3k60rag8y6m69incrw5"; depends=[dplyr magrittr MASS Matrix plyr]; }; doFuture = derive2 { name="doFuture"; version="0.6.0"; sha256="04pvs2h1ibdbl6cph30rvdn5vzj9afllvh8f0iy64pgy83vls790"; depends=[foreach future iterators]; }; doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; @@ -5687,13 +5796,13 @@ in with self; { doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; }; dobson = derive2 { name="dobson"; version="0.2"; sha256="1fyf4dyzpg6hqdvr8n4ncs4dny8mg23nxbd49jd3mrlajszzg0vp"; depends=[]; }; docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; }; - dockerfiler = derive2 { name="dockerfiler"; version="0.1.0"; sha256="16y70blrv9crmgrcnq6dk3bjk73ajlkxv72xj3qrmw78zjy5an19"; depends=[attempt glue R6]; }; + dockerfiler = derive2 { name="dockerfiler"; version="0.1.1"; sha256="17r8az17vkj46cljp0pa15xh9x2p5w85csm2hickfk2lyg2pbjnx"; depends=[attempt glue R6]; }; docopt = derive2 { name="docopt"; version="0.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; }; docopulae = derive2 { name="docopulae"; version="0.3.3"; sha256="13889sj509gbl9zs7jqdvslp6sc81jv54cbqh1wpp834jp5s1q3x"; depends=[]; }; docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; }; docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; }; documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; }; - document = derive2 { name="document"; version="3.0.0"; sha256="1jd7pgifnlffibmmsflgp0gbv83qclqsfi8glvr9kfxw66yx0mhq"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; }; + document = derive2 { name="document"; version="3.0.1"; sha256="1pmms1mrldjqsd2zrmpyxz86xykgq1ld4l4gv9gd1ycd7r8v0f8p"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; }; docxtools = derive2 { name="docxtools"; version="0.1.1"; sha256="1mlgl9105mifzdgf57spgr2rr5740ghr5afmlskxn6ind7jfka70"; depends=[dplyr ggplot2 pander stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; }; dodgr = derive2 { name="dodgr"; version="0.0.3"; sha256="161qy9iyszpb44v26zn6w4d7c9bw8pg7vwgqcba0k0xc5dnr2wjc"; depends=[igraph magrittr osmdata rbenchmark Rcpp sp]; }; @@ -5702,7 +5811,7 @@ in with self; { dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotCall64 = derive2 { name="dotCall64"; version="0.9-5.2"; sha256="1jw0kyw95nivjimh25ri9sigqwlvk12kd45ydsh1yggigzc0k23k"; depends=[]; }; dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; }; - dotwhisker = derive2 { name="dotwhisker"; version="0.3.0"; sha256="1sbj8blnqnsyvf7pq2cc9q7nqb66n0v2gi2rr09yjlppf7v1pcjf"; depends=[broom dplyr ggplot2 ggstance gridExtra gtable plyr stringr]; }; + dotwhisker = derive2 { name="dotwhisker"; version="0.4.1"; sha256="1wmb9c0c6r0f36cks72y2jp1iwi6hxjqchq4z76vlcdxq09gmq3g"; depends=[broom dplyr ggplot2 ggstance gtable purrr rlang stringr]; }; doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; downscale = derive2 { name="downscale"; version="2.0-3"; sha256="0jvzvmwhpdr7ygcxky4yl1ldb843hrmnzhmnvl0694mmswwqsf8l"; depends=[cubature minpack_lm raster Rmpfr sp]; }; @@ -5721,9 +5830,9 @@ in with self; { dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; }; dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; - dr4pl = derive2 { name="dr4pl"; version="1.0.0"; sha256="1gcddnjmzqm16vzqvh8hxw2spvfa41jmapf7n87lv100j5f8ahl5"; depends=[devtools drc ggplot2 Matrix Rdpack tensor testthat]; }; + dr4pl = derive2 { name="dr4pl"; version="1.1.1"; sha256="1wh7mdns9vxjkfphj2nqllh7q3k3lch5y0b4yzf3j4xrd0wyf2hm"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; }; drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; }; - drake = derive2 { name="drake"; version="5.0.0"; sha256="0hldxadlcl3m249rb68yikvn4gck98zj2x67jjxfgas27a1n4pjx"; depends=[codetools crayon digest evaluate formatR future future_apply igraph knitr lubridate magrittr plyr R_utils rprojroot storr stringi stringr testthat visNetwork withr]; }; + drake = derive2 { name="drake"; version="5.1.2"; sha256="18f0mxbzz50dli3y4fzyh5qgk8ccxrvqy8a3xsc5xq4y0ilq8kvf"; depends=[bindr CodeDepends crayon digest dplyr evaluate formatR future future_apply igraph knitr lubridate magrittr pkgconfig plyr purrr R_utils R6 rlang rprojroot storr stringi testthat tibble tidyselect visNetwork withr]; }; drat = derive2 { name="drat"; version="0.1.4"; sha256="0vrpqf793vinx4v7jrbn910iplvpmrlwhdjqqzx8cl2k9hl43x08"; depends=[]; }; drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; @@ -5752,7 +5861,7 @@ in with self; { dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; }; dtwSat = derive2 { name="dtwSat"; version="0.2.3"; sha256="10b0hs9kn5ljfv28iz62h966zb1pxsfrr6fx45d4427gr6fg8ncz"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; }; - dtwclust = derive2 { name="dtwclust"; version="5.3.0"; sha256="0p6v7d7lp5fsbky5c1qcss2cxx4x5w0ass0ami15aijdb8154qyf"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; }; + dtwclust = derive2 { name="dtwclust"; version="5.3.1"; sha256="0lm8y63gx096vdnza7mcqllfnl56vaz8dnrnm7f7jvwgmkqkj1xy"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; }; dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; }; dub = derive2 { name="dub"; version="0.1.0"; sha256="0sdk8sppjcfx2bsngpngm2446warsnipzzw4yz5z4jpickp52ay0"; depends=[]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; @@ -5766,7 +5875,7 @@ in with self; { dwapi = derive2 { name="dwapi"; version="0.1.3"; sha256="149v1yjnrdbqjg7cpnanm1jv1dcpzqy264qk5dx8wvw9kdc5h3b8"; depends=[httr jsonlite readr rjson xml2]; }; dyads = derive2 { name="dyads"; version="1.1"; sha256="0jlyg4bz3zp4g5ig0swwi72bxaj85wll05h6vishnvmnprpdc96n"; depends=[MASS mvnfast]; }; dygraphs = derive2 { name="dygraphs"; version="1.1.1.4"; sha256="0vwg9q7xrwxkm92d55ik9gdky42bj3jlh6fi4jzwyl5nfdswklb9"; depends=[htmltools htmlwidgets magrittr xts zoo]; }; - dyn = derive2 { name="dyn"; version="0.2-9.3"; sha256="00h75kqfpr77jhppnpxvykbdcmsmsb2vl2527xzq10wkvm7gfpvv"; depends=[zoo]; }; + dyn = derive2 { name="dyn"; version="0.2-9.6"; sha256="16fqv9k7yxdgybwzafjkyqm16qpgqz13lcjpi6a1nc8xbzlzh0gb"; depends=[zoo]; }; dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; }; dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; }; dynOmics = derive2 { name="dynOmics"; version="1.0"; sha256="10aw362hhwqdnjf7xxzy25fdxq2zznzvg6xwvl25a9ppj76nm1rh"; depends=[ggplot2 gplots snow]; }; @@ -5784,6 +5893,7 @@ in with self; { dynlm = derive2 { name="dynlm"; version="0.3-5"; sha256="1sjhhlvvcgmayb9dfwacv1g75c4lhbpzyczj6h7gkd19bcfbdhqp"; depends=[car lmtest zoo]; }; dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; }; dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; }; + dynprog = derive2 { name="dynprog"; version="0.1.0"; sha256="1rvn2zyhdi60y01zbvfv4him6iz2ljdr7ivkr7m7y7yd1lg547ax"; depends=[rlang]; }; dynr = derive2 { name="dynr"; version="0.1.12-5"; sha256="1l9waqwg5mkqy8ipryickrkf141mjpzdvsc4qbw8bq4rkrgykklc"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; }; dynsbm = derive2 { name="dynsbm"; version="0.5"; sha256="01vi4qzgp25l4wg2ij9pqrn775x4yj9gck0l397nwjg96pa7x2lz"; depends=[RColorBrewer Rcpp riverplot]; }; dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; }; @@ -5797,10 +5907,10 @@ in with self; { ePCR = derive2 { name="ePCR"; version="0.9.9-4"; sha256="0lnkb4zffn62vbx8hh953z9zh0plj8l15cc1k3x936zblzgd226r"; depends=[Bolstad2 c060 glmnet hamlet impute MASS Matrix pracma ROCR survival timeROC]; }; eRm = derive2 { name="eRm"; version="0.16-0"; sha256="18shx4jjvymhzdab1qvlfqnmg49mwllyw3v46j9v19dy6h9l3n8m"; depends=[lattice MASS Matrix]; }; eVenn = derive2 { name="eVenn"; version="2.4"; sha256="1qs5qsrc89kb6w6xqc8jdxkih6h48zprvavffdqhxq4ab4i1nvbf"; depends=[]; }; - eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; + eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; }; earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; }; - earth = derive2 { name="earth"; version="4.6.1"; sha256="0hrbpa0qvhsdrdi06p0kdl2mw0n84sxcrqk96f6rh7cb6j8bm9bg"; depends=[plotmo TeachingDemos]; }; + earth = derive2 { name="earth"; version="4.6.2"; sha256="1ma2qgbkw0if93wd6fk6611xkznadfxy6v6xawrk4n9b5im3j6f4"; depends=[plotmo TeachingDemos]; }; earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; }; easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; }; easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; }; @@ -5842,7 +5952,7 @@ in with self; { ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; }; ecospat = derive2 { name="ecospat"; version="2.2.0"; sha256="0awzhzl90j72jxp7qk5q5vqmgyccbkw2rbw0jrhjvlwkr5q9gyvx"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; }; - ecotox = derive2 { name="ecotox"; version="1.3.0"; sha256="05k3hdz25kw28222bnlk814b2rlwq2f6b5kdqxqls9wdfvdknij3"; depends=[ggplot2]; }; + ecotox = derive2 { name="ecotox"; version="1.3.1"; sha256="1is4zn7rabpibpnyy9mwpcjdhhb02r0a2r5azw9i5asshr2d1ywi"; depends=[ggplot2 magrittr]; }; ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; }; ecoval = derive2 { name="ecoval"; version="1.1"; sha256="0ihig6nq3lrz6lzix92lrlzywnqkzsp5lrbccn5slhxdj5llird2"; depends=[rivernet utility]; }; ecp = derive2 { name="ecp"; version="3.1.0"; sha256="0siq5acpy4wmqzm6zvpqj1m8a05hgk5jhb1clv06y40kqk5kjrap"; depends=[Rcpp]; }; @@ -5852,7 +5962,7 @@ in with self; { edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-2"; sha256="10rqkimvmyb7hxp4wkpj8bq07q3yaimm058d4mmr09fw25lqyz1q"; depends=[]; }; edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; - edeaR = derive2 { name="edeaR"; version="0.7.2"; sha256="0k043g2qrm58l7dvb2ylpg76wcznkr4p4vp2p3b4hhg1hzq8zccf"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; }; + edeaR = derive2 { name="edeaR"; version="0.8.0"; sha256="1qpkb5ysz5lbkqdxszgzkn7s77h6fqqd62pc0nn2abjgq2hb8a9j"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; }; edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; }; edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; edfReader = derive2 { name="edfReader"; version="1.2.0"; sha256="0r4918swpfddz246kkvy10a07s178zmwp7m4ydxvi8di6iga76hk"; depends=[]; }; @@ -5878,7 +5988,8 @@ in with self; { eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; effectFusion = derive2 { name="effectFusion"; version="1.0"; sha256="1nx61n4lgnj6wh4arqm62p9xwxqvz4g7bs4b5k3ybkhmh6ns9v5l"; depends=[bayesm cluster ggplot2 MASS Matrix]; }; effectR = derive2 { name="effectR"; version="1.0.0"; sha256="08r1jifrqa9fxm5jp6jsvazdpql53kpm6mj0sg70hvd8q0cilryb"; depends=[ggplot2 reshape2 seqinr shiny viridis]; }; - effects = derive2 { name="effects"; version="4.0-0"; sha256="0h3247xcccanp0cp18r5k4l87i9862yjr5jc8sxcsfvjzn13xgf6"; depends=[carData colorspace lattice lme4 nnet survey]; }; + effects = derive2 { name="effects"; version="4.0-1"; sha256="042f6gb799agqqxawd6ddlzplyxkd1h5v9pm759zmnj2094smw6q"; depends=[carData colorspace estimability lattice lme4 nnet survey]; }; + effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; @@ -5901,7 +6012,7 @@ in with self; { elastic = derive2 { name="elastic"; version="0.8.0"; sha256="17aqf0a3spwh8k7s3kgnccbgad3sr3w63if96piygjz0lxgc7kzs"; depends=[curl httr jsonlite]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; elasticnet = derive2 { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; - elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.1"; sha256="1x20w13hkpnf1kjvml99a9q1w162f6703ccqvcqy6z0vamcvylw8"; depends=[httr jsonlite]; }; + elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.2"; sha256="0jawypqlk8374izh3gq9k6fwc2gwn74xa9lbmx4ww3rq2xp90xw6"; depends=[httr jsonlite]; }; elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; }; elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; elect = derive2 { name="elect"; version="1.1.1"; sha256="025h69qsify0v3bsr9082wjdkglmarkjaqqkwr8j826466617n1v"; depends=[msm nnet]; }; @@ -5919,15 +6030,15 @@ in with self; { elo = derive2 { name="elo"; version="1.0.1"; sha256="0dhlac5l68a3jps2hx0bc7qjj8hsr1ha137hcwxnrfdwnki6chlp"; depends=[pROC Rcpp]; }; elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; }; - embryogrowth = derive2 { name="embryogrowth"; version="7.1"; sha256="0gm5ww7vwc6kcv6lzrca4f9a6nkilb79d5b4kidfhwrcbfrkdb2k"; depends=[deSolve HelpersMG numDeriv optimx]; }; + embryogrowth = derive2 { name="embryogrowth"; version="7.4"; sha256="10h80jy391bm1avmh347ly3a1vhlhbpfbhrf39xl7x4nwcckd6bp"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; }; - emdi = derive2 { name="emdi"; version="1.1.1"; sha256="1gbjx0pxfzkbp0csgq07iwqqww5lixpkvwn3k53na65gwx9afsq4"; depends=[boot FNN ggmap ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap reshape2 rgeos simFrame]; }; + emdi = derive2 { name="emdi"; version="1.1.2"; sha256="135dnc7djxa7kyhaa0rd42m396ccic4mgd5pq4qj8zqgd2swj2aa"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; }; emil = derive2 { name="emil"; version="2.2.8"; sha256="02xjf8ipqr136y3pa375lwpg6h63yvbphhghs9jjxfl2r4fdkvcn"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - emmeans = derive2 { name="emmeans"; version="1.1.2"; sha256="12gkg2r7g1n481mvry354az5gzqji7rsl43jrmvq504sqyg4z41n"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; }; + emmeans = derive2 { name="emmeans"; version="1.1.3"; sha256="150kgc5ymssmcf240js4jrbhm32xn4bayrzbxry12mh1lcr9kvf2"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; }; emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; emojifont = derive2 { name="emojifont"; version="0.5.1"; sha256="0i4id9631ah5vzkzh6zfxgk55b2ppnbgabp1w2ivy29i0nji9wk4"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; @@ -5936,11 +6047,11 @@ in with self; { emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; }; emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; }; ems = derive2 { name="ems"; version="1.0.0"; sha256="1x6zsrf15xn865v8awbnq1cpaqp5j2k1pmis5a8mjnw568xi0hhw"; depends=[]; }; - emuR = derive2 { name="emuR"; version="0.2.3"; sha256="04nxrg95qgwc5ss139bgjcsxkarwzkxy132dz0vk3sq7sddnagws"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RCurl RSQLite stringr uuid wrassp]; }; + emuR = derive2 { name="emuR"; version="1.0.0"; sha256="19740da4m22v9ys1z8q80khf71fjbaisn1f6whgal7p3cinvkcr3"; depends=[base64enc compare DBI dplyr httpuv jsonlite MASS purrr RCurl readr RSQLite shiny stringr tibble uuid wrassp]; }; emulator = derive2 { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; }; enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; }; enc = derive2 { name="enc"; version="0.2.0"; sha256="0n4s3abxmpndppm18dcibap2n22xpjzafn5xjskfdfrz3wjfy1kb"; depends=[]; }; - encode = derive2 { name="encode"; version="0.3.3"; sha256="01jippva8gfbg3bq6g1sz8mpmglywg4mkb4k44bfspiv60bmv98f"; depends=[]; }; + encode = derive2 { name="encode"; version="0.3.4"; sha256="1ibrxa0lzni8c1nm3x061vj55faz8fvfgbl7c7b2wfanh5qnny9j"; depends=[]; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; }; @@ -5956,18 +6067,18 @@ in with self; { enrichwith = derive2 { name="enrichwith"; version="0.1"; sha256="10x7p0s96hkalnnnwx2gczywblqxig9p4pllzk1ciyjjfidsc9va"; depends=[]; }; ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; }; ensembleEN = derive2 { name="ensembleEN"; version="1.1.2"; sha256="033i4bcnr62kmrp1fafdw6vx8ir38kqchgxp4fidg3i750nkjnda"; depends=[Rcpp RcppArmadillo]; }; - ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.1"; sha256="1xbk3m4b619wni64i7wrccgp7gwaql2g6lg42lqwbsscdr3j0cls"; depends=[chron ensembleBMA evd]; }; + ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.2"; sha256="16d8030zfdwifqrh45vz3gf5n0bix0mhsmsnydgjq1fghdklcmyx"; depends=[chron ensembleBMA evd]; }; ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; }; ensemblepp = derive2 { name="ensemblepp"; version="0.1-0"; sha256="1b3rhg8mv1x3caz3xg84cwx8m88055n6yl36d9i4ws6vbj8vx68f"; depends=[]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; entropart = derive2 { name="entropart"; version="1.5-3"; sha256="02jzcqb7sqg9fcf2vi4myki9mgdsx0jwyf535zzh124h1bwz3f3y"; depends=[ade4 ape EntropyEstimation geiger vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; }; - enveomics_R = derive2 { name="enveomics.R"; version="1.2.0"; sha256="0bbm16k2i9lwm662hsglv3a5mf367bgxh25c87cvvfxafrbd67wj"; depends=[fitdistrplus investr modeest sn]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.3"; sha256="1m97lmgf42ifzafz91g69nnf4q918464xir9cqjjn6ch5i7lvi65"; depends=[fitdistrplus investr modeest sn]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.3.4"; sha256="1wjf1rxwzd590qsyljw1pd59kppx91m32p6nkdy4yvbnv39rk8dq"; depends=[BiocParallel genefilter limma mixtools qvalue rcdk RColorBrewer sva xcms]; }; enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; - envirem = derive2 { name="envirem"; version="1.1"; sha256="07mlyaqjwwrh9dbc78ik61wrrpg344fg3rb12l6v6hzn04yp26pz"; depends=[raster RSAGA]; }; + envirem = derive2 { name="envirem"; version="1.3"; sha256="1axgbjl4wh44vd5r9n9rbxxsi35k806r1kdvrcmmpkzwam6zd2lp"; depends=[raster RSAGA]; }; envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; }; epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; }; @@ -5977,7 +6088,7 @@ in with self; { epiR = derive2 { name="epiR"; version="0.9-93"; sha256="1i0vi1dx5pjq4rcw8r9g7qkhrn4ra8lffrspzkrrjj12y97izmrg"; depends=[BiasedUrn survival]; }; epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; }; epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; }; - epidata = derive2 { name="epidata"; version="0.1.0"; sha256="1lp6hnjzga787abq94k8v48wlikpp5hj1xwmxc8nj1imyr4r8a4h"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; + epidata = derive2 { name="epidata"; version="0.2.0"; sha256="0n0100fy65kgw3c7gdmb5z5hmla5ch51b7872snf525a2r581i28"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; epifit = derive2 { name="epifit"; version="0.1.2"; sha256="1i1ngb5kh03gyx1702fwav3dc3mqry1wjzc7ry36hdw0ngawid34"; depends=[MASS]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; episensr = derive2 { name="episensr"; version="0.9.2"; sha256="1w1228q8q2ysi3xi3m8a9z0c7japj97dssjkzpjcrng094cy82is"; depends=[actuar boot ggplot2 gridExtra llogistic logitnorm plyr reshape trapezoid triangle]; }; @@ -5986,10 +6097,9 @@ in with self; { episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; }; epitab = derive2 { name="epitab"; version="0.2.1"; sha256="0q8fxxx7ddzaj8dxxlsh1a2gxf6byw5041mr7abac9yjjga2kz97"; depends=[kableExtra knitr MASS survival xml2]; }; - epitable = derive2 { name="epitable"; version="0.1.2"; sha256="1g0ab5bah7v52mzsyfxdv8azmpz66pipbc15q3vpvvhl3gjhsaik"; depends=[broom dplyr htmlTable magrittr purrr readr rlang stringr survival tidyr tidyverse]; }; epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; }; epitrix = derive2 { name="epitrix"; version="0.1.2"; sha256="1fnmcpjbbk645s7q2jcccjv0q20z8hlzr8sl0jh6d00jrgk8qif4"; depends=[digest distcrete stringi]; }; - eply = derive2 { name="eply"; version="0.1.0"; sha256="18q40n06gbqg5cs0jknlxk5x0pwcbjnfb27ysmbf76s826qdc8gh"; depends=[magrittr]; }; + eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; }; epoc = derive2 { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; }; @@ -5997,7 +6107,7 @@ in with self; { eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; equSA = derive2 { name="equSA"; version="1.1.5"; sha256="0sknx2p820i26m1d0ypz4ay5rm4j9i97nvcd3wxawqk72ypvbvw1"; depends=[huge igraph mvtnorm speedglm XMRF ZIM]; }; equaltestMI = derive2 { name="equaltestMI"; version="0.1.0"; sha256="1zqhgx1x6lqjwqisl3ydb6yqp3jn6x7dgnc57r93v73sjx2j5aiz"; depends=[lavaan]; }; - equate = derive2 { name="equate"; version="2.0.6"; sha256="0fkgz4747wf2n1sfkskpbp20zdmxvykqhncr7a8wl5lp314r48x3"; depends=[]; }; + equate = derive2 { name="equate"; version="2.0.7"; sha256="07cji0z139fk70d4wvrpk5m34fq1pfnqrsw336lgnp5a7zp3jz7n"; depends=[]; }; equateIRT = derive2 { name="equateIRT"; version="2.0-4"; sha256="0j5dpgp4r5qisgw65yk7x9nwq7wxfppp0n0qqg734gqwjyfyp68b"; depends=[mirt statmod]; }; equateMultiple = derive2 { name="equateMultiple"; version="0.0.0"; sha256="0q29bv8bb0c3sprhnkbbpn31phw37dwgk23v5ny4abzvlcgwncdb"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; }; equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; }; @@ -6017,24 +6127,26 @@ in with self; { errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; errorist = derive2 { name="errorist"; version="0.0.1"; sha256="1569yvncc9rdzchs7cvx44dhy8xf10g2hwkiy3kp68h47qghxlbd"; depends=[searcher]; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; }; - errorlocate = derive2 { name="errorlocate"; version="0.1.2"; sha256="1qlwdvy7i62hpnfrryzmqwmygxa8mjc7q92g6k5n9r2r179q7h09"; depends=[lpSolveAPI validate]; }; - errors = derive2 { name="errors"; version="0.2.0"; sha256="0l7yxshfc2ig7354r3vk35fsx2vyj09w7abwxakic93grvr09a71"; depends=[]; }; + errorlocate = derive2 { name="errorlocate"; version="0.1.3"; sha256="0hfm0nad1bfh7a37zpn4aljrf69yc6dddz9iq46c1mzyrw116a9f"; depends=[lpSolveAPI validate]; }; + errors = derive2 { name="errors"; version="0.2.1"; sha256="1hf7nqyhyv0n4qn5bzs1gb59fbn6vsiji0va8hpzzw3af0h3dqzy"; depends=[]; }; esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; + esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; }; esc = derive2 { name="esc"; version="0.4.0"; sha256="07mgf1kdz6gjkmbsis24gjsppclaxlf7b03jpvasm1k4snfvgb5h"; depends=[dplyr purrr readr sjmisc tibble]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; - esmprep = derive2 { name="esmprep"; version="0.1.3"; sha256="0s5ij63v3v9hx1xnl8ygbnxbgik65yd8xn3irpbvc41mp9spgcdz"; depends=[lubridate]; }; + esmprep = derive2 { name="esmprep"; version="0.1.4"; sha256="1d1rr11fldxsamn19za03sdyvvybkh3bm5zvlrlkz022jj7pgxlr"; depends=[lubridate]; }; esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; }; ess = derive2 { name="ess"; version="0.1.1"; sha256="1i94sfg8r9mnzcmyddq3zb56gwkgqdclyx90a5plpyy5insk13d7"; depends=[haven httr rvest stringr tibble xml2]; }; - essHist = derive2 { name="essHist"; version="1.0.1"; sha256="0xnf5cxc7x3chs508am9qhnavz89fim10ffkn8mp1b29jdw88aax"; depends=[Rcpp]; }; + essHist = derive2 { name="essHist"; version="1.1.1"; sha256="06wmvwjgbb1bfsjn4bv3p2m0i5nc6shn2p62kjp3iv6z42f5wndc"; depends=[Rcpp]; }; + essurvey = derive2 { name="essurvey"; version="1.0.0"; sha256="0wgwqm59wam5sjzn3cjh3fzbq14bfa02gjsszwg2hid1q976clqk"; depends=[haven httr rvest stringr tibble xml2]; }; estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; }; estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; - estimatr = derive2 { name="estimatr"; version="0.4.0"; sha256="19k8b4rglz4b7r12x8da6wzrkd0j40dp1zxzdwj6pfw3fhpacl2i"; depends=[Rcpp RcppEigen]; }; + estimatr = derive2 { name="estimatr"; version="0.6.0"; sha256="0763wq8y166zwdxf2wqxvbqwps9di7i7877pffs478qr4rx24z5g"; depends=[Formula Rcpp RcppEigen rlang]; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; estprod = derive2 { name="estprod"; version="0.0.1"; sha256="0nd2iz1gqinvppyxgxsdh9m26v46h2ra3cc4nqz6dqnqkslzrl4k"; depends=[boot Formula lazyeval minpack_lm]; }; estudy2 = derive2 { name="estudy2"; version="0.8.4"; sha256="190wxdy1qsf8fgpbp2cr0blwa97vgmdw83pmfk9i44zkpm4nrij1"; depends=[matrixStats Rcpp tseries zoo]; }; - esvis = derive2 { name="esvis"; version="0.1.0"; sha256="19avayz2igw8sjc2743a9c3ikyrf18d42czadd98gdn8ny53vr6b"; depends=[sfsmisc]; }; + esvis = derive2 { name="esvis"; version="0.2.0"; sha256="0l4c87l9n94q14hwky7d7i4h9c5zh8r04zlcz9w4mx7ixfd34zir"; depends=[sfsmisc]; }; etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; }; etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; }; ether = derive2 { name="ether"; version="0.1.4"; sha256="1q6qxda5iw8zj7gy9h35apij5mbndd969ddip7zn5d720131kqra"; depends=[dplyr httr jsonlite Rmpfr]; }; @@ -6050,20 +6162,20 @@ in with self; { eurostat = derive2 { name="eurostat"; version="3.1.5"; sha256="128rlkkxdpl95wjxnrw8yzxpc6sml0vaghnaz0ra90ak1s43ndda"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; }; eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; }; evaluate = derive2 { name="evaluate"; version="0.10.1"; sha256="070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9"; depends=[stringr]; }; - evaluator = derive2 { name="evaluator"; version="0.1.1"; sha256="19ria8y1bc8cvn1sb28p5zbkgs73m20i4c9v26byhd0rn9gjpm2f"; depends=[dplyr extrafont ggplot2 mc2d purrr purrrlyr readr readxl scales stringi tibble tidyr viridis]; }; + evaluator = derive2 { name="evaluator"; version="0.2.3"; sha256="1qlrrd68j622i2n0wazz3m44sc2l7hsg7fd1mc204c7pmfb6a3pl"; depends=[dplyr extrafont ggplot2 mc2d purrr readr readxl rlang scales stringi tibble tidyr viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; }; evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; }; evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; event = derive2 { name="event"; version="1.1.0"; sha256="1nq34bz9dsixidym3n255vmap3gjx9nfk8pc5s7w026faf96dr2v"; depends=[rmutil]; }; eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; }; - eventdataR = derive2 { name="eventdataR"; version="0.1.2"; sha256="0f0w5cir3hc01ag9l69y27cfp6bgh1ikk4n99z7pb16373ficjjw"; depends=[]; }; + eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstudies = derive2 { name="eventstudies"; version="1.2"; sha256="0z449j7yrd6j6hhacz6f048ibilib6m97684cz2wc4pqq2wlj8hg"; depends=[boot sandwich testthat xts zoo]; }; - evidence = derive2 { name="evidence"; version="0.8.8"; sha256="1bfdwl41yqvhc3jg0xddwaw7h0s7qa4xfz2i94jh6wa247r51gwf"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; + evidence = derive2 { name="evidence"; version="0.8.9"; sha256="173fjmpizjmrp0qh08k2qllvjm4l53ykblfri984x9kh68aqfvnz"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; }; - evir = derive2 { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; - evmix = derive2 { name="evmix"; version="2.9"; sha256="1w1mm858515hnjpq2yjj0x05skyprhnvbpyif4mdcm24blyb81di"; depends=[gsl MASS SparseM]; }; + evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; }; + evmix = derive2 { name="evmix"; version="2.10"; sha256="0q2jcd4r9ndl8c8w4g75cv5g9f58ix6ndwa99lgslw2j0ckh0z97"; depends=[gsl MASS SparseM]; }; evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; }; evolqg = derive2 { name="evolqg"; version="0.2-5"; sha256="11n0gxkxhg1d2ziwbipqvyccgnsrzm3mk4xy2d7nxn662q1yl2ah"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; }; @@ -6080,13 +6192,13 @@ in with self; { exampletestr = derive2 { name="exampletestr"; version="1.2.0"; sha256="05p819a6s6anxjqvs10df9kcfdg7lkg1205iw635db9g6biplrb7"; depends=[checkmate devtools filesstrings magrittr purrr readr roxygen2 stringr styler]; }; exams = derive2 { name="exams"; version="2.3-0"; sha256="0y21cx6knx253gka1bib8z0jmyndl4k7c2d8hfh3rwn5bdqyqj53"; depends=[]; }; excerptr = derive2 { name="excerptr"; version="1.4.0"; sha256="0z69lqfdm2dh9z6rqhfnj6f4b2p6sgmlvcxasg49wd0qasx86ph6"; depends=[git2r rprojroot rPython]; }; - excursions = derive2 { name="excursions"; version="2.3.2"; sha256="1fh04kkv9nj7wxrklpapsfh0xi8k5hfaa1f4dvnz2wxvzz3iz5nb"; depends=[Matrix sp]; }; + excursions = derive2 { name="excursions"; version="2.3.3"; sha256="16clwp76hq1q3m7ixjq1rv83vagxyj2fcs4jdsgvl9pzh5syzd3x"; depends=[Matrix sp]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.2.1"; sha256="0969ip7vwhs3r9zwy5l1gqg886yl4gfw8ss2frnq9nmqpn1ib1v2"; depends=[curl dplyr jsonlite purrr tibble]; }; exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; }; expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; }; - expands = derive2 { name="expands"; version="2.1.0"; sha256="0870jbjk2yzddvs57fdnl4psy55r6rjdbs7w7jc7s3vrzdsziwxa"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; }; - experiment = derive2 { name="experiment"; version="1.1-2"; sha256="1wswfxfk3b5gvdxb6i3mzx66i1qszvb9alfwhv95y0dr5q6vss1w"; depends=[boot MASS]; }; + expands = derive2 { name="expands"; version="2.1.1"; sha256="1ajfj5vsqal642avshjfmv0f5vi0ca3whhw5cxmpm013yckb3b3r"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; }; + experiment = derive2 { name="experiment"; version="1.1-3"; sha256="0gxf6bbx06ynz96mwcb9wdb8pb0njvjnpigjc1vq5ammc3l6dkxz"; depends=[boot MASS]; }; expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; expint = derive2 { name="expint"; version="0.1-4"; sha256="17vp7znbxlf5zb944snmnml2w42avj9k70fisb8az047i3kdbvfh"; depends=[]; }; explor = derive2 { name="explor"; version="0.3.3"; sha256="1b3swb7ikp2ik3300ljg2rll5gka4l4lfg95bqbgap3ph4dclv7y"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; }; @@ -6151,13 +6263,13 @@ in with self; { fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; }; fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; }; - fabricatr = derive2 { name="fabricatr"; version="0.2.0"; sha256="1jgfxifp7v80bddcs5zi5zidzhnzmsbvfa7qznaxyp3qknax2k67"; depends=[rlang]; }; + fabricatr = derive2 { name="fabricatr"; version="0.4.0"; sha256="0z04n2n44anpci8m4m5hs83nwhiczil7lkg8glcgngrdh994k8hc"; depends=[rlang]; }; face = derive2 { name="face"; version="0.1-4"; sha256="0kkgblxzhjzifxnym6g5psiwvfgydk1scqbxraldklm8c4a12zc3"; depends=[Matrix matrixcalc mgcv refund]; }; facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; }; facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; - factorMerger = derive2 { name="factorMerger"; version="0.3.5"; sha256="0j5bjn8jmmdxr88aiw3i46frphkn4s5a54iqz6hcqq70cgg91cj4"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; + factorMerger = derive2 { name="factorMerger"; version="0.3.6"; sha256="04l52w2lfihmwqk4xbv2i37jgkanhvmzcw2x7dmj3hmjymlr4yl0"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; }; factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; }; @@ -6176,6 +6288,7 @@ in with self; { fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; }; fanovaGraph = derive2 { name="fanovaGraph"; version="1.4.8"; sha256="1da7yskh2gn4arrrnalkl3izqyyrm0yf0il4v2izs7di7qlw3m6v"; depends=[DiceKriging igraph sensitivity]; }; fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; }; + fansi = derive2 { name="fansi"; version="0.2.2"; sha256="1kjbklr24n649k17mgcxsrw8lsj4c2yd94yg1rilsnlqcyjdvpvi"; depends=[]; }; faoutlier = derive2 { name="faoutlier"; version="0.7.2"; sha256="0h2azbkxpz03qjmq558mh7dkpv87vbvminvg69wqsx21m6hdl5r3"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; }; far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; }; faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; }; @@ -6196,13 +6309,15 @@ in with self; { fastR2 = derive2 { name="fastR2"; version="0.2.0"; sha256="1xwa4v0j2n0qxn1prhc9x0sz53fhsfbg2m1a6kfdp7cpvvk46pw5"; depends=[dplyr ggformula ggplot2 lattice magrittr maxLik miscTools mosaic numDeriv]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; }; fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; }; + fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; }; fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; }; fastcluster = derive2 { name="fastcluster"; version="1.1.24"; sha256="15drhl22wm8whsy6b3vv754skfddiydb068zn1whrw5sknvkkjc2"; depends=[]; }; fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; }; fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; }; fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; - fastmaRching = derive2 { name="fastmaRching"; version="1.0.0"; sha256="17z5frf5c50y4387l4vbwwbm8z1wn0yyr7kp044s4q8bp1k2pqv3"; depends=[raster rgdal sp]; }; + fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; }; + fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; fastnet = derive2 { name="fastnet"; version="0.1.4"; sha256="0hc18yc2cmvb5v8vjj1xvnciz35hyfp9iyqhkg9jfjrlf89icny6"; depends=[doParallel foreach igraph tidygraph]; }; fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; @@ -6214,15 +6329,16 @@ in with self; { favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; - fbar = derive2 { name="fbar"; version="0.3.4"; sha256="0nsw7axdgmkbmn87wxg3adyy060vrqqbr0s2hfdh54fj58i6nq71"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; }; + fbar = derive2 { name="fbar"; version="0.4.3"; sha256="1raq8ak01gcnmcsaa3fdfqi40d67v7nfjr212jzvq7wp2qk3j10i"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; }; fbati = derive2 { name="fbati"; version="1.0-1.1"; sha256="18k8a1m2znzzwmm25dbqnqzwbjxqz4rbjaw3z9affky7lzqgbg6l"; depends=[fgui pbatR rootSolve]; }; fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; }; - fclust = derive2 { name="fclust"; version="1.1.2"; sha256="08gi7w74215r44qbysg233s5n8r905b66gsi4i66xf5r7zgaqsm0"; depends=[]; }; + fclust = derive2 { name="fclust"; version="1.1.3"; sha256="1wpdvpfama90x8rj5yv54q7k318ad4y6pi33vsyh0rsb3fdrkqkr"; depends=[]; }; fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; }; - fcros = derive2 { name="fcros"; version="1.5.5"; sha256="1kyrilm6g0nqgba3bf4vbvcgcfj8044n6jfysbrvvlhwypkzqa0q"; depends=[]; }; + fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; }; + fcros = derive2 { name="fcros"; version="1.5.6"; sha256="0n1zbzl6g9k3smdpgyb3xsa2w8ir4bdagv7w644x1jck5rd0xn2j"; depends=[]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; - fdANOVA = derive2 { name="fdANOVA"; version="0.1.0"; sha256="10c12yns1sv4ph61hma1mymab03xyyx933f27977lw3c0npy7b02"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; + fdANOVA = derive2 { name="fdANOVA"; version="0.1.1"; sha256="16i0mnbxyjbw06havl277c6vi7mq5rak9cjzp8c2zvr8cakalkg4"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; fda = derive2 { name="fda"; version="2.4.7"; sha256="0371c32kxxvfdh18ldgc2p76dr2436ay0n9prdjwm9v0azp4rp9k"; depends=[Matrix]; }; fda_usc = derive2 { name="fda.usc"; version="1.4.0"; sha256="0gp19c5lxp0g4690vdr0gpw89rl9v3l6872mf7hr8nsyyd6776vn"; depends=[fda MASS mgcv nlme rpart]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; }; @@ -6241,6 +6357,7 @@ in with self; { fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; }; feather = derive2 { name="feather"; version="0.3.1"; sha256="1q6dbkfnkpnabq8lb6bm9ma44cfcghx2lm23pyk3vg7943wrn1pi"; depends=[hms Rcpp tibble]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; + featurefinder = derive2 { name="featurefinder"; version="1.0"; sha256="1hhfhc1gjmi770yljqhqrp9a5z5rrbd7bavznb758c26hpk7xilf"; depends=[plyr rpart rpart_plot]; }; features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; }; febr = derive2 { name="febr"; version="1.0-0"; sha256="0c0kgj31n2z2qqbga9waqrrm6xxksi27c6riyp1c57z4wjais860"; depends=[cellranger dplyr glue googlesheets knitr pedometrics readr sp stringr xlsx]; }; @@ -6274,11 +6391,11 @@ in with self; { filenamer = derive2 { name="filenamer"; version="0.2.2"; sha256="0289qpy4891fb71fa4bhc8wp4g7n1sw1kis5k5irdyyzmsa9dfhn"; depends=[]; }; fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; }; files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; }; - filesstrings = derive2 { name="filesstrings"; version="2.1.0"; sha256="1ik6m0ks6k1fhmpd3fk9z4mav3f8hs7si84vjcg8jk37xxqhfnd8"; depends=[checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; }; + filesstrings = derive2 { name="filesstrings"; version="2.2.0"; sha256="1qix25k0j1d1q3z5xiq9gc928kbb78w0j9083q5xsdik840d91kj"; depends=[BH checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; }; filling = derive2 { name="filling"; version="0.1.0"; sha256="0avlfl06nd8wn76ydii09ng2fqp92d4n9v2y5vg16m3my58l0srd"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; }; finch = derive2 { name="finch"; version="0.2.0"; sha256="1vganbkz2d96xfz2jf1q0kqarc575w3nswss2igynsbbd0y53mjm"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; }; - findR = derive2 { name="findR"; version="0.2.0"; sha256="03xkp8akjaciv2cl1przzz56nc3ma8l7pr4k0c3w2y0sivkmawdk"; depends=[pdftools]; }; + findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; findpython = derive2 { name="findpython"; version="1.0.3"; sha256="1y08jk2ffmkf9zpwiz2xymjhfwqvls9vzsnq62v278ghw9d571jl"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; fingerPro = derive2 { name="fingerPro"; version="1.0"; sha256="17r23x8cdllr8slk56dsmrwc4ns69b3cqy59mxxbsjnhjl3di6x8"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL reshape rgl scales]; }; @@ -6296,6 +6413,7 @@ in with self; { fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; fitODBOD = derive2 { name="fitODBOD"; version="1.1.0"; sha256="15ylldlq12mrw06pzww54hsl8nb9krs5w1cgh037km9sndsswvji"; depends=[hypergeo]; }; + fitPoly = derive2 { name="fitPoly"; version="3.0.0"; sha256="0ws1vsh8if9i9i7820ak32b0bysjc0z09nbrk17qpms0b11cpc3g"; depends=[foreach]; }; fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; }; fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; }; @@ -6305,11 +6423,12 @@ in with self; { fitur = derive2 { name="fitur"; version="0.5.25"; sha256="0f33c4mg0257s9c0qldryihaq8p3y07j2nwghjpqhi3rv4mrg2xf"; depends=[actuar e1071 fitdistrplus ggplot2]; }; fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; + fixerapi = derive2 { name="fixerapi"; version="0.1.1"; sha256="0g1bs2d99yv6q6y8kh6s9skkfjany5737kys0yqy8mpflhymvh33"; depends=[jsonlite tibble tidyr]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; }; - flam = derive2 { name="flam"; version="3.1"; sha256="12dkxisi56fg5720mh58jqrjvkqllqgzynafd44xalswkk4ahaak"; depends=[MASS Rcpp]; }; + flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; }; flan = derive2 { name="flan"; version="0.6"; sha256="0idlvi4xlfr5l0csj75xmn94856y71j92im6dwv0rcawkwh8ghqh"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; - flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; }; + flare = derive2 { name="flare"; version="1.6.0"; sha256="0ygif9a7a99qwv0b488wymmmncp6f5ww9yz13s4qs6p8yf37x1r1"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; @@ -6317,11 +6436,12 @@ in with self; { flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; }; flexclust = derive2 { name="flexclust"; version="1.3-5"; sha256="19ihdhmhaglccqpvrpc51367gkfafg4jdpabbk0j6mh2n16hi511"; depends=[lattice modeltools]; }; flexdashboard = derive2 { name="flexdashboard"; version="0.5.1"; sha256="0jb5wswbjr58g121nbvl93p73gxr8cx56kajgpiaw1fis6dsyfyz"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; + flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; }; flexmix = derive2 { name="flexmix"; version="2.3-14"; sha256="0sl4zxh1sb2sr5q7svjw9ihrm219jzn82yrc9d43q6r1b8bpyz43"; depends=[lattice modeltools nnet]; }; flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival]; }; flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.4.2"; sha256="07a962ylr3y8v31557iqzr1m0c8bvprilfdimwzjl9fhlplb9y4h"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr]; }; + flextable = derive2 { name="flextable"; version="0.4.4"; sha256="12f33szyxf4b7ipz4j9sli6miwkjq2309rpinaxmnsqsafd1zn3b"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr]; }; flifo = derive2 { name="flifo"; version="0.1.4"; sha256="1yilfnblarimc8mlvvwsgib5sxcfgvgsvgpyzddxb39g6fb7lffs"; depends=[bazar pryr]; }; flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; }; flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; }; @@ -6336,20 +6456,21 @@ in with self; { flowr = derive2 { name="flowr"; version="0.9.10"; sha256="18mjshfg3827b26b8nz52pl04ph7n887vw0ym5fybjm8gy5wwpdg"; depends=[diagram params whisker]; }; flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; }; flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; + fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; }; flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; fluxweb = derive2 { name="fluxweb"; version="0.1.0"; sha256="1fwxqm8pn9h0bl1cpvz9rx56zsvxz22la5bj8yrrkbg3m8jdzgvi"; depends=[]; }; fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; - fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.0"; sha256="15n2vjfriicg3mijzkz55w54xyq0h8zjchhlgdxsycysqv59lxag"; depends=[geometry MASS mclust mvtnorm]; }; + fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.2"; sha256="0slmwzcmsl5cfgif6d47xfjknmap0x45cql339dyamwmhqm968rk"; depends=[geometry MASS mclust mvtnorm]; }; fmri = derive2 { name="fmri"; version="1.7-2"; sha256="1ifp0fkmr0bj5vkg9vh0lk74f04fk0zc90vknmjmxd2hbdb5kh4r"; depends=[awsMethods metafor nlme]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; }; - fmsb = derive2 { name="fmsb"; version="0.6.1"; sha256="1kdw0j1jl76dzsk56lpl5vvrx5l0w9rc94kmj1dhbqb5yh64xai7"; depends=[]; }; + fmsb = derive2 { name="fmsb"; version="0.6.3"; sha256="1n29bnyp20pvpk2lsa9fblsj5w7amp14snc74pk5w3yr5y6rj0s5"; depends=[]; }; fmt = derive2 { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; }; foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; - foghorn = derive2 { name="foghorn"; version="1.0.1"; sha256="14g82mvh7ylqdms5si3xna1zy5jfxjksv5v2ijikjz40iddxmh5s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; + foghorn = derive2 { name="foghorn"; version="1.0.2"; sha256="17bng0fxjqrlni11vwmghimk0h38mlyjyxizrbs1fycb8khlqh94"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; fold = derive2 { name="fold"; version="0.2.5"; sha256="1h7vx8saq4mbmylh1zgldm8n17i8waq8fgr5d4q68553xmazws41"; depends=[csv dplyr encode lattice lazyeval magrittr metaplot rlang spec tidyr]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; }; @@ -6363,10 +6484,9 @@ in with self; { foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.2"; sha256="1wr99jq8a0cbc7n5sdzr0gwnxsv8sjqy1x1lrazxswyj49xc06i4"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; }; foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.2"; sha256="04mqx1szm22lhiqzncm8ad0kyqhv1y4d6v02gn70d78kxmjangzb"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; }; - forecastHybrid = derive2 { name="forecastHybrid"; version="2.0.10"; sha256="04lspngh44y815amxlnhl74k5g7sj3bm0w8yy58fk8nqrl382pb6"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; }; + forecast = derive2 { name="forecast"; version="8.3"; sha256="0k5b9skjpyzx7gbd8z6f3d92wl2f8zgli781m4jg903ra0hsyncj"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca uroot zoo]; }; + forecastHybrid = derive2 { name="forecastHybrid"; version="2.1.11"; sha256="01jmq6mw3idvascgrmr7i69pllqzdwbks42748pq18znw3f2yvjl"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; }; - forega = derive2 { name="forega"; version="1.0.3"; sha256="1n1gqm0bjdw13jm95zp0ni0hps07xjkswzrszvamn2f6sglrn73d"; depends=[forecast Rcpp robfilter]; }; foreign = derive2 { name="foreign"; version="0.8-69"; sha256="0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; @@ -6394,7 +6514,7 @@ in with self; { fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; }; fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; }; - fpp2 = derive2 { name="fpp2"; version="2.2"; sha256="1mjd8mk169k47mb3cjgd72zgjivrh4kr1yclxxxdds3bm1jh2x8l"; depends=[expsmooth fma forecast ggplot2]; }; + fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; }; fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; }; fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; }; fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; }; @@ -6429,14 +6549,14 @@ in with self; { frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; }; frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; - fs = derive2 { name="fs"; version="1.1.0"; sha256="1rcpji6qygjm75y51gb6x0vg0fjnvkl3x734d6dgd50xal59blb9"; depends=[Rcpp]; }; + fs = derive2 { name="fs"; version="1.2.2"; sha256="194sl0vv0p2h1z474yzh9agqj1w02ppvkpz5p1b8ljn794h4ar7a"; depends=[Rcpp]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.3"; sha256="1miqg7rd3q11aksbjf0nswwnxb7c2p2f0b85nmnwm11snbf1gg8s"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.2-21"; sha256="121khfqy1ixqp86cl3cngc40zxjpd4nm5k0lk558nxcfgyyzvx8y"; depends=[rJava robustbase]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; fslr = derive2 { name="fslr"; version="2.17.3"; sha256="1g7z1jsj89kqyclb3qdc7c6dgn18jqjmrxpxi62llkixhqg21yha"; depends=[matrixStats neurobase oro_nifti R_utils]; }; fso = derive2 { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; fst = derive2 { name="fst"; version="0.8.4"; sha256="1jarhz5c6bib4n3xms1xhgybzaqdf4llfbgmnqndz2gwxjx1igia"; depends=[Rcpp]; }; - fsthet = derive2 { name="fsthet"; version="1.0.0"; sha256="10mimnlq01q0mmaljfp27iq0pv11znbcv3mah57nrwpy0a3zqwhb"; depends=[]; }; + fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; }; ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; }; @@ -6449,7 +6569,7 @@ in with self; { fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; funData = derive2 { name="funData"; version="1.2"; sha256="0y3ar26d6hxc4bg263qjqfb92ivhkphzizhz91wrzbfxha9dcrzz"; depends=[abind fields foreach]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; - funHDDC = derive2 { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; }; + funHDDC = derive2 { name="funHDDC"; version="2.0"; sha256="0bd58pdsg9036vk54fayvzr6il56bamrvn5vhqc3g92papp9jlm8"; depends=[fda MASS]; }; funModeling = derive2 { name="funModeling"; version="1.6.7"; sha256="0blanw0aw7qvcs6a8ryaqvi322gaz65g6flijkbssf681im9pmjr"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; }; funbarRF = derive2 { name="funbarRF"; version="1.0.1"; sha256="05smi717j4zhbrfqjyvx1rzckygigg1x8c6kb3brbpv8w33gcvx7"; depends=[BioSeqClass Biostrings bold randomForest]; }; funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; }; @@ -6457,11 +6577,12 @@ in with self; { functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; }; fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; }; + funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; }; funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; funrar = derive2 { name="funrar"; version="1.2.2"; sha256="179kxhwkd431d2n917mzjnr5qvh09f0hdm2c78lww4ijb54dhn0l"; depends=[cluster dplyr]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive2 { name="funtimes"; version="5.0"; sha256="0xq0n3939rsrz7dna4d3d7mrpxad2xswnblsc4a88nbq6cmx5c70"; depends=[dbscan Jmisc Kendall]; }; - furniture = derive2 { name="furniture"; version="1.7.3"; sha256="1bayp2cfd3vacy83jf9x5l2kp4dr2kvfx9zvmw7z2z03lfmjj841"; depends=[knitr]; }; + furniture = derive2 { name="furniture"; version="1.7.6"; sha256="0yz3l6lrfq5mbh4d7z6ny2gg3qixglcl9lvvs97a3l7mqwi5x4h9"; depends=[knitr]; }; fuser = derive2 { name="fuser"; version="1.0.0"; sha256="0l2ddc3lal3gvzkn8b09i7pzd9nvqnr45naz3ni52nmgygwdk5ma"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; @@ -6470,7 +6591,7 @@ in with self; { futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.2"; sha256="0njckhwmawqhiznv241yjghh99wl72c4xknp9nzbmvi5j575rnlh"; depends=[]; }; - future = derive2 { name="future"; version="1.7.0"; sha256="0lfzw53z1d4bksishjkmwphfkgdr6zpvnpwr1jx8dsj0b1y2laiq"; depends=[digest globals listenv]; }; + future = derive2 { name="future"; version="1.8.0"; sha256="096pfwafiwr16m13qda824ba3mzqabz4cdbg08sz1vh5s2k2hp4c"; depends=[digest globals listenv]; }; future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.15.0"; sha256="0r1bnp9mnv8jk9d6dpr94cqn4zihpm7cgxqj0c3l0x9b6i0ny3z2"; depends=[BatchJobs future R_utils]; }; future_apply = derive2 { name="future.apply"; version="0.1.0"; sha256="1c5jyklam5j9lmr5jmn6972wwlbyaaihy4kczxib87glmc4g0a4k"; depends=[future globals]; }; future_batchtools = derive2 { name="future.batchtools"; version="0.6.0"; sha256="0npvy8d927k3ilmnwcq1fh5lvpdr009pyc93ils5qhwhfma3wfh0"; depends=[batchtools future]; }; @@ -6487,7 +6608,7 @@ in with self; { fwsim = derive2 { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; }; fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; }; g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; - g2f = derive2 { name="g2f"; version="0.1"; sha256="1njx03hnfvzqyzhyjg5zwikv36xggss2vc82vpfybg6rqkx3rqbd"; depends=[KEGGREST minval sybil]; }; + g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; }; gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; }; gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; }; gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; }; @@ -6496,14 +6617,14 @@ in with self; { gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; }; gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; - gProfileR = derive2 { name="gProfileR"; version="0.6.4"; sha256="1cka02zbz1rbppm782qpxk1xn9qxbrv2gp5rgf970j906hxm2y0b"; depends=[plyr RCurl]; }; + gProfileR = derive2 { name="gProfileR"; version="0.6.5"; sha256="1x6ym5bdlpc5z3h3wpyryym2g6qvm45blydw7s44bi165r30vrim"; depends=[plyr RCurl]; }; gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; }; gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; }; gRbase = derive2 { name="gRbase"; version="1.8-3"; sha256="143qvs5mwypswdq344a48kzn83sx9jskdr9w6kxa3fzhdcqlhi7d"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; }; gRc = derive2 { name="gRc"; version="0.4-2"; sha256="0cqc3s7a1njxzmnx7yx1yjkrazbai3gpw2kc4l7g49ld4j40bsln"; depends=[gRbase MASS]; }; gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; - gSeg = derive2 { name="gSeg"; version="0.4"; sha256="0fcjhf8hznh1rzyfrk3f3hy16zs1n61b7r3j90pzg873razf97a2"; depends=[]; }; + gSeg = derive2 { name="gSeg"; version="0.5"; sha256="1f3appvy78adv9jll47smgw2apm3dkm9zrm17hhdxmcnqypd7ias"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; gWQS = derive2 { name="gWQS"; version="1.0.0"; sha256="0n0zwfqz5g4js5y3ss64dv5842jypr6sqacs32ax37immd34slhq"; depends=[ggplot2 Rsolnp tableHTML ztable]; }; gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; }; @@ -6518,12 +6639,12 @@ in with self; { galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; }; gam = derive2 { name="gam"; version="1.15"; sha256="1w6icadyfyqlkz5qijwifa3z96d460m88k8b2iaqj0cf6agmydhy"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; - gamRR = derive2 { name="gamRR"; version="0.3.0"; sha256="07zgh6hxkqxrw5da1pbscl8z8hzbgc5ipkzmpimimxa0i9g04c4h"; depends=[boot mgcv]; }; + gamRR = derive2 { name="gamRR"; version="0.4.0"; sha256="0grd9d7rar4lq82v55k7c2d3h0g2lh7ny4bpxanqgrq02jkpnz1p"; depends=[boot mgcv]; }; gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; }; gambin = derive2 { name="gambin"; version="2.3.0"; sha256="1kwh8s191m6gsjczqc3svf6zp1k4zi86rqz7s94rahg84vwh6a9b"; depends=[doParallel foreach gtools]; }; gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-0"; sha256="0z9wzvxjhnjl2bjnd5pxqzvv43hak7x5m23j76qnm05j12vw4bz1"; depends=[mboost stabs]; }; gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; }; - gamclass = derive2 { name="gamclass"; version="0.56"; sha256="13gy8ys69dkhm54x3vcpqblq4j2hkbsnaswzcq0v0saqd9b1shcs"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; }; + gamclass = derive2 { name="gamclass"; version="0.57"; sha256="08s44n6x7m01gw02q4zgpa5vxbcgx6mnqgmdn6760ff66wy4zrgc"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; }; games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; }; gamesGA = derive2 { name="gamesGA"; version="1.1.3.2"; sha256="0srxsm1zhrx1dpm94mkcsds6rwkx9gi9yfbrkzylhrxgi4g8pvwp"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-4"; sha256="08igzs2raz6nnkz2aisxaq9jy2mlb49cqlm6gwxp0mrag4q6xxrz"; depends=[Matrix]; }; @@ -6542,11 +6663,11 @@ in with self; { gamm4 = derive2 { name="gamm4"; version="0.2-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; depends=[lme4 Matrix mgcv]; }; gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; }; gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; }; - gamsel = derive2 { name="gamsel"; version="1.8-0"; sha256="0s29czlakix5ksblixcv7y5in5az9syzs2n71mqzf32vqgf8sf18"; depends=[foreach mda]; }; + gamsel = derive2 { name="gamsel"; version="1.8-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; }; gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; gap = derive2 { name="gap"; version="1.1-21"; sha256="0vslbk66h1gkpqrpj4pkxnx7nr1fnjp0zvym9cxzyxww797bd57s"; depends=[]; }; gap_datasets = derive2 { name="gap.datasets"; version="0.0.2"; sha256="0skxgiwymd8c4vsy2dbddifjj9a0bq52gdd2r62slsv0q9haw96y"; depends=[]; }; - gapfill = derive2 { name="gapfill"; version="0.9.5-3"; sha256="1hwccvshz9z1zgjjrdk6iri272ih11cwpz91rldkpcwly6pqcwhk"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; + gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; }; gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; }; @@ -6558,7 +6679,7 @@ in with self; { gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; }; gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; }; - gb = derive2 { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; + gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; }; gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; gbm = derive2 { name="gbm"; version="2.1.3"; sha256="0ayrpq5qm18dsain088mbw0037bijxcy342grb6g2qnp67llpwpa"; depends=[lattice survival]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; @@ -6588,7 +6709,7 @@ in with self; { gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; geeM = derive2 { name="geeM"; version="0.10.0"; sha256="0bk99kwh6xapkaxc3yis5x3d49j7pb45hq4ksbmkhz6ba21c4sn5"; depends=[Matrix]; }; - geecure = derive2 { name="geecure"; version="1.0-2"; sha256="0y3h079hyr8p6i0hyf0zzkbfds36zz782ffiw18w7qavnj70yj98"; depends=[geepack MASS Matrix survival]; }; + geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; }; geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; geex = derive2 { name="geex"; version="1.0.3"; sha256="0px197mz3qfx7s4wfdjlgjpss03y7wid1qa34xf4xan05dnrrnzc"; depends=[lme4 Matrix numDeriv rootSolve]; }; @@ -6600,6 +6721,7 @@ in with self; { gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; }; gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; genBaRcode = derive2 { name="genBaRcode"; version="1.0.0"; sha256="0313kyhy9bg9rabxk2jdgxq2brhj2kkiq0xyd3mlq6j9c626pqi8"; depends=[ape Biostrings ggnetwork ggplot2 igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist visNetwork]; }; + genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; }; genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; }; genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; @@ -6608,7 +6730,7 @@ in with self; { gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; }; gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; }; - genderBR = derive2 { name="genderBR"; version="1.0.1"; sha256="1sbxp0wz138xxcv31xz411gp7krzghvfmjfg5hmv66l8014s6s6c"; depends=[dplyr httr jsonlite]; }; + genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; }; genderizeR = derive2 { name="genderizeR"; version="2.0.0"; sha256="0r9r5x93zr58sfrww3l2vyvjyj8lir2yds08y6dzf88rs9v15w3c"; depends=[data_table httr magrittr stringr tm]; }; gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; }; geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; @@ -6625,9 +6747,10 @@ in with self; { genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; }; geniusr = derive2 { name="geniusr"; version="1.0.0"; sha256="0akz6hkw9mjwgx9s9j24j5l1z4q41kbhna2245l26ymn4cf0rwjc"; depends=[httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; }; - genlogis = derive2 { name="genlogis"; version="0.5.0"; sha256="0ybbfm9znkm52kin4f8dxb63rn6b91zsa31baw1lgczh41yswg3r"; depends=[distr doParallel foreach ggplot2 manipulate]; }; + genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; genoPlotR = derive2 { name="genoPlotR"; version="0.8.7"; sha256="1zplk0acismv4x528rmmg5jcv6ng6c4vjf5h0mr124fj3kizsrg0"; depends=[ade4]; }; + genogeographer = derive2 { name="genogeographer"; version="0.1.8"; sha256="1sawxazfyi29h27lyrkkg0cqirmca59387z77r2jamcj6yx4lpxg"; depends=[dplyr DT forcats ggplot2 knitr leaflet magrittr purrr readr rio rmarkdown shiny shinycssloaders shinyjs tibble tidyr]; }; genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; }; genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; }; genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; }; @@ -6636,6 +6759,7 @@ in with self; { genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; }; gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; }; + gensvm = derive2 { name="gensvm"; version="0.1.0"; sha256="19qd67x3j0b60wsbinjny7jwx5yh8hdk6387fl64frnq8fvi9d60"; depends=[]; }; geo = derive2 { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; }; geoBayes = derive2 { name="geoBayes"; version="0.3.3"; sha256="1jw0fj39gzf4cislc889ndgj34svcdxk0jz85ssk936g9gp0mm0c"; depends=[coda sp]; }; geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; }; @@ -6645,14 +6769,15 @@ in with self; { geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; }; - geofacet = derive2 { name="geofacet"; version="0.1.5"; sha256="1fx7qgvyqkm8728ai1nd7kgj295q46jlps56zwvlvlzhqy437p5n"; depends=[ggplot2 gtable]; }; + geofacet = derive2 { name="geofacet"; version="0.1.9"; sha256="0z9xd24hn9j8azd4kal81lz72zy6vv9rvwx1jsmkq7z7f1wwly48"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sp]; }; geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; }; geogrid = derive2 { name="geogrid"; version="0.1.0"; sha256="1aiar70cy8rf7hc7kwc2g3p02x3zmp6nf9vfjjrjm94mb7yr8s48"; depends=[Rcpp RcppArmadillo rgeos sf sp]; }; geohash = derive2 { name="geohash"; version="0.3.0"; sha256="1yabnf0a6jd4r6zh83sxb9wcn4vs8csp7c80qs6pi1nx016lirx7"; depends=[Rcpp]; }; geojson = derive2 { name="geojson"; version="0.2.0"; sha256="1xvbkdaaf55x015pflvcdy06ayrmhqi3my0sdqb48z129rdbr3i7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; geojsonR = derive2 { name="geojsonR"; version="1.0.4"; sha256="0248lb1kgj43czp5z4q7dcrq6ra0jhq62q9x79mgyb83bqn940h8"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.5.0"; sha256="1ywrzjksiim7xhjywhjmp6s3dalqyzh1948xr8958ahpbk242252"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sp V8]; }; + geojsonio = derive2 { name="geojsonio"; version="0.6.0"; sha256="10vi40ppy65yg655xy0j8zl6icn7d7icwfj4a84wpp28pd1bwic8"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sf sp V8]; }; geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; }; + geojsonsf = derive2 { name="geojsonsf"; version="0.2.0"; sha256="1jc0dgxk4zlrwy6a3y2j87a7vk9w8cnmczhaf0jdw6xymmni1faw"; depends=[rapidjsonr Rcpp]; }; geoknife = derive2 { name="geoknife"; version="1.5.5"; sha256="0azb98zk4ayfm0z9vz5h59490xvng16p3gpdn60ca9mwdikyxks3"; depends=[curl httr sp XML]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geomedb = derive2 { name="geomedb"; version="0.2"; sha256="1nsf7xzqayk8zbw3b6xpgiqk2w2kzc896gjswzxq128xw05cia0a"; depends=[ape httr]; }; @@ -6662,7 +6787,7 @@ in with self; { geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; }; geomorph = derive2 { name="geomorph"; version="3.0.5"; sha256="015ijpmx44agmr2ddwgxy5rs1rhkxr6j6dh5wzksaw1p4mxmhfks"; depends=[ape geiger jpeg Matrix rgl]; }; geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; }; - geoops = derive2 { name="geoops"; version="0.1.2"; sha256="1p2nc6lhqvnxs4l8k0kyqb7mjigaycjms61139sd39qs6wy7cnvp"; depends=[Rcpp]; }; + geoops = derive2 { name="geoops"; version="0.1.8"; sha256="1n863z83y19bn97clfddhv009c8d6a1grya0q5pk0a6ylihcw11h"; depends=[Rcpp]; }; geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; }; geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; georob = derive2 { name="georob"; version="0.3-6"; sha256="01gq9ymqk3zyjs5n7nj27ky2bnhc7x7npbipa5bcq7jda6gxirhr"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; @@ -6672,7 +6797,7 @@ in with self; { geosphere = derive2 { name="geosphere"; version="1.5-7"; sha256="186qdm5niq7v3d4w4rngx71znsgi44hnam7698bsx9ar5mg5b6wx"; depends=[sp]; }; geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostatsp = derive2 { name="geostatsp"; version="1.6.0"; sha256="12lkmwfg4wqmc13xzsmgc1g624v2kpacxpycwlcafr60rbix6f9w"; depends=[abind Matrix numDeriv raster sp]; }; + geostatsp = derive2 { name="geostatsp"; version="1.7.1"; sha256="141mvwkqk2jpyggmzvm604s37h92gbmzch3d84dq3ng29mc507s2"; depends=[abind Matrix numDeriv raster sp]; }; geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; }; @@ -6680,6 +6805,7 @@ in with self; { geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; }; geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; }; gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; }; + germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.0"; sha256="1s6mygiwmz2cgg2dcsah4ssnj5hfilf7hfdzvv3qd57imicrlkk5"; depends=[broom ggplot2 ggrepel minpack_lm plyr Rdpack]; }; gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; }; gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; }; getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.2"; sha256="14rw7pdcan4bdjfb16z3h0acx2s8l34vywsp4nn8l1pmmsvgqpap"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; }; @@ -6689,16 +6815,17 @@ in with self; { getlandsat = derive2 { name="getlandsat"; version="0.1.0"; sha256="0h2520r5sqyzsajqw2i86byw9zm5za27mhjkrzzw5vr5sh1vdiwb"; depends=[data_table httr rappdirs readr tibble xml2]; }; getmstatistic = derive2 { name="getmstatistic"; version="0.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; getopt = derive2 { name="getopt"; version="1.20.2"; sha256="13p35lbpy7i578752fa71sbfvcsqw5qfa9p6kf8b5m3c5p9i4v1x"; depends=[]; }; - gets = derive2 { name="gets"; version="0.14"; sha256="01pdpw56q27ihqyp58f0rsggqaqzay74ah1lwi54y7kcyw09yq5w"; depends=[zoo]; }; + gets = derive2 { name="gets"; version="0.15"; sha256="1sz225bymjp2mrklpjagh6x622kpcvh21r0rmimd1mjhqbg0p9vs"; depends=[zoo]; }; gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; }; gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; - gfmR = derive2 { name="gfmR"; version="1.0-1"; sha256="1irzkiq93wh4yphq8x1v2a7plcrskb8fs36qjaa0qhyhvhn0f57i"; depends=[faraway nnet]; }; + gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; - ggExtra = derive2 { name="ggExtra"; version="0.7"; sha256="0vygac13cjcq63f57zd28jyla09za58r77kq1mmsa4qx4dxyfsbl"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; }; + ggExtra = derive2 { name="ggExtra"; version="0.8"; sha256="1m5zpn3l3p1y3d2692gyz50m63d58m2a3b7zb595kvcffdx2qr5b"; depends=[colourpicker ggplot2 gtable miniUI scales shiny shinyjs]; }; ggFacetSample = derive2 { name="ggFacetSample"; version="1.0.0"; sha256="04h5j54wblrygiscvb6n40b9lz42ssds1yz9qs5hxppiph68k5zq"; depends=[ggplot2 plyr]; }; ggQC = derive2 { name="ggQC"; version="0.0.2"; sha256="1wi9hb5ihix2vfpzbhpq2clbs7c0qh84qbmdfcxw4lknb0ha9ai1"; depends=[dplyr ggplot2 tidyr]; }; + ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; }; ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; }; @@ -6707,25 +6834,26 @@ in with self; { ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; - ggconf = derive2 { name="ggconf"; version="0.1"; sha256="1h7z4amlycfddisf8ix5kmax56ix8hdllfn77rf4fs5sbqsqxkdm"; depends=[ggplot2 rly tibble]; }; + ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; }; + ggdag = derive2 { name="ggdag"; version="0.1.0"; sha256="0ja3v8pmlzl55n8y8n9zcg5n17w8w4vdq42bqf6h8hgyqj63rcg9"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr plyr purrr stringr tibble tidygraph]; }; ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; }; ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; }; gge = derive2 { name="gge"; version="1.3"; sha256="0bqclmm4jr7y52n7qh4jikd0804iccjdpy55bvbc2k8ypsp2biik"; depends=[nipals reshape2 rgl]; }; ggedit = derive2 { name="ggedit"; version="0.2.1"; sha256="0l2ryp8xcyqsgfcywr3y6c2y8j42c15dyrcmfhfimbzy52bmnqxy"; depends=[colourpicker dplyr ggplot2 miniUI plyr reshape2 rstudioapi scales shiny shinyAce shinyBS]; }; - ggeffects = derive2 { name="ggeffects"; version="0.3.1"; sha256="04wmyrs1pzdv120w7pq2g0x51h061lj27p42gaxfcrzdbplvrwv1"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; }; + ggeffects = derive2 { name="ggeffects"; version="0.3.2"; sha256="07xrbl8z5ap5yy40wdz4gcwmmmj66c01qv8jdn0smjf06xavbr0n"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; }; ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggfan = derive2 { name="ggfan"; version="0.1.1"; sha256="0sqf37afz9kpl2wm3cpansav9ndil8agwrblzj0fhnyrj41s148n"; depends=[colorspace dplyr ggplot2 rstan]; }; ggfittext = derive2 { name="ggfittext"; version="0.5.0"; sha256="0ih6mqg53y5iaiq003wbzp6qqx4844yh5z9zw5d0k7gqclprmpn5"; depends=[ggplot2 stringi]; }; ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; }; ggformula = derive2 { name="ggformula"; version="0.6.2"; sha256="08smdd3s8dh3qjcm25v8h1r8pfvlfvkymnbhlyw4bymq479g4w0j"; depends=[ggplot2 magrittr mosaicCore rlang stringr tibble]; }; - ggfortify = derive2 { name="ggfortify"; version="0.4.3"; sha256="031fq82g7n9r9mvvh1sqbhq8m0swkha0vl78rkgkmzbrp88lkvqg"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; + ggfortify = derive2 { name="ggfortify"; version="0.4.4"; sha256="12fzf04yqxz0297pq4cpbnxal1vdmibi9nfcmzq5g35diypqwmg9"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; gggenes = derive2 { name="gggenes"; version="0.2.0"; sha256="1s3lkdl9wmhcdra90bv8zzb16h2sdmpr15x8c3d0gfw7yir6prj2"; depends=[ggplot2]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; gghighlight = derive2 { name="gghighlight"; version="0.0.1"; sha256="12by8q31fl2kc6w5p72wvd2nxg1cpvhgdbais6hjly1sxi8jd6zp"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang]; }; - ggimage = derive2 { name="ggimage"; version="0.1.0"; sha256="1kh8r859bayrha96b5wyfncbns2qw49v5kfai1jx66w89x3bsr7h"; depends=[ggplot2 gridGraphics magick rvcheck scales tibble]; }; + ggimage = derive2 { name="ggimage"; version="0.1.4"; sha256="0bwzzd7f4knjg7jifsmqwbd0kbca1n5f8f4s068d6mahaff5d9mn"; depends=[base2grob ggplot2 gridGraphics magick rvcheck scales tibble]; }; ggiraph = derive2 { name="ggiraph"; version="0.4.2"; sha256="0bk6q0psxzggm69yyhfw047xyygp23rk63xvdd9dv6avndfn1h7n"; depends=[ggplot2 htmltools htmlwidgets rvg xml2]; }; ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; }; ggjoy = derive2 { name="ggjoy"; version="0.4.0"; sha256="1s24zn7gmk52bvjjhanxby7rxbnc2yfl0nx5nv7x7z0zja8gg7nb"; depends=[ggplot2 ggridges]; }; @@ -6752,7 +6880,7 @@ in with self; { ggraph = derive2 { name="ggraph"; version="1.0.1"; sha256="0sm1hf2fjfia0s8m5b1x6pi8wvww77rpck86clpa2figwvck8jqr"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; }; ggraptR = derive2 { name="ggraptR"; version="1.0"; sha256="1n3ildrm8jh6m1j8njx1icbjhpkv3d2ndx59d6ddyg4np09cmp8w"; depends=[assertthat backports colorspace colourpicker DBI dplyr DT evaluate futile_logger futile_options gdtools GGally ggplot2 ggthemes gtable htmltools htmlwidgets httpuv labeling lambda_r lazyeval magrittr miniUI munsell plyr RColorBrewer Rcpp reshape rmarkdown rprojroot scales shiny shinyBS shinyjs stringi stringr svglite tibble xtable yaml]; }; ggrepel = derive2 { name="ggrepel"; version="0.7.0"; sha256="0g0qfm6g71rv27423c1x846ipilnj213knyzrcr09vrpxc87l618"; depends=[ggplot2 Rcpp scales]; }; - ggridges = derive2 { name="ggridges"; version="0.4.1"; sha256="0kfa3icqdalqdg1klxjrhfl7if35d3wnsiyl86bprw5dyqyh3lh3"; depends=[ggplot2 plyr scales]; }; + ggridges = derive2 { name="ggridges"; version="0.5.0"; sha256="1znvsbl3px8dddpjgdrygnpz4s685wizi0jnjvx2hrz58i0chjqj"; depends=[ggplot2 plyr scales withr]; }; ggsci = derive2 { name="ggsci"; version="2.8"; sha256="1s2asx9aprpzs6xqbl7yb1dv9ci9ivwqcq46fzvys8zgwzf7mkml"; depends=[ggplot2 scales]; }; ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; }; ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; }; @@ -6761,9 +6889,10 @@ in with self; { ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; }; ggspectra = derive2 { name="ggspectra"; version="0.2.3"; sha256="11y2vlcpxyh56pdfzz11bkip2nxv6rrwscqv48p5fvgn9sllly4q"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; }; ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.1"; sha256="07fpavl7735a7fhaiybf55125afs40ai8sag32xxsf8d24i5zl2s"; depends=[apaTables broom coin cowplot crayon DescTools dplyr effsize ggcorrplot ggExtra ggplot2 ggrepel gtable jmv magrittr MASS nortest purrr rlang RVAideMemoire sfsmisc tibble tidyr userfriendlyscience WRS2]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; ggtern = derive2 { name="ggtern"; version="2.2.1"; sha256="05dszysn1qr5s4ji4il91pv19xjh5yd09w9f153fmg4cyfl716iz"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; - ggthemes = derive2 { name="ggthemes"; version="3.4.0"; sha256="1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"; depends=[assertthat colorspace ggplot2 scales]; }; + ggthemes = derive2 { name="ggthemes"; version="3.4.2"; sha256="0i7ygpizs00acizixc29bhbrci523ys7vzxbii9b3bcmfa3pj7i3"; depends=[assertthat colorspace ggplot2 scales]; }; ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; }; gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; }; @@ -6774,7 +6903,9 @@ in with self; { gibble = derive2 { name="gibble"; version="0.0.2"; sha256="0a9h3q0kwk9aagcpnmih59vbm5n7hdjpa4idwagky351almblmr6"; depends=[dplyr tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; }; - gimme = derive2 { name="gimme"; version="0.3-2"; sha256="1k79c057024i59iccphzdkh0022dd4dv0vrpn3pvlw9px6j9fbz3"; depends=[igraph lavaan qgraph]; }; + gim = derive2 { name="gim"; version="0.11.0"; sha256="1psmziq03k1nbdl64sy152ih4g625qkbp5l7msfibrcbpgz0hg7y"; depends=[numDeriv]; }; + gimme = derive2 { name="gimme"; version="0.3-3"; sha256="0czms27yfv0iwwqljfpa21qx83282ky4misccbln4cxziyw1n7yz"; depends=[igraph lavaan qgraph]; }; + gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; }; gimms = derive2 { name="gimms"; version="1.1.0"; sha256="0mqffqvaapb0m0d50vg4kvdp67yq99qf54f5anwq4md0rf3x8lid"; depends=[curl Kendall ncdf4 raster RCurl zyp]; }; giphyr = derive2 { name="giphyr"; version="0.1.2"; sha256="1id3r291xyj1ylxgmw2cbazaz0jq4bksj8bijwagcawimfxibz45"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; gistr = derive2 { name="gistr"; version="0.4.0"; sha256="1q1wp3q3ppkclvw9fsc9pr5raqv2r9rdm2n8s197b8brfcjilxsi"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; }; @@ -6784,7 +6915,7 @@ in with self; { gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; - gjam = derive2 { name="gjam"; version="2.1.9"; sha256="05xi8wf1bp75irdklgxbx5clik0l1bpykl30hvda0dxp6qyrzm4w"; depends=[MASS RANN Rcpp RcppArmadillo]; }; + gjam = derive2 { name="gjam"; version="2.2.1"; sha256="0xjkssxgpcpn37amkjwi5cjdx5b8lkgjaw2lm4wyjjfn59jj3d14"; depends=[MASS RANN Rcpp RcppArmadillo]; }; gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; }; gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; }; glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; }; @@ -6795,11 +6926,10 @@ in with self; { glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; }; gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; }; - gldrm = derive2 { name="gldrm"; version="1.4"; sha256="0kjd78zpn65zs7nd2fqmm5qs6d0vyjyww93jgcx5ay5qpx83vyrv"; depends=[]; }; + gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.7"; sha256="0kvhkhkhf5bmqvhxiz83cqw478s55gbkk3s2csa9bnz8ymkcn3f4"; depends=[]; }; gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; }; gllvm = derive2 { name="gllvm"; version="0.1.0"; sha256="13ca5ms6bbrj3ny5n438v5ma0d7ccnghysz7c8452cpdq8sn87iy"; depends=[fishMod MASS Matrix mvabund mvtnorm Rcpp RcppEigen statmod TMB]; }; - glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; }; glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; }; glm_predict = derive2 { name="glm.predict"; version="3.0-0"; sha256="1kqh8g7mrpfnzklk23x7ckbn5p2qcw951cg4s9gnlncggby864ig"; depends=[MASS nnet]; }; glm2 = derive2 { name="glm2"; version="1.1.3"; sha256="0mmvba1ccmykm2k02ysjbiqj1lwzdwrbxr1hq1kn1gl97xlarp2x"; depends=[]; }; @@ -6813,10 +6943,10 @@ in with self; { glmm = derive2 { name="glmm"; version="1.2.3"; sha256="0cxlcx09a5vypv6kkcfvfjdpz2rnxhay0pjv6q53hdmbshmchbmj"; depends=[digest Matrix mvtnorm trust]; }; glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; }; glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; - glmmML = derive2 { name="glmmML"; version="1.0.2"; sha256="0ndvp7a7dxq6ygdwzq783ci1y0zb4xwnj6g4w1cm8zvqak8dxjdb"; depends=[]; }; + glmmML = derive2 { name="glmmML"; version="1.0.3"; sha256="1svawi74rfir9czqyf194wmh4fw053n81j7prnanyfskrchkd94k"; depends=[]; }; glmmTMB = derive2 { name="glmmTMB"; version="0.2.0"; sha256="1yqizxjapdh0n872d26bdgn8a04xc6647mnjhb40g0jj59qgmxrc"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; - glmmsr = derive2 { name="glmmsr"; version="0.2.1"; sha256="1f2q8zy3jy97y59bdyxhachkv5ndiwp71ihnspjbwz17mvc38cmn"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; - glmnet = derive2 { name="glmnet"; version="2.0-13"; sha256="1zdqp6wnqxzp5qn2ky47phbkrxv3cpgbwmdp896h3xxjvp58sa7k"; depends=[foreach Matrix]; }; + glmmsr = derive2 { name="glmmsr"; version="0.2.2"; sha256="05psf6yjsp3zgh7lfdh2pk1zycp7rgdk61ccm7059f60dzg182b9"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; + glmnet = derive2 { name="glmnet"; version="2.0-16"; sha256="1brr51z1fzbpyj6myyir4g6dhbp6xwl7nx4xnvrjarnf5y0csk55"; depends=[foreach Matrix]; }; glmnetUtils = derive2 { name="glmnetUtils"; version="1.1"; sha256="0abvxkwfadh56672qh16vql49js9ar8cz8is0bs6i8jgsl5csz91"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.3"; sha256="0w04m0q7w5xxm0yv14f2g1ykpy54pxzdplr0xcz9mn43wi4sl65a"; depends=[glmnet]; }; glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; }; @@ -6830,7 +6960,7 @@ in with self; { globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; }; globals = derive2 { name="globals"; version="0.11.0"; sha256="17spygv9m3mmn01cfxrm05pvny5ddzvr78c60hixqbfh8385na5c"; depends=[codetools]; }; globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; }; - glogis = derive2 { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; }; + glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; }; glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; glue = derive2 { name="glue"; version="1.2.0"; sha256="0vi9y8ix95g6hjqdz9c9y4119apbdjcypdv0ag8cl6vaxqs5n9qr"; depends=[]; }; @@ -6840,8 +6970,8 @@ in with self; { gmapsdistance = derive2 { name="gmapsdistance"; version="3.3"; sha256="09vgrfv5dj0myys0rl767wn0xx1yvmm176c48812ysj2kj3fa29v"; depends=[RCurl XML]; }; gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; }; gmeta = derive2 { name="gmeta"; version="2.3-0"; sha256="1izfz6gkisa8rskhfka6q73rcgzwdsmkdhy79jwcaqk25jrwfk60"; depends=[BiasedUrn binom]; }; - gmfd = derive2 { name="gmfd"; version="1.0"; sha256="1l6hf191v76l5p9f6r4qpq5y940nb23x07mb6lmwna8nnz1sspaz"; depends=[]; }; - gmm = derive2 { name="gmm"; version="1.6-1"; sha256="0giq0ic7gdvglkjby217r70dbz9v0xnvzvzv6icqj0m3rxwarmn1"; depends=[sandwich]; }; + gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; }; + gmm = derive2 { name="gmm"; version="1.6-2"; sha256="0pbimp4g5hpi949m6dpwwds3a9dv2m4iwwg2gbqq1m62fs18hbxi"; depends=[sandwich]; }; gmnl = derive2 { name="gmnl"; version="1.1-3"; sha256="05p2kikv8zz9ldc6xi5bz7fyinpd0sp2v82hxhx6h54hfa6i7b9v"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; }; @@ -6896,6 +7026,7 @@ in with self; { gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; }; gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; + grImport2 = derive2 { name="grImport2"; version="0.1-4"; sha256="1hwx287pp936f0wbcicplwmhz96ip00wq09dp7bvz80lqcmr8nyx"; depends=[base64enc jpeg png XML]; }; gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; }; @@ -6903,8 +7034,9 @@ in with self; { granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; - graphTweets = derive2 { name="graphTweets"; version="0.3.2"; sha256="13kab1nz85ghs5n882ss513di30b7lg72h676v37404ypj5a1vi1"; depends=[dplyr igraph reshape2]; }; + graphTweets = derive2 { name="graphTweets"; version="0.4.0"; sha256="1zw04s61wjgrx6r6fspp59y5l3bfjf68klcrkp7alaap5dpjsn9a"; depends=[dplyr igraph magrittr purrr reshape2 rtweet splitstackshape]; }; grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; + graphframes = derive2 { name="graphframes"; version="0.1.0"; sha256="1h7dng6j2wizr14sl3f9lpvka56vd40rjs6skfdyxbn5s8ijmdd8"; depends=[sparklyr tibble]; }; graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.1"; sha256="1z4x32ji71rq1x89r3wmjhm1fq7klggpz6c1cf45fvcd9qs6ykhk"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; graphkernels = derive2 { name="graphkernels"; version="1.4"; sha256="1dwk1bd2nx9kdzxq31cgynd75r7am49ygkaryb6iqcmva1wc5xs0"; depends=[igraph Rcpp RcppEigen]; }; @@ -6918,12 +7050,13 @@ in with self; { greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; greta = derive2 { name="greta"; version="0.2.3"; sha256="10vli747b5a1m53qszxk91wppg9511la9yc823qrr51s92z8i222"; depends=[coda progress R6 reticulate tensorflow]; }; grex = derive2 { name="grex"; version="1.7"; sha256="0bciyafqwx404axidz4dlj856mzy73ij5sifxhvbjnn07rx844c9"; depends=[]; }; + greybox = derive2 { name="greybox"; version="0.2.0"; sha256="0d0d1c5whh94n678p07fnwn2xaqgv54qp1k1rkis72dgs8jbzm2n"; depends=[forecast zoo]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; - grf = derive2 { name="grf"; version="0.9.5"; sha256="0i3x5h19n3cq8mchm3zwg3rgr1ywknkghsk50m70zcjpb4cdbsj6"; depends=[Matrix Rcpp RcppEigen]; }; + grf = derive2 { name="grf"; version="0.9.6"; sha256="0gv1zphjgwqssiljyqhhv6ggnvw9nyg7wf7sasilpy59qpi457wv"; depends=[DiceKriging Matrix Rcpp RcppEigen sandwich]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; }; gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; }; - gridGraphics = derive2 { name="gridGraphics"; version="0.2-1"; sha256="1ly6fxnac9g5p3dwxfscz95whaxvc2r713fi36x526yhaayj7xwj"; depends=[]; }; + gridGraphics = derive2 { name="gridGraphics"; version="0.3-0"; sha256="1p94flvq5h3x817pl1m0aj3sim87x6zdbpv9xrgdnqw3rxfzwgqs"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; gridSVG = derive2 { name="gridSVG"; version="1.6-0"; sha256="06nxp0h6clsfxcx5lf11sgzq7v4ijbynh6hldbnpm6pqwn18hb0j"; depends=[jsonlite XML]; }; gridsample = derive2 { name="gridsample"; version="0.2.0"; sha256="0hpfhkma60h59z3akjqs7igs6zg00xs3jlq3sm48gxbjrk7fb5sm"; depends=[data_table deldir geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; }; @@ -6938,7 +7071,7 @@ in with self; { groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; }; growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; }; - growfunctions = derive2 { name="growfunctions"; version="0.13"; sha256="19ngsd326vws2f3wsrkcsyzn64fm9nnqvnbamfw6aal9xzzzz59m"; depends=[ggplot2 Matrix mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; + growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; growth = derive2 { name="growth"; version="1.1.0"; sha256="0d1hc56ybp5chckqv5q5jvpgbl7xn9dkbc4dd4sz5gawn1hngbxm"; depends=[rmutil]; }; growthcurver = derive2 { name="growthcurver"; version="0.2.1"; sha256="0q70g940ggpwnx2cpq2j8ambfbj9sqw6ivyp9cya1nbn05bah9ds"; depends=[caTools minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; @@ -6946,7 +7079,7 @@ in with self; { growthrates = derive2 { name="growthrates"; version="0.7.1"; sha256="0ci846jgshnvrvifl8snyax8ljs9n13lr42mzm89l0gpkg6lh2g0"; depends=[deSolve FME lattice]; }; grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; }; grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; }; - grpreg = derive2 { name="grpreg"; version="3.1-2"; sha256="042waw813jfc163376019zd7ngwrmrr26z17c2kw7ggvp1vz5m9q"; depends=[Matrix]; }; + grpreg = derive2 { name="grpreg"; version="3.1-3"; sha256="0i5gxhjylva3aby933hydkdb8v842qfa4jgfs0pwim8xfr2ipjs7"; depends=[Matrix]; }; grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; }; grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; }; grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; }; @@ -6956,6 +7089,7 @@ in with self; { gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; }; gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; }; gsbDesign = derive2 { name="gsbDesign"; version="1.00"; sha256="1kbwlpxbr70aagx9jkap9xlw13r1k3y630b08wmmny421sv4zhxl"; depends=[gsDesign lattice]; }; + gscounts = derive2 { name="gscounts"; version="0.1-1"; sha256="1x2irpp0jxninijdhsiw12j19c5yq9kljv48j81sp3k97s2f9vbd"; depends=[Rcpp]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; gsg = derive2 { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; }; gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; }; @@ -6964,10 +7098,10 @@ in with self; { gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; }; gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; gsrsb = derive2 { name="gsrsb"; version="1.0.3"; sha256="1r4pc3zcmgwxbsmpwb6m24mmy0p78nq35bigjqvwcc32imyw4ls9"; depends=[ldbounds mvtnorm xtable]; }; - gss = derive2 { name="gss"; version="2.1-7"; sha256="1nrs1yhf2h06pkkhkvaal92h0mzrwixs0pay6dkb8q2d9igbn184"; depends=[]; }; + gss = derive2 { name="gss"; version="2.1-8"; sha256="1g44214kbgx4gafcz482iyy3izzv2cfp6v6yqfggp6lkvn6wwv0p"; depends=[]; }; gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; }; - gstat = derive2 { name="gstat"; version="1.1-5"; sha256="1wfzffl0wfimb93d5ln96yhv2g64aywzmh6hdaadl8qyqx6rx7q3"; depends=[FNN lattice sp spacetime zoo]; }; - gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; }; + gstat = derive2 { name="gstat"; version="1.1-6"; sha256="0snvga824v1kbd3xp46652bv6drfrgkjsi5zrbdcliqpqz79wk9f"; depends=[FNN lattice sp spacetime zoo]; }; + gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; }; gsynth = derive2 { name="gsynth"; version="1.0.6"; sha256="0fzdlflrl9qlvbzjdspws3naabwyphwqys01wp4wkw5y7whq0mar"; depends=[abind doParallel foreach GGally ggplot2 mvtnorm Rcpp RcppArmadillo]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; @@ -6996,10 +7130,12 @@ in with self; { gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; }; h2o = derive2 { name="h2o"; version="3.16.0.2"; sha256="181rm5y7wwmpzi45sy62blr6jk9wfbs3j14ansmh7ad1rbml3zm3"; depends=[jsonlite RCurl]; }; + h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; }; h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; }; hBayesDM = derive2 { name="hBayesDM"; version="0.5.0"; sha256="174z98jvi04df04lpdxh3j8lmjvgrg287nxfnrcvjkibc0jiss4m"; depends=[ggplot2 loo Rcpp rstan rstantools]; }; hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; }; - hR = derive2 { name="hR"; version="0.1.1"; sha256="18a9nhnsw7va1ambj2lc99ralhildc3a2l6xpilfanig4pg7cq08"; depends=[data_tree reshape2 visNetwork]; }; + hNMF = derive2 { name="hNMF"; version="0.5"; sha256="1nm9sy921fjzqc60p0mf6k0j5a56bdrd8hnghnpaqzs244mm08bj"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; + hR = derive2 { name="hR"; version="0.1.3"; sha256="0s7c2aiq58c2zmv25m42cxp5chzkp5grz5bjqrknfkwjy21679h1"; depends=[data_tree reshape2]; }; hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; }; @@ -7007,7 +7143,7 @@ in with self; { hansard = derive2 { name="hansard"; version="0.6.0"; sha256="13h68b300c4lkqbl5gw4hkqcbb2ikvan4hx8092ds995514rg4x8"; depends=[dplyr httr jsonlite lubridate stringi tibble tidyr]; }; hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; }; haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; - haplo_stats = derive2 { name="haplo.stats"; version="1.7.7"; sha256="1rag22sqy8r87w5a1dww5cxknacm6975bpp74vw9zr04ldx4c64k"; depends=[rms]; }; + haplo_stats = derive2 { name="haplo.stats"; version="1.7.9"; sha256="19kxascqq5qz0zdxx0w837ji207y1z2ggxkl4vmlbay03k2dw2mx"; depends=[rms]; }; haploR = derive2 { name="haploR"; version="1.6.2"; sha256="0xzh18170gxxd91yjvh2j3a8jkkz8hyf5rbvh4c9vfi5zirbi82z"; depends=[httr plyr RUnit tibble XML]; }; haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; }; haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; }; @@ -7029,7 +7165,7 @@ in with self; { hbdct = derive2 { name="hbdct"; version="1.0.1"; sha256="1lmbhl757hdswfq3skwbwsgxpfgim8475d9hk511dbwrzcm6wsxr"; depends=[]; }; hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; }; hbm = derive2 { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[doParallel foreach Matrix]; }; - hbmem = derive2 { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; }; + hbmem = derive2 { name="hbmem"; version="0.3-3"; sha256="1rajd5h9gp0rrpc0q0m0fx37mv2n70da3gnfvvnjc5a77mzfyqkp"; depends=[]; }; hbsae = derive2 { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[arm Matrix]; }; hcc = derive2 { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; }; hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; @@ -7041,7 +7177,7 @@ in with self; { hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; }; hdm = derive2 { name="hdm"; version="0.2.3"; sha256="0nj7pbkygzbiraw1b3pqv3bnkjhi1a0h48q0zgkcq8y79kj2f8cl"; depends=[checkmate Formula ggplot2 glmnet MASS]; }; - hdme = derive2 { name="hdme"; version="0.1.0"; sha256="1wq4kl7dc853v8v1wgihayrd50x5asx5r190lq6flm2ssqd1m6nm"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; }; + hdme = derive2 { name="hdme"; version="0.1.1"; sha256="0p8qldiiqbd2vyxyrgz0dsh7n2dw5vbvqfqy6z5vkjl52wdggp7z"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; }; hdnom = derive2 { name="hdnom"; version="4.9"; sha256="11yzjfp6b4apn0nyqmi0qm5rd8xy49w6hwwiq7p566mxqy32i2j2"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; }; hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; }; hdrcde = derive2 { name="hdrcde"; version="3.2"; sha256="1901mg2k2ch9fzn1n9k0kmxkgd1m4pxvrda7mv0mp64nf4mx43xw"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; }; @@ -7060,9 +7196,9 @@ in with self; { hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; }; - heplots = derive2 { name="heplots"; version="1.3-4"; sha256="0qrx2qiy5w1hdy48ipa5is3k6dmz9gnfk5pckqpxp3hd0ip3217f"; depends=[car MASS]; }; + heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; }; here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; }; - hergm = derive2 { name="hergm"; version="3.1-0"; sha256="17mxn2ff7yzj95vjsppvz7c9a5g6a2z9zyf34xvvxp9031zhrf46"; depends=[ergm latentnet mcgibbsit network sna]; }; + hergm = derive2 { name="hergm"; version="3.2-0"; sha256="0yy684vjlk06r0bsx7clpjaj05q0pmbj006kbh9q6rysh35nf9p3"; depends=[ergm latentnet mcgibbsit network sna]; }; heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.1"; sha256="0ns8l1rf346qxalfdwc7ny0kjp212f6qnnlgillpyvd8k29kg8iy"; depends=[maxLik]; }; hesim = derive2 { name="hesim"; version="0.1.0"; sha256="002phncl1glv3c3gwp9ifpk56j06rka26a3774xlj3zcs6izglns"; depends=[data_table Rcpp RcppArmadillo]; }; @@ -7082,12 +7218,13 @@ in with self; { hglm_data = derive2 { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[MASS Matrix]; }; hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; }; hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; }; + hhi = derive2 { name="hhi"; version="1.1.0"; sha256="0f0b6a2zr2nipcx4p8n2wx088kndh6bd150f80619kjfizr55x2d"; depends=[ggplot2]; }; hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; }; hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; }; hier_part = derive2 { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; hierDiversity = derive2 { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; }; - hierNet = derive2 { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; }; + hierNet = derive2 { name="hierNet"; version="1.7"; sha256="1yjsbi17qkz7x9q9x6i8312skwf4gjyisp2096wbg9s19dzvccvi"; depends=[]; }; hierarchicalDS = derive2 { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; }; hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; }; hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; }; @@ -7103,6 +7240,7 @@ in with self; { highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; highr = derive2 { name="highr"; version="0.6"; sha256="0n9v44dxdy5fhkdmpbpa2p78whyd9z3rhhy42ipdz5m5vsr55qa3"; depends=[]; }; highriskzone = derive2 { name="highriskzone"; version="1.4-2"; sha256="1q9y34nj73kg5y6qy4kb023vyzbdb0f6x23asq20bj5pmz2l25y1"; depends=[deldir fields ks Matrix mvtnorm rgeos spatstat]; }; + higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; @@ -7120,7 +7258,7 @@ in with self; { hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; }; hmi = derive2 { name="hmi"; version="0.9.10"; sha256="1swbzxykf4mwgahadi5l1xy06h4ivpc4gq3izshg6fvgrapbg1r5"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; }; - hmmm = derive2 { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; }; + hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; }; hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; }; hnp = derive2 { name="hnp"; version="1.2-4"; sha256="14w2n95pgi5h71fag4ndrc82z7q26za99vj5z99rv19l5jkvmd46"; depends=[MASS]; }; hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; }; @@ -7137,6 +7275,7 @@ in with self; { hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; }; horizon = derive2 { name="horizon"; version="1.0"; sha256="1wrp5qr1qql21xwcjh415q67z2ym4790zfp0n81360v6bp2b3hyy"; depends=[raster]; }; hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; + horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; }; horseshoe = derive2 { name="horseshoe"; version="0.1.0"; sha256="19khsr7gfcygqasjswvm0v0ddna1i1grfbhars8jlvybfawswhgx"; depends=[]; }; hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; }; hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; }; @@ -7150,7 +7289,7 @@ in with self; { hrbrthemes = derive2 { name="hrbrthemes"; version="0.1.0"; sha256="1hf4370hj80m6zr20236p9068g6ky0366gfk5l9hnj6l8jpmy9qa"; depends=[extrafont ggplot2 hunspell purrr scales stringi]; }; hsdar = derive2 { name="hsdar"; version="0.7.0"; sha256="09yx8zc9qbf2kj8k76z9a6rhh5zy4ggsxvwhx35666phdml42dy0"; depends=[caret raster rgdal signal]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; - hsm = derive2 { name="hsm"; version="0.1"; sha256="1dacsq2f23bz94rh4s3477hs38pbrpz2lis4s1l9im894bcbny1x"; depends=[]; }; + hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; @@ -7159,21 +7298,22 @@ in with self; { htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; }; htmltidy = derive2 { name="htmltidy"; version="0.4.0"; sha256="090rj1fzdsa8m4g33d4mx92dm8afh173i4hqa4zym8c909jwh9qn"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; }; - htmlwidgets = derive2 { name="htmlwidgets"; version="1.0"; sha256="09lkmzh35l1420sg0dyh4vgyishqx3g8xmgs2y9z7lbi09xgwwwr"; depends=[htmltools jsonlite yaml]; }; - htree = derive2 { name="htree"; version="0.1.1"; sha256="1ns7yzzxapax5f355bpq81i581l1iwrfixp1k69n8mzsy106i988"; depends=[]; }; - hts = derive2 { name="hts"; version="5.1.4"; sha256="0n1gna2694yih5kaiw59crdlfcdfm9dqhjpkcwaskgrpmh08wnkd"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; + htmlwidgets = derive2 { name="htmlwidgets"; version="1.2"; sha256="04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s"; depends=[htmltools jsonlite yaml]; }; + htree = derive2 { name="htree"; version="1.0.0"; sha256="1yw29rk752g3sc50igcgnxfsp7ydcmrlwpacch5c8yjg5di06ymb"; depends=[]; }; + hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; httk = derive2 { name="httk"; version="1.8"; sha256="1snwqqvacxgl4cyadx5la87xh4kxiqpdmyq4szqz5r1aq2sxrr03"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; }; httptest = derive2 { name="httptest"; version="3.0.0"; sha256="1k75i84ajka0abc8x51w74dldb0z9i08dlqbkcdby25465k01l8r"; depends=[digest httr jsonlite testthat]; }; - httpuv = derive2 { name="httpuv"; version="1.3.6.2"; sha256="0h3hkw575b211bxma23inbq1565wkhiapgasd539h219apqs534f"; depends=[Rcpp]; }; + httpuv = derive2 { name="httpuv"; version="1.4.0"; sha256="076blaj0vzwfgx212lvgscczmiy9n13izdshrm6xb9vpcmklm95m"; depends=[BH later promises Rcpp]; }; httr = derive2 { name="httr"; version="1.3.1"; sha256="0n7jz2digbgv48rbr9vmzv4vmf4rahl9jjy31izs7sxj4rs4s4r2"; depends=[curl jsonlite mime openssl R6]; }; hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; }; huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; }; humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; }; + humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; }; humanleague = derive2 { name="humanleague"; version="2.0.2"; sha256="1svsqfqisywf0iqf3mrh4xnssvjmml6wn7l8iq5shvpmw71l4nnl"; depends=[curl Rcpp]; }; humidity = derive2 { name="humidity"; version="0.1.1"; sha256="0ifxjz7216ld5c4kc9vs83fcijbg5i2z0mwfzszch9j1s734yc8y"; depends=[]; }; hunspell = derive2 { name="hunspell"; version="2.9"; sha256="10186544s6nyd2ba470idxrxsl788dkmr1g1ri8x2n1lky9zmrik"; depends=[digest Rcpp]; }; @@ -7192,13 +7332,12 @@ in with self; { hydroPSO = derive2 { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; }; hydroTSM = derive2 { name="hydroTSM"; version="0.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; }; - hydrolinks = derive2 { name="hydrolinks"; version="0.7.1"; sha256="1yghqn5wvwx2s1lqjh8pi051hki5f9glhaqnrnjlx4bbsirf3hv7"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; }; - hydroscoper = derive2 { name="hydroscoper"; version="0.1.0"; sha256="06w3rzdv0cjyk5pfx6ji1hkjf23pfd2z0aigyynj7ajbqfxmibna"; depends=[readr stringi stringr XML]; }; + hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; }; + hydroscoper = derive2 { name="hydroscoper"; version="1.0.0"; sha256="09dcn2wfd06waxzq8cv8lxyw07kavjp30qc2czn2gamrak8xvrl9"; depends=[jsonlite pingr plyr readr stringi stringr tibble]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; }; hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; }; hyper2 = derive2 { name="hyper2"; version="1.0-1"; sha256="107cp6na0srqax42fmvcsrviy631hg6phqmkc0cxz1zdxxxw6442"; depends=[partitions Rcpp]; }; - hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.4"; sha256="0mqymg4326cjvcz9qvlfdsydfqgd6szfzy89llr5mwz2s3arnv6j"; depends=[doParallel foreach iterators randomForest unbalanced]; }; hyperSpec = derive2 { name="hyperSpec"; version="0.99-20171005"; sha256="0rhn9f4faxscwrip14ndymaddc5nfd6pyrhgwkwm8hf680wdrhbl"; depends=[ggplot2 lattice latticeExtra testthat]; }; hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; }; hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; }; @@ -7236,6 +7375,7 @@ in with self; { iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; }; iRepro = derive2 { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; }; iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; }; + iTOP = derive2 { name="iTOP"; version="1.0.1"; sha256="1cjrbjrpfm27widw466kgkl5xlbyjf7ipk8ki8mfn3lqp9r2f3rc"; depends=[corpcor Matrix]; }; iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; }; iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; }; @@ -7251,7 +7391,6 @@ in with self; { ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-1"; sha256="1bkl4a72l0k6gm82l3jxnib898z20cw17zg81jj39l9dn65rlmcq"; depends=[]; }; - icaOcularCorrection = derive2 { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; }; icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; }; @@ -7261,22 +7400,22 @@ in with self; { icenReg = derive2 { name="icenReg"; version="2.0.7"; sha256="1fc6l3mqnm4rcg49bk2plfa011g7nay71gzd4nxnjisifmw6qi2s"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; - icesAdvice = derive2 { name="icesAdvice"; version="1.4-0"; sha256="0ra25g6am75qh32rfjps59x31zwav98k5d4nf6gbam98cr7vr5h3"; depends=[]; }; + icesAdvice = derive2 { name="icesAdvice"; version="1.4-1"; sha256="0vhp4mh3isxibxr1i05vlxvrz53ni83s5khjvnk8i20dcri0501g"; depends=[]; }; icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; }; icesSAG = derive2 { name="icesSAG"; version="1.3-2"; sha256="1w3v10qjs9jyn7dp6vsv8hyax8mn2b8y5afba4lcpzh0p8d2yzpm"; depends=[httr icesVocab openssl png xml2]; }; - icesTAF = derive2 { name="icesTAF"; version="1.5-0"; sha256="19xg24k4fz64ki8mxf9g0r49syqh97a98dfb9zgiga3da3f2rk4w"; depends=[httr]; }; + icesTAF = derive2 { name="icesTAF"; version="1.5-1"; sha256="0sj9wswpaxch195rnwav2qbk2f25xc2kdzf9xr6p8l0adxnijmki"; depends=[httr]; }; icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; }; icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; }; icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; }; icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; }; - icr = derive2 { name="icr"; version="0.5.2"; sha256="1qmr6sc56v7ywy01f2mdhdxv2yp6rnwhbq347lfhb4ikhax3znpy"; depends=[ggplot2 Rcpp reshape2]; }; + icr = derive2 { name="icr"; version="0.5.3"; sha256="178j4xyaxkzi6fxajw5qkab9ifabaj3lvhk2qqipb6n5p68cd9bn"; depends=[ggplot2 Rcpp reshape2]; }; icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; }; idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; - idbr = derive2 { name="idbr"; version="0.2"; sha256="1hhwn93arkzqs5ns9ll7rwqq5gyngixbicly9asw0dgjn12n5p7x"; depends=[countrycode dplyr httr jsonlite]; }; + idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; }; idealstan = derive2 { name="idealstan"; version="0.2.7"; sha256="1818vwlv5cr6qyg7p6kgyb996n89d2xr4cy6ys9pdhrp7lip9prr"; depends=[bayesplot BH dplyr ggplot2 lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; }; idefix = derive2 { name="idefix"; version="0.2.4"; sha256="0j64pmccg01lscvjg9z97ypv3svl4jbvs4819jn4kc9ni6gq4fai"; depends=[dplyr gtools MASS maxLik Rdpack scales shiny]; }; - idem = derive2 { name="idem"; version="3.0"; sha256="15k6gk3v2hijdfabc1c2xabm5v84hgs0p9lpddrpir3h5jzilr3i"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; }; + idem = derive2 { name="idem"; version="3.5"; sha256="1fr456drfnla917byw0c8ppqrhq4i7gsd4idfasx6xx5fqhv7ypc"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; @@ -7302,7 +7441,8 @@ in with self; { igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; iheatmapr = derive2 { name="iheatmapr"; version="0.4.3"; sha256="0124d7h8n83zb5kvvavccprlqknpqrd634zv7sz9s915xzhp7jgz"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; }; ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; - ijtiff = derive2 { name="ijtiff"; version="0.3.0"; sha256="1c5pamxjmipgmqipnf0gg4yx7i0hjrb80c0mb2sjab4v05finz55"; depends=[checkmate fields filesstrings magrittr purrr Rcpp readr RSAGA stringr]; }; + iilasso = derive2 { name="iilasso"; version="0.0.1"; sha256="08d5j0dvi8k0hzn4xn4nzplc1fliqz11jd9i4pfj80ggl5dmc2x1"; depends=[BH Matrix Rcpp]; }; + ijtiff = derive2 { name="ijtiff"; version="1.1.0"; sha256="0hb201qcwynbdi2fzspvv9sdhyx0cypbsvhawhcwj5zqdp6f507f"; depends=[checkmate fields filesstrings magrittr purrr Rcpp readr rlang stringr]; }; iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; }; ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; }; imPois = derive2 { name="imPois"; version="0.1.4"; sha256="07350zly4fyx2sf9cqpfpyy8l5kn96z49kzym81p2bmhq66d408h"; depends=[geometry rgl]; }; @@ -7313,9 +7453,10 @@ in with self; { imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; imfr = derive2 { name="imfr"; version="0.1.5"; sha256="1f4zynra79h42dmd9qhg67wwvs7c640f5is98bq30fdphiybihgz"; depends=[dplyr httr jsonlite]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; + iml = derive2 { name="iml"; version="0.3.0"; sha256="0jz3gw45lyb4ddw9pdfj797aipha2bwcmqrf7dyxx0ga3cfxv7ay"; depends=[checkmate data_table ggplot2 glmnet Metrics partykit R6]; }; immer = derive2 { name="immer"; version="0.8-5"; sha256="181mp407vy2ij35ggr1vi80y8ak6vyjplyvps1fdpxnanp1mqpw3"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; }; imp4p = derive2 { name="imp4p"; version="0.5"; sha256="0s1vq64qspni5fqzz781a1l8ldfbwhb57h8z4dr5k9bama5s3g6l"; depends=[imputeLCMD Iso Rcpp truncnorm]; }; - implyr = derive2 { name="implyr"; version="0.2.2"; sha256="1kqz8pzgdbyvngsbab3v578jxm01hqmh2ipcqxsv1h9j628mvqj8"; depends=[assertthat DBI dbplyr dplyr rlang]; }; + implyr = derive2 { name="implyr"; version="0.2.3"; sha256="0ap7qdnwm1gcfl67r6bfjmk9ji4z30plclwnwzlv5j7yx5si6lps"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; @@ -7325,15 +7466,15 @@ in with self; { imputeMulti = derive2 { name="imputeMulti"; version="0.6.4"; sha256="0ngjbj8pl5mwprrgy234a5p9dhf615z7ymfv8184hby1z6ib3mgl"; depends=[DBI gtools Rcpp RSQLite]; }; imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; }; imputeR = derive2 { name="imputeR"; version="2.0"; sha256="0xyvy785jb1mv06jq25cnsbgiywi3857sdiizcjck7bx970lk02n"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; }; - imputeTS = derive2 { name="imputeTS"; version="2.5"; sha256="1b0gpgg07hl4n5dnvqfjxk1zxgh93ykh7lz8l0szv5hbijidvqxp"; depends=[forecast Rcpp stinepack]; }; + imputeTS = derive2 { name="imputeTS"; version="2.6"; sha256="14hkz9y6r8nl036zwi8c7k54bbkyz7zmvnq8ln7pwl15kgpcadkf"; depends=[forecast Rcpp stinepack]; }; imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.1"; sha256="0yxvwk1bcsid116a4zqsagf2dl3vhzva559bfjjcqdgyniapcmcj"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; }; - inTrees = derive2 { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; }; + inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; }; inaparc = derive2 { name="inaparc"; version="0.2.0"; sha256="0rgbnvvqzbx4j40qz32l1bxmg3wwzbl6719wb9m3xpakblvhhxs2"; depends=[kpeaks lhs]; }; inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; }; inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; - incR = derive2 { name="incR"; version="1.0.2"; sha256="07v0jg3cw04qnblpr3zslfwxw8ng444f5545q4yznnbdw8wfmk8x"; depends=[dplyr lubridate maptools rgeos]; }; + incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; }; inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; }; incadata = derive2 { name="incadata"; version="0.6.1"; sha256="05i0zifdzc1w6p6annhzp9rdd4v82gx2sxi4lqpdnraaczdrhgbb"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; }; incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; }; @@ -7341,7 +7482,8 @@ in with self; { inctools = derive2 { name="inctools"; version="1.0.11"; sha256="08a1aqsx1f1mkykpgbqbgvai60zxj9zwpmxynyajbm4lwr3rc6rp"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma tmvtnorm]; }; indelmiss = derive2 { name="indelmiss"; version="1.0.8"; sha256="0674hvgdq0fxab3h55iililphrr6lqp25359crvkqqgb8higbs0h"; depends=[ape numDeriv phangorn Rcpp]; }; indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; }; - inegiR = derive2 { name="inegiR"; version="1.2.0"; sha256="14mpjyc85l9sznhn29cxk37l3y5yxclqiv2kgcwf8prpxfgwy83l"; depends=[jsonlite plyr XML zoo]; }; + indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; }; + inegiR = derive2 { name="inegiR"; version="2.0.0"; sha256="00bhb3zvqhir2rqza3axk98lxhq98s41apwpsm242pqb7wsnmg95"; depends=[jsonlite plyr XML zoo]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; infer = derive2 { name="infer"; version="0.1.1"; sha256="1ln2vw4d4xcy9g6cv594glrrcqwmjynv0mfq6nsl1h94gz8wnh8a"; depends=[assertive dplyr ggplot2 magrittr rlang tibble]; }; inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; @@ -7349,7 +7491,7 @@ in with self; { inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny tibble tidyr]; }; inflection = derive2 { name="inflection"; version="1.3"; sha256="168ms6hfakr6wql45r9qvk7hpas6sgpaiqyxicihsq0j3dpzvys4"; depends=[]; }; influence_ME = derive2 { name="influence.ME"; version="0.9-9"; sha256="0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v"; depends=[lattice lme4 Matrix]; }; - influence_SEM = derive2 { name="influence.SEM"; version="2.1"; sha256="1qhv640lngwrbdfqvw2x0x4zwv0aqzxwyfdpnivzjf5pw58nya5s"; depends=[lavaan]; }; + influence_SEM = derive2 { name="influence.SEM"; version="2.2"; sha256="1cabl6486mlrmk0418s18wii3n6nl1ckv6w9281wdk4fy27y9qk2"; depends=[lavaan]; }; influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; }; influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; }; infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.0"; sha256="1gmsf4gw6xf70sh7y5hagkavknp80293sb7wgx6lycngq2acmi4w"; depends=[MASS]; }; @@ -7364,7 +7506,7 @@ in with self; { inlabru = derive2 { name="inlabru"; version="2.1.3"; sha256="09sdbzg3cdg43clkwnahkhyns019gjya55m6zhq340mgrnirx2i5"; depends=[ggplot2 rgdal rgeos sp]; }; inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; }; inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; }; - inlmisc = derive2 { name="inlmisc"; version="0.3.5"; sha256="0m215fgyh17nbp2cqmyism3i77rgqkpdggc6fnpn3njxgw7wyb9m"; depends=[checkmate dplyr GA htmlwidgets igraph knitr leaflet raster rgdal rgeos sp]; }; + inlmisc = derive2 { name="inlmisc"; version="0.4.0"; sha256="0hhw87zvqd2mplpbmbh1y91pyfgyqamw4wiz74a6qwn705bcymah"; depends=[checkmate dplyr GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos sp xtable]; }; inpdfr = derive2 { name="inpdfr"; version="0.1.6"; sha256="0fwznjsq4wccqfnb3a5ic1nyx538jxmlcv59xdz06y6raczjp9q9"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; }; @@ -7377,7 +7519,7 @@ in with self; { intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-1"; sha256="1shyxlps1rxqavrvg55gw0c9115q0j3yw78ilavig7036zx5lazv"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; }; - intccr = derive2 { name="intccr"; version="0.2.0"; sha256="0sm66c0ivvky01k5v28k7rc6ba15jpnalhgc019nbrly1s5kyqcy"; depends=[alabama doParallel foreach]; }; + intccr = derive2 { name="intccr"; version="1.0.0"; sha256="1y3rrxr9m8s6xvg4j8w9a2673kl1g5mmzz2p5dxjr6ddlfl8aji3"; depends=[alabama doParallel foreach numDeriv]; }; integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; }; @@ -7388,7 +7530,7 @@ in with self; { intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; interim = derive2 { name="interim"; version="0.7.0"; sha256="05hgypckfjb9pr60cv6m8lgqibdkgksw13gy8g1rmd9njs6qcb8i"; depends=[]; }; internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; }; - interp = derive2 { name="interp"; version="1.0-30"; sha256="1gzxh0xz0zdw5fr9m4w4w99rg540bljwkcmlla4pc0974d6fcg6i"; depends=[deldir Rcpp RcppEigen]; }; + interp = derive2 { name="interp"; version="1.0-31"; sha256="0zrqlzsl71fggwy8qvhggzxphbc7ld2gahsh8h5aawvkpfz5jm8k"; depends=[deldir Rcpp RcppEigen]; }; interplot = derive2 { name="interplot"; version="0.1.5"; sha256="0svhs7mj987vravirhmp4788qvqm32v614qj7q06b2y4va477yj8"; depends=[abind arm dplyr ggplot2]; }; interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; }; interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; }; @@ -7406,7 +7548,7 @@ in with self; { investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; }; invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; }; io = derive2 { name="io"; version="0.3.0"; sha256="16mnbxq217ixfg2qfqrj97qqfpc5dj622hf80nwray6hp47lbw2s"; depends=[filenamer stringr]; }; - ioncopy = derive2 { name="ioncopy"; version="2.0.1"; sha256="1iy4a894yp91f7sm89hvr9sh69abjrygx4yaks1d405vbfxa6z58"; depends=[multtest shiny]; }; + ioncopy = derive2 { name="ioncopy"; version="2.1.1"; sha256="1lkav3xvh2qazfmcxwisrjy8wzf639a4md71499jj5rmy650crys"; depends=[shiny]; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; }; ionicons = derive2 { name="ionicons"; version="0.1.1"; sha256="0v7icjx2bpb0hd3j8a14lijklyjkmw7qgp336z66wzscm6f411ip"; depends=[png rsvg xml2]; }; ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; }; @@ -7428,12 +7570,12 @@ in with self; { ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; }; ipwErrorY = derive2 { name="ipwErrorY"; version="1.0"; sha256="1n1j1crxnnfkg38drgg8rhc13y6s8hcsr5g0f6hi4v680dgrkhmp"; depends=[nleqslv]; }; iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; }; - iqspr = derive2 { name="iqspr"; version="2.3"; sha256="190d0mc36l3ggh62km3z7ylhi9f0wp4brkwmm72qjqbm1przvk0w"; depends=[doParallel fingerprint ggplot2 glmnet gridExtra kernlab ranger rBayesianOptimization rcdk tictoc xgboost]; }; irace = derive2 { name="irace"; version="2.4"; sha256="07xzg4jcq0rjdq1drs3xh02y29z1gmkjkw54apmaqzc0s1pwzkk4"; depends=[]; }; ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; }; irlba = derive2 { name="irlba"; version="2.3.2"; sha256="0f7wb12wa0zbyllk5adcf4f517wgjpkhsx4j176i9ax6xy7jvprz"; depends=[Matrix]; }; irr = derive2 { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; }; - irtDemo = derive2 { name="irtDemo"; version="0.1.3"; sha256="057m8p6qnws09kbq30712hfqkdyqkshpc4vprmj65mrdx6kwvqr7"; depends=[fGarch shiny shinydashboard]; }; + irrNA = derive2 { name="irrNA"; version="0.1.4"; sha256="1i7s4c285dw1s2kiq01a81cfpd2v40y26yklr06xlmqp28iwslbr"; depends=[irr]; }; + irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; }; irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; @@ -7444,7 +7586,7 @@ in with self; { isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; island = derive2 { name="island"; version="0.1.3"; sha256="1wb44zyfkgk62aidw5qg660473dxh9nyahmxzxn7ffmi8a0hmdnf"; depends=[]; }; ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; }; - isni = derive2 { name="isni"; version="0.1"; sha256="0xqz5ha6ca02xk5n0c8awx8m7zibrb6h2mwwsr44jchdb3dj39sr"; depends=[matrixcalc mvtnorm nlme nnet numDeriv]; }; + isni = derive2 { name="isni"; version="0.2"; sha256="1092sz4xskrvpxlkxnd8s7lzwqy1qnim63lzx55sspqcwdbry5hn"; depends=[Formula matrixcalc mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; }; @@ -7452,10 +7594,11 @@ in with self; { isoph = derive2 { name="isoph"; version="1.1.2"; sha256="1qw98cnil3rb9d3vbii8drca744qig6bfd3rc74dxm23cj86f66g"; depends=[Iso survival]; }; isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; + isqg = derive2 { name="isqg"; version="1.0"; sha256="0ym3d916lpr1bmmla599xg13c8k0wvyi7b6jhzlrxi6nj5ci0vad"; depends=[BH R6 Rcpp]; }; isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; }; italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; }; itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; }; - itcSegment = derive2 { name="itcSegment"; version="0.7"; sha256="15im0aqnl73c7gg6v4al40mappfsb4axfxclpzmdganvr6fccvay"; depends=[maptools raster rgeos sp]; }; + itcSegment = derive2 { name="itcSegment"; version="0.8"; sha256="032wj34313m3wigdfalq356srdzg0cvnvxnaxwxws6bc44r78izf"; depends=[maptools raster rgeos sp]; }; iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; }; iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; }; iterators = derive2 { name="iterators"; version="1.0.9"; sha256="16sycjq912ix52fjxjhcwiaqr0yj1v5iqmrvjljd3z857031w06y"; depends=[]; }; @@ -7482,11 +7625,11 @@ in with self; { jagsUI = derive2 { name="jagsUI"; version="1.4.9"; sha256="1c2fq7q3kvf092j6r9ci0gigjpb61dj19phzm8mqi05q2k08siin"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; - janitor = derive2 { name="janitor"; version="0.3.1"; sha256="0s2inn0apzwrvm5dvvdh36n9fhhrwvfbs6f3fn6byrbd713xl7rq"; depends=[dplyr magrittr tidyr]; }; + janitor = derive2 { name="janitor"; version="1.0.0"; sha256="0q6mq8s8k7yyx2459nhjvlxjaqxn61k3dpxdhcq0fyk37dafva79"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; }; jcext = derive2 { name="jcext"; version="0.1"; sha256="18vmf57l2kv3rvi6laqp948m8mjkdxdy0vi4xp68480b2mjmvij1"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; }; jcolors = derive2 { name="jcolors"; version="0.0.2"; sha256="0d71sdvj7hwafj0sx2z1nyza5j2lfd8y5yj1p94yrw32wi7b89jn"; depends=[ggplot2 scales]; }; - jdx = derive2 { name="jdx"; version="0.1.2"; sha256="0963h1ppasw5psxgxzav0mnwc5gq0ah5xv5cyhnm8d1a66svn6pw"; depends=[rJava]; }; + jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jiebaR = derive2 { name="jiebaR"; version="0.9.1"; sha256="1qv4k5fgi40ppivdk3mxkhawyf2443h2lz5b9gvai9sqj6vf0s8k"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; @@ -7494,8 +7637,8 @@ in with self; { jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; }; jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="1.4"; sha256="1vrihjvq8l2q7d3z80fkzzzwg6xmnfi8sipsgwic1lcbv6vnqndp"; depends=[]; }; - jmv = derive2 { name="jmv"; version="0.8.1.16"; sha256="1m7h0sbva865ki2wf0sxlb6bl1qw936grks2g4h82i2xq9nrlrhh"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; }; - jmvcore = derive2 { name="jmvcore"; version="0.8.1.6"; sha256="1k1w4c0c8ayjzhbi4fqxr2pcynf73jhkr4wc933nijhkyd6w8m29"; depends=[base64enc R6 rjson]; }; + jmv = derive2 { name="jmv"; version="0.8.6.2"; sha256="0an3ni6lz85cfcra69mycka6x1hgaas6rv6ybbnikmrv846sx03n"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; + jmvcore = derive2 { name="jmvcore"; version="0.8.5"; sha256="0w1d18qrb8aimkzv7imnj9yfdmz7ppdvaiadsaprackch16s91kx"; depends=[base64enc R6 rjson]; }; jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; joineR = derive2 { name="joineR"; version="1.2.3"; sha256="0cg7bfn0hb7ayx2s7myja5qzdvsbzyk8fbb1x5z0fp21gyrpfz18"; depends=[lattice MASS nlme statmod survival]; }; @@ -7506,8 +7649,8 @@ in with self; { jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jointseg = derive2 { name="jointseg"; version="1.0.1"; sha256="0wa531b5shrxhnzflfjqn2wypfb565qc2c8wngysgrgyj1kjq1pl"; depends=[acnr DNAcopy matrixStats]; }; - jomo = derive2 { name="jomo"; version="2.5-3"; sha256="1ig6r4sc4c2vf3h51by78610c5yqd7ap8gqcf0hswn3h2zsf6vm8"; depends=[lme4 survival]; }; - jose = derive2 { name="jose"; version="0.1"; sha256="1cvrjcx902pbh9xryph1kilmyf0rmbk671jvqd19a2kfwpcw7gqc"; depends=[jsonlite openssl]; }; + jomo = derive2 { name="jomo"; version="2.6-1"; sha256="1pcac6kbag4as28l557h702kc78mr0iz4m4rkhcx602l7dch8gd8"; depends=[lme4 survival]; }; + jose = derive2 { name="jose"; version="0.2"; sha256="0vgmr5kmps6yk10bbzrxz2d3y7jk0w1rxpm9gx510kpnqbj325xz"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; jpmesh = derive2 { name="jpmesh"; version="1.1.0"; sha256="01f0020ghl1f5fsri54gni15b36fg9vkr4xj43vy881sv11c5yr8"; depends=[dplyr leaflet miniUI purrr rlang sf shiny tibble tidyr units]; }; jpndistrict = derive2 { name="jpndistrict"; version="0.3.0"; sha256="0vnawpkrkhv0vjvw49ldn86qy07pqsdw7mmq13h3l4qw5jmfsd9i"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr readr rlang sf shiny stringi tibble tidyr]; }; @@ -7519,16 +7662,17 @@ in with self; { jsonld = derive2 { name="jsonld"; version="1.2"; sha256="1y4574ai4m31x4yjx5bp9i8wfgcgjgfr8jn5nn0x6qzlnjg58gyz"; depends=[curl jsonlite V8]; }; jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; depends=[]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; }; + jsr223 = derive2 { name="jsr223"; version="0.3.1"; sha256="030dp51fh9b7r4f7ad9drln73m3mhg2zh5fh053d65hzyszrqyqg"; depends=[curl jdx R6 rJava]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; jtools = derive2 { name="jtools"; version="0.9.4"; sha256="0vljw3n1ykvf3f2ydar9rb24cgiqljh195g2jc4dx77zy1kcfh4d"; depends=[ggplot2]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; }; - junctions = derive2 { name="junctions"; version="1.0"; sha256="13vqmy4968hpxi6vs3kfgd802miw8navcvsjmak6knwa2mjhhd54"; depends=[Rcpp]; }; + junctions = derive2 { name="junctions"; version="1.0.1"; sha256="1mfzhizfzpsrlc23kdi658a1svw4p3wh1la7zpf5fk2bbksw0v97"; depends=[Rcpp]; }; junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; }; kSamples = derive2 { name="kSamples"; version="1.2-7"; sha256="0f19rjngk0lg6s8c6h5l55qpxp8sl4vxj3kpi05cizzncny9b9bj"; depends=[SuppDists]; }; - kableExtra = derive2 { name="kableExtra"; version="0.7.0"; sha256="1rj41kcvc46nn6fvqhsc9v1snq2phh09vchkdng1avbm3g5sld62"; depends=[htmltools knitr magrittr readr rmarkdown rvest scales stringr viridisLite xml2]; }; + kableExtra = derive2 { name="kableExtra"; version="0.8.0"; sha256="01m2h8ms83h5zmy9rys0dal9y77fk7bk1f3k1l2vsg2krb5wxagv"; depends=[htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite xml2]; }; kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; kamila = derive2 { name="kamila"; version="0.1.1.2"; sha256="0mcray8byifjddsmwzmcpmw3zpm1y8q3nfrgpgacb36rwprqkj6z"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; }; kangar00 = derive2 { name="kangar00"; version="1.1"; sha256="1rm3mjghgfq8fliha6flqvcb6m4xag1697c0q5smg515453l0s0p"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; @@ -7540,16 +7684,18 @@ in with self; { karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; }; kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; - kdecopula = derive2 { name="kdecopula"; version="0.9.1"; sha256="0qbrm4b2ijyp7fmljz8m918zkv5aywm549lbwjk3rk8isvaac10m"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; + kde1d = derive2 { name="kde1d"; version="0.1.2"; sha256="0n28xkkhl9mfd0bcgfv181j9lqk0aiim2irnwn654fpz0y6rwhnh"; depends=[BH cctools qrng Rcpp RcppEigen]; }; + kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; kdensity = derive2 { name="kdensity"; version="1.0.0"; sha256="0di027xjcd8xllkbygmkmpvp9wchh3haf15vrw7sjck3yvh68k5f"; depends=[assertthat EQL knitr rmarkdown]; }; kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; kdevine = derive2 { name="kdevine"; version="0.4.1"; sha256="0ci51dn7jhz9swlywiqj3inkk4329argm63lhkyvcbj2kd2rjay1"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; }; + kdtools = derive2 { name="kdtools"; version="0.3.0"; sha256="1q22h5cs5p6nvmxrnq0pdfs8aq2aghash9y387ch0g6cm1n5hzj4"; depends=[BH Rcpp strider]; }; kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; }; keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; }; kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; }; kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; }; kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; }; - keras = derive2 { name="keras"; version="2.1.4"; sha256="1z08fi5a0hxw96xj95w9k0d918b1yvqixlv0szqbdrd5dqnfj0xa"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; }; + keras = derive2 { name="keras"; version="2.1.5"; sha256="0l6hs9bawrnjansmka082cqvcf4h5lnrfjgp9rivg8k89nqaknfq"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; kerasformula = derive2 { name="kerasformula"; version="0.1.1"; sha256="0c19208y9v8a1w4p54z7yng5vvmb6h79fs0a20ij98ngys9afbwz"; depends=[dplyr keras Matrix]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; @@ -7559,7 +7705,7 @@ in with self; { kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; kernelboot = derive2 { name="kernelboot"; version="0.1.4"; sha256="1d1l9sbnlyx5a88qmd6q2zxlkr6dykcwlkk648yqmmfvqmq4xjmj"; depends=[future future_apply Rcpp]; }; kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; }; - kernplus = derive2 { name="kernplus"; version="0.1.0"; sha256="0wibp4bbzxmjdyhp643v76accjy1w8jixmwgsdfrq2yjxacgnwcb"; depends=[circular KernSmooth mixtools]; }; + kernplus = derive2 { name="kernplus"; version="0.1.1"; sha256="1dxw1qk5gx7g05kgsbh5436r7mbv77631zjs0c4ibpscaw77g475"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; }; kexpmv = derive2 { name="kexpmv"; version="0.0.3"; sha256="1nx2bpyc06vlr78nhig4zaaygphjp4wqsz9jzhs4qx8wy3kh7rmy"; depends=[Rcpp SparseM]; }; keyholder = derive2 { name="keyholder"; version="0.1.1"; sha256="1dp326vayjzjpfhd2ajrpqjvbn6vvqa7iw9mdhblprz4cvv65g30"; depends=[dplyr rlang]; }; @@ -7582,16 +7728,15 @@ in with self; { kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; }; kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; }; kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; }; - klaR = derive2 { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[combinat MASS]; }; + klaR = derive2 { name="klaR"; version="0.6-14"; sha256="1g995df6286sd64nw7q9bihzkqhrasks45n8xk678y57kcadksai"; depends=[combinat MASS questionr]; }; klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; }; klin = derive2 { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; }; km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; kmc = derive2 { name="kmc"; version="0.2-2"; sha256="0ldyhlqdrbygvhpy4b9xp52zjvjmb0gaph0v9fhla707f63i21m5"; depends=[emplik Rcpp rootSolve]; }; kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; }; - kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; }; kmed = derive2 { name="kmed"; version="0.0.1"; sha256="0vcks4n0dpfd5cl5b8mhvhw6r2f3y12jn3d3j3dkj2grxmb9lh4c"; depends=[ggplot2]; }; - kmer = derive2 { name="kmer"; version="1.0.0"; sha256="0zknmcmv96bq0yqmmbshjwwh7vy2iwks4masmglayx7jw323n9cx"; depends=[openssl phylogram Rcpp]; }; + kmer = derive2 { name="kmer"; version="1.0.2"; sha256="117ggn2i4yy0l7vvrf9miy4x63n9d34rjksd3dd3ama2alp4s95l"; depends=[openssl phylogram Rcpp]; }; kmi = derive2 { name="kmi"; version="0.5.3"; sha256="0b3nibvi0skrx3mjfzypqmdqx8s9zkn11f0ljscqpjr28idx4hr0"; depends=[mitools survival]; }; kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; }; kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; }; @@ -7611,12 +7756,15 @@ in with self; { knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; }; koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; }; + koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-2"; sha256="0v3cjzcpa24n479xi2lkj3yhjrgbd14iq9rz1bvywbj3shixs0bn"; depends=[koRpus sylly_en]; }; kofdata = derive2 { name="kofdata"; version="0.1.3"; sha256="135fkfciya8d215iv0ir7kmd01w7rlzqfcif5jz918skrv2p9mcl"; depends=[httr jsonlite xts zoo]; }; kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; }; kohonen = derive2 { name="kohonen"; version="3.0.4"; sha256="1aq98qbmbzsdyimhn28qiyqfrwkwq70qmm5yhx0rvhjq53bn9622"; depends=[MASS Rcpp]; }; kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; }; kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; komadown = derive2 { name="komadown"; version="0.1.0"; sha256="08rg2qz4dmxl4xi0d7wdl2xgdmsc29fdc0yi40yddzrbpj4vs2z4"; depends=[bookdown knitr rmarkdown]; }; + komaletter = derive2 { name="komaletter"; version="0.2.0"; sha256="17xkc22ci2gqypcfs1yhyzfmpsh8bmjbw6yms27cbqg4m4jdgm9v"; depends=[rmarkdown]; }; + konfound = derive2 { name="konfound"; version="0.1.0"; sha256="1w85gsms061d5hik3bc7x5gc7cp6c9h8l8q8q60isj1r0n60a81s"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; }; kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; }; @@ -7628,12 +7776,12 @@ in with self; { kscons = derive2 { name="kscons"; version="0.7.0"; sha256="1i4dp56y9swl5s6cipqlm5i5fknz2v0yz5g930cl5i8kx91rxwrp"; depends=[]; }; kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; }; - kst = derive2 { name="kst"; version="0.3-1"; sha256="1b4lqjg9j91qhr5gk0y1xsyfbhgaixza7qw6kl05yz88p6m7p35z"; depends=[proxy relations sets]; }; + kst = derive2 { name="kst"; version="0.4-0"; sha256="1vqkriqhzdzs3kldjqgl15sm25lbfqzisglk2r96rjgxbj8k59w7"; depends=[proxy relations sets]; }; kstIO = derive2 { name="kstIO"; version="0.1-0"; sha256="04s8lyg7622zcq947qlx5brwf1an7icg94i5di8vwjp7d8zgczq6"; depends=[MASS pks sets stringr]; }; ktsolve = derive2 { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; }; ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; }; kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; - kutils = derive2 { name="kutils"; version="1.34"; sha256="17f6pzinmp4lcjd5glhnvbjy1yg912jccx9d4n55bini93vlcz0z"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; }; + kutils = derive2 { name="kutils"; version="1.39"; sha256="05744f8bz8mbxcqhf50rxjlknwar4ci3g0nmcx5jggwczqqmn2pq"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; }; kvh = derive2 { name="kvh"; version="1.1"; sha256="1dvq7wbpx1hpjshvsihivd8q8hyhji047gifxc6cjnv778r4irb1"; depends=[Rcpp]; }; kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; }; kyotil = derive2 { name="kyotil"; version="2017.12-27"; sha256="0xd64xg3nj0pj0ziycq4ndpl8kwxfng96ag8zmqzzxk85zw2vyq3"; depends=[]; }; @@ -7652,7 +7800,7 @@ in with self; { labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; labelled = derive2 { name="labelled"; version="1.0.1"; sha256="18mz4qraxalq50rzmblsvavx4isb4194rj4iqab09qzh8ib1qzwv"; depends=[haven]; }; labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; }; - labstatR = derive2 { name="labstatR"; version="1.0.8"; sha256="1qs76vhw6ihsriq5v0s980fxbb0pbvgwqm0a97b226cpqqabkpfm"; depends=[]; }; + labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; }; labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; }; laeken = derive2 { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; @@ -7668,6 +7816,8 @@ in with self; { landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; }; landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; + landscapetools = derive2 { name="landscapetools"; version="0.3.0"; sha256="0ssrqcac3x8fca0vx63nzzac38kx8vlbffkzahmag24c6b1y6dzq"; depends=[checkmate dplyr extrafont ggplot2 magrittr purrr raster rasterVis tibble tidyr viridis]; }; + landsepi = derive2 { name="landsepi"; version="0.0.4"; sha256="0b162vdgrd1v93bm5dc5r4nzpcm3cq5iy8v3f2axpx1fk378aaar"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; }; languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; }; languagelayeR = derive2 { name="languagelayeR"; version="1.2.3"; sha256="1sh3k8xw88pm93wmpy1qi44i8pv5b5g6ajzas36bdi1bqm8cqzax"; depends=[attempt curl httr rjson]; }; languageserver = derive2 { name="languageserver"; version="0.1.0"; sha256="05ph152xrw8qmnb1mwqsq2qx11d6f4g57v9qp1mxi6y11wl21rxq"; depends=[callr jsonlite lintr R6 repr stringr]; }; @@ -7680,7 +7830,6 @@ in with self; { lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; }; lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; - lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; }; latdiag = derive2 { name="latdiag"; version="0.2-3"; sha256="0i2mqk3ldg5kf4d8sfljgjsqbdin7v69anmc2rrxgy28bmvykf9d"; depends=[]; }; latentnet = derive2 { name="latentnet"; version="2.8.0"; sha256="05r7hzj5i7rgpxl798lwi2m62l1qkl5zdza0q2awcd5ydkgj34hp"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; later = derive2 { name="later"; version="0.7.1"; sha256="0z9jymmclkq9zcg1fd8p6gsnm5z1sn3n9pfz3bs03qjrkbizgrvz"; depends=[BH Rcpp rlang]; }; @@ -7689,9 +7838,9 @@ in with self; { lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; }; latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; }; - lava = derive2 { name="lava"; version="1.6"; sha256="02xf5d968raz9gnq5ywy04wz29xpdyca1hm79vbbg1mcxvzdl1dz"; depends=[numDeriv SQUAREM survival]; }; + lava = derive2 { name="lava"; version="1.6.1"; sha256="11k9npmzp3nk2qx0h1dwwfc37j4ddd9y54bppxby0ffnb8qlpw1k"; depends=[numDeriv SQUAREM survival]; }; lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; - lavaSearch2 = derive2 { name="lavaSearch2"; version="1.1.0"; sha256="1nmzj4yfgas6a9wss34ckd55gajxmd9a0fk8lmpxc2130hlr4ld8"; depends=[ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; }; + lavaSearch2 = derive2 { name="lavaSearch2"; version="1.3.3"; sha256="08h9nfbjbq6l5drmq07js2b6ylv29wfrddqdlpsnysi99sj8i8aq"; depends=[ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; }; lavaan = derive2 { name="lavaan"; version="0.5-23.1097"; sha256="11wxzjg09q5wzvbp1lhi9sjnp4rrjpdxnmq3zf8npx08iwkw79ws"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; @@ -7714,7 +7863,7 @@ in with self; { lcmm = derive2 { name="lcmm"; version="1.7.8"; sha256="180xfx842sic5qnfr0zh2h4345zkzlf123pdw4q6gd0mi5smwwc7"; depends=[survival]; }; lcopula = derive2 { name="lcopula"; version="1.0"; sha256="07a9k5fp03s6jnjawg11j4458xrsrrqxv6kf3cs58ymv0j2s1qyd"; depends=[copula pcaPP Rcpp]; }; lctools = derive2 { name="lctools"; version="0.2-6"; sha256="06hhz0sjdrci1li03f09wij1qrl74sla2938fbkx72ffy0mdg310"; depends=[MASS pscl reshape weights]; }; - lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.0"; sha256="0m8wfp8vs4pgzmxinlbxask1i0z6mf35cyyib77mbyqlfvf0hic0"; depends=[quantmod TTR xts zoo]; }; + lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.3"; sha256="0nkqrm8r5iyvw2gbixvi0bnqx2wafg67cqz9mn99halzk9hpynl9"; depends=[quantmod TTR xts zoo]; }; lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; ldat = derive2 { name="ldat"; version="0.1.0"; sha256="1ga96m1sl7khhwi41ab07k02ay4w8vzi5cl895h9kfavgbhqsf6m"; depends=[BH lvec]; }; @@ -7737,7 +7886,7 @@ in with self; { leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; }; leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; }; learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; }; - learningCurve = derive2 { name="learningCurve"; version="1.1.1"; sha256="1rvh6i3vmwrff491k9w551402m3i9sra8rzkljgk9b5fmw7hk5ki"; depends=[ggplot2 gridExtra scales tidyverse]; }; + learningCurve = derive2 { name="learningCurve"; version="1.1.2"; sha256="02dl5rlvwa8dvhknf4kdfg3aial54shnxrq7k2k8yj2dj0qh062c"; depends=[ggplot2 gridExtra scales tibble]; }; learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; learnr = derive2 { name="learnr"; version="0.9.2"; sha256="1z04c1djg7ghsl7p9ypc6k5m7snahnmjy10xmrzqfayx1wkfkn9n"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; @@ -7746,17 +7895,17 @@ in with self; { leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; lemon = derive2 { name="lemon"; version="0.3.3"; sha256="0jxcyplr69a3rganqc02ry57xj7is7dylsh9kvsy6kwnji6bvdib"; depends=[ggplot2 gridExtra gtable knitr lattice]; }; lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; }; - lessR = derive2 { name="lessR"; version="3.7.0"; sha256="14zzm7dsjwl94bcnzrkf8bk83nxsini11s5l0pia31xnm6yl89ln"; depends=[colorspace ellipse foreign lattice latticeExtra leaps png readxl robustbase sas7bdat triangle]; }; + lessR = derive2 { name="lessR"; version="3.7.2"; sha256="0rmfrwp6hznivj8809n21ihriq33264yj82l3ii7kil1i3vmac3n"; depends=[ellipse foreign lattice latticeExtra leaps openxlsx png robustbase sas7bdat triangle]; }; lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; }; lexRankr = derive2 { name="lexRankr"; version="0.5.0"; sha256="1l0p4qg6lcpp1f2n6mh1glvxzy3bis0c1ra8x9z5v26x31wmwq68"; depends=[igraph Rcpp SnowballC]; }; lexicon = derive2 { name="lexicon"; version="0.7.4"; sha256="1f2n90xdpbxk6ffzzlib7fxxswwkfrpf404vzx85s016529dy42m"; depends=[data_table syuzhet]; }; lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; }; - lfactors = derive2 { name="lfactors"; version="1.0.1"; sha256="13vjafbss0860fi4qcf23g3cjs9dlr2k5f3majbnyvhwsbfs7cla"; depends=[]; }; + lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; }; lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; }; lfe = derive2 { name="lfe"; version="2.6-2291"; sha256="1hdzq85y1nxrinikf308mvdmyw883bfzbamr27ffdphlk403ry70"; depends=[Formula Matrix sandwich xtable]; }; - lfl = derive2 { name="lfl"; version="1.4"; sha256="09ni0n7xqn3qw9jjh24j679cyzgf0cxxw535ap4z44jjk29bqngw"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; + lfl = derive2 { name="lfl"; version="1.4.1"; sha256="0r9459mmnx1khpw24w943y1x4xl3zcws2cvv61216yzb0xbqwhc0"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; }; lg = derive2 { name="lg"; version="0.1.0"; sha256="0gaid5aihc9dk3igbm8jhsspl1k4k3prqvn7j2vsm92jc7m00iyw"; depends=[ggplot2 ks localgauss logspline mvtnorm]; }; lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; @@ -7770,7 +7919,7 @@ in with self; { librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; libsoc = derive2 { name="libsoc"; version="0.6.4"; sha256="1hdnqgnvzm5116gphxa55k2bc3ksr607px2s2yg1ilmmxdghdccw"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; }; - lidR = derive2 { name="lidR"; version="1.4.1"; sha256="01nw6i7ddk99zayblqhxsnx2cy29ippii9vdqahffv91644iqqb1"; depends=[data_table future gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; }; + lidR = derive2 { name="lidR"; version="1.4.2"; sha256="1m37ncyj2z9yh40qzl4h3s4dpizmfqz8n0fcybpjjhi8yr3lipdf"; depends=[data_table future gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.2"; sha256="012pfiz4l8xrwrjlzwfc0vxw1wpw2n2f2vj39mlpmg5aswg4mm8k"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; }; @@ -7793,7 +7942,7 @@ in with self; { linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; }; linearQ = derive2 { name="linearQ"; version="1.0"; sha256="0c6ccllv4zf8zgs3957zjvnkdwbv2ryrs0f5lzk1clc233vm7acm"; depends=[Rcpp stepR]; }; linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; }; - lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; }; + lineup = derive2 { name="lineup"; version="0.37-10"; sha256="1w45ll6phynn03ala0wadmp06rrgg8rcqnhz7hqy4w6q7khbkk6r"; depends=[class qtl]; }; lingtypology = derive2 { name="lingtypology"; version="1.0.12"; sha256="03rjnr4hy7im88pawrd86nas0fzkgz3mnzdc8rclcfbbv1vyzxf5"; depends=[leaflet leaflet_minicharts magrittr MASS rowr sp stringdist]; }; link2GI = derive2 { name="link2GI"; version="0.3-0"; sha256="0jzk1p9cygcw0xz9hqfzx74acl4ymn3jmcjj0dxrmknsvfdzcl2d"; depends=[gdalUtils raster rgdal rgrass7 RSAGA sf sp]; }; linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; }; @@ -7814,10 +7963,11 @@ in with self; { listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; }; listenv = derive2 { name="listenv"; version="0.7.0"; sha256="0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"; depends=[]; }; listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; }; - listviewer = derive2 { name="listviewer"; version="1.4.0"; sha256="1273vk8pk393ciwahvpmdh9z4xdlhw3a7mlm7jsqxqnsrc6jrz3x"; depends=[htmltools htmlwidgets shiny]; }; + listviewer = derive2 { name="listviewer"; version="2.0.0"; sha256="0fq9jdb9yahm095m5ja9j7hlv3ggigj14nlf1pdk26xj2685j8n9"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.0.1"; sha256="080ljgb2qsfmyppnlp9acmskgq94pmdbbgbhygqkxvzda5bbas8h"; depends=[assertthat DBI rappdirs RSQLite]; }; littler = derive2 { name="littler"; version="0.3.3"; sha256="1cbsnm4ffzld93b9q8g6g6h6yskjfwa8j1xani5682ipb7r290x7"; depends=[]; }; - liureg = derive2 { name="liureg"; version="1.1.1"; sha256="11cybb1i3a0na3yadzwmn1hlglqk0zdzxj0n07ygsxrdq7sxbpnj"; depends=[]; }; + liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; }; + live = derive2 { name="live"; version="1.4.2"; sha256="0f04glaji3yy16mlwmizr4c7ykngqnfk7j2zx8smfn2n6biv6qg3"; depends=[breakDown data_table dplyr forestmodel ggplot2 lubridate mlr]; }; livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; }; @@ -7827,8 +7977,10 @@ in with self; { lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; }; lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; }; lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; }; - lmSupport = derive2 { name="lmSupport"; version="2.9.11"; sha256="1yvckfahw3kq0r28ggrml7qhgm4ib5ihd971zxg62li4inrkri6b"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; - lme4 = derive2 { name="lme4"; version="1.1-15"; sha256="0sc6rvhiizxxpkdc3wps200wg3pqc0d89crn29lzm75fk8qdd7vx"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lmQCM = derive2 { name="lmQCM"; version="0.1.0"; sha256="0y02pbvl5qbfwnhyzilbcpswwmmq0x47ggpg7pcnhd3dv4b6w6zm"; depends=[Biobase genefilter nnet]; }; + lmSubsets = derive2 { name="lmSubsets"; version="0.1"; sha256="0lkccpk2rxv7dlm4jlk9y3cl3s4cdlfi6schvndrk69glcx0v0zd"; depends=[]; }; + lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; + lme4 = derive2 { name="lme4"; version="1.1-17"; sha256="0czwdy1s8h3slaw73pz0h8qmqczf5135fz6i46i2dv1ql2pbq49x"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; @@ -7836,7 +7988,7 @@ in with self; { lmem_gwaser = derive2 { name="lmem.gwaser"; version="0.1.0"; sha256="0i315plqq1c8d7nvzk7jj9b3n4pgy27673pgdbii4c5bccwm12vn"; depends=[fdrtool genetics lattice LDheatmap lme4 pastecs qtl stringr]; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; }; - lmerTest = derive2 { name="lmerTest"; version="2.0-36"; sha256="1ja56y45fdxa5xqwzng4rk3vjcfjvmchfcpdy08lv9dzkp71g1qp"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; }; + lmerTest = derive2 { name="lmerTest"; version="3.0-0"; sha256="08n6zdyxjbch8vf4gbp339yirf3ixxdhhai8iafxf3f1q2gcr52v"; depends=[ggplot2 lme4 MASS numDeriv]; }; lmeresampler = derive2 { name="lmeresampler"; version="0.1.0"; sha256="00v3qg5vyjjb0pcbrknzxy80kkwsypkhwkv3nsck5rscaf86y3aq"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; }; @@ -7852,7 +8004,7 @@ in with self; { lmomRFA = derive2 { name="lmomRFA"; version="3.1"; sha256="1gq5sjdywz1jbsshrh350zad7iifml2yj8an5xa63ghxiskrxscx"; depends=[lmom]; }; lmomco = derive2 { name="lmomco"; version="2.3.1"; sha256="0nyl18kipsab4ka5ywbmw28kkr6i09w4lc9pa96m1fh765zghjxi"; depends=[goftest Lmoments MASS]; }; lmridge = derive2 { name="lmridge"; version="1.1"; sha256="1r4g7482iz4b7jk0gj169bj96ip2wyrff1ndkwhf0qzg6r6vqa8d"; depends=[]; }; - lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; }; + lmtest = derive2 { name="lmtest"; version="0.9-36"; sha256="0sym9sm1vl6bbgq01jhz1plxqmgh8hrgrn7rw0mwvsalcn6id7xy"; depends=[zoo]; }; lmvar = derive2 { name="lmvar"; version="1.4.0"; sha256="0pwpsdmqjlj79ybx5rw82qgkjzak941d9vvdzwipjh8n51mcvwcd"; depends=[Matrix matrixcalc maxLik]; }; loa = derive2 { name="loa"; version="0.2.43.3"; sha256="0krrv5sicm4xvgilri8nwby6jlidx375b4sk273hxq7bhayw4hqq"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; }; localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; }; @@ -7872,7 +8024,8 @@ in with self; { logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; }; logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; }; logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; }; - loggit = derive2 { name="loggit"; version="1.0.0"; sha256="1h2m4a55v54nvgh665rzhxhzjqkky6lx0f8f43zqh7l152z7bsh2"; depends=[dplyr jsonlite]; }; + loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; }; + loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; }; logiBin = derive2 { name="logiBin"; version="0.1.0"; sha256="146jh5cpydpvv8g3ccrglm88zp8sam4airw521cxcfyg5v8qvdqs"; depends=[data_table doParallel foreach iterators partykit]; }; logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; }; logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; }; @@ -7884,18 +8037,18 @@ in with self; { logmult = derive2 { name="logmult"; version="0.6.5"; sha256="0ak13nfgaima6g75rxbghl7xmagfp4qshj09x1fxh2r2rcags7dk"; depends=[gnm qvcalc]; }; logspline = derive2 { name="logspline"; version="2.1.9"; sha256="1kd7ricaxbcjl6d9hx7bb5mlkr7x2h7gc8vrmfvlzxppbcghb6vw"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; }; - lolR = derive2 { name="lolR"; version="1.0.1"; sha256="1lhhasbbpacqpc3d7bvw7q183czdjqc6xdlc7yafk7rnwgmpxjxz"; depends=[abind ggplot2 irlba MASS]; }; + lolR = derive2 { name="lolR"; version="2.0"; sha256="0ygxm5qym1s64pa8a04jf44y786svrkhscda2x781jx8gpil753v"; depends=[abind ggplot2 irlba MASS pls]; }; lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; }; longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; }; longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; }; longRPart2 = derive2 { name="longRPart2"; version="0.2.3"; sha256="1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685"; depends=[formula_tools ggplot2 MASS nlme rpart]; }; - longclust = derive2 { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; }; + longclust = derive2 { name="longclust"; version="1.2.2"; sha256="1yxxz8apbl1vaqzrsiq7r5ss87j2li595bkvibpkwslgwzv47dcs"; depends=[]; }; longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; }; longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longmemo = derive2 { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; }; longpower = derive2 { name="longpower"; version="1.0-16"; sha256="0hbv43y0fgbv1qiczy4kibqc7pk7whrz4kyxshg8730y8g9wyxdi"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; }; - loo = derive2 { name="loo"; version="1.1.0"; sha256="0nh1jbrvm33v28gbys8sh6v4cxfzfd85561gz380b4kaahn2089l"; depends=[matrixStats]; }; + loo = derive2 { name="loo"; version="2.0.0"; sha256="1k2qhma7gm4l3h9wf5gh1gm09map2jqcdzz3pba4gf039n8h3gsl"; depends=[matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loon = derive2 { name="loon"; version="1.1.1"; sha256="023vrnbn4pikiq6l57phwy9zy1lp6vxrkinrffaxwicvaj58c931"; depends=[]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; @@ -7915,34 +8068,35 @@ in with self; { lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; }; lpridge = derive2 { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; }; lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; }; - lqmm = derive2 { name="lqmm"; version="1.5.3"; sha256="1gl609irhxk7qi4x8as2xylc6iybm9jyrnm7dvb92nxl0ksp44v7"; depends=[nlme SparseGrid]; }; + lqmm = derive2 { name="lqmm"; version="1.5.4"; sha256="117g38m650mi28ff19nd71dadbdphd1ladmrip2kbsnkpcz2q37p"; depends=[nlme SparseGrid]; }; lqr = derive2 { name="lqr"; version="1.7"; sha256="110c18wc3y3nkdwjgrksw20kvvy65822njrpy4gwb100ifigw0v7"; depends=[ghyp spatstat]; }; lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; }; lrgs = derive2 { name="lrgs"; version="0.5.3"; sha256="0aqz07vg3z52lq224mapwgwr9mspa7aswzdfngg6x933aqsha4gj"; depends=[mvtnorm]; }; lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; }; lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; }; lsasim = derive2 { name="lsasim"; version="1.0.1"; sha256="0bwk6bv0wp30v6p55nyd1hcvwnjjddwccyy1swf6sg7lw3fy657p"; depends=[]; }; - lsbclust = derive2 { name="lsbclust"; version="1.0.4"; sha256="0a0l1vvr4gp1vvqccjicy4qh7l2kwyh7k503yi403d0987zqywcc"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; }; + lsbclust = derive2 { name="lsbclust"; version="1.0.5"; sha256="005kswkpp3qmrg5ij8999xambyyry5wajkawiwhv45niyi2hlkxv"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; }; lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsei = derive2 { name="lsei"; version="1.2-0"; sha256="1xl06fb3is744pxlh42wx5hn1h0ab1k31wnmsmh0524kxzcyp0a7"; depends=[]; }; - lsgl = derive2 { name="lsgl"; version="1.3.6"; sha256="0zkv5xgwrnwx0w0qpzsg7krd7fdnlr3a85q64xj1wx0gd578dqq6"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; }; lslx = derive2 { name="lslx"; version="0.6.2"; sha256="0girzjmkmqym5bnw492991smyhvlz7xw70n8hlswpa4lw3x15q2n"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; }; + lsm = derive2 { name="lsm"; version="0.1.6"; sha256="1j68jvb7gvgr77wpq1gzh1jw3cs94im1zrlnvw4jnbgbzsmpql99"; depends=[]; }; lsmeans = derive2 { name="lsmeans"; version="2.27-61"; sha256="0qw4lkgaynld56ywvdyy5nqvq7c6r2v24gsy54rkcw2n4xhlnahm"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; }; + lspartition = derive2 { name="lspartition"; version="0.1"; sha256="1c2wp9yl0jzvbh181flzywwqmm6xr5jg9qbfibw4ja9wf6xnfx8w"; depends=[combinat ggplot2 MASS matrixStats mgcv pracma]; }; lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; }; lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; }; lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; }; - ltm = derive2 { name="ltm"; version="1.1-0"; sha256="1gxjz3rn5bacv7xdlinzk6rdcwragb76grjpk5wqs4shqbk0rld2"; depends=[MASS msm polycor]; }; + ltm = derive2 { name="ltm"; version="1.1-1"; sha256="1qrgzwx5l58qf5rfp1knxc84r0g943q5sdr3ky74zzwpnmrf2vf7"; depends=[MASS msm polycor]; }; ltmle = derive2 { name="ltmle"; version="1.0-1"; sha256="0g3nybhxz7mivqkzvlzkasc1m489s4fsi4874wvlhqg3x3mww0x9"; depends=[Matrix matrixStats speedglm]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive2 { name="ltsk"; version="1.0.5"; sha256="0x142w2l6qaqw1kmx5kix7lkadaw2kl8dqx11d091vqj2imi9wlr"; depends=[fields gstat sp]; }; ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; }; - lubridate = derive2 { name="lubridate"; version="1.7.3"; sha256="1pzkqfiahnsdm3zx46asgn8fw43vlxvbh7r4cn70c7ffmxabzzrc"; depends=[Rcpp stringr]; }; + lubridate = derive2 { name="lubridate"; version="1.7.4"; sha256="14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i"; depends=[Rcpp stringr]; }; luca = derive2 { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; }; lucid = derive2 { name="lucid"; version="1.4"; sha256="1kwl9h7ynp8nhny51xskrbgc3060bawxjkdijhsjzss2hbbygwds"; depends=[nlme]; }; lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; }; @@ -7993,15 +8147,16 @@ in with self; { magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; magicaxis = derive2 { name="magicaxis"; version="2.0.3"; sha256="08nkf9k2ijlm52ybncfiwrghy911wpvwpvdvllcz2d4slk1vdakj"; depends=[celestial mapproj MASS plotrix sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; - magick = derive2 { name="magick"; version="1.7"; sha256="09dcgfbpp6lls943yps3qaylrs6n9dd1svwab5rmwj0fa4ph2by4"; depends=[curl knitr magrittr Rcpp]; }; + magick = derive2 { name="magick"; version="1.8"; sha256="0qi86fhqaxad9bbigfv1czxhxqi3x49376pyhfkw7lc7r2fxkx6y"; depends=[curl knitr magrittr Rcpp]; }; magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; }; makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; }; makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; - makedummies = derive2 { name="makedummies"; version="1.0"; sha256="1kyx0n620pnaaxi136f81kr55v94zlw2bikrky1sq9bhrvdlf7yh"; depends=[]; }; + makedummies = derive2 { name="makedummies"; version="1.1"; sha256="1qpkghlgkzpzai290kidkmwhn4aj0balb17rs2l5amsml942lq0a"; depends=[]; }; malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; }; + malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.1"; sha256="1c1bvfs1azvlci2yrgw5xlr460fdjwikm3vsdfz8lj1xzs1w220c"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal sp stringi tidyr xml2]; }; mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; }; @@ -8010,19 +8165,19 @@ in with self; { manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; manifestoR = derive2 { name="manifestoR"; version="1.2.4"; sha256="1hd4qsa2xsa1dq5jnwh1bph34glkpaabjmsnavdjhkfzjilp32ya"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; - manipulateWidget = derive2 { name="manipulateWidget"; version="0.8.0"; sha256="19vcf3q2q8r53dygc8kh7pbcbjs9q6knylz2jnc9pwxq3wdkbrp7"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny]; }; + manipulateWidget = derive2 { name="manipulateWidget"; version="0.9.0"; sha256="18zk1f3dk63crpfpljafakdvfvd0494kbws0dwahwfr60avvvx2v"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; - mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; }; + mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; }; mapedit = derive2 { name="mapedit"; version="0.4.1"; sha256="1dy87kmwra917716r99hp139fbxy3z0cx03cw61b832isizd0b51"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapfuser = derive2 { name="mapfuser"; version="0.1.2"; sha256="1q7l6rfs6dv76ifizfqq4pdpjpb2zwzd3vvrnhdzh8vw2mrlqcjg"; depends=[doParallel dplyr foreach ggplot2 igraph lazyeval LPmerge mgcv plotly stringi tidyr visNetwork]; }; - mapmisc = derive2 { name="mapmisc"; version="1.7.0"; sha256="0m8a0zzdrmqkkv9clfar9acij80fmanqny08g9xlir14620aq38c"; depends=[raster sp]; }; + mapmisc = derive2 { name="mapmisc"; version="1.7.2"; sha256="0w0yvdnxk6gjcc86b6imq764va9f9hjan3ayw7qrbjpqx16fs7dx"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; - mapproj = derive2 { name="mapproj"; version="1.2-5"; sha256="0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk"; depends=[maps]; }; - mapr = derive2 { name="mapr"; version="0.3.4"; sha256="14f7zfzxb1h935bbybj2l2n4a62cnq0wvgmc09in0fvnl75jl971"; depends=[ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; }; - maps = derive2 { name="maps"; version="3.2.0"; sha256="0577f3b5d3a7djl7r0miy9mzr6xq6jb32p8nyrma7m2azasbwyj3"; depends=[]; }; - mapsapi = derive2 { name="mapsapi"; version="0.3.0"; sha256="070dckm5dkicmwkpji4zvap9h9rl3n3l7fxhz2ryslblbrzx70fn"; depends=[bitops magrittr plyr sf xml2]; }; + mapproj = derive2 { name="mapproj"; version="1.2.6"; sha256="1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"; depends=[maps]; }; + mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; }; + maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; }; + mapsapi = derive2 { name="mapsapi"; version="0.3.5"; sha256="0v33kkny98xql6m6rp2xh39rsp00r1crpin8gqw5wh5x28n20sna"; depends=[bitops magrittr plyr sf xml2]; }; maptools = derive2 { name="maptools"; version="0.9-2"; sha256="075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"; depends=[foreign lattice sp]; }; maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; @@ -8031,20 +8186,19 @@ in with self; { march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; marelac = derive2 { name="marelac"; version="2.1.6"; sha256="024gbrdby6h722j58wl8xn8027sanlpnz1l3hhxnllwzbz3mbdz4"; depends=[seacarb shape]; }; - marg = derive2 { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; + marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; }; margins = derive2 { name="margins"; version="0.3.0"; sha256="0i6c39acyyvxsx2lkza2afjyhpdlb9fx0zssr24g0xdk3f7c2dc2"; depends=[MASS prediction]; }; marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; }; marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; }; markdown = derive2 { name="markdown"; version="0.8"; sha256="1vcgsh2m2f5kfgappgg71nbf04ff0j1sbk668krjs3r2n89dk3sk"; depends=[mime]; }; - marked = derive2 { name="marked"; version="1.1.13"; sha256="0zgfd7fdcrvvqnlgzarly16zjnipshxsa1g3j9jqc5kbqvh7fnh2"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; + marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; markmyassignment = derive2 { name="markmyassignment"; version="0.8.1"; sha256="1y388s73b1zs482d1d7z40kg4hizp46lc3279xspm2ryx4m49mzj"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; markophylo = derive2 { name="markophylo"; version="1.0.6"; sha256="1gyj3ykwh4ljrb5s80hihy7wl89y3p4xkckspvv4ynl9lnsbm7cs"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; markovchain = derive2 { name="markovchain"; version="0.6.9.8-1"; sha256="1av89829fwnf2bll7b75v2vrglw4130d5c42c3i1fiqh54jxjy7k"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; - marmap = derive2 { name="marmap"; version="0.9.6"; sha256="1b0mpygk18ri0xs9f56j2g7zmka7krnw7fmh9m9xisbvq2g23g92"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; + marmap = derive2 { name="marmap"; version="1.0"; sha256="187zqmpdd4kl5dviphfzdhjlaa9bss1gx4wxxc8zgn4q1g66f4c2"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; mason = derive2 { name="mason"; version="0.2.5"; sha256="1v2gja8kbwzx5c8y8gchh4rwwprv99ad0nhgb0hnfgjnqsbdmdv7"; depends=[assertive broom dplyr lazyeval magrittr tidyr]; }; - matR = derive2 { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; }; matchMulti = derive2 { name="matchMulti"; version="1.1.6"; sha256="05nkrncrf7vq2bmqbhm9n6p6cyb4drbhjrrfdcw6qcdgvh3bbiy0"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; }; matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-5"; sha256="083gnqjxvzgqd0lvg13qwzw3cp1imp4xn2nacspfxqg4878jjpn3"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; @@ -8056,7 +8210,7 @@ in with self; { matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; }; matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; matlabr = derive2 { name="matlabr"; version="1.5.0"; sha256="0gy639fv0b85h4z96b2b3m635q4w62q63kfxfqny3pwr0r5vsc2p"; depends=[stringr]; }; - matlib = derive2 { name="matlib"; version="0.8.1"; sha256="080mbmr1lb5ha5ql40hv0idcnnbyaai46c42z756kdyq9pdzcabf"; depends=[car rgl]; }; + matlib = derive2 { name="matlib"; version="0.9.1"; sha256="03991ckrfk663pdi9q2a4sms9csr1dkr075dsycqggr96yp1cwh8"; depends=[car MASS rgl xtable]; }; matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; matrixStats = derive2 { name="matrixStats"; version="0.53.1"; sha256="0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z"; depends=[]; }; @@ -8067,6 +8221,7 @@ in with self; { mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; }; maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; }; + maxadjAUC = derive2 { name="maxadjAUC"; version="0.1.0"; sha256="04zdaqmavhhrj63s2k5pqncvlzbfnxan7r0fagfka9dypwwcl5qm"; depends=[aucm Hmisc Rsolnp survival]; }; maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; }; maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; }; maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; }; @@ -8091,21 +8246,22 @@ in with self; { mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; - mcca = derive2 { name="mcca"; version="0.2.0"; sha256="01c7dp9m8vqffhq0ixsqcfw40jsmb6dwiblym31h84f9s0x4f00j"; depends=[e1071 MASS nnet pROC rpart]; }; + mcca = derive2 { name="mcca"; version="0.3.0"; sha256="0fmlqk4q2vy7gzxhvb9249f1644jlvy755cpda8kvwp9qk55bp4p"; depends=[caret e1071 MASS nnet pROC rpart]; }; mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; }; mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; }; mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; }; mcga = derive2 { name="mcga"; version="3.0.1"; sha256="0q0nn881lii8wfw28k8jh9z0kbi5ljcwi2wpq460k2w3agsjzw5n"; depends=[GA Rcpp]; }; mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; - mcglm = derive2 { name="mcglm"; version="0.3.0"; sha256="1q2zc0xn4inp9inadb52yc0svbh581qxxjzc08pgrm9l3xms4a14"; depends=[assertthat Matrix]; }; + mcglm = derive2 { name="mcglm"; version="0.4.0"; sha256="0k5zkdq3c4fvyhk0lfwikmrxcrd2hg3s820l8rswz7xhl645zr5a"; depends=[assertthat Matrix]; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; - mclcar = derive2 { name="mclcar"; version="0.1-8"; sha256="1hrjfjbsxh8g6bw2cfxciry8hn9xxfg4bww5p1sjq98v8bsqcx23"; depends=[fields maxLik nleqslv rsm spam spdep]; }; + mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.5.1"; sha256="1qnkkjq7gxivpz3mmbq5dx9a128r3xhrdzx96kc80h3w67yc7hbl"; depends=[Matrix memisc]; }; mclust = derive2 { name="mclust"; version="5.4"; sha256="1i3v1q8qq0al3ifvjhcvxfsg68cx9mq8jz67jwmiqai78mw0aqvk"; depends=[]; }; - mclustcomp = derive2 { name="mclustcomp"; version="0.2.0"; sha256="0ijsy1p80bqbknw9did3dqa90ck7zd0xplvw870578h4x5q30qdp"; depends=[Rcpp RcppArmadillo]; }; + mclustcomp = derive2 { name="mclustcomp"; version="0.3.0"; sha256="02j87p2z9z3b8kxnvnm1syjpv6axcs09fs3mnrl1n2q6jyc4gwsr"; depends=[Rcpp RcppArmadillo Rdpack]; }; mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; }; + mcmcr = derive2 { name="mcmcr"; version="0.0.1"; sha256="0g64df8v6snbcmk0kynfppq1mqaz9z8apfsm1zn3ch5q2afg0kqy"; depends=[abind checkr coda tibble]; }; mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; }; mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; mcompanion = derive2 { name="mcompanion"; version="0.4-5"; sha256="18l29cbggf5mdab8vdzmbsnc0p77llaq3ylp07a7gsq44bys8zq0"; depends=[gbutils MASS Matrix Rdpack]; }; @@ -8123,7 +8279,7 @@ in with self; { mdhglm = derive2 { name="mdhglm"; version="1.6"; sha256="1lvckais4c3pbf6zrpfkdlyqhcg4jaw11n00622h9ks413fl788v"; depends=[boot Matrix mvtnorm numDeriv]; }; mdmb = derive2 { name="mdmb"; version="0.6-17"; sha256="1ydvfjqid7bsgryr8j77ajmh2q40s3gh67n8027f70pa8amr9fnq"; depends=[CDM coda MASS miceadds sirt TAM]; }; mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; }; - mdsOpt = derive2 { name="mdsOpt"; version="0.2-2"; sha256="1wg0f2a3z5pdiw8lljfrifn7lf00rza8rmrdh61dmna2nkrg9j4g"; depends=[clusterSim smacof symbolicDA]; }; + mdsOpt = derive2 { name="mdsOpt"; version="0.3-1"; sha256="0fyzmbaqnj42nhl32cj1kycrqkfx2qvb5vpi0qj98fi6iwsa4psq"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; }; mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; mdsr = derive2 { name="mdsr"; version="0.1.5"; sha256="0b80l478v68w91vsmvvyvnmk0yasybmm013psy4181lhvxc93kma"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL tidyverse]; }; @@ -8132,7 +8288,7 @@ in with self; { meanShiftR = derive2 { name="meanShiftR"; version="0.51"; sha256="0qcciayriygfwkb15n863amcpcfl97fr1sarwm3d269idf5m7w6x"; depends=[]; }; meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; }; measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; }; - measurements = derive2 { name="measurements"; version="1.1.0"; sha256="1zi6mpwyxycbphq48s7vfc8gm76nidpa2gafp0jxiv56rwpv3jc3"; depends=[]; }; + measurements = derive2 { name="measurements"; version="1.2.0"; sha256="1k47xmydgd9lhc6phr40zphnibiq817f5nf8619ibla2pridjn1l"; depends=[]; }; meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; }; @@ -8143,27 +8299,27 @@ in with self; { medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; }; meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; }; mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; - mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; }; + mefa4 = derive2 { name="mefa4"; version="0.3-5"; sha256="19khmc7jxwlvjyr5gpmmz4pv60xzgjw3npx1iqv1ayx8ghpsmaj0"; depends=[Matrix pbapply]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; }; - meltt = derive2 { name="meltt"; version="0.3.3"; sha256="08qifdpk0c9digpayw1d9h2p9q4nyrlihg8kjqacirb5wh39wr6r"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; }; + meltt = derive2 { name="meltt"; version="0.4.0"; sha256="0m0r7in1s8vq2pvq7pxgwjfhqds8pwhcrn5hy0wa126s1y88v34x"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; }; mem = derive2 { name="mem"; version="2.12"; sha256="0075i2mbkck06bljck44d26ys68p8vjfb1jhgzrjy1sv2g2w0qa8"; depends=[boot dplyr ggplot2 mclust RColorBrewer reshape2 sm stringr tidyr]; }; - memapp = derive2 { name="memapp"; version="2.8"; sha256="0y5wl0rv1s8dgxhb0q42wy5rlj4smw9pz7a4j23195llql8lfc9m"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; }; - meme = derive2 { name="meme"; version="0.1.1"; sha256="102z3zgfldggcykb7wlmw0wbdas6jbpvy2kfdps0wky3j552ir95"; depends=[ggplot2 magick showtext sysfonts]; }; + memapp = derive2 { name="memapp"; version="2.9"; sha256="1g53c90yvh34jisbcy5nvch7yyi7yxx7sg32492rk97h6hr2j8qv"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; }; + meme = derive2 { name="meme"; version="0.2.0"; sha256="17zpnspc90nlga3iyl4ahasr70mnrhzja4pz7zhmjddhzjs8x3sz"; depends=[ggplot2 magick showtext sysfonts]; }; memery = derive2 { name="memery"; version="0.4.2"; sha256="0wfp3hf567a1q6mhrsgn4hr8x52yp4na8783f2d19hm0c3r4z51q"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; }; memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; }; memisc = derive2 { name="memisc"; version="0.99.14.9"; sha256="1gh6shm9nwfjwfi5f4cz2jsldfdnkj6f73279l86wki5gdf36zri"; depends=[lattice MASS repr]; }; memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; }; memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; }; memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; }; - merDeriv = derive2 { name="merDeriv"; version="0.1-3"; sha256="0kgmv220nlg0r31bwg5qxkc8ybngg4c5q16bkknzf4khmbx19iwm"; depends=[lme4 Matrix nonnest2 sandwich]; }; + merDeriv = derive2 { name="merDeriv"; version="0.1-4"; sha256="1gkxc2bf4fx3vbf1nq1g713hhhx7031wchxmgr2ydwfrighwf8qg"; depends=[lme4 Matrix nonnest2 sandwich]; }; merTools = derive2 { name="merTools"; version="0.3.0"; sha256="1kc32zm1wmmivf1qfs6vi7y8kwibj6sr540is82dyh7xdmbc5mx3"; depends=[abind arm blme broom dplyr DT ggplot2 lme4 mvtnorm shiny]; }; merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; meshsimp = derive2 { name="meshsimp"; version="0.1.1"; sha256="0cdgq4vfjf0h6l55v687k5xs0nwmlpqmw424xgnsfnwxw5ljcvb1"; depends=[plot3D Rcpp RcppEigen]; }; metRology = derive2 { name="metRology"; version="0.9-26-2"; sha256="1i9lxgphn8nmkcp2zgjs6ylbccmfgv9lfch00xmx1xfb538jz82q"; depends=[MASS numDeriv robustbase]; }; - metScanR = derive2 { name="metScanR"; version="1.1.1"; sha256="0cl3vfh8hcx230xpv5611liwk7jr49a2akz18f641yd04akk7f19"; depends=[geosphere leaflet plyr RColorBrewer RCurl]; }; - meta = derive2 { name="meta"; version="4.9-0"; sha256="012yhxbn114q8bf75mm8ap11q33a5azzkh1b811saq77p1f6lwgq"; depends=[]; }; + metScanR = derive2 { name="metScanR"; version="1.2.0"; sha256="1x32f23w5f3s7sc5gbbqzq9s83clarskj9vpnfnwryrx87dg1jjc"; depends=[geosphere leaflet plyr RColorBrewer RCurl]; }; + meta = derive2 { name="meta"; version="4.9-1"; sha256="1nv8yzcwamflcii5x6l3h5p1q7q4xrd74v40njnpgmhkn4vrkyax"; depends=[]; }; meta4diag = derive2 { name="meta4diag"; version="2.0.7"; sha256="024rxnqzw9xydy0mm1w38s739qgkzjsifq23bwpvkwj0x0jnwry0"; depends=[caTools shiny shinyBS sp]; }; metaBMA = derive2 { name="metaBMA"; version="0.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; }; metaLik = derive2 { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; }; @@ -8171,6 +8327,7 @@ in with self; { metaMix = derive2 { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; }; metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; }; metaSEM = derive2 { name="metaSEM"; version="1.0.0"; sha256="1i77w7b6xbi8p43s9vicj121kz7f3qp1zhqwy6qc5xcj9qaqjklp"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; }; + metaboGSE = derive2 { name="metaboGSE"; version="1.0.2"; sha256="1nfcjplry2ba98yi3flk6zcvlys57gri3582mylh543xkcvlrifz"; depends=[AnnotationDbi ape Matrix sybil topGO]; }; metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; }; metacart = derive2 { name="metacart"; version="1.0-0"; sha256="13dp9yz6yjd2jc7lf3w3ac3vk69ry7zygf6xnvzrcwsdmxd0258n"; depends=[ggplot2 gridExtra rpart rpart_plot]; }; metacoder = derive2 { name="metacoder"; version="0.2.0"; sha256="0dyd16yy7adpyksfpg6d414s1l6nls5hv1k938mn7fji1px14sgj"; depends=[ape biomformat cowplot dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr taxa taxize traits vegan zoo]; }; @@ -8185,18 +8342,18 @@ in with self; { metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; }; metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="1.0.0"; sha256="1wzy5dnmrdfdj1386snjyisrbzbq8v4qsnq57l3wvkg1pgnz1vh2"; depends=[]; }; metamisc = derive2 { name="metamisc"; version="0.1.8"; sha256="06dzjnrbxqkb0d0zcdxg8fyadsbq0f0fca4xifjz16yjz1047n5k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; }; - metansue = derive2 { name="metansue"; version="2.0"; sha256="102cddahlzm0b76y6pr7jxqxf28j6y3hsjd17fpnyvrwnzhqbz5m"; depends=[]; }; + metansue = derive2 { name="metansue"; version="2.1"; sha256="0mklpnb9m0pynz3x0fin003zz0n1v6i0fdcahny70y1yxiy5agcs"; depends=[]; }; metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; }; - metaplot = derive2 { name="metaplot"; version="0.4.6"; sha256="1qh7v7s8jrdpjzyw41zjlwv8dlq7k49zi2h5slk0jfa9jd635w4x"; depends=[dplyr encode lattice magrittr rlang tidyr]; }; + metaplot = derive2 { name="metaplot"; version="0.4.9"; sha256="1nbnyh03n1kkkl4v80nbbbnkrzs1a5ri210x9q4m2v87jrcikllw"; depends=[dplyr encode lattice magrittr rlang tidyr]; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; }; - metaplus = derive2 { name="metaplus"; version="0.7-10"; sha256="066w0klii6a82mq4kdzbx3ccshmsxikym9x8w288pjw92r2z2cfn"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; + metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; metasens = derive2 { name="metasens"; version="0.3-2"; sha256="1wxp6gzq3wmas8hm8vqxclawxkc4p8dw2apzmg0nciqvas6dzic8"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; - metaviz = derive2 { name="metaviz"; version="0.1.1"; sha256="1myhh16a7mad4gidl2xhnfv940gjqhbl8rlg6vrwvawgaiwigbxp"; depends=[ggplot2 metafor nullabor plyr RColorBrewer]; }; + metaviz = derive2 { name="metaviz"; version="0.2.0"; sha256="1a4qwhg3lb5jxnddmi7zf2sc2yjzjap3rh6hfm3965bydpf1q57c"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; }; meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; - meteoForecast = derive2 { name="meteoForecast"; version="0.51"; sha256="1k5m561b6hpqvzrg5l16523ig1rxcsi4s172jmya039cwyk8mqfp"; depends=[ncdf4 raster sp XML zoo]; }; + meteoForecast = derive2 { name="meteoForecast"; version="0.52"; sha256="1v9p2l45jzzim10pmy4y1hzc68sxawd996sri6dw7hnalfqfiyxj"; depends=[ncdf4 raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; meteoland = derive2 { name="meteoland"; version="0.7.1"; sha256="1nsn4z3gbkcdhgyn13fjcpsyb0lb85kiyy6fhirlnw63dwr56a2l"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; }; metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; }; @@ -8204,12 +8361,13 @@ in with self; { mets = derive2 { name="mets"; version="1.2.3"; sha256="1f1mqpzpvh5vb8b8w72q13jhk978bcvwipf4bx3kzzgsf6yfxk5s"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; }; mev = derive2 { name="mev"; version="1.11"; sha256="0iqcslnchap8zh4s3bllqqb8z0klpzg2pn8ays1xk66lj5ywl390"; depends=[boot evd gmm ismev nleqslv nloptr numDeriv Rcpp RcppArmadillo revdbayes rootSolve]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; - mexhaz = derive2 { name="mexhaz"; version="1.4"; sha256="1c3n8g93pb38dw45ls6wh81giqw7zkksh2rmpbw46ink23ks12ij"; depends=[MASS numDeriv statmod survival]; }; + mexhaz = derive2 { name="mexhaz"; version="1.5"; sha256="0my53dg321xfbbkxawxcggnh5gw9qkliji5gsdb8m1fi37djd67w"; depends=[MASS numDeriv statmod survival]; }; mfGARCH = derive2 { name="mfGARCH"; version="0.1.2"; sha256="08gkba5v8l0867rrxakn7js11v1yj7qp9vmzbjmri9hjcm02s44a"; depends=[numDeriv Rcpp zoo]; }; mfe = derive2 { name="mfe"; version="0.1.0"; sha256="06x6csf3pr1vdmmimg6f7iffrivj8wcdfafvld7nrzbkl09cbfbn"; depends=[C50 class e1071 infotheo MASS rpart]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; + mgc = derive2 { name="mgc"; version="1.0.1"; sha256="0bdj890v2rinsddny8kwa48cgqh9qlzfd7k5s4i9mg40ajr0f291"; depends=[MASS SDMTools]; }; mgcv = derive2 { name="mgcv"; version="1.8-23"; sha256="1lsrhf1yzn25pfn3f5x8yxjqnfryim4jx3iqd7ah8aalh5asqwbp"; depends=[Matrix nlme]; }; mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; @@ -8224,7 +8382,7 @@ in with self; { mhurdle = derive2 { name="mhurdle"; version="1.1-7"; sha256="06ph0vbm7yk5388v2aww6nmi2rhjhfjj1hl506a41m5k6hf746pk"; depends=[Formula maxLik survival texreg truncreg]; }; mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; }; miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; }; - miLineage = derive2 { name="miLineage"; version="2.0"; sha256="091wf4kwakdr91xkyg038f0vj941gvziy7yc4l8cylcjbr647qzz"; depends=[data_table geepack MASS]; }; + miLineage = derive2 { name="miLineage"; version="2.1"; sha256="0660vk44ywmj0q2cw7pa2z1r039ncw693dnz7zlgc0ipwak3b0ry"; depends=[data_table geepack MASS]; }; miRNAss = derive2 { name="miRNAss"; version="1.4"; sha256="0p852vyn44g84i4hzm7b02m5cxyqajnczx0s9x9373rn7fi6r98c"; depends=[CORElearn Matrix Rcpp RSpectra]; }; miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; }; @@ -8235,7 +8393,9 @@ in with self; { micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; }; mice = derive2 { name="mice"; version="2.46.0"; sha256="1gjvlk67zvgipfczsca8zqk97vg3sivv82hblsdwp14s7smhjcax"; depends=[lattice MASS nnet Rcpp rpart survival]; }; miceExt = derive2 { name="miceExt"; version="1.1.0"; sha256="07xj9f5w0kh4d1yj8mx1jydvhd0vwpvvrb6h67xz5gb1ban4k6c6"; depends=[mice RANN RANN_L1]; }; - miceadds = derive2 { name="miceadds"; version="2.9-15"; sha256="03jvs643cq23y5fj1ffilqr9bi7g4blk7c0bh7nvrpjx5sscqjck"; depends=[CDM lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; + miceFast = derive2 { name="miceFast"; version="0.1.0"; sha256="0089n3iagy81b6k9kdm6rh2k21vi55ly4a5d4b4snhf0rxrj7if8"; depends=[Rcpp RcppArmadillo]; }; + miceMNAR = derive2 { name="miceMNAR"; version="1.0"; sha256="1ns7i1p2nil2s7960hkfl557qipwshibsgpwyn58ss3ch1vr213g"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; }; + miceadds = derive2 { name="miceadds"; version="2.10-14"; sha256="1cpwf8j1r5k5wb4cwjz0aqrsgb5x9nhdrxb22sfw3lrfc1x6i6ay"; depends=[CDM lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; micemd = derive2 { name="micemd"; version="1.2.0"; sha256="0l4qzhkxy43xwgfqp2c638fimixdrm94hgiabfds3sc1vbxma4r8"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.3"; sha256="072qldi020m84j9crfvzvw2nzn5fagqmjjzb7g7i70zwqhl1kjsa"; depends=[deSolve]; }; @@ -8243,11 +8403,11 @@ in with self; { microbenchmark = derive2 { name="microbenchmark"; version="1.4-4"; sha256="0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c"; depends=[]; }; microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; }; microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; }; - microdemic = derive2 { name="microdemic"; version="0.2.0"; sha256="0g39j9bdfcv90332g9mp7khn15vqs0fzqx38criw4rxwi8dcd307"; depends=[crul data_table jsonlite tibble]; }; + microdemic = derive2 { name="microdemic"; version="0.3.0"; sha256="1hrl458jwrgjm7ds4scmicf39ssw1gbjxqaq95lhlwi9n0prd7jn"; depends=[crul data_table jsonlite tibble]; }; micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; }; - microplot = derive2 { name="microplot"; version="1.0-25"; sha256="05b29l5s4g4yvprxsla28ykr4823lfhqlxm46p406p06r9wki3d7"; depends=[ggplot2 HH Hmisc htmltools lattice ReporteRs]; }; + microplot = derive2 { name="microplot"; version="1.0-38"; sha256="1jrm0rzq8xwrd3j1xwyy70071jk9cxqnqdbr3ljjn926yji10nfs"; depends=[cowplot ggplot2 HH Hmisc htmltools lattice ReporteRs]; }; microseq = derive2 { name="microseq"; version="1.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midasr = derive2 { name="midasr"; version="0.6"; sha256="1sg6m36jg3b6znfg97ln5a6b4z36xkyjvgxk7wmqdq3h528z8613"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; }; @@ -8273,10 +8433,10 @@ in with self; { minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; }; minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; }; minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; }; - minval = derive2 { name="minval"; version="0.8"; sha256="05yqr2b5x17kpp4661x6p4pjszmvz2bad43z8m3qnvaa29zhd3n3"; depends=[]; }; + minval = derive2 { name="minval"; version="0.8-1"; sha256="11sr69hmqnh5g2zbfajy3wqc57759basky1w72dnrd38rq50llxs"; depends=[]; }; minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; }; - mirt = derive2 { name="mirt"; version="1.26.3"; sha256="1jzvxcq7s179vi5cwrxkcqzffl2pyay5abnvlgazhabzf4150sml"; depends=[GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; + mirt = derive2 { name="mirt"; version="1.27.1"; sha256="0344gqyx8x0q5smi8ifs6dw0hgqgw23mfgw8cb9gc8ky78zydjpp"; depends=[Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.7"; sha256="038jp680hn17q8hcz346j4i0p913h7gbkqfswn0ygf1kwgsz1mpa"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; }; @@ -8286,11 +8446,12 @@ in with self; { miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; }; miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; }; mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; }; + mispr = derive2 { name="mispr"; version="1.0.0"; sha256="166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx"; depends=[e1071 MASS penalized]; }; misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; }; missDeaths = derive2 { name="missDeaths"; version="2.5"; sha256="0pslssgf580zd0dd7m0l97bzgxnywj2qac0agxv6ih1a0xlxz874"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.11"; sha256="185ia5zg5gdrkjpj5sql46lz5svw77wjy9zplpqhrmgx43fv0w0i"; depends=[FactoMineR mice mvtnorm]; }; - missRanger = derive2 { name="missRanger"; version="1.0.0"; sha256="0advj6a57pj79xn43gxp7ll4b3y7hl5cvz5d7hw69f4yk4blwkjr"; depends=[FNN ranger]; }; + missRanger = derive2 { name="missRanger"; version="1.0.1"; sha256="0rab8b0fankymfhnz4f5g2hh2yq30h6cdblvz2d43i46d147js41"; depends=[FNN ranger]; }; mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; mitml = derive2 { name="mitml"; version="0.3-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; }; @@ -8306,13 +8467,13 @@ in with self; { mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; }; mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; }; - mixedsde = derive2 { name="mixedsde"; version="3.0"; sha256="1libm4pyzfqi11hcx823qdhgshdsy84dzv7jhz3b89w9bkla5l17"; depends=[MASS moments plot3D sde]; }; + mixedsde = derive2 { name="mixedsde"; version="4.0"; sha256="1hryscff4i4ayqxv9imnx4g56497s1s95fzqv8wkwcpfcqi20bqf"; depends=[MASS moments plot3D sde]; }; mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; }; mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; }; mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; depends=[car leaps multcomp pls pracma]; }; mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; }; mixpack = derive2 { name="mixpack"; version="0.3.6"; sha256="0q19mal86qlriwilabgy3sn33iymi5hl3wa33kvb8cd1dgdmjr7a"; depends=[mvtnorm Rcpp RcppArmadillo]; }; - mixreg = derive2 { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; + mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; mixsmsn = derive2 { name="mixsmsn"; version="1.1-4"; sha256="1y15qjh6qzx3aqlv4pndmgk2mgkqpyxcd76ykn31qd8mwzddci9d"; depends=[mvtnorm]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; @@ -8323,34 +8484,40 @@ in with self; { mizer = derive2 { name="mizer"; version="0.4"; sha256="0ir6hx3fb4lkfgg7dln96fd50fr4jdrxbqp70461fsyzi3lxn6nv"; depends=[ggplot2 plyr Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; mkin = derive2 { name="mkin"; version="0.9.47.1"; sha256="1cz6f9122im594dvqdmdm9yjlnmwzrx2ka63dgj0zf1ysqzf0872"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; }; + mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; mlVAR = derive2 { name="mlVAR"; version="0.4"; sha256="08iaq6wq0ngd60nhmlj8c0x8r1fal1zfv2zpd6ll54szcvdbxahr"; depends=[abind arm clusterGeneration corpcor dplyr lme4 MplusAutomation mvtnorm plyr qgraph]; }; mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; }; mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; - mlbgameday = derive2 { name="mlbgameday"; version="0.1.0"; sha256="1d339hr7iys8qlw6m0zbvpcw4b1k04504k6l1xz63ijdgpyr593y"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr xml2]; }; + mlbgameday = derive2 { name="mlbgameday"; version="0.1.1"; sha256="01jb2fiv847jfdl18g2b3xlihfbry2j2r9ajmw8gd82052ayyk1j"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; }; + mlbstats = derive2 { name="mlbstats"; version="0.1.0"; sha256="1pfsc1pc5986gykx8l6afahszhaj4940l8g33fdxyy7194kbcz70"; depends=[]; }; mldr = derive2 { name="mldr"; version="0.4.0"; sha256="1nx21yyxfaiyxpbjkc5sif6pis5v2skisxcxdqk4479h54qzwlj3"; depends=[circlize shiny XML]; }; mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.0"; sha256="0kbfaf39vkhvscw47bkx2mmc6cmgwz1cys62iiw3yb6kvkzddr3s"; depends=[]; }; mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; }; mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; }; - mlegp = derive2 { name="mlegp"; version="3.1.6"; sha256="12w6gw1g1xn3i42pgall09w5im8gf84h28d3fa9m3fhkifkid2db"; depends=[]; }; + mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; + mlf = derive2 { name="mlf"; version="1.2"; sha256="1k2vplsqnccf5ymf50hgl4ly3np7n87ympd3aajpfwcn3jljbxkf"; depends=[]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; }; mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; }; mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; + mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.2"; sha256="1zxmiqsn3rcs0a6w785smx8ifa10083vakawy3c59pa8zigii1xp"; depends=[coxme Matrix multcomp multcompView sommer]; }; mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; mlogit = derive2 { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; - mlr = derive2 { name="mlr"; version="2.12"; sha256="0qf1yl487jmg7w85vjd7wdky8agysi1xlvl20dnqrn2cms4h1q6g"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; + mlr = derive2 { name="mlr"; version="2.12.1"; sha256="0b68pgx55f19i3pnci1n87cq2a7kfs6s2248zs1vg4xl5sw9ifww"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; + mlrCPO = derive2 { name="mlrCPO"; version="0.3.2"; sha256="1wnh0ljh7739qcrgkgnf40xwkih0bmvpvykaaw51rascy63mf003"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; mlrMBO = derive2 { name="mlrMBO"; version="1.1.1"; sha256="1r6p5ph7nyqs6cqqsg04mass1zppys75n8448lv6iadlm499jzg8"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; mlt = derive2 { name="mlt"; version="1.0-0"; sha256="0vbja0sxjg3a5gpa8wwnj1fvr8kkvkpzhim6lssvyy7kcb44fcya"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; }; mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-0"; sha256="1shhf5pk90cfia51a0qnbg8pvvv5n86d3mjy961rjs1wj30vj3yd"; depends=[mlt numDeriv]; }; mltools = derive2 { name="mltools"; version="0.3.4"; sha256="18dxhims684a6fk44nrzdnry8dpxs69wim8kd7zamp8zdhy38kyy"; depends=[data_table Matrix]; }; + mlvocab = derive2 { name="mlvocab"; version="0.0.1"; sha256="0lv9aqrwm00jdklig80yi5lxj87sh6ysg7qkg0kf1nv05lkvrpb0"; depends=[digest Matrix Rcpp sparsepp]; }; mlxR = derive2 { name="mlxR"; version="3.3.0"; sha256="0qbhmxmsyqfc2csk96qwizpjj7yk35r85rr5xaqkyr72mjn2m3gh"; depends=[ggplot2 Rcpp XML]; }; mma = derive2 { name="mma"; version="6.1-0"; sha256="1rrnm7szlaly8klqgi8wdh5qvfx4kx5bkl1q2y9y6zjpxmb4zvi6"; depends=[car doParallel foreach gbm gplots plotrix survival]; }; mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; }; @@ -8416,11 +8583,12 @@ in with self; { mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; mongolite = derive2 { name="mongolite"; version="1.5"; sha256="06qry561kdg4lxvdayghmhmgb94sqy16gxjp081xnmya0vqf9wjy"; depends=[jsonlite openssl]; }; monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; }; - monkeylearn = derive2 { name="monkeylearn"; version="0.1.3"; sha256="1sq30pkqd8q4dck4ck1lfdfyiir5p4c87i3xnvx7w9spx3c6pxpd"; depends=[digest httr jsonlite tibble]; }; + monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; }; monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; }; monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; }; monomvn = derive2 { name="monomvn"; version="1.9-7"; sha256="1bz967sl6ji84x9v0fypjn75d39naaqgvw31n9lgcd5lyj39hbsk"; depends=[lars MASS mvtnorm pls quadprog]; }; monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; }; + monotonicity = derive2 { name="monotonicity"; version="1.0"; sha256="0xpsn57lixw6pzf7qyp2x6az7vwbfw9bsd0yz93710pyyhkzr94b"; depends=[lmtest MASS sandwich]; }; monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; }; moonBook = derive2 { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; }; moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; @@ -8434,6 +8602,7 @@ in with self; { mosaicCore = derive2 { name="mosaicCore"; version="0.4.2"; sha256="17yani6781znrrnrcji1q7h6y422bq443gzly0mm6yn8bj7v5qrc"; depends=[dplyr lazyeval MASS rlang tidyr]; }; mosaicData = derive2 { name="mosaicData"; version="0.16.0"; sha256="09kp3d3h3xmz9fnjaz9nr1jldjd93gyq5gq9sk2a2ymgnbmbc5wm"; depends=[]; }; mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; }; + mosum = derive2 { name="mosum"; version="1.1"; sha256="0njpmb7mhgmaylfq1jgk198d6sc6r96kywbjpl2c465kvs8khc2f"; depends=[plot3D Rcpp zoo]; }; motmot_2_0 = derive2 { name="motmot.2.0"; version="1.1.2"; sha256="1hnpp2850yhvxki7pcwscg79knvxzs3gx4b19wza0wg3p02fvsb6"; depends=[ape caper coda MASS mvtnorm]; }; moult = derive2 { name="moult"; version="2.1.0"; sha256="0k0969fwy648x25xw42w5ncimyw2cbq305rzf4m77p3pf0k50m9b"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; }; @@ -8461,7 +8630,7 @@ in with self; { mpt = derive2 { name="mpt"; version="0.5-4"; sha256="01akz72z6z5ybzika120v4v6ah13hfynh98rzbmqgbchijxbbkz6"; depends=[]; }; mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; }; mr_raps = derive2 { name="mr.raps"; version="0.2"; sha256="069vyvsdgc5m7n2fd0h7jrllz789zvsxka7h5wiy36dc7lagd6f8"; depends=[nortest]; }; - mrMLM = derive2 { name="mrMLM"; version="2.1"; sha256="0ip8xd2dj6d4hxq18pf4j6mk4yl00ajci72rr485wk94cr0zj5hy"; depends=[ggplot2 gWidgets gWidgetsRGtk2 lars MASS ncvreg openxlsx qqman RGtk2 RGtk2Extras stringr]; }; + mrMLM = derive2 { name="mrMLM"; version="3.0"; sha256="174d12dxrsndd8hkc4ivfa5wd7ixh3vkkvd1br5zm5rwxbq3c71l"; depends=[coin data_table doParallel foreach ggplot2 lars MASS ncvreg openxlsx qqman sampling stringr]; }; mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; }; mratios = derive2 { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; }; mrbsizeR = derive2 { name="mrbsizeR"; version="1.0.1"; sha256="1gr8mx1byq8nw095yla4gn2ascgw4d90j7a3a3rzwfdavkjj7167"; depends=[fields maps]; }; @@ -8480,28 +8649,28 @@ in with self; { msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; }; msaenet = derive2 { name="msaenet"; version="2.8"; sha256="1293qdvn2qv3prnp4rwwndcjnzk49v565yfvzrvb9j7sqvjshf07"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; - mschart = derive2 { name="mschart"; version="0.2.2"; sha256="0h6q7vzrhw9ccj3m037kw72ylqdsj7hlf0bqpghqpa3sv280ap2n"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; + mschart = derive2 { name="mschart"; version="0.2.3"; sha256="0lq2hhbwy3hycbvzhrhny7jk5cc4iq89a4mff5q2jjfff13vmm6g"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; msde = derive2 { name="msde"; version="1.0.3"; sha256="18l5ca4s1ryyb9i0zsb03klm53f25klwyg171dqkn5z4bqwznp2m"; depends=[Rcpp RcppProgress]; }; mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; - msgl = derive2 { name="msgl"; version="2.3.6"; sha256="0qq9v8bb70iw67raygpzsg35nb2wdafp7rh7wzq42xd4gghi31ya"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; msgpack = derive2 { name="msgpack"; version="1.0"; sha256="1j1nnca9nm3l1r4wjjlb15zr8p6zw1lcgyj4383ndy156bbh1f5a"; depends=[]; }; msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; }; msgtools = derive2 { name="msgtools"; version="0.2.7"; sha256="1lk4r9gdhlfarl5z6a48aih682q7dvwa6lf31119lljpa5gmi92y"; depends=[devtools digest hunspell poio tibble]; }; + msigdbr = derive2 { name="msigdbr"; version="6.1.1"; sha256="0d8jxkfnlybs17s0qfxr1qcg6r4pp4q6c3srmm2r8zp7ln0qkj8j"; depends=[dplyr magrittr rlang tibble]; }; msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; }; msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; }; msm = derive2 { name="msm"; version="1.6.6"; sha256="06m7fflb6lgjfnj9v4wjc63x2as8jvc24qmz6jvgm9fw7hnm24px"; depends=[expm mvtnorm survival]; }; msma = derive2 { name="msma"; version="1.0"; sha256="1pq1m8hrvpfjh89wiz4f3jlzlp620clxzash5061zbhm0xjmxjpd"; depends=[mvtnorm]; }; - msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; }; + msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; }; msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; }; msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; }; msr = derive2 { name="msr"; version="0.4.4"; sha256="1r7kzicyi380xylw4vl88918gqmvs875f3rssx57yg28swb93sv0"; depends=[colorspace e1071 glmnet RColorBrewer rgl]; }; mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; }; - mstR = derive2 { name="mstR"; version="1.0"; sha256="0c189ia2mbhn183j0vbqxhwb20ww64fj11pq7p2cd55zfih4kp4b"; depends=[]; }; - mstate = derive2 { name="mstate"; version="0.2.10"; sha256="14namzs0s7v28xkj1pidccjpxg7570fdqhd64rihvyv1r7ybfyav"; depends=[RColorBrewer survival]; }; + mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; }; + mstate = derive2 { name="mstate"; version="0.2.11"; sha256="13kw1n1p2f1f0k5hkcc4732wlhiy3csx8nx2ajrgw06svzksgh3y"; depends=[RColorBrewer survival]; }; mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; }; msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; }; mtconnectR = derive2 { name="mtconnectR"; version="1.1.0"; sha256="068rp4n2afl9qgqrnp0a4lmnq7mq9wrc2yi361bfvib96gzg1fdw"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; }; @@ -8511,8 +8680,9 @@ in with self; { muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; }; muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; }; - mudata2 = derive2 { name="mudata2"; version="1.0.0"; sha256="0wlj9kra99ll3vmhkrw3gibricq3gwfl27iymnzrvv847lpvqjml"; depends=[dplyr ggplot2 hms jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect]; }; + mudata2 = derive2 { name="mudata2"; version="1.0.2"; sha256="14jd0fwc11a5640p0vr5dgfw7f1h7473ybqhalg20n7519jybfcb"; depends=[dplyr ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect]; }; mudfold = derive2 { name="mudfold"; version="1.1.0"; sha256="0mp25lad79dx2101srarx26my172jbkd6a0bzr87hjdgqr1pys5b"; depends=[ggplot2 gtools reshape2 yesno zoo]; }; + mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; }; muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; multcomp = derive2 { name="multcomp"; version="1.4-8"; sha256="0fm78g4zjc6ank316qfw977864shmy890znn4fahwc8jjdhpc252"; depends=[codetools mvtnorm sandwich survival TH_data]; }; @@ -8538,21 +8708,21 @@ in with self; { multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; }; multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; }; - multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; + multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; }; multimode = derive2 { name="multimode"; version="1.1"; sha256="0dhzpvw71szyw454gi7460yr46j1vas109xgwyz9h6kwm6gi5ysn"; depends=[diptest ks rootSolve]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; - multinet = derive2 { name="multinet"; version="1.1.1"; sha256="13f7gqf45ydnyiv36gwcrc8mgv5gy61fak0in7f8bss4bvfldbxx"; depends=[igraph Rcpp]; }; + multinet = derive2 { name="multinet"; version="1.1.4"; sha256="0zajynn9mkpaqb5a208g90pv14rfxbb6k8gh9xikj4a42g9ijjsp"; depends=[igraph Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.0"; sha256="05m0xin8wxshmwb3b9cgsvi8037wvmirbyyim1xxx2ppfwrdr2a6"; depends=[igraph Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; - multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.6"; sha256="1v53fanbnyba3f1ymgxr6q8yy1g5ax49z9ig1bxk3qywpixl8yh3"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; }; + multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.7"; sha256="077pjjambyyz6z2a34vnzbwyx9imalhnca3yl6q6j7w12klis41h"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; }; multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; }; multiplex = derive2 { name="multiplex"; version="2.8"; sha256="01l3kmvsrrq0c98dv5m25yjjcbc99in6dv9k5h54cyjsw4jsjhns"; depends=[]; }; multiplyr = derive2 { name="multiplyr"; version="0.1.1"; sha256="0bsf2zhzqwl3skg26fm27j2wpifky0mph26acrlq8p72njkbcw4d"; depends=[bigmemory bigmemory_sri magrittr]; }; - multipol = derive2 { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; + multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; }; multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; }; multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; }; - multisensi = derive2 { name="multisensi"; version="2.1"; sha256="17c1cddgzkgd583fh31wfjahpl5iv1casfs1aja000rqq1x2kfqm"; depends=[knitr sensitivity]; }; + multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; }; multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; }; @@ -8577,7 +8747,7 @@ in with self; { mvLSW = derive2 { name="mvLSW"; version="1.2.1"; sha256="012p828pyzz6xnv2akax5hx79v522dg4a2gqrjss526qylpg5j9l"; depends=[fields wavethresh xts zoo]; }; mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; }; - mvPot = derive2 { name="mvPot"; version="0.1.3"; sha256="16m9i33sbgx69426i1nkimkrp75a6jbmkzlsp9bjbm7iyxdcl48b"; depends=[evd gmp MASS numbers]; }; + mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.3"; sha256="18gnxs1cx4f7r3m2vgrkmm41vwkamk9mn5hcgjacv2adl0ihnagd"; depends=[ape corpcor mvtnorm numDeriv ouch]; }; @@ -8589,8 +8759,8 @@ in with self; { mvctm = derive2 { name="mvctm"; version="1.1"; sha256="00lrnqnzpnvrl84b41ai33iwpyb4qzpjyqrw1d18hj6szybdfhsv"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; }; mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; }; mvdalab = derive2 { name="mvdalab"; version="1.4"; sha256="18wchy517qd45w5y0sr8lcafb7kmscy0q9vsryk9if6x2jq22lqz"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; }; - mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; }; - mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; }; + mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-1"; sha256="1gyc1xjyapadrv43kd4kngld37q8drhx4qfcimsvf7jdp33y6g5d"; depends=[MASS Matrix numDeriv]; }; + mvinfluence = derive2 { name="mvinfluence"; version="0.8-1"; sha256="1lpxvc6g8g9kkshxg41a2dwbxzkfnqp4dggr2j5hh2h6f0xrca4j"; depends=[car heplots]; }; mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; mvmeta = derive2 { name="mvmeta"; version="0.4.11"; sha256="1h1393s7xdi4sv461srsard6w961mcxxmxq9mkmfsgw5hdmkwkr2"; depends=[]; }; mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; @@ -8613,9 +8783,9 @@ in with self; { mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; }; mwaved = derive2 { name="mwaved"; version="1.1.5"; sha256="1hb7y42fy26pv6cf235g4xx1vyvwx7chwryi7phjd2aavxffj18z"; depends=[Rcpp shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; - myTAI = derive2 { name="myTAI"; version="0.6.0"; sha256="15r3ipan491n8mvmq9b1bkwx99gy6inq0nxrk35kqjjhfv2bq7c4"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; }; + myTAI = derive2 { name="myTAI"; version="0.7.0"; sha256="1x7zhkjm89xdzgn4z2ivl9w5srsfbavzdw8kgn2v7x75ihs0dr2n"; depends=[biomartr doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; }; mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; - mycor = derive2 { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; }; + mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; }; myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; }; n1qn1 = derive2 { name="n1qn1"; version="6.0.0-1"; sha256="01bci81lhanxpfl454gl09krgb4229dnq9f34bngwm8ygvdadfgy"; depends=[Rcpp RcppArmadillo]; }; @@ -8623,7 +8793,8 @@ in with self; { nCal = derive2 { name="nCal"; version="2017.12-3"; sha256="1k03zrf67il7miap81r2fdnsi15i98wmwc3a8zxn54qfr2w9pcy6"; depends=[drc gdata gWidgets kyotil]; }; nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; }; - nLTT = derive2 { name="nLTT"; version="1.3.1"; sha256="1wha26lcgk2kw48vyiws1ciyp8x6d7nmkrahh5b8w23ns6bqpngf"; depends=[ape coda deSolve]; }; + nLTT = derive2 { name="nLTT"; version="1.4"; sha256="0718r93xw8hw639xpa5w6lax7agr2k3avqx9dcdybqdp19x9qia0"; depends=[ape coda deSolve testit]; }; + nVennR = derive2 { name="nVennR"; version="0.2.0"; sha256="0y0y15r7j3in2rqiiz42b9rzljajp0pk8172kc7gj9nshih3ryqw"; depends=[grImport2 Rcpp RcppProgress rsvg]; }; na_tools = derive2 { name="na.tools"; version="0.2.1"; sha256="1fdbrf97mvak44vzarwqr4w6cs6msr42zcfxl2ci3i67nlgsv4pl"; depends=[]; }; nabor = derive2 { name="nabor"; version="0.4.7"; sha256="16dxnvq6yxlrignzvxjdwzwm32fn2a8bsjqjsg5qz94ir7g3pzm6"; depends=[BH Rcpp RcppEigen]; }; nadiv = derive2 { name="nadiv"; version="2.14.3.1"; sha256="08276bakyrn9d9vh08yzan60kigsihwfhgx788gwp6pk8v6m25wa"; depends=[Matrix]; }; @@ -8635,7 +8806,7 @@ in with self; { nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; nanotime = derive2 { name="nanotime"; version="0.2.0"; sha256="138qz844sczgzzl8vn5079590hnq96w7jdbn851cpw64gmq21r4w"; depends=[bit64 RcppCCTZ zoo]; }; naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; }; - nardl = derive2 { name="nardl"; version="0.1.3"; sha256="1361bh94m4dzcijg1929av88sni4f5ccwwyxsrg7kcxdxl3zhqp0"; depends=[Formula gtools matlab strucchange tseries]; }; + nardl = derive2 { name="nardl"; version="0.1.4"; sha256="108m1bngal27pz80l1rdlgrx7x4id42ch95w1g9d0r5jnlxlvxp7"; depends=[Formula gtools matlab strucchange tseries]; }; narray = derive2 { name="narray"; version="0.4.0"; sha256="0cr0y8mqwprxk0bv9160xvqxgvqkihn3avzsjm6ccivvb8zlkqxv"; depends=[reshape2 stringr]; }; nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; @@ -8651,17 +8822,17 @@ in with self; { nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; }; nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; ncappc = derive2 { name="ncappc"; version="0.2.1.1"; sha256="19wq7ihcr8989xpzf1dsxz1kwwzqvsx2mwcciqv9204k4fc94zjc"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; }; - ncar = derive2 { name="ncar"; version="0.3.7"; sha256="1cbcadyz84w629bz86sivfyf545w9cda078liq9l0j7gm5z5g2if"; depends=[NonCompart rtf]; }; + ncar = derive2 { name="ncar"; version="0.3.8"; sha256="02xglxz63b9b7yfkwqrh81spzkmvglay6wpylm9fwcqxdasf3bj5"; depends=[NonCompart rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; }; ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; }; ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; }; ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; }; - ncf = derive2 { name="ncf"; version="1.1-8"; sha256="1hnx6k21ss1mp4llzbfxpsv2y7z1nxf4c46rwq3qpmvqhnw6hh9s"; depends=[]; }; + ncf = derive2 { name="ncf"; version="1.2-3"; sha256="0d4qbfdhwy071vhkfjn9385vak73zf9c9ghbbiba1ha2d9d2irsl"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; ncmeta = derive2 { name="ncmeta"; version="0.0.2"; sha256="1qr0zfyy8g3zrmvg6i6b7sfvl3lavr391rqgf6pqhslg7i9cgpiz"; depends=[dplyr rlang RNetCDF tibble]; }; ncpen = derive2 { name="ncpen"; version="0.2.0"; sha256="1wrpscd9n7z9lz7537qyy4rn4pjznlb8zwb79kkzmnfvyj21fi1r"; depends=[Rcpp RcppArmadillo]; }; - ncvreg = derive2 { name="ncvreg"; version="3.9-1"; sha256="1v71r2k25n28lhpqsgzaaw48w1gwn0yjbir64hx5lchdbvd5k1j3"; depends=[]; }; + ncvreg = derive2 { name="ncvreg"; version="3.10-0"; sha256="0q9rk1mz2rm1h99m093kz7a2p6fl3pj4nqzblp3154q8i1kva7za"; depends=[]; }; ndjson = derive2 { name="ndjson"; version="0.6.0"; sha256="0w7a587q45hkzmjhzlyrhk0hw4c8avkfzf4ai0wib5qk3al8gk6n"; depends=[data_table dplyr dtplyr Rcpp]; }; ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; }; ndtv = derive2 { name="ndtv"; version="0.10.0"; sha256="1j4g5qclfbw7fkykaclrsb2d70vy40fd1rgr1n73qyrkx0fyym44"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; @@ -8671,7 +8842,7 @@ in with self; { neatmaps = derive2 { name="neatmaps"; version="1.0.7"; sha256="07nr8c5i1s3sba4l2123vb50b1cgn1qjdckwmyjwwai1yb3smkag"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; }; needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; - negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; }; + negenes = derive2 { name="negenes"; version="1.0-8"; sha256="0qyhypryp3p8c876jffg1syg05b370mw24clwlx733yx86qhmb1v"; depends=[]; }; neighbr = derive2 { name="neighbr"; version="1.0"; sha256="0612nzpryj4xp0ncpvpn56x5n9ammzjp3ysq1rj1fc84h0p7nml3"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; }; neotoma = derive2 { name="neotoma"; version="1.7.0"; sha256="0f4s5yw0yj4n8lkvbl2l3ivdclg9pknyss7qhppp85rdxzwxilpq"; depends=[analogue httr jsonlite leaflet plyr reshape2 xml2]; }; @@ -8679,19 +8850,19 @@ in with self; { nesRdata = derive2 { name="nesRdata"; version="0.1.0"; sha256="1h33hql0vgkr2ps1ysisdxxb0cnm18mh8sbd3fxy9xf42icwfwdb"; depends=[dataone dplyr purrr rappdirs readr]; }; nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; }; net_security = derive2 { name="net.security"; version="0.3.0"; sha256="15vvcmakl9hl1srdhjf73g2bwwcxn93220i4gv0rcsw5732mjanz"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; }; - netCoin = derive2 { name="netCoin"; version="0.2.7"; sha256="0dzncn72zl3yp2gds7vmjk5j82rb80j03ivkf74b0z5s4ckxhc9b"; depends=[haven igraph Matrix]; }; + netCoin = derive2 { name="netCoin"; version="0.2.8"; sha256="0axac72fj5qhssdpx8k20lgayzpwzcd3pp7cz4mv6cwfzc0y8768"; depends=[haven igraph Matrix]; }; netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; }; netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; }; netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; }; netdiffuseR = derive2 { name="netdiffuseR"; version="1.19.0"; sha256="0rnf7hf5vxpqw2rn00yqmkgpsx752pmfigyggbs4ikfbcsjq24sx"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM]; }; netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; }; - netgwas = derive2 { name="netgwas"; version="0.1.3.1"; sha256="1fgs7dr4dhrs4hmscazsyiq1nkkx1vvygmarmy7pyqhxzv13kdwg"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; }; - netmeta = derive2 { name="netmeta"; version="0.9-7"; sha256="0yi1x0dyi7kim2yz9qwsbdnx1k6k15nmv6wlaby9z9yl7p2ij3jq"; depends=[magic MASS meta]; }; + netgwas = derive2 { name="netgwas"; version="0.1.4.2"; sha256="19r168xppxgdj3b0b575b47vgmzbzkgwpqh499vlm5as9livjlyb"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; }; + netmeta = derive2 { name="netmeta"; version="0.9-8"; sha256="0bkfxdz14lg9r51ykwmkmpm6vhbvly35hrcgj6f26g36ihagjksd"; depends=[magic MASS meta]; }; netrankr = derive2 { name="netrankr"; version="0.2.0"; sha256="1y56y5wv95d7mmjf8rrwr7cs0k64h9a2qbpind4xp0kakpjihn7m"; depends=[igraph Rcpp RcppArmadillo]; }; + netregR = derive2 { name="netregR"; version="0.3.0"; sha256="106qq3mafqbcdyhnjicbzc4rzi9mr262nqb3ncpzpcvkf0xd988w"; depends=[Matrix]; }; nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; }; - nettools = derive2 { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; }; - network = derive2 { name="network"; version="1.13.0"; sha256="11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"; depends=[]; }; + network = derive2 { name="network"; version="1.13.0.1"; sha256="1bbkbqkqf1d7irfwh08c13c2pfypir1ssvlqrln83irqns1ikdv0"; depends=[]; }; networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; }; networkDynamic = derive2 { name="networkDynamic"; version="0.9.0"; sha256="1949fbcw0gq8lsm6rx5d5mpj1y9k4rk2v0pmm1kxi5igi6yd8lg9"; depends=[network statnet_common]; }; networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; }; @@ -8706,34 +8877,39 @@ in with self; { neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; }; neurobase = derive2 { name="neurobase"; version="1.26.1"; sha256="0fb2cvh3j650zjx7b60jfrvm5i7n3l98wis91bmyr9hx3qz24rj5"; depends=[abind matrixStats oro_nifti R_utils RNifti]; }; neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; - neurohcp = derive2 { name="neurohcp"; version="0.7.3"; sha256="0mz8aiyimw3vqkgm54mwfvnki5hg1j958r71fs1k213zn1cg9qqr"; depends=[base64enc digest httr xml2]; }; + neurohcp = derive2 { name="neurohcp"; version="0.8.0"; sha256="1p38n2ggz2yj6fqrlf2jm1jnjbv8a0ifi477f5qklmr4bga2c4kr"; depends=[base64enc digest httr xml2]; }; neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; }; + neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.1"; sha256="15bgb9bh4nwjhjq6wkfbk7cys4mrih3bnjv527mrack8pwkybgpa"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; }; neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; }; + newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; }; ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; }; ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; ngspatial = derive2 { name="ngspatial"; version="1.2-1"; sha256="1c65ws9b9s2grr44lqg8026c4p2875d0426dfmrakpb44mw2zppp"; depends=[batchmeans Rcpp RcppArmadillo]; }; ngstk = derive2 { name="ngstk"; version="0.2.1"; sha256="12zpl20i07d1f9navs9jjrialfh798wrfn1241j7s9h3rd6xi40l"; depends=[configr data_table stringr]; }; - nhanesA = derive2 { name="nhanesA"; version="0.6.4.3.3"; sha256="09mpxmk8w48hc14167jd2xifnj0kjz9h3h76bdnbb33wvhkn4jld"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; + nhanesA = derive2 { name="nhanesA"; version="0.6.4.4"; sha256="0vl8bg718fk97x3yrjkg48hj3lap4gzhri53gzcwz9g4rfyrlwxp"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; nhlscrapr = derive2 { name="nhlscrapr"; version="1.8.1"; sha256="107k063279w9cy6in99rn03w2rq42ci8s6dvb9x6f9w7y3bdpvzn"; depends=[biglm bitops RCurl rjson]; }; nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nima = derive2 { name="nima"; version="0.4.5"; sha256="1fllq76k4r07ymd58s865hgg3yrmwa34kr5mjd89n50mm1m110mh"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; }; - nimble = derive2 { name="nimble"; version="0.6-9"; sha256="1lkf386qcgw5gr8cpxfh2ncrc9wj59icygi9m37c8077h3h0sj03"; depends=[coda igraph R6]; }; + nimble = derive2 { name="nimble"; version="0.6-10"; sha256="0aa6823b7xnp2bgrc3jwjrc2py9y57xadsahzva4zxn7vlsp5f36"; depends=[coda igraph R6]; }; nipals = derive2 { name="nipals"; version="0.4"; sha256="0h9jxmj44x3lllxk1y2izkslafbiab175qrsxlnfcvhnaj13zsds"; depends=[]; }; + nitrcbot = derive2 { name="nitrcbot"; version="1.0"; sha256="1cg52zv72ppv8vgfl3rccgykw2bhlk3j7pm47cydfmhqbc6sn6by"; depends=[dplyr httr]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; }; nlcv = derive2 { name="nlcv"; version="0.3.2"; sha256="1lknlqd64p15lnkydbi7zx7lmhg1fdl750yjqjaccdjzrgrqvgkv"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; }; nleqslv = derive2 { name="nleqslv"; version="3.3.1"; sha256="1n1sbp7436yd5g6v0060j2iwk4rppjq2pc5x47g9wlwnskdfgvl7"; depends=[]; }; - nlme = derive2 { name="nlme"; version="3.1-131.1"; sha256="1xafi670a9jzb52kqxkacxfmy0viac3aql5byfq86kgkgla2sg0y"; depends=[lattice]; }; + nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; + nlme = derive2 { name="nlme"; version="3.1-137"; sha256="11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; nlmixr = derive2 { name="nlmixr"; version="0.9.0-3"; sha256="1fwnq0bnsqadadgy9i1083dz4zkidwdxm2ncy6jyrk1pb055m318"; depends=[BH brew dparser ggplot2 inline lattice lbfgs Matrix memoise minqa mvtnorm n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders]; }; nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; - nlnet = derive2 { name="nlnet"; version="1.0"; sha256="1ipds80qlv2zrl51v0n670g9ihb68sm98p06nvs97w05i64g8frq"; depends=[coin fdrtool igraph TSP]; }; + nlnet = derive2 { name="nlnet"; version="1.2"; sha256="00lcyz5csjj9qbhh7yw0qlbnyv32k0c2dpm23v04n9wkdgs67jy0"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; }; nloptr = derive2 { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; }; - nlreg = derive2 { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; + nlr = derive2 { name="nlr"; version="0.1-1"; sha256="12j2hp5fgpdz7pvlpykhf9zp1sw1f6vzhh5ykk9b2diaf3l55zsl"; depends=[GA MASS nlme quantreg robcor TSA tseries]; }; + nlreg = derive2 { name="nlreg"; version="1.2-2.1"; sha256="08pz3qycnsvz175ppj23i2i0wcif6imi6fc117n8802ln3npwm64"; depends=[statmod survival]; }; nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; depends=[dplyr minpack_lm purrr tibble tidyr]; }; nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; @@ -8749,34 +8925,36 @@ in with self; { nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; }; nlts = derive2 { name="nlts"; version="0.2-2"; sha256="0bx6xqa3j0k01p43vnv5lcv2pryjzgsak77y1cr9rm2xwqa3j6az"; depends=[acepack locfit]; }; nmaINLA = derive2 { name="nmaINLA"; version="0.1.1"; sha256="0976jafmdhy2rz5fcarb7hh1vaanm8l2610hk06f5k93xjhypg8j"; depends=[]; }; - nmathresh = derive2 { name="nmathresh"; version="0.1.2"; sha256="1ldxhk2ry3m8q0881fis403r303n431csmp0gp4785mafy476b5h"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; - nmfem = derive2 { name="nmfem"; version="1.0.0"; sha256="0bkw27b59knppfh4qnhrcs2j0mpxak7iyb7lskccv6ibym2kvljw"; depends=[d3heatmap dplyr mixtools plyr tidyr]; }; + nmathresh = derive2 { name="nmathresh"; version="0.1.3"; sha256="09pxbizmvdp2l5j1gs0v3xk2lsyclx5rndaw6b4ccn61m3x060ls"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; + nmfem = derive2 { name="nmfem"; version="1.0.1"; sha256="10y3s7g76pnqqyg8wc3cyjiqay7scp0bdlly4yx30v2sbvxf0msx"; depends=[d3heatmap dplyr mixtools plyr tidyr]; }; nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; }; - nmslibR = derive2 { name="nmslibR"; version="1.0.0"; sha256="12022g9jww718bqpp7yaapafnjxj29sx7mircj8a7zwww58a7v0q"; depends=[Matrix R6 Rcpp RcppArmadillo reticulate]; }; - nmw = derive2 { name="nmw"; version="0.1.2"; sha256="1p2h13g0ss0v2jy0ii0r0qgf8i1f0dc8zhii05k2vr6cbiapslv3"; depends=[numDeriv]; }; + nmslibR = derive2 { name="nmslibR"; version="1.0.1"; sha256="02c2ns9dw1mkr5gmsd31j0yjcr3vr302yvqkfdkmm9csppdcrmb3"; depends=[Matrix R6 Rcpp RcppArmadillo reticulate]; }; + nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; + nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; nneo = derive2 { name="nneo"; version="0.1.0"; sha256="0jaaz15y1csh3bwmzp7mgx86m3f0w3ykzb8qdvg8ak2grxw3wl6a"; depends=[crul data_table fauxpas jsonlite tibble]; }; nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; nnfor = derive2 { name="nnfor"; version="0.9.2"; sha256="1wxv8s5547spw155rj7nlilsfn5d7m40xpfy87mady93n25pwm3d"; depends=[forecast glmnet MASS neuralnet plotrix]; }; - nngeo = derive2 { name="nngeo"; version="0.1.0"; sha256="1r92d5bgd7m9d6v424fry4hsbnwzhzww1sqrphwnk2aag70hqv0g"; depends=[geosphere lwgeom RANN sf units]; }; + nngeo = derive2 { name="nngeo"; version="0.1.5"; sha256="1285a0p461wm91zriy7rh3awh0k0z7ifmjkxffyxh1l84y51jfak"; depends=[geosphere lwgeom RANN Rcpp sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; - nodiv = derive2 { name="nodiv"; version="1.1.8"; sha256="0ws0yp4j26yf45gmbvb6dpq476z8mn8yl6xdrzs0yxliizpz8jsf"; depends=[ape picante raster sp vegan]; }; + nodiv = derive2 { name="nodiv"; version="1.1.9"; sha256="0pbcigfqps44i07yghcg5zx5nlybivkb34bz67fnkgkpbkbs79k7"; depends=[ape picante raster sp vegan]; }; nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; }; nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; }; nomine = derive2 { name="nomine"; version="1.0.0"; sha256="1yaxhac002fxcyiz5x562fnhrsq9h9nx0qmw4rykjsc5l2qbi9gd"; depends=[httr RCurl]; }; + nomisr = derive2 { name="nomisr"; version="0.2.0"; sha256="0a83fcn5qq2wycbn6acfhapni3k84jf1xj7aarmnr9az1gqdbwc9"; depends=[dplyr httr jsonlite readr tibble]; }; nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; }; noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; }; noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; }; noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; }; nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; }; nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; }; - nonmem2R = derive2 { name="nonmem2R"; version="0.1.8"; sha256="1250y5ylwfc3gwc0ilmzrwzk577bp7pj7bljvamzs3pqy4sflvrv"; depends=[ggplot2 lattice latticeExtra MASS mvtnorm]; }; - nonmemica = derive2 { name="nonmemica"; version="0.7.9"; sha256="0krixfwzxjalmj4b1ln79c1fxxx07qj71gzdddix3p056cdrxlyq"; depends=[csv dplyr encode fold lazyeval magrittr metaplot rlang spec tidyr xml2]; }; + nonmem2R = derive2 { name="nonmem2R"; version="0.1.9"; sha256="06irvlyhfimcx3izbfivvrxc9xbiwvqajvl5n47krgbkbd4r4ag0"; depends=[ggplot2 lattice latticeExtra MASS mvtnorm]; }; + nonmemica = derive2 { name="nonmemica"; version="0.8.2"; sha256="1nz0sq8a1xgpasii2hpxiz79d501nnfs6awaqpp8m8lviimnhv68"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; nonnest2 = derive2 { name="nonnest2"; version="0.5-1"; sha256="02pflg6frvsq7azwcr660qj9mpj4q3kjx6xr6v5lshg77mjfhgdg"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; }; nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; }; @@ -8790,7 +8968,7 @@ in with self; { nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; normalp = derive2 { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; }; - normalr = derive2 { name="normalr"; version="0.0.3"; sha256="1ydlp6nbldq7sq60zdlvqah43xdfvx5nyiqaq2m5vgma6yny930x"; depends=[ddR magrittr MASS purrr shiny]; }; + normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; }; normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; }; @@ -8813,7 +8991,6 @@ in with self; { npbr = derive2 { name="npbr"; version="1.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; }; npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; }; npcp = derive2 { name="npcp"; version="0.1-9"; sha256="16vzl3psa806ns387d5mhlp369r45ljcqlhl0lzdjpc1niv572nc"; depends=[]; }; - npde = derive2 { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; }; nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; }; npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; }; @@ -8823,7 +9000,7 @@ in with self; { nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; }; npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; }; npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; - nprobust = derive2 { name="nprobust"; version="0.1.1"; sha256="0aynp42y0qn0jl9f26rk358hjdswkz6anwvni7frxnkb7l1vyrd5"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + nprobust = derive2 { name="nprobust"; version="0.1.2"; sha256="0hc2p30jalaibjwlq8g52rdpifhvmpaq2c7ww0zzhf3h1az442xs"; depends=[ggplot2 Rcpp RcppArmadillo]; }; nproc = derive2 { name="nproc"; version="2.1.1"; sha256="0wpny7c1n9mmv1yywlws8gjbidkrikvcqcckrxpba9avjw2c5df8"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; }; npsf = derive2 { name="npsf"; version="0.3.1"; sha256="1mv2dzn3gc7b9ynpw8dv22xd31igg4hmkgrds12n9920pghkya44"; depends=[Formula Rcpp]; }; npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; }; @@ -8831,7 +9008,7 @@ in with self; { npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; }; nricens = derive2 { name="nricens"; version="1.5"; sha256="0a7b4kw91qkr9vrm8swflby06a78d059im54zxxgvy42qjsijwqx"; depends=[survival]; }; - nsRFA = derive2 { name="nsRFA"; version="0.7-12"; sha256="182zshwyg0l6shb5wcwibqygxs8qmgma9c4s683za8q3f9l94aqj"; depends=[]; }; + nsRFA = derive2 { name="nsRFA"; version="0.7-13"; sha256="0xa8zm0mk5ckwsmbgdyk8xv1q56pm6j19zxd48rwl3fsqs49bpah"; depends=[]; }; nsROC = derive2 { name="nsROC"; version="1.0"; sha256="0c99z8kknbrnbyyv7p79sj848aq7b5n4m4r7v1yrcs61ackrdn2n"; depends=[sde survival]; }; nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; }; nscprepr = derive2 { name="nscprepr"; version="0.1.1"; sha256="1rd32zywrzyxz6hpn9s6cwjlg8q8rz3cc0p3b5gan8bicx0ilwjc"; depends=[dplyr lubridate stringr]; }; @@ -8847,6 +9024,7 @@ in with self; { numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; }; numOSL = derive2 { name="numOSL"; version="2.3"; sha256="1bcj1qk3nx1jqhldx9rcwphvlxspz3bj4vb891hkw2fa2i4559c5"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.6-6"; sha256="05qmv12b90vkzf2b50qjnp8hja6rms91jj97knx70n2yhpb2lnd9"; depends=[]; }; + numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; numform = derive2 { name="numform"; version="0.4.0"; sha256="09vim4ajnnkdf27ag5j8pj7p8qyfakfh3ar1dki8bqzms2d7bkcm"; depends=[]; }; nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; }; nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; @@ -8881,22 +9059,20 @@ in with self; { odds_converter = derive2 { name="odds.converter"; version="1.4"; sha256="13y3s04l2jvjhn1i4syz4y3q42ba8br0sp3mks5f5h4cp8w4j3wy"; depends=[]; }; oddsratio = derive2 { name="oddsratio"; version="1.0.2"; sha256="0s9w5iqcabkc7lqdh27nmg7xnw2jpwik5djjlqxb6xgabzls97d6"; depends=[cowplot ggplot2 MASS mgcv]; }; odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; - odfWeave = derive2 { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; }; - odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; odkr = derive2 { name="odkr"; version="0.1.3"; sha256="0vcpsykr4sq4rq721vyd3wbm4jzlldvvxqh75q7x7wwhjhrnr3qn"; depends=[Hmisc stringr]; }; odpc = derive2 { name="odpc"; version="1.0.0"; sha256="1mhak9drp0a7h1yrbk08cs00hbvkfkj8r1y6klhr40sdych4q506"; depends=[forecast gdpc Rcpp RcppArmadillo]; }; odr = derive2 { name="odr"; version="0.7.3"; sha256="07jfd809wv92ijgw1r1nq9516zi2rkf3ik243br42glf6lszn19p"; depends=[]; }; oec = derive2 { name="oec"; version="2.5.2"; sha256="17np562cv6ln3j4b9iawyhbz8kfd5cy1ifj96kzyhv082jgpsk1s"; depends=[dplyr jsonlite magrittr readr servr]; }; - oem = derive2 { name="oem"; version="2.0.7"; sha256="12z6cgkm8yyk9dz3s1bswccn7vrvca2wiqz0ylr65q88ws828snz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; - officer = derive2 { name="officer"; version="0.2.1"; sha256="0l8xj6zsklh2dyl6kn4piv5wjalqm1ifakxh31zfz714s9w0y8qj"; depends=[base64enc digest htmltools magrittr R_utils R6 Rcpp uuid xml2 zip]; }; + oem = derive2 { name="oem"; version="2.0.8"; sha256="08j9y9vq31skvdpg0kyqj50d77aijd2d95vcwm92df5vcvw9bpwz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; + officer = derive2 { name="officer"; version="0.2.2"; sha256="1yixvlcz7mnf3w5kixd14zi0sa6vvydiqvlsnvj0zll8vplmcsij"; depends=[base64enc digest htmltools magrittr R_utils R6 Rcpp uuid xml2 zip]; }; oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; }; ohtadstats = derive2 { name="ohtadstats"; version="1.0"; sha256="1wpil3ag7vzinz4ky7jpzny88a4ycfifbhayyib9cldk8d0mbcgh"; depends=[lattice]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; - olsrr = derive2 { name="olsrr"; version="0.4.0"; sha256="0ka8a6gm4ynbr2ss4syw2znnqcjly209sh992shyzp01yp5vy7bm"; depends=[dplyr ggplot2 glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; }; + olsrr = derive2 { name="olsrr"; version="0.5.0"; sha256="1id5z628bq91p3w64mq28bk247i6vb9ly1maqpf6fsfqiq2pavmv"; depends=[cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; ompr = derive2 { name="ompr"; version="0.7.0"; sha256="06zhmddg19sjnl18zmjjswggjg58rjgarqj2wqf5jf0g0qz3my2n"; depends=[dplyr lazyeval Matrix progress Rcpp]; }; @@ -8915,13 +9091,14 @@ in with self; { ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; }; oompaBase = derive2 { name="oompaBase"; version="3.2.5"; sha256="0269jmdw236jy008ic6iwg9y2fq674alqvd5zdvy1k2grxm72hvw"; depends=[cluster]; }; oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; }; - openEBGM = derive2 { name="openEBGM"; version="0.4.0"; sha256="0293cy1p3nh4q37qjjkzxivk6lw5sqs6n93hlmvr93ywz4h4wvyf"; depends=[data_table ggplot2]; }; + openCR = derive2 { name="openCR"; version="1.1.1"; sha256="0dmjisnxn9hdi2a4pb7qy367g4lmmlvnc8sll55dzjir472c3zm1"; depends=[abind MASS nlme plyr Rcpp secr stringr]; }; + openEBGM = derive2 { name="openEBGM"; version="0.5.0"; sha256="079wy3xrfdcmn0wd314rlrf4499qpdhsfq1m4b7s5y9c21h0raiy"; depends=[data_table ggplot2]; }; openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; openSTARS = derive2 { name="openSTARS"; version="1.0.0"; sha256="0arry24nkd50nkdnddzxagrpy4lky9smc4xr1nl6q9nwxyfgdskg"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; }; openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; - openair = derive2 { name="openair"; version="2.2-3"; sha256="0gp5q84r6psqd3900f74dm0qgiig6vhnm5400nbwjm0arp1jlyp7"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; }; + openair = derive2 { name="openair"; version="2.3-0"; sha256="0kfikssvmdg1r7j1z80hw7pa66rs06cki211rhmv0f12m500zl0c"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; }; opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; }; opencpu = derive2 { name="opencpu"; version="2.0.5"; sha256="1bs2z3y2zc3aqzfjh6bq3qrpzm106f5xhw7lbyng1bpcp4rch6y3"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; @@ -8967,7 +9144,7 @@ in with self; { orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; }; ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; orca = derive2 { name="orca"; version="1.1-1"; sha256="1wd5nh2vh6j1rp78hbw17qipi67f0wimrbkiarak8f7k5pfiy1zn"; depends=[]; }; - orclus = derive2 { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; }; + orclus = derive2 { name="orclus"; version="0.2-6"; sha256="0d78mn2vl2yxlvdswyxkxp9zg59b8cvfksz9m56kddn79aps1ikl"; depends=[]; }; orcutt = derive2 { name="orcutt"; version="2.2"; sha256="0mwfbbsn39nla083p845xbbgh3y8kkrg0q735kap64jf4pgcyac7"; depends=[lmtest]; }; ordBTL = derive2 { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret gtools VGAM wikibooks]; }; ordDisp = derive2 { name="ordDisp"; version="1.0.1"; sha256="1vjki73h8933z36ikwmjn84ldz154mahp2jkd9cbj5n6xsi47fnw"; depends=[VGAM]; }; @@ -8978,11 +9155,12 @@ in with self; { orderedLasso = derive2 { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; }; orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; }; ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; }; - ordinal = derive2 { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; }; + ordinal = derive2 { name="ordinal"; version="2018.4-19"; sha256="04fpm4jsjfd90ig2rzd11jafkip74814b60ixis0sii2gr9c8zxb"; depends=[MASS Matrix ucminf]; }; ordinalClust = derive2 { name="ordinalClust"; version="1.2.1"; sha256="1035471ni5f8129w23kkj7263p5pa9jlihqdq2skda410lj50vnk"; depends=[progress Rcpp RcppArmadillo]; }; ordinalCont = derive2 { name="ordinalCont"; version="1.3.0"; sha256="0zi9cfvkb811hhcplp159zpnmmk4rs0nid19gi4g9g3dgn9pa296"; depends=[boot]; }; ordinalForest = derive2 { name="ordinalForest"; version="2.1"; sha256="1ancr7xdwhbqq3rj5hijrkjbrcaih8rqcx5r41mykrrp1k1s55dd"; depends=[combinat ggplot2 Rcpp]; }; ordinalNet = derive2 { name="ordinalNet"; version="2.4"; sha256="0c9k3p62d482sl0vg94xm6hllk2mic2nd1c5m4vhci5ycavqzdd3"; depends=[]; }; + ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; }; ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; }; ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; }; orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; }; @@ -8997,7 +9175,7 @@ in with self; { oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; }; orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; }; orsk = derive2 { name="orsk"; version="1.0-3"; sha256="0j8bz5kddzglcljycxy8lv8h5f6hvz88nzwq3b9cdyayd8mlbxs2"; depends=[BB BHH2]; }; - orthoDr = derive2 { name="orthoDr"; version="0.3.0"; sha256="14z3zl6hvvvsm3q9slwl4sfnzd5igsgdycimg0ww3xg2nw7hln4l"; depends=[plot3D pracma Rcpp RcppArmadillo rgl survival]; }; + orthoDr = derive2 { name="orthoDr"; version="0.5.1"; sha256="0zpi3g6pkid40cblzsxck254wxljn5bfs354l51xfb182qr76x6k"; depends=[dr MASS plot3D pracma Rcpp RcppArmadillo rgl survival]; }; orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; }; orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; }; osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; @@ -9009,7 +9187,8 @@ in with self; { osmdata = derive2 { name="osmdata"; version="0.0.6"; sha256="1sjaqsj0jxipg00raj20gszzjspgpy9ja37rfkx6jpaa2wh3ii87"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; }; osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.0"; sha256="0w45riwwjigh1bxf9gx0wdj2yhdizwi6ydprp83pss2z9wph66yb"; depends=[curl e1071 ggm ggplot2 httr osmdata rgeos sp spatstat]; }; - osrm = derive2 { name="osrm"; version="3.1.0"; sha256="12gbgjp3hq0vg0wf6xq0l9wgq0h6w4l0bfwmlnyhq26z9n08a1lq"; depends=[gepaf jsonlite raster RCurl rgeos sp]; }; + osrm = derive2 { name="osrm"; version="3.1.1"; sha256="14rf5m2pm5w414v2l1dvd6vlvirms93l8rkfbmgcvxwxmc52b187"; depends=[gepaf jsonlite raster RCurl rgeos sp]; }; + osrmr = derive2 { name="osrmr"; version="0.1.28"; sha256="0db8db7hkpc3rl7193gldmjz6ikm2m21d11ff9jmf7l8x0shg38i"; depends=[assertthat bitops R_utils rjson stringr]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; otrimle = derive2 { name="otrimle"; version="1.1"; sha256="0c3wlj6cxpikrfr0knldd1z2kfihpfsppnyb9n3rflnxhk7pwij2"; depends=[doParallel foreach mclust]; }; otvPlots = derive2 { name="otvPlots"; version="0.2.0"; sha256="1halgpk5ld5ihz0da69wf72l0624r73h2wjc0zjn8b8kw1v9xgzs"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; }; @@ -9034,7 +9213,7 @@ in with self; { pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; }; pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; }; pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; - pROC = derive2 { name="pROC"; version="1.10.0"; sha256="0rm08hf2gxqn5b83ara733w5nihkg1jmdilz67zzrc9iwmqznfa0"; depends=[ggplot2 plyr Rcpp]; }; + pROC = derive2 { name="pROC"; version="1.11.0"; sha256="1v61z529yj1bp7wcagyhx0jszla9hv0aq1zvxz9w19r7lcinlzjz"; depends=[ggplot2 plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; @@ -9046,10 +9225,10 @@ in with self; { packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.3.1"; sha256="0f2y651i96sa7b7mfxg5kinmhhzvcv18lia74fdpdnmc6fxlxg17"; depends=[Rcpp]; }; - packrat = derive2 { name="packrat"; version="0.4.9"; sha256="1l0p59h0w0qdg5vlgq93932hpkidg6kd9cwg3ckn3vwms4sh2p7x"; depends=[]; }; + packrat = derive2 { name="packrat"; version="0.4.9-1"; sha256="1kk6hs88y5jqgd781kk5jn5467r7sfyqd225vibflbz0s42rcv5a"; depends=[]; }; pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; }; paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; }; - pacotest = derive2 { name="pacotest"; version="0.2.2"; sha256="0n17qzn7wabs6am55z96zg8759fdcz3vpm7yx25dyaqliawgqnj7"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; + pacotest = derive2 { name="pacotest"; version="0.3"; sha256="135637bidfx71xay6c69lfjvr4i0v3ckgkg0fi838p24is6icbix"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; }; padr = derive2 { name="padr"; version="0.4.0"; sha256="1liks4cj1cyzf6ls2h8f68xd7nry6y9ml3zdmw1fsax251dhmbq4"; depends=[dplyr lubridate Rcpp rlang]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; @@ -9084,6 +9263,7 @@ in with self; { pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; }; panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; + panelvar = derive2 { name="panelvar"; version="0.5.1"; sha256="1394lvvpzbcvm2mhxw68k784jyvsnzxiq787kdf4y4538lqgfx1n"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; }; papeR = derive2 { name="papeR"; version="1.0-2"; sha256="1pp6zzdqg9lj61f8p90sxl30vp9knmis7154fmfpm6pynbgr46ms"; depends=[car gmodels xtable]; }; @@ -9095,7 +9275,7 @@ in with self; { parallelMap = derive2 { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; }; parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; - paramGUI = derive2 { name="paramGUI"; version="2.1.2"; sha256="054l9hqsvgnwipzqrapkhsk67afz93zv1cligqhjl2wggzn9a8sc"; depends=[colorspace fields shiny shinydashboard TIMP]; }; + paramGUI = derive2 { name="paramGUI"; version="2.1.3"; sha256="1z7k4wgzm1bga8djyk44r1kr1mzdb9mrd6fvb5nrd69d76pvldji"; depends=[colorspace fields shiny shinydashboard TIMP]; }; paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; }; @@ -9107,7 +9287,7 @@ in with self; { parlitools = derive2 { name="parlitools"; version="0.2.1"; sha256="14nzcbjddwnsiwwksl7bf2qk1kzzcnjc0b47ilqiq4nc4c386im3"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; }; parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; }; parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; - parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; }; + parsec = derive2 { name="parsec"; version="1.2.0"; sha256="0ilc9d6kv7zb0kwhpqqi3bjx3r1cihyfamphrw83p6zy3xhfmfs6"; depends=[igraph]; }; parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; }; parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; @@ -9127,13 +9307,13 @@ in with self; { pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; }; passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; }; password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; }; - pastecs = derive2 { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; }; + pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; }; pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; }; patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; }; patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; - patentsview = derive2 { name="patentsview"; version="0.2.0"; sha256="1n599ksd4vdpfxdlq8bfc0h94v76qbsrrpd5p0q1c6cl083fvvzq"; depends=[httr jsonlite]; }; + patentsview = derive2 { name="patentsview"; version="0.2.1"; sha256="104qq6cqvfk5m2yynpg5iwlp89y5qx18m20qp343mknxjbvqpjdg"; depends=[httr jsonlite]; }; pathClass = derive2 { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; }; pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; }; pathfindR = derive2 { name="pathfindR"; version="1.0.0"; sha256="1wwl7cxgdrvcyrzyv1jrhhp850fc512585ih5g24jmrfr6n0422h"; depends=[AnnotationDbi DBI doParallel foreach knitr org_Hs_eg_db pathview rmarkdown shiny]; }; @@ -9152,11 +9332,11 @@ in with self; { pbdBASE = derive2 { name="pbdBASE"; version="0.4-5.1"; sha256="0ghdq8ry6fiq8qj3plq2n8isjx6iacnhqd1z73bjckmvp99g221n"; depends=[pbdMPI pbdSLAP]; }; pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; }; pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-2"; sha256="1xiwfpi8r0l8jlfrc35aknm09y4qbn0hvvkscdpcxv9q7zifvl3v"; depends=[pbdBASE pbdMPI]; }; - pbdMPI = derive2 { name="pbdMPI"; version="0.3-4"; sha256="05b0f8hqnn5wrmxg1yjd60h5v0hys7bvzb9brgbsxp1nbsashqq9"; depends=[rlecuyer]; }; + pbdMPI = derive2 { name="pbdMPI"; version="0.3-5"; sha256="1i970p74j53bnvqwv4ac03i7rbwp9ixbq1qbcv2x878wwz6fkcc2"; depends=[rlecuyer]; }; pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; pbdPROF = derive2 { name="pbdPROF"; version="0.3-1"; sha256="0a7c31605si062vbwcwngv770axlwyhh00cvdfqw3hv421p61sj8"; depends=[]; }; pbdRPC = derive2 { name="pbdRPC"; version="0.2-0"; sha256="0qndlgv6r9k17mz75g7d2k5alg0qp5h7scpnz2zl6kqlpr8z6l2p"; depends=[]; }; - pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-3"; sha256="1famaxkm385ka7kgk997lvkb68cpch0vb26l94vzkhxwfxl0fyjp"; depends=[pbdMPI rlecuyer]; }; + pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-4"; sha256="0wl8iir00nyb4j0sm8nssmgb2xhr8g2064pql0s72cgbzkq1k1cm"; depends=[pbdMPI rlecuyer]; }; pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-2"; sha256="0dzwwffinn9bbb73dmmh88c374f9057bl0a8dq97fbv63j4a5qpc"; depends=[]; }; pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; }; @@ -9182,7 +9362,7 @@ in with self; { pcr = derive2 { name="pcr"; version="1.1.0"; sha256="1rz9jxjs9s7kwg3aljfm1x2v7jsg94wawmhgs8va83g46pbl26g8"; depends=[broom devtools dplyr ggplot2 magrittr purrr readr tidyr]; }; pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; }; pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; }; - pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; }; + pcse = derive2 { name="pcse"; version="1.9.1"; sha256="07382jz75ywqr4q750rk66yf0j28k54plx281k1yi541la8vic57"; depends=[]; }; pdR = derive2 { name="pdR"; version="1.5"; sha256="072ra8czfvgcgkbdfkjhbpk7f23zh717f9sh84vls9j0wyrai6hn"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.1"; sha256="0j68jmsm6c9pan195k0l0nm1ldbipl5ywlbwkz61dblspizh04iw"; depends=[ddalpha multitaper Rcpp RcppArmadillo]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; @@ -9191,7 +9371,7 @@ in with self; { pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; }; pdfsearch = derive2 { name="pdfsearch"; version="0.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; }; pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; }; - pdftools = derive2 { name="pdftools"; version="1.5"; sha256="09z4174zbp0nzdkpwx5yxxlmzskqg48gc6n5qpmx0hkanfz8g7ls"; depends=[Rcpp]; }; + pdftools = derive2 { name="pdftools"; version="1.6"; sha256="00m5x1n5kjzvc1wljfy8riq2srxjvklasnh6ps8a89zbgglhp5cv"; depends=[Rcpp]; }; pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; }; pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; }; @@ -9201,8 +9381,8 @@ in with self; { peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; }; pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; }; - pec = derive2 { name="pec"; version="2.5.4"; sha256="1gi8vvdj3mwpi5rgfqci1lan1a34nbcyyypwa171sfj7j1m770r3"; depends=[foreach prodlim rms survival timereg]; }; - pedantics = derive2 { name="pedantics"; version="1.6"; sha256="08d13igjprqb8l2i8y07rn8pdq6bvjy8bf2ccpixv34d8cg5758j"; depends=[genetics kinship2 MasterBayes MCMCglmm mvtnorm]; }; + pec = derive2 { name="pec"; version="2018.04.18"; sha256="0a6q37l42zbz566bz0qs5aszd71bb0kd9bz0zmb42q0ak0v4yijd"; depends=[foreach prodlim rms survival timereg]; }; + pedantics = derive2 { name="pedantics"; version="1.7"; sha256="14hphziwqrq4fkxlvp94j564q19k9fabvhmdz7zhb6cvak6xv1n6"; depends=[genetics kinship2 MasterBayes MCMCglmm mvtnorm]; }; pedgene = derive2 { name="pedgene"; version="2.9"; sha256="1200d6blz7n3krnvhw0i9mz6219vwk0vlj17yzr3fqzyn5cyf91z"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; }; pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; @@ -9226,11 +9406,11 @@ in with self; { pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; }; perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; }; - perccalc = derive2 { name="perccalc"; version="1.0.0"; sha256="0327jj67gqq05a6fd5iac3b47ch7mgslalk4hr92v6svh8cz4syv"; depends=[broom devtools dplyr ggplot2 haven magrittr MASS multcomp purrr tibble tidyr tidyverse]; }; + perccalc = derive2 { name="perccalc"; version="1.0.1"; sha256="0dq5m7d6jdapbnkh65f5cizqiggpl1922nl4gc6damzvyym95qrj"; depends=[broom dplyr magrittr multcomp purrr tibble tidyr]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; - permDep = derive2 { name="permDep"; version="1.0-0"; sha256="15jjxni14i3br0j5cqajgydkb71yd657fvz4m0jcr66g1sb77aij"; depends=[BB goft survival]; }; + permDep = derive2 { name="permDep"; version="1.0-1"; sha256="03va74vxzijy169pqf6qhpw4afb3r3ia5y0qcfqz1xjs2zmck7mj"; depends=[BB survival]; }; permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; }; permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; }; permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; }; @@ -9240,12 +9420,13 @@ in with self; { permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; - personalized = derive2 { name="personalized"; version="0.1.4"; sha256="0w6qvkbzpbsyjvsgadx59h49im4c03x8kyd39z2w825vznds9xmz"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; }; + personalized = derive2 { name="personalized"; version="0.1.5"; sha256="1id3ml5n7l7lgd029csn23ffrsqhm4g1id20hxqhqz4knknfxkkf"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; }; personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; }; perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; - perturbR = derive2 { name="perturbR"; version="0.1.0"; sha256="0zn10xm39sbv9g8mvp582c6bwpdk6ss1b50pdk7nkdmih3g6cxqb"; depends=[dils ggplot2 igraph mcclust]; }; + perturbR = derive2 { name="perturbR"; version="0.1.1"; sha256="13in5xjv1854ihalyj4427ix4scc17b95iw72rcb4yivha9jgplq"; depends=[dils ggplot2 igraph mcclust]; }; pesticides = derive2 { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; + petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; }; petrinetR = derive2 { name="petrinetR"; version="0.1.0"; sha256="0na8srzwi933bva9j3hrn4ji8s58dm28jpxw9q13mpahzch4r454"; depends=[dplyr visNetwork]; }; petro_One = derive2 { name="petro.One"; version="0.1.3"; sha256="13bxd011lprimy5m3z08l4yng2fkp28b1ad1bqs0piffx5bxw13n"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka tibble tm urltools wordcloud xml2]; }; pewdata = derive2 { name="pewdata"; version="0.2.0"; sha256="17j8fdn9x6hannr91zyccya523z3zm03gr517xfcyrd0m486xnqb"; depends=[httr magrittr purrr rvest]; }; @@ -9253,8 +9434,9 @@ in with self; { pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; }; pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; }; pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; }; - pgirmess = derive2 { name="pgirmess"; version="1.6.8"; sha256="1sy5jf356mylsr0bjmvdykcv1ssf60v4bnrsqjdqsrry9a7iyp7g"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; + pgirmess = derive2 { name="pgirmess"; version="1.6.9"; sha256="1i1qn68isaz2lbpqyydjgj9kri09aknza5qjn6m1wa1alyl7f611"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; pglm = derive2 { name="pglm"; version="0.2-1"; sha256="14hnlidf62kzcf83jc7k17n4hjjaj82scdwh8a7qxd056vygkqx2"; depends=[maxLik plm statmod]; }; + pgmm = derive2 { name="pgmm"; version="1.2.2"; sha256="1z39148gvs5nndd54x2afpsqdyqd8apjgnxn0ndv2071aa8gyk1j"; depends=[]; }; pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; }; pgraph = derive2 { name="pgraph"; version="0.8"; sha256="1r784snci5m81qljfh1r3w8qzszmy0476zvsd1alh43afzg9zpr5"; depends=[energy glasso glmnet SAM]; }; pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; @@ -9263,6 +9445,7 @@ in with self; { ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; }; phalen = derive2 { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; }; phangorn = derive2 { name="phangorn"; version="2.4.0"; sha256="0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; }; + phantom = derive2 { name="phantom"; version="0.1.3"; sha256="0kgw65jziw5s03isq5ywmqijhkbik5i84k30hx5gbi0zzgj8y0h1"; depends=[gplots MASS NMF qusage RColorBrewer Rcpp RcppArmadillo]; }; phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; @@ -9272,20 +9455,21 @@ in with self; { phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; }; pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; }; pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; }; - phenoCDM = derive2 { name="phenoCDM"; version="0.0.2"; sha256="07fmljdn5dg9v2mv0k7hjk7xlldhvzvcxia8vda0xkpn3hlrriid"; depends=[rjags]; }; - phenology = derive2 { name="phenology"; version="6.0.3"; sha256="17idd9znwmgsa6wzijc4ahvlld4qp6sihyg3cdv91gfl0yjd51w1"; depends=[HelpersMG lmf numDeriv optimx]; }; - phenomap = derive2 { name="phenomap"; version="1.2.0"; sha256="1lz0sjpk8nj9v2fxqzwhcdppjy3hafb3ag2lbi3v85lc9ngwccdd"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; + phenoCDM = derive2 { name="phenoCDM"; version="0.1.2"; sha256="1158ac6cjl83pnfxmklxjnh35nagx1c21iidawr1s7pqv858ixix"; depends=[rjags]; }; + phenocamr = derive2 { name="phenocamr"; version="1.1.0"; sha256="10k7z82skkf9l15a2b77ygg5lkg0x68z7xbkw4p3mgs68dd9ah63"; depends=[changepoint curl daymetr DT jsonlite leaflet plotly shiny shinydashboard zoo]; }; + phenology = derive2 { name="phenology"; version="7.0"; sha256="1glbjm7i2kyl04k0sam29zy1lpzfq2mpkgg44jpnby8c9vz8pkmi"; depends=[HelpersMG lmf numDeriv optimx]; }; + phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; - philentropy = derive2 { name="philentropy"; version="0.0.3"; sha256="00fpbmxg8m8apjb6cdrhh9rw3vp1j65ccvsqj1xlfcn1x5l1h3h8"; depends=[dplyr KernSmooth Rcpp]; }; + philentropy = derive2 { name="philentropy"; version="0.1.0"; sha256="19nrfkla64jbd46ig13ljy6k5dxiwq2mnsfn37sgy9sf4h8zzwk3"; depends=[dplyr KernSmooth Rcpp]; }; phmm = derive2 { name="phmm"; version="0.7-10"; sha256="1ra5qf24qmwjf8cra9yh20i2s8jv0kzb1gyw96il8r5cdl20gbcz"; depends=[lattice Matrix survival]; }; phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; phonics = derive2 { name="phonics"; version="1.0.0"; sha256="02bkw589iijlzbw0cbg9qhq99jij2p92cqrxa77chkly4naqkqds"; depends=[BH Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.9.19"; sha256="1islzlsj37y41c30r1cqmi646596n5b2swx8csxl0l1lrz0h8nnd"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; }; + photobiology = derive2 { name="photobiology"; version="0.9.20"; sha256="0w4xcg9r6hn8lv8jkmfr1b2w2q30wxs6m3nv4409hy9rp77qgfcl"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; }; photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.4.4"; sha256="14aiw5jxd6wnngy1rbbm85l0yx64nxrancal017wvr5n867c32d6"; depends=[photobiology]; }; - photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.13"; sha256="1zagvdaiv8d5frwki20wwvbyw4a9in3k8560janbmd161xh13ii0"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl reshape2 tibble]; }; + photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.14"; sha256="1q0dd3szr06rm6zy2mkb37n4s37554x71jgkhmw88iiy58y2fkv5"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl tibble tidyr]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.2"; sha256="0fcin04xc2k39qdipslqd3w3bsd8yl3xlvg7mlgm3aphfwg4hnmj"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; }; @@ -9306,17 +9490,18 @@ in with self; { phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; }; phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; }; - phylogram = derive2 { name="phylogram"; version="1.0.1"; sha256="0hjniq91ivw82aqifb4sqqbw36scs0081s7xrjj37581rk0xamyl"; depends=[openssl Rcpp]; }; + phylogram = derive2 { name="phylogram"; version="2.0.1"; sha256="17032pr87cdyz2aynb17jspkghq64xivsf1ylky2niypz7xbz0i3"; depends=[ape]; }; phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; }; phylolm = derive2 { name="phylolm"; version="2.5"; sha256="0bffqzba6kcv8jyya7pja10mjnklhihczljhmj8q0pdrmd6qgqp8"; depends=[ape]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; phylopath = derive2 { name="phylopath"; version="1.0.0"; sha256="1n6f7piygps3pwqapsvqpz764995kxhdqz1hc5n6znvl01ykdqx5"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; }; + phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.1"; sha256="0bxhikzrs5gcwkchpmxwvampyrbwv0d3ay5i7s766x6687xzm6qa"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; }; phylosignal = derive2 { name="phylosignal"; version="1.2"; sha256="0apsg4v1n58wn8y8wnl6x1ahl903i29hh8bs2dw6ky2jafkjj4jb"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; }; phylotate = derive2 { name="phylotate"; version="1.2"; sha256="19nssrdax5w5a50159j39jgs7305s48k3h56ivyzs5di6l7x1yxj"; depends=[]; }; phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; }; phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; }; - phyreg = derive2 { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; }; + phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; }; physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; }; phytools = derive2 { name="phytools"; version="0.6-44"; sha256="1y815pv1cksj244vcb7q4qr45gzr4cb1qwi166h65ryggywcj48w"; depends=[animation ape clusterGeneration coda combinat maps MASS mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; @@ -9327,6 +9512,7 @@ in with self; { pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; }; pillar = derive2 { name="pillar"; version="1.2.1"; sha256="1ryd7m570y6q3w71wd5dz042b3d0dv24g2rbkw1kdx0n6jj9gsbd"; depends=[cli crayon rlang utf8]; }; pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; }; + pimeta = derive2 { name="pimeta"; version="1.0.0"; sha256="0ri6qznk3nj1a2nj9qdahlm452drzcb51x8g89ffb3y6xjsh6y5g"; depends=[Rcpp RcppEigen]; }; pinbasic = derive2 { name="pinbasic"; version="1.2.0"; sha256="1sn4q9g2pw8z6gyxi302bd7p578ldy1g6419w56z7jgv7m8n7g73"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; }; pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; }; @@ -9351,6 +9537,7 @@ in with self; { pkgcopier = derive2 { name="pkgcopier"; version="0.0.1"; sha256="04vpjf8nvqnpry54f1wwrnmipd5m6gqd89c3vkryqx88jk85jd8s"; depends=[httr stringr]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.2"; sha256="0pzqlim84b22ahq5yr50ybffqa0f5k5ch372v37nw1ndzci211d8"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkgmaker = derive2 { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; }; + pkgnet = derive2 { name="pkgnet"; version="0.1.0"; sha256="0f7xakl7vsx4byw6wfb1yw9bk95wrqsjs8wq6prg697zpdy3c7fw"; depends=[assertthat covr data_table DT futile_logger igraph knitr magrittr mvbutils R6 rmarkdown visNetwork]; }; pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.1"; sha256="0mwrpkmf016lpwkjhhjpq7bw18mvshpyhwgmgqfrfl9gfbq4gphd"; depends=[binr foreign forestplot]; }; pks = derive2 { name="pks"; version="0.4-0"; sha256="0fx7p2d83x0ip65aqp9dga59d9cggam8k79mi0drk5birzchqbcr"; depends=[sets]; }; @@ -9375,7 +9562,7 @@ in with self; { plmDE = derive2 { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; - plogr = derive2 { name="plogr"; version="0.1-1"; sha256="13zliqlbkl8b04k9ga0sx5jsh7k867gracgl84l2a9kcqy9mqx92"; depends=[]; }; + plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; }; plot3D = derive2 { name="plot3D"; version="1.1.1"; sha256="0chn70fqwyca8lbnjnpbcj08ni0dfbax2gjmzhk2c4w72c04mzpn"; depends=[misc3d]; }; plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; }; plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; }; @@ -9387,7 +9574,7 @@ in with self; { plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; }; plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; plotly = derive2 { name="plotly"; version="4.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; }; - plotmo = derive2 { name="plotmo"; version="3.3.5"; sha256="1hiak4gg73ifml24mx1bjhgwqx9706v2mk5pxh59jvbrrc6mzvf4"; depends=[plotrix TeachingDemos]; }; + plotmo = derive2 { name="plotmo"; version="3.3.6"; sha256="11v1jncw2x96j1f7nhv9sqvy3ia3035yh8slpy2ky7lf8ravjy58"; depends=[plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; }; plotrix = derive2 { name="plotrix"; version="3.7"; sha256="0rw81n9p3d2i03b4pgcfj5blryc94f29bm9a4j9bnp5h8qjj6pry"; depends=[]; }; @@ -9411,8 +9598,7 @@ in with self; { plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; }; plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; }; - pmap = derive2 { name="pmap"; version="0.6.0"; sha256="1g7das8bbp31r6syzn3zbxb8han1lqs9zpija7z8w2jpbw7gj4lb"; depends=[data_table DiagrammeR dplyr lubridate shiny stringr]; }; - pmatch = derive2 { name="pmatch"; version="0.1.2"; sha256="1sbd02q2jqjqnh269m9f83mk0vbhh4mqqv0p23p6rj6gz0wljz9c"; depends=[dplyr glue purrr rlang tibble]; }; + pmatch = derive2 { name="pmatch"; version="0.1.3"; sha256="1k83ysgc4dwms0k5knh2rj99l3kfclw9a29h2ksphy0g4r1ig9k3"; depends=[dplyr glue purrr rlang tibble]; }; pmc = derive2 { name="pmc"; version="1.0.2"; sha256="1pamxg2cwyg36w0xnggrv5w03lb12l25z2da7xm1jvr17h0ipqmh"; depends=[dplyr geiger ggplot2 ouch tidyr]; }; pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; }; @@ -9421,6 +9607,7 @@ in with self; { pmml = derive2 { name="pmml"; version="1.5.4"; sha256="1acld1x0z5rgyxb5id071s3zvf2vbv4b9nngvxrb63ay3yyy124b"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.1"; sha256="1cxmp3fgsf3z71v6qpd9l9ilgda5knan7vqifxpgm8m7a30sp3f3"; depends=[]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; + pmxTools = derive2 { name="pmxTools"; version="0.1.0"; sha256="1a242c85ywk026vb778s8bjc331ww11rb15pai02wbvpw9x4kpa0"; depends=[GGally ggplot2 magrittr MASS PKNCA plyr stringr XML xpose]; }; png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; @@ -9430,7 +9617,7 @@ in with self; { poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; }; pointblank = derive2 { name="pointblank"; version="0.1"; sha256="11v0x264065iljhv77m4yc44zqd0i9bg95c6qiv8d85nf97201hh"; depends=[digest dplyr Hmisc htmltools knitr lazyWeave lubridate magrittr mailR pixiedust purrr readr rJava rlang rmarkdown stringr tibble tidyr]; }; - pointdensityP = derive2 { name="pointdensityP"; version="0.3.2"; sha256="1wi1lv5y589vmibvzigpqk0m9k5m265brhnz520g7wa4h3wpsdq3"; depends=[data_table]; }; + pointdensityP = derive2 { name="pointdensityP"; version="0.3.3"; sha256="0ifkxxlmrrwscakmlap5bpfkzn4gfx9nc84p98i2spncnyd215ya"; depends=[data_table]; }; poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; @@ -9442,20 +9629,21 @@ in with self; { poliscidata = derive2 { name="poliscidata"; version="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; politeness = derive2 { name="politeness"; version="0.2.2"; sha256="06h4g9xbk5dbaqzhybqc0mppa61ypb7ryi6hghqnqyj32y8r6dbr"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; }; pollen = derive2 { name="pollen"; version="0.70.0"; sha256="1hk9sjxzwglj98ryic3m80lajzv1klnq9dl6i97c8f0ihbf97zdq"; depends=[dplyr lubridate purrr]; }; - pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; }; + pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; }; polmineR = derive2 { name="polmineR"; version="0.7.5"; sha256="0yz2c915jrf3dqadi6px9jidfwr4jd23rjrpas4xg4m6dx0f70jm"; depends=[data_table DT jsonlite Matrix pbapply R6 slam tm]; }; polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.6.1"; sha256="16nr83gmv6pnk89nqxh8ihzacb0y8l4lz05c8sp6whmr26ja9vnf"; depends=[sp]; }; polyPK = derive2 { name="polyPK"; version="3.0.0"; sha256="1vdfsad2b9habvm2ikjgn7ihnm851q9lqmgqjlsl737ka1vsgisf"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls samr sqldf xlsx]; }; - polySegratio = derive2 { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; }; - polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; }; + polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; }; + polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-4"; sha256="162xj52566kaxgfk7c14170xx07isyjmqb9skvhrdg7sz20lc3l1"; depends=[coda gtools lattice polySegratio]; }; polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; polyapost = derive2 { name="polyapost"; version="1.5"; sha256="0r2h51l2y0sj0xahdzfy1lyq4kh166crh2j02sk85q577q9d883y"; depends=[boot rcdd]; }; polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; }; polyclip = derive2 { name="polyclip"; version="1.6-1"; sha256="07xxw5ik30ds18kv808hynzmz3w351k6lj4ifz9kak0s7xsaqfn3"; depends=[]; }; polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; }; polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; }; - polymapR = derive2 { name="polymapR"; version="1.0.13"; sha256="18bwi149y2622bdcyb5gcq0mxwalg6dsv3dgsnx2km4kd5x1a4ck"; depends=[combinat doParallel foreach igraph knitr Matrix MDSMap]; }; + polyglot = derive2 { name="polyglot"; version="0.1.2"; sha256="01sb3ilr58252yw0b2669vjdf8574br0n2n0ffwd86gc9f3islb3"; depends=[]; }; + polymapR = derive2 { name="polymapR"; version="1.0.16"; sha256="0j9zsgm4v78scsl4bblrf2rs691296p1sdimqqzs03d56cgaky04"; depends=[combinat doParallel foreach igraph knitr MDSMap]; }; polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; polysat = derive2 { name="polysat"; version="1.7-2"; sha256="0ahx2pvlv2vdfiskwgawcrp447249ha0dq4qkhav3hpyvdg3in38"; depends=[]; }; @@ -9465,6 +9653,7 @@ in with self; { pompom = derive2 { name="pompom"; version="0.1.4"; sha256="0j37gq6lfccypclhrp7w3yfgsjbhfgqwg7x87r6rgywz6b3fnsgh"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; pool = derive2 { name="pool"; version="0.1.4"; sha256="0k209n40l2kwahy7b6hjwj1l19pdhnnq36jzxjmhv5zdad7dmckq"; depends=[DBI dbplyr dplyr later R6]; }; + poolfstat = derive2 { name="poolfstat"; version="0.0.1"; sha256="1g6qx4518cr77wdlbicda68jm2yji24h14mjv5sq7zq241h4ailh"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; }; popEpi = derive2 { name="popEpi"; version="0.4.4"; sha256="010nsb3jlz769i8srkd3528a52h9gpw7q7gn4vraz9nx8g8585bs"; depends=[data_table Epi survival]; }; @@ -9472,10 +9661,10 @@ in with self; { popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; }; popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; }; popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; }; - popdemo = derive2 { name="popdemo"; version="0.2-3"; sha256="0r3qdvwjwqzqxk3zp9vfzxwmc5fhjzn0ka91b37g62nanwxiyayw"; depends=[expm]; }; + popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; }; popkin = derive2 { name="popkin"; version="1.0.5"; sha256="147ic0d7cgs4x9vz4jm4wd6ckikn0s8a0q1mknmcrcfisq8zim75"; depends=[RColorBrewer Rcpp RcppEigen]; }; poplite = derive2 { name="poplite"; version="0.99.19"; sha256="0y1l21clp9b5m50chqnqmvyd6rsk6xgn2bqf1877gx3h1qidh5fm"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; }; - poppr = derive2 { name="poppr"; version="2.6.1"; sha256="1ib6z5rpx8xr5wfvjiy56fn9vgjda4d7x16n6wn4377b5fi4l3zp"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn rlang shiny vegan]; }; + poppr = derive2 { name="poppr"; version="2.7.1"; sha256="01g2kcbrlnfw27yrvf3wzj68r5h8xif5baalx1rdfp16v49jkx34"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; }; popsom = derive2 { name="popsom"; version="4.2"; sha256="11d6z3qsq94k0557pnwa0h4pc718360lvg9jkblp8abnj52lcvvv"; depends=[class fields ggplot2 som]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; @@ -9483,7 +9672,7 @@ in with self; { portes = derive2 { name="portes"; version="2.1-4"; sha256="09liy2bia76h5dh21s8skq9pj8k4wpq5agwrmr1pnvlpgc8m2b60"; depends=[]; }; portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; - postGIStools = derive2 { name="postGIStools"; version="0.2.1"; sha256="1dmf77xpy61pqis3j9qzjjksmm9hkyhzxqdmjajpj7rkbqhl5qvp"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; + postGIStools = derive2 { name="postGIStools"; version="0.2.2"; sha256="1d1igv17bj17d0nmavvn5814nqb7k0hs2cjbaqgjd6ip1wcclfxz"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; }; powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; @@ -9495,19 +9684,19 @@ in with self; { powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; }; - powerbydesign = derive2 { name="powerbydesign"; version="1.0.3"; sha256="0dv4j0kwdzvxnq587vs1dsy2yci3v3q2smncpscpcsalp38rvx4i"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; - powerlmm = derive2 { name="powerlmm"; version="0.1.0"; sha256="0fsd3h94va5hn0nqxdalchw02s4daxq8dlgdxb5a4nigg64lfkm2"; depends=[ggplot2 ggsci gridExtra lme4 lmerTest MASS Matrix pbmcapply scales testthat]; }; + powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; + powerlmm = derive2 { name="powerlmm"; version="0.3.0"; sha256="1prg1dw0pzyz4vc7a936bgx56227ab34b3ipwxn1mm8n03xk1zqc"; depends=[lme4 MASS Matrix scales]; }; powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; }; ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; }; ppclust = derive2 { name="ppclust"; version="0.1.1"; sha256="10fcyayda634lg5g992g21casqx5k0jni9r30km5rczzib7cz9gg"; depends=[inaparc MASS]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; - ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GO_db GOSemSim igraph]; }; ppitables = derive2 { name="ppitables"; version="0.1.2"; sha256="1hw25zvvbmc6vxbhcrpz9xkwc6lbc9v1r77fil3gv2wm5n672s4h"; depends=[]; }; ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; + ppsbm = derive2 { name="ppsbm"; version="0.2.2"; sha256="0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4"; depends=[clue gtools Rfast]; }; pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; }; prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; }; prabclus = derive2 { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; }; @@ -9526,7 +9715,7 @@ in with self; { precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; precrec = derive2 { name="precrec"; version="0.9.1"; sha256="0kppl4x8ji8hzll5wss1nzlk8qvf4g78f14x4c2b8dcxjikgl939"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; predatory = derive2 { name="predatory"; version="1.2"; sha256="1qbkifx16ixzimshm8lsg3d1y7cj453ksn8cpwy03xql6b19r8x4"; depends=[readr stringr]; }; - prediction = derive2 { name="prediction"; version="0.2.0"; sha256="09jlwk3fh7lkka9vsbr0bp7bpaf2p7q96qb8mv56rcmfrsf5446c"; depends=[]; }; + prediction = derive2 { name="prediction"; version="0.3.2"; sha256="1a65006i4gs9syvc240zzhx91mvf49jy60grz375lq0bzkxy4ly0"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.0"; sha256="1xmzdv35hxnslffkj8nbahhxrxmv7995pkdq2igw72x9wbryqlhs"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; @@ -9536,6 +9725,7 @@ in with self; { preference = derive2 { name="preference"; version="0.1.2"; sha256="113car6miax832kl0gzlqawwq3f5xbp06fz1ygz9nkzxh7mpmi11"; depends=[]; }; prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; }; prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; }; + prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; }; preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; }; preprosim = derive2 { name="preprosim"; version="0.2.0"; sha256="1z10ranfal51vzsnndfaw5aqddh2w1xx8h50j1p7gx4fi90d0waq"; depends=[caret DMwR doParallel e1071 foreach ggplot2 reshape2]; }; preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; }; @@ -9550,6 +9740,7 @@ in with self; { prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; }; prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; + pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="0.2.1"; sha256="0yy2ndvmcwb5syb1km0hkv73mwlnnf53mpqp02p98xib1bm4a1w4"; depends=[]; }; prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; }; primefactr = derive2 { name="primefactr"; version="0.1.0"; sha256="1p0hlf0llyfccg0pa2fccxp8zzhwsyrpd18d8ih1z7mx88kyrhwm"; depends=[]; }; primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; }; @@ -9558,7 +9749,7 @@ in with self; { princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; }; - prioritizr = derive2 { name="prioritizr"; version="3.0.3"; sha256="111y7zdalai0wd2w1a9fn89axz568gxn91x2zp2x3101y263q1kx"; depends=[assertthat BH data_table doParallel magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp uuid]; }; + prioritizr = derive2 { name="prioritizr"; version="3.0.4"; sha256="0c82v0vz7b95milgzbbh5z19h1qmybb44lxxmw5407pqrdv2fihl"; depends=[assertthat BH data_table doParallel magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp uuid]; }; prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.1"; sha256="0mskny9j6dwfbndzqpbmqh552vc86xqwjdpjk2h64qza2abyh5vr"; depends=[raster sp]; }; prioritylasso = derive2 { name="prioritylasso"; version="0.2.1"; sha256="1wcykrhv1d762h7k7qkvnsjk7l6sincmh6vc6wmgpmmwx5nch70x"; depends=[glmnet survival]; }; prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; }; @@ -9571,19 +9762,19 @@ in with self; { probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; }; processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; }; - processmapR = derive2 { name="processmapR"; version="0.2.1"; sha256="0qlz6av6f0ik62md0wa5il3id55rnbwc6i34sxjhv9awwvm2ygrv"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr]; }; + processmapR = derive2 { name="processmapR"; version="0.3.0"; sha256="056g379hi80r1hxd77axayb4sa5a97bvxrlsh0nqw6pam5ycqr53"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr]; }; processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; }; processx = derive2 { name="processx"; version="2.0.0.1"; sha256="0yw23lp9xjvbpswzghkmjiayw7p19hbvmgv58k3i6b8g5nav4qcg"; depends=[assertthat crayon debugme R6]; }; prodest = derive2 { name="prodest"; version="0.1.1"; sha256="1j8gqxswwvnd45givadlvblnsc3qli228gz77d7alc19qf1wrrvz"; depends=[DEoptim dplyr Matrix Rsolnp]; }; prodigenr = derive2 { name="prodigenr"; version="0.3.0"; sha256="1217l9r012xrgzna1bf9z31n2gw36h6grga3949kg7ghxrzjbm4q"; depends=[devtools]; }; - prodlim = derive2 { name="prodlim"; version="1.6.1"; sha256="0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"; depends=[KernSmooth lava Rcpp survival]; }; - productivity = derive2 { name="productivity"; version="1.0.0"; sha256="1yf1w9pss8cbhlqg1zmsmr5qchf7sdvl67m1zzgxf8pplj2pzrzm"; depends=[doParallel foreach plm Rglpk]; }; + prodlim = derive2 { name="prodlim"; version="2018.04.18"; sha256="1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"; depends=[KernSmooth lava Rcpp survival]; }; + productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; }; productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; }; prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; }; profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; }; profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; }; - profileR = derive2 { name="profileR"; version="0.3-4"; sha256="1vinqddhd4jbncn37rbypja7ili3kwmj2sacgf491s94zil4ijik"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; + profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; }; profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; }; profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; }; @@ -9596,7 +9787,8 @@ in with self; { projections = derive2 { name="projections"; version="0.0.1"; sha256="1qrgazxdihzp1i4aghkwkh6q5g1all39bvd83gwh4hj9pxm2w5zy"; depends=[distcrete ggplot2 incidence]; }; projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; }; projmanr = derive2 { name="projmanr"; version="0.1.1"; sha256="0mmfmp5qf4r75q4hjbra2pxym77m16g28n94z5yj2qdzq46hgl4c"; depends=[ggplot2 igraph R6 tidyr]; }; - projpred = derive2 { name="projpred"; version="0.7.0"; sha256="1n2lwzc3hvjr4d6csc2nqlxqcrr979h52lfvbr81alybkg1nbqch"; depends=[ggplot2 loo Rcpp RcppArmadillo rstan rstanarm]; }; + projpred = derive2 { name="projpred"; version="0.8.0"; sha256="06wi8lc88xm45drqhb3mcq5l1g1zm2msgi1m0857vldg6828gjbq"; depends=[ggplot2 loo Rcpp RcppArmadillo rngtools rstan rstanarm]; }; + promises = derive2 { name="promises"; version="1.0.1"; sha256="0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"; depends=[later magrittr R6 Rcpp rlang]; }; promote = derive2 { name="promote"; version="1.0.1"; sha256="1f8f5rm25fx4146hf3rds2lb7qpfz17fa5r2a1f4s3q5p86svgqn"; depends=[httr jsonlite stringr]; }; prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; @@ -9604,7 +9796,7 @@ in with self; { properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; prophet = derive2 { name="prophet"; version="0.2.1"; sha256="10qd3w9jgk3d53465005b0di2lxa6cg67lj81fzmf2h919ai9i5m"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; - propr = derive2 { name="propr"; version="3.1.4"; sha256="1hggj926zphhg6v09bbrv77rp11bg6vciy3xfnkqi2hakjw3ak59"; depends=[fastcluster ggplot2 igraph Rcpp]; }; + propr = derive2 { name="propr"; version="3.1.9"; sha256="0bwkn923id6wd9c4qas6j363i9v4ziwvcr8d0rijxyvg23vjaq6x"; depends=[fastcluster ggplot2 igraph Rcpp]; }; prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; }; protViz = derive2 { name="protViz"; version="0.2.45"; sha256="0mvq0p0lnxwpia1znyizha5gdj6f9i07nghp3gv9kfficlq3fw03"; depends=[Rcpp]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; @@ -9619,7 +9811,7 @@ in with self; { protr = derive2 { name="protr"; version="1.5-0"; sha256="1mi14hph6cqdsgjw4p00miaa4bh2axkwfcmxaiv7f7v4dk8i52y1"; depends=[]; }; proustr = derive2 { name="proustr"; version="0.2.1"; sha256="17syaxfrwm9kh5q825hj7bsrvi4h9avpdabw9y0vq20y87w8cq1s"; depends=[assertthat dplyr magrittr purrr rlang SnowballC stringr tidyr tokenizers]; }; provenance = derive2 { name="provenance"; version="1.9"; sha256="1d40k85cxnnxy480ylvy6wwswgf8hbxgcbansx90hyg9cb3rvhil"; depends=[MASS]; }; - proxy = derive2 { name="proxy"; version="0.4-21"; sha256="1vih8gsfzv97h5c8ixd1qjnn02i7fzla2p9fdj2wpisqhx0p0xv0"; depends=[]; }; + proxy = derive2 { name="proxy"; version="0.4-22"; sha256="0l0ff8irmmvic941is290hd5vszyhaj5nfwna4v3w9c1zk5nr1ma"; depends=[]; }; prozor = derive2 { name="prozor"; version="0.2.3"; sha256="1686lfmzmzl1488xnppv95hfr83gf67xfzqsw49gdas0aba3plhh"; depends=[AhoCorasickTrie doParallel foreach Matrix plyr seqinr stringr]; }; prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; }; pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; }; @@ -9632,6 +9824,7 @@ in with self; { pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; }; pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; }; pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; }; + psgp = derive2 { name="psgp"; version="0.3-17"; sha256="11rx3xim9jx8klpz1p2xj1laimd5q5qs9mvigbh48gsjrm0pnd5v"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; }; psidR = derive2 { name="psidR"; version="1.4"; sha256="1whdjsab5cihlq4gp06xafl3zg7z0cjb4622d23v24igz7kr0ic2"; depends=[data_table foreign RCurl SAScii]; }; pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; @@ -9640,9 +9833,9 @@ in with self; { pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; }; pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; - psych = derive2 { name="psych"; version="1.7.8"; sha256="0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k"; depends=[foreign lattice mnormt nlme]; }; - psychmeta = derive2 { name="psychmeta"; version="0.2.3"; sha256="0lfgsbvb1dplwbxfqim3q7lnf4sclngdik1l5cxl9rkdwb54lcy6"; depends=[boot dplyr fungible ggplot2 MASS metafor nor1mix progress reshape2 rtf tibble tidyr tmvtnorm]; }; - psycho = derive2 { name="psycho"; version="0.1.0"; sha256="0qfgq5sivr01jiglaykh3jqjz11zag8si1nmw0ffr28bp94gibrg"; depends=[dplyr ggcorrplot ggplot2 lmerTest MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm stringr tidyr]; }; + psych = derive2 { name="psych"; version="1.8.3.3"; sha256="1zhp8j81nkzd65168zdw9ylypb9n07ajan21x0wqcn8jdbg970sg"; depends=[foreign lattice mnormt nlme]; }; + psychmeta = derive2 { name="psychmeta"; version="1.0.0"; sha256="0wbjq8908wnch45n4mblx1lxsp5r65jv2g9d46lar6qxrawqbaqg"; depends=[boot dplyr fungible ggplot2 knitr MASS metafor nor1mix progress RCurl RefManageR reshape2 rlang rmarkdown rtf stringr tibble tidyr tmvtnorm]; }; + psycho = derive2 { name="psycho"; version="0.1.4"; sha256="0drzr3svs76wx7ki6s4c5i27r5p309wgzdcpxz1j5i4ivvwhkl0b"; depends=[dplyr ggcorrplot ggplot2 lmerTest MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm stringr tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; }; psychotools = derive2 { name="psychotools"; version="0.4-2"; sha256="04p5yb39c8j28q6brqsrw0dr1zvgpyzb7008v2kk3d5sncgl4dd0"; depends=[]; }; @@ -9656,12 +9849,13 @@ in with self; { ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; pubh = derive2 { name="pubh"; version="0.1.7"; sha256="0dha3adlbrxgkamlb5i2lcnqcsspqb30fmj0f2zhz0bh4i83lznb"; depends=[bookdown car descr Epi epiR epitools gee lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR rmdformats sandwich survival visreg]; }; - pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.11"; sha256="01b4dd28x3a25d0s8k0dwbcr6asaqh2b9c4fddg683i54q483lkd"; depends=[boot R2HTML RCurl XML]; }; + pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.12"; sha256="04zb5lbjdrhdpam4xmkcc947icsnias5pxbv2pwhvyhk7mz16nya"; depends=[boot R2HTML RCurl XML]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; - pulsar = derive2 { name="pulsar"; version="0.3.1"; sha256="0y72wpxa9rqjzyqrfpl1sa06zpx6rbxi4jfncxzac8m534l5l7l5"; depends=[Matrix]; }; + pulsar = derive2 { name="pulsar"; version="0.3.2"; sha256="1zfkxksynrphfv6lpr7rc3g9k643840bgrdv9ic700984vxgg68m"; depends=[Matrix]; }; pulver = derive2 { name="pulver"; version="0.1.1"; sha256="0zj3a66hjing4a87lvhxlvdp72kpn0s2d6r5kc0pi06ls04r8sax"; depends=[DatABEL Rcpp]; }; pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; }; purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; }; + purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; }; purrr = derive2 { name="purrr"; version="0.2.4"; sha256="0wgbnbrqncjpggg8f9bdpcd1gy351s5f0az5k8lc55cvs9lhz3gd"; depends=[magrittr rlang tibble]; }; purrrlyr = derive2 { name="purrrlyr"; version="0.0.2"; sha256="1wkngb87xmlkghsqjr7l5fhlj3a54prvg6v6hd0prn768xw4rc1c"; depends=[BH dplyr lazyeval magrittr purrr Rcpp]; }; pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; }; @@ -9673,7 +9867,7 @@ in with self; { pwr = derive2 { name="pwr"; version="1.2-2"; sha256="0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm"; depends=[]; }; pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; }; pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; }; - pwrFDR = derive2 { name="pwrFDR"; version="1.85"; sha256="1al8dh5h32lipnqfa823wwx7nsrz8z3fadl7hz4qvj8vpfijpz1i"; depends=[]; }; + pwrFDR = derive2 { name="pwrFDR"; version="1.90"; sha256="1lphq62k33wd1ay18gyl62yg6d57j2hhyk1pxz67qv5ywj73r34s"; depends=[]; }; pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; }; pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; }; @@ -9681,6 +9875,7 @@ in with self; { pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; }; pxweb = derive2 { name="pxweb"; version="0.6.3"; sha256="106nb0a3v295cam8ixhdwpgjhwq8p71c2z5c49s6xnqwmf6rbd0h"; depends=[data_table httr plyr RJSONIO stringr]; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; }; + pyinit = derive2 { name="pyinit"; version="1.0.2"; sha256="148b8l5a8c636rgm8dwd8v6ggw9qmkafc5a40bciqc4rk09lfhl3"; depends=[robustbase]; }; pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; }; qCBA = derive2 { name="qCBA"; version="0.3.1"; sha256="0lr97hig9c4l9k7vjalvgar4f1dic1lqf91li4q63j07lgdyvh4c"; depends=[arc arules rJava]; }; qGaussian = derive2 { name="qGaussian"; version="0.1.6"; sha256="0j8n4y4yzidkp52db73zv2snx0kwpg3aiz7vr82ybq3x9scy8c4n"; depends=[Rcpp robustbase zipfR]; }; @@ -9711,7 +9906,7 @@ in with self; { qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; }; qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.5"; sha256="0fm49iydbjp264h9mkk8qfblbvg4l3bfcnphxyhcv3n27m0w44sf"; depends=[Matrix slam]; }; qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; }; - qle = derive2 { name="qle"; version="0.16-6"; sha256="1gah72vv7zfaxl2i9r58qzpkml7pkspxffd7jaf9z93izrzcsp74"; depends=[digest expm lhs mvtnorm nloptr]; }; + qle = derive2 { name="qle"; version="0.17-1"; sha256="1zsvmnxdfd6avr14z5101i4kmks87yrsn15wiq5sx8gsfbxksjkj"; depends=[digest expm lhs mvtnorm nloptr]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; qmethod = derive2 { name="qmethod"; version="1.5.2"; sha256="1snllw82cijl7qgmgkn2x1k3x43x0hxbvh5mx5sffrma9kkv2fii"; depends=[digest GPArotation knitr psych xtable]; }; qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; @@ -9742,9 +9937,9 @@ in with self; { qtlbook = derive2 { name="qtlbook"; version="0.18-6"; sha256="0kbz7icp6fzl2bgk50fcg8x704aijpz3xbqrzraj7qa3z8gakaj6"; depends=[qtl]; }; qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; }; qtlcharts = derive2 { name="qtlcharts"; version="0.9-6"; sha256="021gx5qzrc7jbgpp91mn36czr7fsh37wf3c7cifcv3xwzc54j4dd"; depends=[htmlwidgets qtl]; }; - qtlhot = derive2 { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; }; + qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; }; - qtlnet = derive2 { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[graph igraph pcalg qtl sem]; }; + qtlnet = derive2 { name="qtlnet"; version="1.4.4"; sha256="1r9r6wp71i36ffcdxiljvh2c8nva868x2dx6bkinbaq8cixww2cx"; depends=[graph igraph pcalg qtl sem]; }; qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; }; quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; quadmesh = derive2 { name="quadmesh"; version="0.1.0"; sha256="1k1midhszmi843krv9sdwbyhjmffgps0xx9aigkp7yw7mpif07vx"; depends=[dplyr raster]; }; @@ -9759,10 +9954,10 @@ in with self; { qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; }; quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; }; quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; - quanteda = derive2 { name="quanteda"; version="1.1.1"; sha256="1yi59lr968y6l7v537xc6p50yi9y7hgyg5lwghqqgk13glg6zmbg"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi XML yaml]; }; + quanteda = derive2 { name="quanteda"; version="1.2.0"; sha256="19rr0dkcazdkyzyy7srawf57mmvjjz3nvxik0bkqx6cl7cvrjajz"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi XML yaml]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; - quantmod = derive2 { name="quantmod"; version="0.4-12"; sha256="0y7gh0k1s10vdsfch8777avbhf99mc9crikvx7ahqrw0j631vmhq"; depends=[curl TTR xts zoo]; }; + quantmod = derive2 { name="quantmod"; version="0.4-13"; sha256="16aldg96z7amp5mr90nb8127yy04gxsihfr26km5p3cx3j117yv0"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; quantreg = derive2 { name="quantreg"; version="5.35"; sha256="18f3qxv1j1bqmq55hzssz8mnp5ww4flhy80rm2v1rk0mmg9paz7m"; depends=[Matrix MatrixModels SparseM]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; @@ -9785,10 +9980,10 @@ in with self; { quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; }; quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; }; quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; }; - quotedargs = derive2 { name="quotedargs"; version="0.1.1"; sha256="05y3jgix3aix3d4nazd7h9c27mfcl52xl6fdpfpi7zyd4iznpv9g"; depends=[]; }; + quotedargs = derive2 { name="quotedargs"; version="0.1.2"; sha256="034fhfmfq62yf7akx2i0bim70jq9azkk2h28k79lwax7ysydsjnj"; depends=[]; }; qut = derive2 { name="qut"; version="2.0"; sha256="1r0yg99p88ar1d9qhayzpplssjpsy901b7n6yr7r4n9nldh8p7xz"; depends=[flare glmnet lars Matrix]; }; qvcalc = derive2 { name="qvcalc"; version="0.9-1"; sha256="1ll71yww8rsbp0qa60w7vdna8yk60cq66cjn5cdk3bkdwyni28yy"; depends=[]; }; - qwraps2 = derive2 { name="qwraps2"; version="0.2.4"; sha256="18ail1y3kpiiwgkf7zn1acfz1ipz7wbk8pcmlganayr8p9yv7sh2"; depends=[dplyr ggplot2 knitr Rcpp tidyr]; }; + qwraps2 = derive2 { name="qwraps2"; version="0.3.0"; sha256="0xhlb0c955raxrqw202f7jd9c1wkrigh1qs93m2739jkwkyv2n3b"; depends=[devtools dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; }; r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; }; r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; }; @@ -9816,14 +10011,14 @@ in with self; { rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; rEDM = derive2 { name="rEDM"; version="0.6.9"; sha256="0825yh82vlkmjkrwbk7xfhdq4c7yq7n4bmmw6x7ywmhbnayqj6b3"; depends=[Rcpp RcppEigen]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; - rENA = derive2 { name="rENA"; version="0.1.3"; sha256="03sb6fb6d41nf4qd7ifsbr3gqgdk9g5lvjcxvdqhldxrhwn4b1ji"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll scales]; }; + rENA = derive2 { name="rENA"; version="0.1.4"; sha256="007kgb5n30c4jpbp7q2f0yj5mplb8pvhs8pvghy8zbwrl61n4kx5"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll scales]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; }; rFTRLProximal = derive2 { name="rFTRLProximal"; version="1.0.0"; sha256="1458gqy2zbaa62vaimawdr1nk0lsgwz1j4pgw21fkw7bskcszz0f"; depends=[data_table FeatureHashing foreach magrittr Matrix Rcpp RcppArmadillo RcppProgress]; }; rFerns = derive2 { name="rFerns"; version="2.0.3"; sha256="02lq43mgcz8n21hwb0pjqi0aq5dacnaakpx336q1xzw1kwlvfkhv"; depends=[]; }; rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; }; - rGroovy = derive2 { name="rGroovy"; version="1.2"; sha256="0wx17d4c7202dbmgw4nvnvw42fiwlzsl151idrmm4fzfff8y1vdi"; depends=[rJava]; }; + rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; }; rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; }; rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; }; rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; }; @@ -9833,9 +10028,10 @@ in with self; { rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; }; rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; }; - rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.0"; sha256="0y6ir41yl8xj19lbwlvzcrfcrdk9cn9i4q4z1pg7mwj4cq6bc6gd"; depends=[plyr]; }; + rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4"; sha256="1fvln3r2zkzhsck53jppchg795qbjbzw0rd688h89if1lkiy51w6"; depends=[plyr]; }; rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; }; rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; + rMEA = derive2 { name="rMEA"; version="1.0.0"; sha256="1cxcf2ji2f3kkjlj6lym7zfpmgbbjw7al67dldy2kn9dk2dn087z"; depends=[]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; @@ -9869,6 +10065,7 @@ in with self; { radiant_design = derive2 { name="radiant.design"; version="0.8.0"; sha256="0n2a0jpjcxxmmr9sbky7v2cnzil3hv6b20yzkyc9lf4a48pqlm4l"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data shiny]; }; radiant_model = derive2 { name="radiant.model"; version="0.8.0"; sha256="0zlb5ny3s15d1ngdhszkn5wzij4y5fz7c2lwkb9g619pr0ngrwr8"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet pryr psych r_import radiant_basics radiant_data rpart sandwich shiny stringr tidyr yaml]; }; radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.8.0"; sha256="0l3rk5045apjb2jx04jf3mwjixg8cjwrgmz83km9627n93cabs2l"; depends=[car dplyr ggplot2 Gmedian GPArotation gridExtra magrittr MASS pryr psych r_import radiant_data radiant_model scales shiny wordcloud]; }; + radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.2"; sha256="09lcq8ax5x5yk3sqx15rvw3vyi8fyfzgs76kxjhf7hcw4qnib46d"; depends=[hermite]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; @@ -9884,7 +10081,7 @@ in with self; { ramcmc = derive2 { name="ramcmc"; version="0.1.0"; sha256="0s5jgjqkschr64srblppv9lbvhynlpfiy8cy12fywpmnbv8viazq"; depends=[Rcpp RcppArmadillo]; }; ramidst = derive2 { name="ramidst"; version="0.1.0"; sha256="1q4lvq2c2vj9xrm2p2w2qjsl4qvwcl6y54y68mmbd6cw7wqpffjj"; depends=[rJava]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; - ramps = derive2 { name="ramps"; version="0.6-14"; sha256="09chbqh13h8b10dlcka07y954ga129lamg0fr38iwj4lqb6a2fvy"; depends=[coda fields maps Matrix nlme]; }; + ramps = derive2 { name="ramps"; version="0.6-15"; sha256="0c7y64z0ysjy0kh234xfqhbwwn1vgscvp1n4l2fjk5s5xz8633pn"; depends=[coda fields maps Matrix nlme]; }; ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; }; randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; }; randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; @@ -9892,8 +10089,7 @@ in with self; { randnet = derive2 { name="randnet"; version="0.1"; sha256="1mpz3dsbzd5hffv2v5p6jdp0z07f7rhgcjinr1lwggvxw37xwrkj"; depends=[AUC entropy irlba Matrix poweRlaw RSpectra]; }; random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; }; random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; }; - randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; }; - randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.2"; sha256="1fijnzzap8my4l211m5pgj4fwna04z1db5m3hhim72i3xzc77hy2"; depends=[ddR Matrix randomForest]; }; + randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; }; randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; }; randomForestSRC = derive2 { name="randomForestSRC"; version="2.5.1"; sha256="1p5a5z7ddhnsrln8vpdrwvxbgknwdigczjw8vpxzbkckmf6qfidd"; depends=[]; }; randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; }; @@ -9904,7 +10100,7 @@ in with self; { randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; }; randomizeBE = derive2 { name="randomizeBE"; version="0.3-3"; sha256="0vdvgk2b1h1lsj0ka01lwldfxanngir91axc8ywa6pg12hrdkkb0"; depends=[]; }; randomizeR = derive2 { name="randomizeR"; version="1.4"; sha256="0l7gvpm52fwbz79vgy7vn4z2n4gqigimdj6r9drm3lfzbylmx3js"; depends=[ggplot2 plotrix]; }; - randomizr = derive2 { name="randomizr"; version="0.8.0"; sha256="0yrjw3q8ivimbir6m3adw22mwq2ka0vpyrsrkvvn05bm5x5mffvs"; depends=[]; }; + randomizr = derive2 { name="randomizr"; version="0.12.0"; sha256="0g0n63srydljvj4spjl5r08khq0sqlhsj01s150m31cxf23zdjli"; depends=[]; }; randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; }; randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive2 { name="randtoolbox"; version="1.17.1"; sha256="13akf13qi4yhj9gapym05074b1qzk03vgysy81qsd73pd8r107ls"; depends=[rngWELL]; }; @@ -9913,24 +10109,26 @@ in with self; { rangemodelR = derive2 { name="rangemodelR"; version="1.0.1"; sha256="04zv8a4nhin9masvbw1cmbwdkls4wgq81xfw6kg0wdh1hpqjz1z0"; depends=[]; }; ranger = derive2 { name="ranger"; version="0.9.0"; sha256="1pilj5pxl8jl0gsy9vsyqxqdqfcxzvphbgvrlp4hf7r9mrfw9v0p"; depends=[Matrix Rcpp RcppEigen]; }; rankFD = derive2 { name="rankFD"; version="0.0.1"; sha256="1zb9gxvsmv46mpw5znskhfjxnwkr59hdixcly6i3r78yaqgca0dz"; depends=[coin lattice MASS Matrix]; }; - rankdist = derive2 { name="rankdist"; version="1.1.2"; sha256="1nr9nr5nfziia6jykk598hm5ngkfr6yx5mypq34iyfm24877gd3q"; depends=[hash optimx permute Rcpp]; }; + rankdist = derive2 { name="rankdist"; version="1.1.3"; sha256="1hdafy2zzn7hwl1lx5jksgi974zjn49dwih5s2zdyv4nnmmai003"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; }; + rapidjsonr = derive2 { name="rapidjsonr"; version="1.0.0"; sha256="064xqvyv83vl188rk18kgi4iaqq299d2y6fr24dk9lndpc4509kc"; depends=[]; }; rapidraker = derive2 { name="rapidraker"; version="0.1.0"; sha256="17jzkzm5hvd8vcqql40bwl89sfgz8yicvi0753nzgkmbvanzjhjx"; depends=[openNLPdata rJava slowraker]; }; rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; }; rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; }; rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; }; raptr = derive2 { name="raptr"; version="0.1.1"; sha256="17k392vid1is0wl5iyr8b41xyw5y0ad7drvlmrcsda7683yal3p3"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; }; + rare = derive2 { name="rare"; version="0.1.0"; sha256="05bnh2m1sah6zvzvmm3bq1i2n5kmhhxnlzbrjxzmb9vj6skaglv1"; depends=[glmnet Matrix Rcpp RcppArmadillo]; }; rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; - rarhsmm = derive2 { name="rarhsmm"; version="1.0.5"; sha256="0h5njhvpl2msb2wbb80bmlzzci0ma10rx5y5hxa4vdxgj23g6rpm"; depends=[glmnet Rcpp RcppArmadillo]; }; + rarhsmm = derive2 { name="rarhsmm"; version="1.0.7"; sha256="0pvqa6f0ib1jb0rwc6wv6hfinncb21v2g0y0hsy5l33gdagjw2sz"; depends=[glmnet Rcpp RcppArmadillo]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; raster = derive2 { name="raster"; version="2.6-7"; sha256="009bwil3n9gaf11wzifwxyw9j6pl0pyjk3l5v7csd935si7q14gv"; depends=[Rcpp sp]; }; rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; - rasterVis = derive2 { name="rasterVis"; version="0.43"; sha256="0g6ij4h5di4c0pzv7ghc63jfl3j3rm1g541apbjr6n4k9ci12k4l"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; + rasterVis = derive2 { name="rasterVis"; version="0.44"; sha256="041a3d6vcvsah6qm4mf2nc70sln9djlv2ymq389icagiwdqjw9xh"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; ratelimitr = derive2 { name="ratelimitr"; version="0.3.9"; sha256="0w6i9czcbj8ipd9nn4w4h4pqk6xd8anh00cn60hss9hs18fcb21d"; depends=[assertthat]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; @@ -9940,7 +10138,7 @@ in with self; { rattle = derive2 { name="rattle"; version="5.1.0"; sha256="0xxf2wpazsk29y2byyk010n59vmzmhm4phpsqvklmsr1v3m10pvp"; depends=[cairoDevice dplyr ggplot2 magrittr RGtk2 rpart_plot stringi stringr tidyr XML]; }; rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; }; raw = derive2 { name="raw"; version="0.1.5"; sha256="0w0k35izvsi8vwp38har4ygh1zxnz7hfla8d8fcbvckpfbkwpggp"; depends=[]; }; - rbacon = derive2 { name="rbacon"; version="2.3.3"; sha256="0kkj4ylvk7gsbzzqdg8b66kp4mn99k8yzmgml7z0nkll0lr54srk"; depends=[coda Rcpp]; }; + rbacon = derive2 { name="rbacon"; version="2.3.4"; sha256="1va1rap2n6mcjfzclqg5h58ggrs2kb4nlaam5ch984w9rzq59g2l"; depends=[coda Rcpp]; }; rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; }; rbcb = derive2 { name="rbcb"; version="0.1.3"; sha256="0bghbxrgy4lpxyazqlm90i42dav1kjca02l2nmw320v01rvw5qvd"; depends=[httr jsonlite tibble xml2 xts]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; @@ -9949,17 +10147,18 @@ in with self; { rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; }; rbi = derive2 { name="rbi"; version="0.9.0"; sha256="0am6r8dy3nfahprkyvap73x3b6vxgc604v7mf9wbb9vwjja00xzp"; depends=[data_table ncdf4 reshape2]; }; rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; }; - rbison = derive2 { name="rbison"; version="0.5.4"; sha256="0l3653q7bfda9lw1isnx6gdd7l5b8aldqgc2hppg2wh2k004rnf6"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; }; + rbison = derive2 { name="rbison"; version="0.6.0"; sha256="09mbhk56ns1qldgcj8qard3dsvsfbnlrq4s4drc46lr1s8lqjd1h"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; }; rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; }; rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; }; rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; }; + rbraries = derive2 { name="rbraries"; version="0.1.0"; sha256="12vdci4rzjvd419nxh99hpkhjlx86nsmrbjca0am5q0rkc68dgmj"; depends=[crul data_table fauxpas jsonlite tibble]; }; rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; }; rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; }; rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcarbon = derive2 { name="rcarbon"; version="1.0.0"; sha256="0xgf26m8cw3g4nc4s413xgplxv8a6s2m4m7g3zavsjl3517b86bc"; depends=[doParallel foreach sp]; }; + rcarbon = derive2 { name="rcarbon"; version="1.1.0"; sha256="0y201lrmdisw7rmzaxsyiwdj4kms7q1dvw34ial28989ci1rslrw"; depends=[doParallel foreach sp]; }; rcartocolor = derive2 { name="rcartocolor"; version="0.0.22"; sha256="1dh1n01v70sfmymg1w0f272j6nwnrzawqx5x4ljgh46pzqprx56r"; depends=[ggplot2 scales]; }; rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; }; rcbsubset = derive2 { name="rcbsubset"; version="1.1.3"; sha256="16wd0j0z2ll8hqrk27fss4k9fyjw6xwx30xkrphx9jj2ws08wibl"; depends=[MASS plyr]; }; @@ -9972,17 +10171,19 @@ in with self; { rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; }; - rclimateca = derive2 { name="rclimateca"; version="1.0.0"; sha256="1wydh7k7yyi56l3xdprzx4s7425k68a7f53hx9pvr0xmn501l67z"; depends=[digest dplyr hms httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; }; + rclimateca = derive2 { name="rclimateca"; version="1.0.1"; sha256="1mv4i290x0bwvap5njizal5z0ccbkqjfyk2pmcbx4sml5crhx6yy"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; }; rclipboard = derive2 { name="rclipboard"; version="0.1"; sha256="0qphr3qrp0k2gnzk27bgfiq3ff6b8564gmkrjw1kri1p7ilf71wx"; depends=[shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; }; - rcompanion = derive2 { name="rcompanion"; version="1.11.3"; sha256="1wzqqss86z2qggyjwpc41wblw9kkca20mbh6q4dwl4yc7gb4ggaf"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; }; + rcompanion = derive2 { name="rcompanion"; version="1.13.0"; sha256="1smkwp7xjkwiix1m7cx13hwnmka8nqv6m3s5wlzd02l9grc5ldrp"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; }; rcongresso = derive2 { name="rcongresso"; version="0.3.2"; sha256="15b7m1z5lr66kwhl8v8k2car4id9ssd0ypz75z259v8c1w0k7xkl"; depends=[dplyr httr jsonlite magrittr tibble tidyr]; }; rcoreoa = derive2 { name="rcoreoa"; version="0.1.0"; sha256="13nfziqxxljnczn3idq3zlc9xkklalfnxbakvhs5bw19jmbd11ba"; depends=[crul jsonlite pdftools]; }; rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; }; + rcqp = derive2 { name="rcqp"; version="0.5"; sha256="0iww9pbfxlvr68csig9nfi48nrqn2j6viqwwwggk789bk6ffz00a"; depends=[plyr]; }; rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; }; rcrossref = derive2 { name="rcrossref"; version="0.8.0"; sha256="01k3jpd6awan8r4kc5wjw0did30i2bafzjr8mwaaqv87gni2yiyf"; depends=[bibtex crul dplyr jsonlite miniUI plyr R6 shiny stringr xml2]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; rcss = derive2 { name="rcss"; version="1.2"; sha256="08hiprjcjvc138laqrvlvrmn664b63x829ammzgrwjqcsj4kpmds"; depends=[Rcpp RcppArmadillo rflann]; }; + rcube = derive2 { name="rcube"; version="0.1"; sha256="15dyxwsj7f2annf3a2wi158m9s38jfl31lhwfi9shlzi5xadcwjk"; depends=[]; }; rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; }; rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; }; rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; }; @@ -9996,21 +10197,23 @@ in with self; { rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; rdflib = derive2 { name="rdflib"; version="0.1.0"; sha256="1xq378nfvbk8b2nbnr6yswqr351pgli7jcmhcr1ipynkl93rl5qm"; depends=[jsonld readr redland stringi]; }; + rdfp = derive2 { name="rdfp"; version="0.1.2"; sha256="1kznr5p5mhplgpgmc0f4vrs1fwpivwjy52hwfc8k0q0vx53h3fs2"; depends=[curl dplyr httr lubridate plyr purrr readr XML xml2]; }; rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; }; rdist = derive2 { name="rdist"; version="0.0.2"; sha256="0rwv8brambwki3jzpq250lk0k7nmvlzm80szy4nkhdl2zxwriv0a"; depends=[Rcpp RcppArmadillo]; }; rdiversity = derive2 { name="rdiversity"; version="1.0"; sha256="0x6s9028v4xcc54yy4977yqw5mrsbqlrm5b9drj05c64mavhm4sq"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; }; - rdlocrand = derive2 { name="rdlocrand"; version="0.2"; sha256="1jad0b9qqlc88knd92yvjqklilbybp9zpkdq7jx1251m6hivs9sw"; depends=[AER sandwich]; }; + rdlocrand = derive2 { name="rdlocrand"; version="0.3"; sha256="1cv69iy5sx9kdplpk9hnriqzgrm5mjbmhax4cybszhsyaly6r78d"; depends=[AER sandwich]; }; rdnb = derive2 { name="rdnb"; version="0.1-1"; sha256="1mg40jad79mk95ndnljvfvyh9rhbxkw7inpg2vbsixf1ywdljri3"; depends=[brew httr xml2]; }; rdomains = derive2 { name="rdomains"; version="0.1.7"; sha256="1w6jvwzd9lwha4qkf8rhd1g3cpr79fsl4rrmh5chdnbahqg60gh9"; depends=[aws_alexa curl glmnet httr Matrix rlang RSelenium urltools virustotal XML xml2]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; }; - rdrobust = derive2 { name="rdrobust"; version="0.99"; sha256="1c9issw0mssswln2mdirwjlaps4ps8q9z1wr4ailr4c2z9klla9p"; depends=[]; }; + rdpower = derive2 { name="rdpower"; version="0.1"; sha256="1pi0g980zgy0h3kyiksnbpi59fksm17g9lxinqjf7xiam7pgw99n"; depends=[rdrobust]; }; + rdrobust = derive2 { name="rdrobust"; version="0.99.1"; sha256="18hq4nmyf8327qdbh7m8y0av6f21pcxaxfqs0qrc07yf6sdcj6ri"; depends=[]; }; rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; rdryad = derive2 { name="rdryad"; version="0.3.0"; sha256="18vjq5amaian174ywymsx1px7ckirk36386h66lsq0h87qwnrwj7"; depends=[crul curl oai solrium xml2]; }; - rdwd = derive2 { name="rdwd"; version="0.9.0"; sha256="1zqmfrxjrkp0f8d943wlzvr7g0rrnbp3x9klx3syrbkn7jqxz49i"; depends=[berryFunctions pbapply]; }; + rdwd = derive2 { name="rdwd"; version="0.10.1"; sha256="0w1wd1qxisdqd04ybcacbjjsjsvhjd152jcfjljzv2d20ha82kcn"; depends=[berryFunctions pbapply]; }; re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; }; reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; }; - reReg = derive2 { name="reReg"; version="1.1-1"; sha256="1pjzh9r7488d39a5s0hkymzxh79zc1kp2ag2cp037v3j65mifbin"; depends=[aftgee BB ggplot2 MASS nleqslv plyr SQUAREM survival]; }; + reReg = derive2 { name="reReg"; version="1.1-2"; sha256="13xnxpsa5pk39sp6pq9qvj4m0pjhvidfbjsx1s9qdczrvm6zsl3c"; depends=[aftgee BB ggplot2 MASS nleqslv plyr SQUAREM survival]; }; reactR = derive2 { name="reactR"; version="0.2.0"; sha256="17jdcby95fxfa3imalllnqsp16py5vqqj4y0za4wli91vd37555q"; depends=[htmltools]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.5"; sha256="1qmimfxwh6d7s5qrnnk20i2f9l5j1ci3wpfs3qlmggz69jzf589m"; depends=[]; }; @@ -10024,15 +10227,17 @@ in with self; { readbitmap = derive2 { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; }; readbulk = derive2 { name="readbulk"; version="1.1.0"; sha256="0m02isvja0ihvy1fscjdl5f9gfdlmfmabgvpirgd2m9j3lz6mi8s"; depends=[plyr]; }; reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; }; + readit = derive2 { name="readit"; version="1.0.0"; sha256="1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9"; depends=[crayon haven jsonlite readr readxl]; }; readobj = derive2 { name="readobj"; version="0.3"; sha256="0hwxfk27azay8hjz702b10cg395is06wnypqdw4788gm25d0i041"; depends=[Rcpp]; }; readr = derive2 { name="readr"; version="1.1.1"; sha256="1cvw5wdcqk88cp5fyv678mnmp66l3whcd2yh33p2qvx0168bja8s"; depends=[BH hms R6 Rcpp tibble]; }; + readroper = derive2 { name="readroper"; version="0.9.0"; sha256="1ikw114gc71lg3snawz7bfpd2mk2m1181183sz0lsc5sgl67bb17"; depends=[readr]; }; readstata13 = derive2 { name="readstata13"; version="0.9.0"; sha256="06qx40v4n217wi379d08w7kc9wlbxlyz9jqcsc85099vgab7l993"; depends=[Rcpp]; }; readtext = derive2 { name="readtext"; version="0.50"; sha256="1il7zfm092vvns8manz8lkj34q1w4gw931agkpk83cvf1618l5nl"; depends=[antiword data_table httr jsonlite pdftools readODS readxl streamR stringi tibble XML]; }; readxl = derive2 { name="readxl"; version="1.0.0"; sha256="1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv"; depends=[cellranger Rcpp tibble]; }; realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; }; - rebmix = derive2 { name="rebmix"; version="2.10.0"; sha256="0n9s3xklrlzw6mb798q8p395506baj0pxp6n9lj9hhfibbgjif1c"; depends=[mvtnorm]; }; + rebmix = derive2 { name="rebmix"; version="2.10.1"; sha256="1ccdcmbcnlm0i3r6h09v85wdq4c8gz9dvvbfd2a5zx3ikwfm4wri"; depends=[mvtnorm]; }; rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; }; rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; }; rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; }; @@ -10042,7 +10247,7 @@ in with self; { rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; recipes = derive2 { name="recipes"; version="0.1.2"; sha256="1car3a3mqn87pz049cbgkaayz86970mvkapk6al2k7jjw76306l9"; depends=[broom ddalpha dimRed dplyr gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyselect timeDate]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; - recmap = derive2 { name="recmap"; version="0.5.26"; sha256="02fvl275k4455yw5n31fxb2jhiaciki4i7zzzks166gz33rc0dwy"; depends=[GA Rcpp sp]; }; + recmap = derive2 { name="recmap"; version="0.5.31"; sha256="1kgmqmpphz4p2zidl0l24nia49g8211dyk66wl09azay4vxm46nj"; depends=[GA Rcpp sp]; }; recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; recombinator = derive2 { name="recombinator"; version="1.0.0"; sha256="0amcpicsk270l9h7qgv764wp09phsffdpi4adcxrsrwiwm274ibw"; depends=[crayon]; }; recommenderlab = derive2 { name="recommenderlab"; version="0.2-2"; sha256="13mgkxrcwh5ry699my3w6xgm6rabsk9fd5qqsdwzy7cfq6xkq7cg"; depends=[arules irlba Matrix proxy registry]; }; @@ -10051,7 +10256,7 @@ in with self; { reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; }; recosystem = derive2 { name="recosystem"; version="0.4.2"; sha256="1bn6l23gqmfpr6w60ph7zgv53vy3vnq9zdy5x0a8n1yp6b0lw48x"; depends=[Rcpp RcppProgress]; }; recurse = derive2 { name="recurse"; version="1.1.0"; sha256="1zgzzhbvdzqgmgzj43yvpyc7ahbkn96l5wyr1iqpnn3ha78fy0p3"; depends=[Rcpp]; }; - red = derive2 { name="red"; version="1.3.1"; sha256="1m8jk3k0g17dlqbws74wi1lsa11v26si2857sxgzv659f46ybmq3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; + red = derive2 { name="red"; version="1.3.3"; sha256="0f4lriwlsq65z0sqjv4csrkbcjjvpybqf68rgx92ypkdjf57ixrs"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; redR = derive2 { name="redR"; version="1.0.0"; sha256="01safawd9ai34fqxjpc161yzpsk31hfyl8ybcfvdj7a9vdbvcb5i"; depends=[imager]; }; reda = derive2 { name="reda"; version="0.4.1"; sha256="0aq6c2h694kdmjis12g4nxq5hdlzsi42nbnpzq7wic305l5r7nxl"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; }; redcapAPI = derive2 { name="redcapAPI"; version="2.0"; sha256="1n4kwmd0kgmnx2zcgvrz2dlkxmv6wflyj4pll00qvpb1njgnq1xv"; depends=[checkmate chron DBI httr labelVector lubridate stringr tidyr]; }; @@ -10109,7 +10314,7 @@ in with self; { relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; }; reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; }; - relsurv = derive2 { name="relsurv"; version="2.1-1"; sha256="0jdxjnrxygn3ppzsndyzcch19c726s15lrd0kc1vxbjp3b4r0lhl"; depends=[date survival]; }; + relsurv = derive2 { name="relsurv"; version="2.1-2"; sha256="0hcvp1n8cvcnpqhwi1gcj3krzsarsk73ivwi75bvsvr3dpgxnwrm"; depends=[date survival]; }; rem = derive2 { name="rem"; version="1.2.8"; sha256="1w0lkxjhyssl9343z6lw7dn0cazz9firglvcf74nls4ngkgv0bbd"; depends=[doParallel foreach Rcpp]; }; remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; }; @@ -10124,7 +10329,7 @@ in with self; { repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; - replyr = derive2 { name="replyr"; version="0.9.1"; sha256="0vxxmnin8a9mrak33cm01wndbc333dyjh83iyn633yc6ll092klr"; depends=[cdata DBI dbplyr dplyr RSQLite seplyr wrapr]; }; + replyr = derive2 { name="replyr"; version="0.9.4"; sha256="1f8y2ywv7wf15g76949934r2qq2bp75ayfvrcb654q9pf2h5w39v"; depends=[DBI dplyr wrapr]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; repo = derive2 { name="repo"; version="2.1.2"; sha256="14a7lw1rvn7n7caz3p3y69n9wqw48qsxsjs5kwvpbwsmap7bjj7l"; depends=[digest]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; @@ -10134,7 +10339,7 @@ in with self; { reportr = derive2 { name="reportr"; version="1.2.2"; sha256="1fl4hy4ck4aapy152vn9gjd7w5vgvh2gz2ky6p0wwahah7m9b255"; depends=[ore]; }; reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; - repr = derive2 { name="repr"; version="0.12.0"; sha256="1p6a2ryb5iaf4i6nn1iav26bh83wmvncwpk25hyrzd5rxich1bq3"; depends=[]; }; + repr = derive2 { name="repr"; version="0.13"; sha256="0k5796r5z9yr8s1hlx30x4cy1ix4fc85m0lwqf9zdapcvw0iqgld"; depends=[base64enc htmltools]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="0.1.2"; sha256="105d9vsmqfilgpw8psfb2wyiz1hvcycvh4cqhb3ab37lm3rcavvs"; depends=[callr knitr rmarkdown whisker]; }; @@ -10161,7 +10366,7 @@ in with self; { restriktor = derive2 { name="restriktor"; version="0.1-80.711"; sha256="10kbfr7gzah119xm4cnx7br9i9fcga38kymjajw7m2571f4jsji9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; }; - reticulate = derive2 { name="reticulate"; version="1.5"; sha256="0bbsd87ajw9s37g0m8gpv0rws4jfiic9q31fn5a3lb06r2i4wl53"; depends=[jsonlite Rcpp]; }; + reticulate = derive2 { name="reticulate"; version="1.6"; sha256="036jiwxfvxkkijpilpbzlndm4bg4nd8gx8gxx4dl4zj263gd398m"; depends=[jsonlite Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; @@ -10181,27 +10386,28 @@ in with self; { rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; }; rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; rflann = derive2 { name="rflann"; version="1.3"; sha256="1y8m52vlrcl69srssd23zgg90yfhh9rryd16hk1dnqg713qhksgm"; depends=[Rcpp RcppArmadillo]; }; + rfm = derive2 { name="rfm"; version="0.1.0"; sha256="0bd71qk6vrd0jnnwdwlh30mn8v8dwwgmffrd71kbq83gbfp8ry3l"; depends=[assertthat dplyr forcats ggplot2 lubridate magrittr purrr RColorBrewer rlang shiny tidyr]; }; rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; rfoaas = derive2 { name="rfoaas"; version="1.1.1"; sha256="1rglqmbhnasc3ciypms3qqgfaj19202cnqdimsi69lvig2rnkca5"; depends=[httr]; }; rfordummies = derive2 { name="rfordummies"; version="0.1.3"; sha256="13jqvww65wzac1c8ajkljz89vi4j76y9ga52w3ygajjzg0rn15l5"; depends=[]; }; - rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; }; + rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; }; rgbif = derive2 { name="rgbif"; version="0.9.9"; sha256="11gji0b1gzh3zpmaff7ly9pvv6jdig5d1277hrss8x4zj7r34iap"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; }; rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; - rgdal = derive2 { name="rgdal"; version="1.2-16"; sha256="1j83bc16ndk561vgr67z99gba9bhgcchgir8s504avcs9zmfyzq1"; depends=[sp]; }; - rgdax = derive2 { name="rgdax"; version="0.4.0"; sha256="0f8n016p9y62rpxmqrycmbdb7b3h7vnsyd9qcicqs19yvpm91im2"; depends=[digest httr jsonlite RCurl]; }; + rgdal = derive2 { name="rgdal"; version="1.2-18"; sha256="0vyvbsz7260crfnqk61vcbk051d01lyl984yk140nwh9wj8svr1d"; depends=[sp]; }; + rgdax = derive2 { name="rgdax"; version="0.5.0"; sha256="1s9vqjmnkd4jvq5v8w1wc44khgd1pjzr2hq356vm0jpcvgf0qscq"; depends=[digest httr jsonlite RCurl]; }; rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; rgenoud = derive2 { name="rgenoud"; version="5.8-1.0"; sha256="12n34r0p00bmflxrmbj927jm0q19j5r9mjplz5mzb1v8praa7v4x"; depends=[]; }; rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; }; rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; }; - rgeopat2 = derive2 { name="rgeopat2"; version="0.2.0"; sha256="12n5zgx8svcrgsihvhw0drd0l3r48clshs2b36p0md111a2b1gh3"; depends=[readr sf stringr]; }; + rgeopat2 = derive2 { name="rgeopat2"; version="0.2.4"; sha256="1ngisbx9ws8zllkq2qa7zafl400wrvmj3rm812aja74d8rr2i7mw"; depends=[readr sf stringr]; }; rgeos = derive2 { name="rgeos"; version="0.3-26"; sha256="0czlwfqilzh1zj61axisg06d9dksdvvg5hgcs31ydaqkh45llllq"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; }; rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; - rgl = derive2 { name="rgl"; version="0.99.9"; sha256="1rv4gq03mbx62v4kyj83y5kh1f77d68aqwmdb00r8szqlx5w5gdm"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr shiny]; }; - rglobi = derive2 { name="rglobi"; version="0.2.13"; sha256="15hqcmh8r6lsc60139f9q9kyspkys61q0y39i5wq86lsq6i3q4js"; depends=[RCurl rjson]; }; + rgl = derive2 { name="rgl"; version="0.99.16"; sha256="0q8sg8fr0140ilssqhscaxkjc29w1rpp6f4k50amw3zzs9g58ak9"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rglobi = derive2 { name="rglobi"; version="0.2.14"; sha256="09f4v98m68ssnf1n0ijsrzawpri3jhv4bz7gzzzpijb75mkb0zwz"; depends=[RCurl rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; }; rgrass7 = derive2 { name="rgrass7"; version="0.1-10"; sha256="0w5vy8163xlfmdrpyp00x25wwq4jnaspzggpvj160azigndsc1kr"; depends=[sp XML]; }; @@ -10214,22 +10420,24 @@ in with self; { rhub = derive2 { name="rhub"; version="1.0.2"; sha256="18aq28q4vggbp19l9wcw3dylnyv7sd26wg0i5w8jrva5cq1v2n5j"; depends=[assertthat callr clisymbols crayon desc httr jsonlite parsedate prettyunits R6 rappdirs rcmdcheck rematch whoami withr]; }; rhymer = derive2 { name="rhymer"; version="1.0.0"; sha256="1k15sd5q6a1ijayl585vc54d1zs4nyrxsfck9bn4nlfdiwc5arwf"; depends=[httr jsonlite]; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; - ri2 = derive2 { name="ri2"; version="0.1.0"; sha256="02rlczjpfy1q5i7lq4ypindhc65cnryryvbklqjh5dh2xzwjkain"; depends=[estimatr ggplot2 pbapply randomizr]; }; + ri2 = derive2 { name="ri2"; version="0.1.1"; sha256="01iyk9cfs6v7jd1z962vrcdb3bfab5pcq9abkb21yqi82f9w97jf"; depends=[estimatr ggplot2 pbapply randomizr]; }; riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; }; ridge = derive2 { name="ridge"; version="2.2"; sha256="01yldzzlqg0xqha31l3py62lyq7fw5xfsbmz6ifzff24gqsf029x"; depends=[]; }; ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; }; + ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; }; riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; }; rif = derive2 { name="rif"; version="0.2.0"; sha256="0vk3dmg3qzw3i27wbpfih66rx8sdxq033l7h59h3hy960av4hawh"; depends=[crul data_table jsonlite tibble]; }; + riingo = derive2 { name="riingo"; version="0.1.0"; sha256="1lkg0xmy3mhx99ywbvkmnkj6i61r5x75g4fnnwj6vdyslvwf3s5x"; depends=[crayon glue httr jsonlite purrr rlang tibble]; }; rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; }; rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; }; ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; }; rintrojs = derive2 { name="rintrojs"; version="0.2.0"; sha256="0qdry88f6ci5g6k0i8mycm9k5ibnmb9zjppjvqqaflw3g3nsnli2"; depends=[jsonlite shiny]; }; - rio = derive2 { name="rio"; version="0.5.9"; sha256="1cb7p0kgas3y84sc1p59zcsp0c4qhg01cs9s7kl927qhral778kd"; depends=[curl data_table foreign haven openxlsx readxl tibble]; }; + rio = derive2 { name="rio"; version="0.5.10"; sha256="158xg3vj0glk3fslwi6fywwmfym2b6kn3fdmjligdfy5lf68khix"; depends=[curl data_table foreign haven openxlsx readxl tibble]; }; rioja = derive2 { name="rioja"; version="0.9-15.1"; sha256="18fyqcykg12mf4ap0a2la30656xq32immqz11ddmrfrb0vpd2h7h"; depends=[mgcv vegan]; }; ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; }; riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; - riskRegression = derive2 { name="riskRegression"; version="1.4.3"; sha256="1r9habv47wwhnbvcjl6yin4i415ayhisg67rzggv899nqcyqpm80"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo rms survival]; }; + riskRegression = derive2 { name="riskRegression"; version="2018.04.21"; sha256="0jyk5pdgr8wqyfxzwbmanqp7ff0fkw3nlz7dx19rqxji1lnj74qa"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava plotrix prodlim Rcpp RcppArmadillo rms survival timereg]; }; riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; riskyr = derive2 { name="riskyr"; version="0.1.0"; sha256="1s6yrij5d1vhvzc7nnajjnjmxnhrs0r1psppcvwb0qg3ff181y22"; depends=[diagram vcd]; }; @@ -10243,6 +10451,7 @@ in with self; { rivr = derive2 { name="rivr"; version="1.2"; sha256="0ankpfixggwdv17ba8i5iln0zzmngqrhvh3dg8lis9kqg6wa89yr"; depends=[Rcpp]; }; rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; }; + rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; }; rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; }; rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; }; @@ -10253,28 +10462,30 @@ in with self; { rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; rlang = derive2 { name="rlang"; version="0.2.0"; sha256="0f87fhw5pj6s2zjdxnpnd7pwn78czdz71b0xhm5adqg1p38sfwj8"; depends=[]; }; - rlas = derive2 { name="rlas"; version="1.1.9"; sha256="1c8sc277jiij1j5sb3wsjdm1pxlp0ia3a39xqzglvmlcnlvcygbq"; depends=[data_table Rcpp]; }; + rlas = derive2 { name="rlas"; version="1.2.1"; sha256="0mqs7vd4855hdjymvp6427vhs2ihaz37lx59984x39rc7sfw6nap"; depends=[data_table Rcpp uuid]; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; }; + rlfsm = derive2 { name="rlfsm"; version="0.1.0"; sha256="1ixffrn56s9hg56ygk8882kz4b77sfdd9xb5vnk8b10sl9yjh4r7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; }; rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; }; rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; }; - rly = derive2 { name="rly"; version="1.4.2"; sha256="0mppl3y808k9ydn1lwng2bqmdzbbsla2p9p8qk73mp0xyq8iq9sm"; depends=[futile_logger R6]; }; + rly = derive2 { name="rly"; version="1.5"; sha256="0rd4ksd6qv227zgdxmy9d77v1jyba0vk0svh5wc5b72z92j9cjzb"; depends=[futile_logger R6]; }; rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; }; rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; - rmapshaper = derive2 { name="rmapshaper"; version="0.3.0"; sha256="0v7p8wqgjymidavyq9lfl6kzlpn5ybfc9lqhsaxbxcc9hb80xjxz"; depends=[geojsonio geojsonlint rgdal sp V8]; }; - rmapzen = derive2 { name="rmapzen"; version="0.3.3"; sha256="0rz3wwy8dbb2620gy07aib2aad6ds001vf47bxrj3vzrxp5h448i"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; + rmake = derive2 { name="rmake"; version="1.0.0"; sha256="1qvbyd68p37nsqrm77w18znsa6m629qzyd7sl8w98p654pqmjhdw"; depends=[assertthat pryr rmarkdown]; }; + rmapshaper = derive2 { name="rmapshaper"; version="0.4.0"; sha256="0a911f6q9czni6zpijp63rngnil7jkbcy9f7jz55jr225fgm6g6z"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; + rmapzen = derive2 { name="rmapzen"; version="0.3.4"; sha256="1hpl2j347d5qahwzxlr66k2fl6fg09160jn6p3ycvhp0g7zaq5r4"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; rmarkdown = derive2 { name="rmarkdown"; version="1.9"; sha256="0wq6kbhrkv3fhcy4hg5yyv9gdvf8gr4nsjwdifs4ih8lnn0dmdyb"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr yaml]; }; rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; }; - rmcfs = derive2 { name="rmcfs"; version="1.2.9"; sha256="1ar2dsxjf0a6ij91d380arlh9wlywqpfaii80bk6mrq4xg6qy4b0"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; }; + rmcfs = derive2 { name="rmcfs"; version="1.2.10"; sha256="0gyvb8vdv1n93xbz0xl5vhwhskas8cxj4zv8flz18jm6f0bgqlrr"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; }; rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; }; rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; }; - rmda = derive2 { name="rmda"; version="1.4"; sha256="0agh4mrs8mjjb7hc41r59mbnq0h873fmykljla1cbf4ikhxwjihf"; depends=[caret MASS pander reshape]; }; + rmda = derive2 { name="rmda"; version="1.5"; sha256="13119x23xi912s7wl2p2a24msbczgv75x37p2jsr5w0n4l2k01wi"; depends=[caret MASS pander reshape]; }; rmdformats = derive2 { name="rmdformats"; version="0.3.3"; sha256="06nyrdhy26mvgfb1bnlbd8hslybpc01a30a40wwlc3ay7yp0nzrj"; depends=[bookdown htmltools knitr questionr rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; - rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; + rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; @@ -10301,13 +10512,13 @@ in with self; { rnn = derive2 { name="rnn"; version="0.8.0"; sha256="04924zn448x9rc3z9vh033l4rv9lz0hxv1bhfl0gn6gvd5wavlc7"; depends=[shiny sigmoid]; }; rnoaa = derive2 { name="rnoaa"; version="0.7.0"; sha256="0mha1izbzfa6vq44wjsc4p018k83zw99f6bpkhc275c5v09pxvmr"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; }; rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; }; - rnr = derive2 { name="rnr"; version="0.1.0"; sha256="1209gayyn98zdkwv51liq62b2xvza6xndfqkpc73w5dgj1rqn343"; depends=[assertthat purrr]; }; - rnrfa = derive2 { name="rnrfa"; version="1.3.0"; sha256="1zrj7y0qh57r7r9c5pspz238w0j1kaicd2l6vcg92lgxi8b9i558"; depends=[ggmap ggplot2 httr plyr rjson sp stringr xml2 xts]; }; + rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; + rnrfa = derive2 { name="rnrfa"; version="1.4.0"; sha256="007j6a2hihw7h0vhv6aiz7iymzr3lkzmc1dy5f8b22z5n52k4pl3"; depends=[ggmap ggplot2 httr plyr rgdal rjson sp stringr xml2 xts]; }; roadoi = derive2 { name="roadoi"; version="0.4.1"; sha256="1g4x1gkcrq8pd5vdikhf16ghgd990hhb1m387r2smz21v993cfk8"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; }; roahd = derive2 { name="roahd"; version="1.3"; sha256="1pn2xzc5fnp2hb3fw3gpqng0x9rvpd4qfhx9gclf31algpzaidbb"; depends=[robustbase scales]; }; - robCompositions = derive2 { name="robCompositions"; version="2.0.6"; sha256="1r74w6ssq9fhjain02hr9sz0x2j1fi1waw7319gls69kp73b51hw"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM]; }; + robCompositions = derive2 { name="robCompositions"; version="2.0.7"; sha256="1ym63s6rn02p42q4mwmxbnh713shs4sc2ayimi053yzix4cnwn7w"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM zCompositions]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; - robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; + robeth = derive2 { name="robeth"; version="2.7-1"; sha256="06qkrjvg4yps4h6xdb81svx52vlw389z1j4brpv0w9h40ljpxbff"; depends=[]; }; robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; }; robis = derive2 { name="robis"; version="1.0.0"; sha256="02spxy33vh675dvhx2v6f06hxzcwfrsmkzb6yk5h30xp21blqv4g"; depends=[dplyr httr jsonlite leaflet]; }; @@ -10347,7 +10558,7 @@ in with self; { rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; }; rolypoly = derive2 { name="rolypoly"; version="0.1.0"; sha256="11nf7in6n03675l11ynl4rp20rlzy7jli3m518s4sqqxdm8f8ci7"; depends=[data_table dplyr foreach ggplot2 glmnet MASS Matrix matrixcalc]; }; rootSolve = derive2 { name="rootSolve"; version="1.7"; sha256="08ic6ggcc5dw4nv9xsqkm3vnvswmxyhnqnv1rdjv1h2gy1ivpcq8"; depends=[]; }; - rootWishart = derive2 { name="rootWishart"; version="0.4.0"; sha256="028k1h6vibbcnmh35kg0z388c991k8v78ac0fbrv1k2ajqrrl4lg"; depends=[BH Rcpp RcppEigen]; }; + rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; }; roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; ropenaq = derive2 { name="ropenaq"; version="0.2.6"; sha256="065p4c8l4bqxy00clbjhad8hqw4gg2h2c00b06n2fa5n70z0akgq"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; }; @@ -10361,7 +10572,7 @@ in with self; { rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; }; - rotl = derive2 { name="rotl"; version="3.0.3"; sha256="0pfpgynvdi011m6j6gs98irldpjrdc8rgza36ndk60q2w5z436h4"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; + rotl = derive2 { name="rotl"; version="3.0.4"; sha256="1zc4418gxpd65n60lspsdm15v7apkv6wkf9jqqs152z079ppdrhx"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; routr = derive2 { name="routr"; version="0.3.0"; sha256="1mjf1vwrh1k1kjl1kcgqs29zb8h9m05630czsjkz7li3pmvy9mrv"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; }; @@ -10377,7 +10588,7 @@ in with self; { rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; }; rpdo = derive2 { name="rpdo"; version="0.2.3"; sha256="150kd9pvfr7msrh55vsqcj8lv994izlvhxf4g5n1qbzdcaqsdjzp"; depends=[checkr]; }; - rpf = derive2 { name="rpf"; version="0.56"; sha256="089n2mmczvvwga8ak3l0p326qsp83d0cz03lc6fhx6a9w5vhl67i"; depends=[mvtnorm RcppEigen]; }; + rpf = derive2 { name="rpf"; version="0.56.1"; sha256="1332d5fzpsi988k1x57hyydjwrx3gxr3l7hgf946jrd8y1c2nj5d"; depends=[mvtnorm RcppEigen]; }; rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; }; rpgm = derive2 { name="rpgm"; version="1.1.2"; sha256="0pbja877gb3mn7m78lfdl217dm7qsrblq6gwrjh5wbv1nd532hvz"; depends=[]; }; rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; }; @@ -10404,7 +10615,7 @@ in with self; { rptR = derive2 { name="rptR"; version="0.9.21"; sha256="0wqh9d372s2222qm5w0wx77l2sj7zvdnl7zvxcn5wfs3cz84fj15"; depends=[lme4 pbapply]; }; rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; }; rqPen = derive2 { name="rqPen"; version="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; }; - rquery = derive2 { name="rquery"; version="0.4.0"; sha256="080q99q5bkhdxbnd2xg3mjpyvj3ad2lvvay845h50s9c9gpsn9wp"; depends=[DBI RSQLite wrapr]; }; + rquery = derive2 { name="rquery"; version="0.4.2"; sha256="018m46iqrbs4h20clhqhxydd9y43swhdq1mmb00hvzlfbwbxi05r"; depends=[DBI wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; }; rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; @@ -10416,8 +10627,9 @@ in with self; { rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; rredlist = derive2 { name="rredlist"; version="0.4.0"; sha256="0j2hab26zs9dyg9fggza7yffbvwvnmrk5frbfs2ys8h3hg2x6ncy"; depends=[crul jsonlite]; }; rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; }; - rreg = derive2 { name="rreg"; version="0.1.2"; sha256="06zang5m39bla4c5wxb9p4fgrn66a69l190z5gnsyp8r6b166x3p"; depends=[directlabels ggplot2]; }; + rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; }; rrepast = derive2 { name="rrepast"; version="0.6.0"; sha256="1d6nk6437c4bxbyvpzdlgd1kxh651979m0k7aadi9fl77i5k2x3w"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; + rres = derive2 { name="rres"; version="1.0"; sha256="16blkbmma5wj5zigl9yr62kbffyk2amvq45gvgpdj726qdskymcx"; depends=[kernlab Rcpp]; }; rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; }; rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; }; rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; }; @@ -10427,11 +10639,11 @@ in with self; { rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; rsample = derive2 { name="rsample"; version="0.0.2"; sha256="10lmpy4ca045j2fxbz5xzl1w9242dkp6sc8hhrk0fxs0dkfb7amf"; depends=[broom dplyr purrr recipes rlang tibble tidyr]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="2.5.1"; sha256="0az638dlg7nqhj7xf1bwcpv9anqqcif8ni4a8q68lcn2sxb4wamp"; depends=[]; }; + rscala = derive2 { name="rscala"; version="2.5.3"; sha256="0a6l7inx6shyxma0a0kf2jh8402n7xavpday4k7lr316v62lyq29"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; rsconnect = derive2 { name="rsconnect"; version="0.8.8"; sha256="019phwamg2irb0ak9y0sn25ihi0a9sfdpa02dz9x0bhpcg55x0li"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; }; rscopus = derive2 { name="rscopus"; version="0.5.3"; sha256="1d6265ffmhd6ajlp607y5jy77nqgcrdym6w1j8vnil0705z3swzb"; depends=[httr plyr tidyr]; }; - rscorecard = derive2 { name="rscorecard"; version="0.7.0"; sha256="02bjkk03cppd88dljxj72lngwryhbbffvin8h3fkl7jkcaccsq1z"; depends=[dplyr httr jsonlite lazyeval magrittr]; }; + rscorecard = derive2 { name="rscorecard"; version="0.7.1"; sha256="1j7v383gcb13bi6d1v59pkx6d9g4yichyyh5ads9w82qq6v31xnw"; depends=[dplyr httr jsonlite lazyeval magrittr]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive2 { name="rsdmx"; version="0.5-11"; sha256="06sjkjl9y2fg2yz740a1z5zn4afnjfv1nsykszxsnwn7s23rxi31"; depends=[plyr RCurl XML]; }; rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; }; @@ -10440,7 +10652,7 @@ in with self; { rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; }; rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; }; rsig = derive2 { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; }; - rsimsum = derive2 { name="rsimsum"; version="0.3.0"; sha256="11zc6ga4d4i9bilmbfinkanv3fkz8xpcikc38mxf88lv9jfv0kx1"; depends=[checkmate ggplot2]; }; + rsimsum = derive2 { name="rsimsum"; version="0.3.1"; sha256="0rg3flfh2wwa3xyjsb041k94jryx2yxf8kb0nnvy9wgybn3v1c01"; depends=[checkmate ggplot2]; }; rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; }; rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; }; rsm = derive2 { name="rsm"; version="2.9"; sha256="1rj2qdlv44hbv1ipv7hdpssn90ypp6bfc7nqdaf9dak0bd6khwni"; depends=[estimability]; }; @@ -10453,9 +10665,9 @@ in with self; { rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; rstan = derive2 { name="rstan"; version="2.17.3"; sha256="10fdasqbdwlisnm7hjmgl5f027ypfhni86d1c5fykb09g1pvkjz3"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; }; - rstanarm = derive2 { name="rstanarm"; version="2.17.3"; sha256="196fi09fpxf3v0kbdf6ci6f8c0mw1vx3g30cmkvl5rm17abhwifs"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; }; + rstanarm = derive2 { name="rstanarm"; version="2.17.4"; sha256="1azggccxj6k8nrz8xlmsv42h0rvwmqfih8xxqn45v7fy9la006p0"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; }; rstansim = derive2 { name="rstansim"; version="0.1.1"; sha256="09hg4ishzp6q90nrl94h21al0ad0jn7fr8brp8f0xa9cvkwlzjpg"; depends=[doRNG doSNOW foreach loo Rcpp rstan]; }; - rstantools = derive2 { name="rstantools"; version="1.4.0"; sha256="1k1nhcy0d2lcnllrdslk4p2d6cp12s5v2vzl5j7l9c7l24syq2ar"; depends=[]; }; + rstantools = derive2 { name="rstantools"; version="1.5.0"; sha256="19rzcfiirw539hxs98j33gccwigdpwf3nj1w5jwwzank217wmgg4"; depends=[]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; }; rstpm2 = derive2 { name="rstpm2"; version="1.4.1"; sha256="0pgy9a8llj0zzzc06afzd0w11mdbx3xvmjf0qpzvsid1zqdbcqxr"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; }; @@ -10480,13 +10692,13 @@ in with self; { rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; }; rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; }; rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; }; - rtip = derive2 { name="rtip"; version="1.1.0"; sha256="1fpxg85lhdvc68rr13x1w7k9s7j0cwsc18gc579bd44jqpgfkw72"; depends=[boot ggplot2 mvtnorm plyr]; }; + rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; }; rtk = derive2 { name="rtk"; version="0.2.5.4"; sha256="1nh757l4ih5pmmh7b84ca1f5wpz9mcksdb0a4rvs2hhgap38ihg9"; depends=[Rcpp]; }; rtkore = derive2 { name="rtkore"; version="1.5.1"; sha256="03vmgrsil5yrrs3ndgqvfcwv9plcawc8v2y2x9nwcashxg40djn6"; depends=[Rcpp]; }; - rtop = derive2 { name="rtop"; version="0.5-13"; sha256="1md9sgsmbc3jv1lc4l6r26830k9vjljjqpzzna4s23bn6ky7glgp"; depends=[gstat rgdal sp]; }; + rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; - rtrim = derive2 { name="rtrim"; version="1.0.1"; sha256="134j5sv9dvcq1n37rry7615nr3pa54by6r7ss7fagcmy4lnma2ps"; depends=[]; }; - rts = derive2 { name="rts"; version="1.0-38"; sha256="1m9kir2snfhxyagsflp4cyii33ycw4fr0f8bn7r92757l92i7vr7"; depends=[raster RCurl sp xts zoo]; }; + rtrim = derive2 { name="rtrim"; version="2.0.4"; sha256="1xl3xai768idnfc30hp20cnpq3a07049p7vpkqpdrpla6a8zhvqk"; depends=[]; }; + rts = derive2 { name="rts"; version="1.0-45"; sha256="11gvgj5bqiacsf51sg4dj7jpsjgdj6j26vqc8by15325a4c804ml"; depends=[raster RCurl sp xts zoo]; }; rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; }; rtweet = derive2 { name="rtweet"; version="0.6.0"; sha256="0bh483wfl4f8xscdyv3ys5hhdabc91dynlbqlxxv8mil7pgg3chg"; depends=[bit64 httr jsonlite magrittr openssl readr tibble]; }; rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; @@ -10501,18 +10713,18 @@ in with self; { rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1"; sha256="05ci4f0k2b54sqf0h6j38h3kkq3r27klva0hfg968snr9bb6v0wv"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; rust = derive2 { name="rust"; version="1.3.4"; sha256="1jb970kskl2wdhqcjbxl8gh986abdy96jbipnsdi3656ic5dxivn"; depends=[Rcpp RcppArmadillo spatstat]; }; - ruv = derive2 { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; }; + ruv = derive2 { name="ruv"; version="0.9.7"; sha256="1ynxmax9sz74s8abmmizla6jas385mn5ij151mq35k0yv1xszzj5"; depends=[ggplot2 gridExtra scales]; }; rv = derive2 { name="rv"; version="2.3.2"; sha256="108s9q19h5ypxb9w4a8nk97js261izag1sf75g4xfqblwxxrbflc"; depends=[]; }; rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; rvcheck = derive2 { name="rvcheck"; version="0.0.9"; sha256="14pa7fa7yyhmk0v5md7x5xr5jd4gjwjlvgbynnhq30fj56qffyvf"; depends=[]; }; rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; }; - rvertnet = derive2 { name="rvertnet"; version="0.6.2"; sha256="12qffkkl3yqiqh0zi4zrj6irv7jnylja7fv21h3fnjpvqwkazv8a"; depends=[crul dplyr ggplot2 jsonlite maps]; }; + rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; }; rvg = derive2 { name="rvg"; version="0.1.8"; sha256="03hank94b5d1spig9jzrm5h2xbipi8skwqjg8sfwxwy5sjyrbaam"; depends=[gdtools officer Rcpp xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.7.1.0"; sha256="1w3nwxpvmmkcvyymhz434xh6srjc87hj824bcjydmavx221ncf6p"; depends=[BH lattice Rcpp RcppEigen RcppThread]; }; - rwalkr = derive2 { name="rwalkr"; version="0.3.2"; sha256="0vp7iizc6bn3y30vcrvksy91aiid52q01vgzjphc5m5sy99gsxj2"; depends=[dplyr httr tibble tidyr]; }; + rwalkr = derive2 { name="rwalkr"; version="0.3.3"; sha256="03kpv4hvlajm09cqrlihia62pcj1skakx28ci4mgbfgpjy6l4jsl"; depends=[dplyr httr tibble tidyr]; }; rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; rwc = derive2 { name="rwc"; version="1.1"; sha256="0gdpskj87wjnpas90i3iqn1qv6frrki2xqiyyakg3zpaviw1imag"; depends=[MASS Matrix mvtnorm raster]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; @@ -10536,7 +10748,7 @@ in with self; { sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; }; sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; }; sFFLHD = derive2 { name="sFFLHD"; version="0.1.1"; sha256="19zhx0rc6h44301a5q68r9jbxzh12ci3387d1c319vdiw05nschy"; depends=[conf_design DoE_base]; }; - sGMRFmix = derive2 { name="sGMRFmix"; version="0.1.3"; sha256="19kfcg36yvwcsq24cn16s5zv9l42rnd9yk2p85j40d6f00ncivkr"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; + sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; }; sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; }; sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; @@ -10549,13 +10761,14 @@ in with self; { sads = derive2 { name="sads"; version="0.4.1"; sha256="1ir5cfjw3416gg7bvfp2qrn9qy1xbklb9a57rp06ghjg7d4slwpr"; depends=[bbmle GUILDS MASS poilog VGAM]; }; sae = derive2 { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; }; sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; - saeRobust = derive2 { name="saeRobust"; version="0.1.0"; sha256="1zin9ix4wx3qbx2mfjyn61l0g1k4dgn4ps79qn21y6l9r647ya9q"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules Rcpp RcppArmadillo spdep]; }; + saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; }; saeSim = derive2 { name="saeSim"; version="0.9.0"; sha256="19l41qpwspccphmgxi20p7f473lxxh8d86b0wyy5jq24phhd8awx"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; saemix = derive2 { name="saemix"; version="2.1"; sha256="1g52vkqg2dfld7miakkmp23yf4yzc7ka0hbg2fl6ya9cq9m7wyqq"; depends=[]; }; saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; safer = derive2 { name="safer"; version="0.2.0"; sha256="0659xn8jzd5md2mm71p4036ljrfvlhkfshsgidx7l2k9ig532059"; depends=[assertthat base64enc sodium]; }; safi = derive2 { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; }; + salesforcer = derive2 { name="salesforcer"; version="0.1.2"; sha256="02a4xzwphy5zfkd0qza6cm2n7dpf71bmc6r78gj17w4amrp3k5y5"; depends=[dplyr httr jsonlite lubridate purrr readr XML xml2]; }; samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; depends=[]; }; sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; }; sampleSelection = derive2 { name="sampleSelection"; version="1.2-0"; sha256="1s3p5fvvxkjkm6vjpxi3rw8ncbmyvqpfb0gghcvf2sspdyzam1s2"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; }; @@ -10589,11 +10802,11 @@ in with self; { sbgcop = derive2 { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; }; sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; }; sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; }; - sbpiper = derive2 { name="sbpiper"; version="1.5.0"; sha256="0ighjp1934y3f6myl60fjxman7333yi9fnhhk3d5xgazsfb8bnnp"; depends=[colorRamps data_table ggplot2 Hmisc reshape2 scales stringr]; }; + sbpiper = derive2 { name="sbpiper"; version="1.6.0"; sha256="00i6wp893rsmm688si3yja7bphmz6ixidhchg2j2h50cfik9q18h"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; }; sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; }; sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; - scagnostics = derive2 { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; }; + scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; }; scaleboot = derive2 { name="scaleboot"; version="0.3-4"; sha256="16shdj4b8pbdbphqzw7r5xzx6k2qfkr729inv21gkp9qcp4h0vrm"; depends=[mvtnorm pvclust]; }; scales = derive2 { name="scales"; version="0.5.0"; sha256="0zg9wfzmsdjxpbld0nzv7hcpq5r0wazqxmn7grvvif2agj0w1z6v"; depends=[dichromat labeling munsell plyr R6 RColorBrewer Rcpp viridisLite]; }; scalpel = derive2 { name="scalpel"; version="1.0.0"; sha256="0zk81q2f49vrbprlvjq3q4s2ak7rrlpj55rrfkqr8nq1vvi6nxd2"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; }; @@ -10605,8 +10818,8 @@ in with self; { scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; }; scatterD3 = derive2 { name="scatterD3"; version="0.8.2"; sha256="1cfh060ffwxy33b1f7n8mba1sbbwgx28mqn08im16dqbphkcmx1z"; depends=[digest ellipse htmlwidgets]; }; - scatterpie = derive2 { name="scatterpie"; version="0.0.8"; sha256="1dfwz83hxdms7qglsz540wszzcd5hfmjzw440c93jgi18n6kx9s4"; depends=[ggforce ggplot2 tidyr]; }; - scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-40"; sha256="0ababcj87kx7860mica9y2ydlhskxmgj9n46crx036cila512jc2"; depends=[]; }; + scatterpie = derive2 { name="scatterpie"; version="0.1.0"; sha256="0ssfvnwwfyavzxxrbimb623pc0y72qvbis16sdr6fxvyfif4qmm5"; depends=[ggforce ggplot2 rlang tidyr]; }; + scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; }; scclust = derive2 { name="scclust"; version="0.1.1"; sha256="1bml4qyyspwaqxzwjhqy8i450614p3f3dj0s0qdkv6psa60h0w5z"; depends=[distances]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; }; @@ -10623,7 +10836,7 @@ in with self; { sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; }; scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; - scorecard = derive2 { name="scorecard"; version="0.1.5"; sha256="1cf4cmn3csbv1l3nnr3873vszp7xb5v4864g072mwzg7xr1maj4w"; depends=[data_table ggplot2 gridExtra]; }; + scorecard = derive2 { name="scorecard"; version="0.1.6"; sha256="1k5vcjd574i493wazckyg6a0b4pf9b833rqppq444lwvkag7qn2q"; depends=[data_table doParallel foreach ggplot2 gridExtra]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; scoringRules = derive2 { name="scoringRules"; version="0.9.4"; sha256="0m8050qqb3j0miwfbadp6lmd2q5vicsqn4waw4jszz52fhb8mv27"; depends=[MASS Rcpp RcppArmadillo]; }; @@ -10632,6 +10845,7 @@ in with self; { scraEP = derive2 { name="scraEP"; version="1.0"; sha256="1pmab2nhymb7vjfg7vysqn2cs9apdkwxgi55qn8kjg2g5r0098p7"; depends=[RCurl XML]; }; scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; }; scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; }; + scriptName = derive2 { name="scriptName"; version="1.0.0"; sha256="0jpr9x5hf45cik5zxqw0j3vkvbk04a7ck2crvb2472hrv7s9al55"; depends=[purrr rlang]; }; scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; }; scriptexec = derive2 { name="scriptexec"; version="0.2.1"; sha256="09gaccqadb51ia66xk9vi3p9472s82bg6v8i6ba390g04yipbipi"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.7.2-1"; sha256="123rxx1a13fbv975hp9f9rjcigp8vfai7679wbn9dlyvph5nivaz"; depends=[Rcpp]; }; @@ -10640,8 +10854,8 @@ in with self; { scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; }; sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; }; sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; }; - sdat = derive2 { name="sdat"; version="1.0"; sha256="1rp2s3y44f3vj0p16j1k2rrs44kmnzy9k0lpcm9ga801nbv93saz"; depends=[]; }; - sdcMicro = derive2 { name="sdcMicro"; version="5.1.0"; sha256="06rnnm5g7rpbbxgdb9sl7gkcimdbx1qmgzg5d2n0jl4b81jac2n2"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; }; + sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; }; + sdcMicro = derive2 { name="sdcMicro"; version="5.2.0"; sha256="1kfws4y59x7blvv8ix1xvwi92ccfsjnjlifs89jj18wjlb2khjsw"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; }; sdcTable = derive2 { name="sdcTable"; version="0.22.8"; sha256="134a0g1v5w9airckn1bqp4k7hv2dcl5kmb1hx78nw5s8h92y3gkc"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; }; sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; }; sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; @@ -10659,6 +10873,7 @@ in with self; { seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; }; seacarb = derive2 { name="seacarb"; version="3.2.6"; sha256="1036hrmgv7xn0khddbfdg0p9d4hmhhxxb3fd7fysjmzlk7k7naqb"; depends=[gsw oce]; }; sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; + sealr = derive2 { name="sealr"; version="0.1.0"; sha256="1ky0m120bf4mmb0c99ywrzr2jjx3cljscf9vnsnp54rkabh1q2mm"; depends=[clipr clisymbols digest dplyr glue magrittr purrr rlang rstudioapi styler tibble tidyr]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; }; searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; searcher = derive2 { name="searcher"; version="0.0.2"; sha256="0lj7zyqldr8m7ky20frzaxmf9by2h3p89ibwsa7dyrf378swkwwj"; depends=[]; }; @@ -10681,6 +10896,7 @@ in with self; { segclust2d = derive2 { name="segclust2d"; version="0.1.0"; sha256="0kymw36cvakx84c96npkbnsvv0a1s82773ib5c802ybvkb2r1k9p"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; segmented = derive2 { name="segmented"; version="0.5-3.0"; sha256="0nrik5fyq59hwiwjcpbi4p5yfavgfjq6wyrynhkrbm4k6v1g1wlq"; depends=[]; }; + segregation = derive2 { name="segregation"; version="0.0.1"; sha256="0avapyr8h0c4hl0xchazr5gig9857y25xx4js788liy679iczwf7"; depends=[data_table]; }; seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; }; sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; @@ -10689,7 +10905,7 @@ in with self; { selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; }; selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; }; selectiveInference = derive2 { name="selectiveInference"; version="1.2.4"; sha256="1k7lnf6fplnxp3giwinldg9g5spi21infln21k413dv3wkksk71f"; depends=[glmnet intervals survival]; }; - selectr = derive2 { name="selectr"; version="0.3-2"; sha256="0kdrj64rqg4z6hg92y9r2h602a2i73r5rnlpg23ys33d5d32n8jy"; depends=[stringr]; }; + selectr = derive2 { name="selectr"; version="0.4-1"; sha256="1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b"; depends=[R6 stringr]; }; selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; }; seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; }; selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; }; @@ -10698,6 +10914,7 @@ in with self; { semGOF = derive2 { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[MASS matrixcalc sem]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; }; + semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; }; semTools = derive2 { name="semTools"; version="0.4-14"; sha256="1j1chman14i908c009lf0jgdmrrb8avgp8nif1i9wlj6vgif890c"; depends=[lavaan]; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semds = derive2 { name="semds"; version="0.9-2"; sha256="0ig8b7ii1c8av0il904b71lzr8lqdiibwf16yj5dp8n4xc80bryh"; depends=[minpack_lm pracma]; }; @@ -10722,10 +10939,10 @@ in with self; { sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; }; senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; }; sentimentr = derive2 { name="sentimentr"; version="2.2.3"; sha256="0f9hwiyja9cgig0ja9miqzsfwpn25bfa8xrwfm34v1n2l3v2gbxv"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; - sentometrics = derive2 { name="sentometrics"; version="0.2"; sha256="0pndbas1xya2pnriil94r0pp6zjd44flhsqimdgmi7w5k87wlabf"; depends=[abind caret data_table foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll sentimentr stringi zoo]; }; + sentometrics = derive2 { name="sentometrics"; version="0.3.5"; sha256="0628vnv3wga21z5dvhxs3alj194s43xgaasifpbfm2gmfzma6lb4"; depends=[abind caret data_table foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll stringi zoo]; }; seoR = derive2 { name="seoR"; version="0.1.0"; sha256="0aa74a9vi176ap4ap44sjm8lm3025dss067sm5lgc4b73a6ph75p"; depends=[digest dplyr httr igraph jsonlite RCurl readr robotstxt rvest stringr XML xml2]; }; separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; - seplyr = derive2 { name="seplyr"; version="0.5.4"; sha256="1ha3cxz5wql9bsw4japc5kj2c42mkk0g1yb141hpxpqq1c416gd1"; depends=[DBI dbplyr dplyr rlang RSQLite wrapr]; }; + seplyr = derive2 { name="seplyr"; version="0.5.5"; sha256="1hb0df1mlqv8fivdnqg5lw7gj92hscrxw122isgixkqm74n0vc5y"; depends=[dplyr rlang wrapr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; }; seqHMM = derive2 { name="seqHMM"; version="1.0.8"; sha256="1zr70ym32isav13wsb7zv4gv3bn04qi0dn5k0fqjbdcw36m5hfi8"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; @@ -10738,13 +10955,13 @@ in with self; { seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; }; - sequoia = derive2 { name="sequoia"; version="0.9.3"; sha256="1lxq88bw5fbm2afdh79fs363dvb1c2jsz02dc6c0ndwkwch04igc"; depends=[plyr]; }; + sequoia = derive2 { name="sequoia"; version="1.0.2"; sha256="1pn282s40ssprjrfh5drjr123ldlp84z3kviv6mmavrwhkp5lq5g"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; }; serial = derive2 { name="serial"; version="1.3"; sha256="1ibwd8xmkd0pwdhivm6h3yd3rsi28mai5n7qcs1bq2mx8hb5lg7f"; depends=[]; }; seriation = derive2 { name="seriation"; version="1.2-3"; sha256="1q6hw4hjw224b4y0dc0j630v2pgj6sn455nwkilb70w8k31hpk92"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; }; serrsBayes = derive2 { name="serrsBayes"; version="0.3-12"; sha256="137pm5s7w6fxaalyc7hzvdkg7rayjhqw2dnb2q8q9ijp0v9wx7mr"; depends=[MASS Matrix Rcpp RcppEigen truncnorm]; }; - servr = derive2 { name="servr"; version="0.8"; sha256="05pz4ychqp4cqywcdavdi8jj3y09gmam097d2idjnlcg9x61h2s9"; depends=[httpuv jsonlite mime]; }; + servr = derive2 { name="servr"; version="0.9"; sha256="0bs0i5mjfzxfshqz8i30nhn7kvgwly4fqn5bfq6dqfdrn7biai2x"; depends=[httpuv jsonlite mime xfun]; }; sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; sessioninfo = derive2 { name="sessioninfo"; version="1.0.0"; sha256="00g3lbvk1cjjzckl70fn5n3579qb301im4lbm3cip5c2v8k283dk"; depends=[clisymbols withr]; }; @@ -10753,11 +10970,11 @@ in with self; { setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.6-0"; sha256="0g6ghmjpxvlpi2sgvcxb6dx74pl7nc70cr8lgslrnv0fhnjr49jk"; depends=[classInt DBI magrittr pillar Rcpp units]; }; + sf = derive2 { name="sf"; version="0.6-1"; sha256="1hqsjbbasqb8vxswl7cwwjgvjiki71yb8fr301lzfxagkanys790"; depends=[classInt DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; - sfdct = derive2 { name="sfdct"; version="0.0.5"; sha256="02di504pcv423wk40ap8k18b2q759x8f5wsp8kkbwks54j42s69a"; depends=[dplyr RTriangle sf sp tibble]; }; + sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; sfsmisc = derive2 { name="sfsmisc"; version="1.1-2"; sha256="0cgq2h11ngkzd6p34k6mqjnvlvc5vj4lnqrl64k05lb391j391w0"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-0"; sha256="0d1yiimc899i09yyrv1x40ixqss87xjpy08ab16h9faxd4bsk3y2"; depends=[fda SuppDists]; }; @@ -10765,11 +10982,10 @@ in with self; { sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; - sglOptim = derive2 { name="sglOptim"; version="1.3.6"; sha256="0gzhzfi5q9hgqgzagfdzi4cswpmwic9ggf72qi6axl1hixgmgp0w"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; }; sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; }; - sglg = derive2 { name="sglg"; version="0.1.2"; sha256="0wqjw466j3j5ipjgp18978g7fwb2fvzxhfv2bp4dqdazmxrjyyqm"; depends=[Formula robustloggamma ssym survival]; }; + sglg = derive2 { name="sglg"; version="0.1.3"; sha256="17w9mfb53ll8aqasl4ysnb0b7sk6cgp7s1cfvn07rg5win2swqrj"; depends=[Formula robustloggamma ssym survival]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; - sgmcmc = derive2 { name="sgmcmc"; version="0.2.1"; sha256="13wgc6rd6knmcw8nj12j43qqjsipxf702a4cycsnn9z7jlaxzszh"; depends=[tensorflow]; }; + sgmcmc = derive2 { name="sgmcmc"; version="0.2.2"; sha256="1ga3dynhldkl98fd7fzbbhb4bryf6nyijwvxsj8i1szy4jsv8q3q"; depends=[tensorflow]; }; sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; }; sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; @@ -10785,29 +11001,30 @@ in with self; { sharpr2 = derive2 { name="sharpr2"; version="1.0.0.0"; sha256="018xzpl9h07cddpmr2bxm9iz50ky0ja12kybjil7ipjfn0kxavyr"; depends=[mvtnorm]; }; sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; - shazam = derive2 { name="shazam"; version="0.1.8"; sha256="0j953zf0wigr645a52088ajrchhr7xlf891hybbx8pvspj240f3y"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; }; + shazam = derive2 { name="shazam"; version="0.1.9"; sha256="1dm553l1qwqajy5p13x3ms6x45ax33zh7b79iw6xx1chbrpalhmk"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; shiftR = derive2 { name="shiftR"; version="1.4"; sha256="12mb4b5zhiq7hfkpc9hgi004hqli1kkkzdy2169svwrjv7bfifrn"; depends=[]; }; shiny = derive2 { name="shiny"; version="1.0.5"; sha256="0hps6nlyffh685smsm9sd0rdmip0y8v7hgv6a4hqlq7kf8zmzqi0"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; }; - shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.1"; sha256="0jd00z817cccz3wfhcmz61wsy5fjw6yyan2ywkf06xqcdpnr8iwh"; depends=[htmltools htmlwidgets purrr shiny]; }; + shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.2"; sha256="0zvd37z4d2vx2h2ypmbzbaxa617dpwdzhp3rwd6yak0avfv5h7a0"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; }; shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; - shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.3"; sha256="1ikxwa02jpkir1xxx4lvz995ggx8032vl0zknmhccb2mn1k98b4i"; depends=[digest shiny]; }; + shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.4"; sha256="14lvr99nfldlr101ysmpwz0zw0bjvr6b7lfm0msx57ymh6gjzg3n"; depends=[digest shiny]; }; shinyFiles = derive2 { name="shinyFiles"; version="0.6.2"; sha256="1lphzqbzg482lv0xiamfv28n5nyjppss9zzcpx1cd5fsz0xg1282"; depends=[htmltools RJSONIO shiny]; }; shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; - shinyLP = derive2 { name="shinyLP"; version="1.1.0"; sha256="08vc35988pv0kx0kvdl26nkdzcgmi6w4xffmyylan7x59519imkk"; depends=[shiny shinyBS shinythemes]; }; + shinyLP = derive2 { name="shinyLP"; version="1.1.1"; sha256="099ca86wvjfi3ld6fnvxk65rnxr5yji28il2f9xhacmhksn3db3l"; depends=[shiny]; }; shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.1"; sha256="11qwwz4il4n8ha587bc32n1z5pnhw4vv2ffxl9cc1i431k01p7yc"; depends=[htmltools jsonlite shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.2"; sha256="0y23p9wirrp3d9zb8cfdizsg8ijgm2sxhvhfl06yq8i1wnr8yif5"; depends=[htmltools jsonlite shiny]; }; shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; }; shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; }; - shinydashboard = derive2 { name="shinydashboard"; version="0.6.1"; sha256="14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy"; depends=[htmltools shiny]; }; + shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; }; + shinydashboard = derive2 { name="shinydashboard"; version="0.7.0"; sha256="10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb"; depends=[htmltools shiny]; }; shinyjqui = derive2 { name="shinyjqui"; version="0.2.0"; sha256="07ijd5psywlkfrz54d4q68bwij1as4ai0360fya8ikngkwg393mj"; depends=[htmlwidgets jsonlite shiny]; }; shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; }; shinymaterial = derive2 { name="shinymaterial"; version="0.5.2"; sha256="1xdvk8icnzc156bdn6782qgj1dgzc8v22b8qhfnxabxxgpap5nm9"; depends=[shiny]; }; @@ -10820,9 +11037,10 @@ in with self; { showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; showtext = derive2 { name="showtext"; version="0.5-1"; sha256="0zb9h6frw580cql0nbkvfb0jajq6k4yhqaifvz8cpysd32dk35wm"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; }; - shp2graph = derive2 { name="shp2graph"; version="0-3"; sha256="0mfb3f64kpd23qa1yb19j7j234snls7yvszp2yxnv9yahk0blifw"; depends=[igraph maptools sp]; }; + shp2graph = derive2 { name="shp2graph"; version="0-4"; sha256="13hpj2yjai3yf8q6dnhpdqzsw4nkdpi06fxxdgn82ycx0sp7zk4v"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; }; + shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; }; siRSM = derive2 { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[doSNOW foreach MASS rsm]; }; siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; }; sicegar = derive2 { name="sicegar"; version="0.2.2"; sha256="0fnr0wv8zbhs2i5y1kqyvhm0kzisc68ys3iy0wxwbdj3bnfgzj70"; depends=[dplyr fBasics ggplot2 minpack_lm]; }; @@ -10831,7 +11049,7 @@ in with self; { sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; }; sievetest = derive2 { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; }; sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; }; - sigQC = derive2 { name="sigQC"; version="0.1.12"; sha256="1m7vywpmrwlldgdg9d8vjlfxkdnhcaz3w5vbkyljd9qfsqbwaipz"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS mclust moments nnet RankProd]; }; + sigQC = derive2 { name="sigQC"; version="0.1.14"; sha256="17vgfpkbn8g3bgfxmy5wvpjkzizpzqjw5xijmzpi627ba9g8lrwh"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS mclust moments nnet RankProd]; }; sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; }; sigmaNet = derive2 { name="sigmaNet"; version="1.0.3"; sha256="0b9p5kgcbpzb83s0vgmfwmh15lvsfz5q0yk5wl16rxyiqqg2nxag"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; }; @@ -10840,7 +11058,7 @@ in with self; { signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; }; - sigr = derive2 { name="sigr"; version="0.2.3"; sha256="1kyj8xizswwg5agv4ac296pqvxxq3kla537z10qvg16ilskbqny5"; depends=[pwr]; }; + sigr = derive2 { name="sigr"; version="0.2.4"; sha256="11dxv99yibp6cj3jg8qmy8r4csr2lyww6zrdy4a2zgmrzl02fhlc"; depends=[pwr]; }; siland = derive2 { name="siland"; version="1.0"; sha256="0zqwslg0vak22q475azwank81wr4kfx33h21w84lsg7iihrb08nv"; depends=[lme4 raster rgdal sp]; }; sim1000G = derive2 { name="sim1000G"; version="1.39"; sha256="1qxl7lsdsd4skn6x8iw7jx60ly0rwsj27yh5yiqmhxa34jpyjg0m"; depends=[hapsim MASS readr stringr]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; @@ -10850,9 +11068,9 @@ in with self; { simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; }; simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; - simPop = derive2 { name="simPop"; version="1.0.0"; sha256="1197gfpikrb02s7jgvpxzp19bbjdpzsik8ngh77k2fa76gzs4p6c"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp vcd VIM]; }; + simPop = derive2 { name="simPop"; version="1.1.0"; sha256="0zaf12lzca73nn0jy1gikzzwrsg046sgsfn9ck65jzdwh9xj9020"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; }; simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; }; - simTool = derive2 { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; + simTool = derive2 { name="simTool"; version="1.1.0"; sha256="121nv0s14jzxgcmj2fsj1k0msziknwbix2a49f7igic2l8yv869p"; depends=[dplyr plyr purrr reshape tibble tidyr]; }; simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; }; simcausal = derive2 { name="simcausal"; version="0.5.4"; sha256="19mqabxqz2mvfhslbln5vsnlrnmgcfmgp7ypf5k2yd03755b0k4b"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; @@ -10888,7 +11106,7 @@ in with self; { sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; - sirt = derive2 { name="sirt"; version="2.4-20"; sha256="0kgy5jv6yz6hlx4c8mbb4fgqfb8ihslmaxqxlr8qpqh79fvgv2q6"; depends=[CDM coda lavaan lavaan_survey mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; }; + sirt = derive2 { name="sirt"; version="2.6-9"; sha256="06iz4dxlsxdfgmn52pyiyng0bbxffc5b7sszwbzq5i64ad1j0d48"; depends=[CDM coda lavaan lavaan_survey MASS mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; }; @@ -10902,18 +11120,18 @@ in with self; { sjPlot = derive2 { name="sjPlot"; version="2.4.1"; sha256="0aazxrqsbp5jsd5yfm6hrx17rmlqbh5vs314xms7g620aj383zrh"; depends=[arm broom dplyr effects forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; sjlabelled = derive2 { name="sjlabelled"; version="1.0.8"; sha256="1hhcv5d5jbrd9wv9hdvck40wdpr4nr6hr972ng5w2wbh7bikvgqg"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble]; }; - sjmisc = derive2 { name="sjmisc"; version="2.7.0"; sha256="1bni8ppvabzjx94hd8ygp14n2g6a8qhjvnimm0v7pqbf7czmpapy"; depends=[broom cli crayon dplyr haven magrittr pillar psych purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; }; - sjstats = derive2 { name="sjstats"; version="0.14.1"; sha256="10siniyy1nqsacayyl7p35yc9gmdh5rjlwzv8aywid2a1ld13lfs"; depends=[bayesplot broom cli coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; }; + sjmisc = derive2 { name="sjmisc"; version="2.7.1"; sha256="0vj0b3vn3mkqw23x2rnrn468db44x6wvphbqlap5n7c7dzg8hg22"; depends=[broom cli crayon dplyr haven magrittr pillar psych purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; }; + sjstats = derive2 { name="sjstats"; version="0.14.2-3"; sha256="0wqnyf1wpbq0av3027x455jcha7w8kg9lb62rjm5fkz52ff93hpx"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; }; skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; - skimr = derive2 { name="skimr"; version="1.0.1"; sha256="173ymwkx7n24xj70azdwlpiyswdfy17mw2dhpqcm6ssv0crnjjcc"; depends=[dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; }; + skimr = derive2 { name="skimr"; version="1.0.2"; sha256="1grm4z4avl6qp9ssk3cwg20wgqzk9w61p2hjwhld6p78r971k07a"; depends=[dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; }; - skpr = derive2 { name="skpr"; version="0.45.2"; sha256="1wi19rz9mhim91pqdzljjscpsv2dbm838jjbv9ynmscjnfcbbfl6"; depends=[doParallel foreach iterators kableExtra knitr lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; }; - skynet = derive2 { name="skynet"; version="1.0"; sha256="00i3gvl9hz72id449wph8f0gncps6gzj0yz4n34ys8ih0j8n8b81"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; }; + skpr = derive2 { name="skpr"; version="0.47.5"; sha256="1c9ikn3lj3w2a4p1m8gdmhc1xzavf3y8zwra7lcb1snw9pznj7s8"; depends=[doParallel doRNG foreach iterators kableExtra knitr lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; }; + skynet = derive2 { name="skynet"; version="1.0.1"; sha256="1jcb7m4warpg0c8x83dzm107qb5i0zakvjx4a1c6rr814c7xrlhl"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; }; skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; }; sla = derive2 { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; }; slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; }; @@ -10929,13 +11147,14 @@ in with self; { sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.2-5"; sha256="1mwahjgslk82f8bl6qcjs1yadhbnqrxxhvkffkgc2fv3s6lh5d9m"; depends=[]; }; smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; }; - smacof = derive2 { name="smacof"; version="1.9-6"; sha256="19x11011w8kwdbd0jp7y7zqhmn0a5bhc9gh7jkcpxij8ppiigh8y"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; }; + smacof = derive2 { name="smacof"; version="1.10-5"; sha256="102b63b5zyjv0fsmp3in98ckacsgjvpzmv3fwbchdrvf1262aia2"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; }; smacpod = derive2 { name="smacpod"; version="2.0"; sha256="05bylhh98qlnq4gn0wwg3wb3pwa1q2kh06v2skj2fgbjgr03fhkn"; depends=[abind pbapply plotrix sp SpatialTools spatstat]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smam = derive2 { name="smam"; version="0.3-0"; sha256="1sdr0ki2y9smiwfglgh97kj6y0n1z3blyyxk823xp3467byk1rnb"; depends=[Matrix numDeriv Rcpp]; }; smapr = derive2 { name="smapr"; version="0.1.1"; sha256="0ci0j26nsgl4yi0b0bhxqgpn281ml5clhih2nl7hm5l8nybdyp3q"; depends=[httr rappdirs raster rhdf5 rvest xml2]; }; smart = derive2 { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; }; - smatr = derive2 { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; }; + smartsizer = derive2 { name="smartsizer"; version="1.0.0"; sha256="0lp7qykb6y93aw5w7nbpb4d2vpz6by6zv8j7safhixx4wczlc39k"; depends=[MASS]; }; + smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; }; smbinning = derive2 { name="smbinning"; version="0.6"; sha256="13izdq2pl7hi8ppzmpmiiz4pmc43m63ixjrbj9lwa371vx60ndmh"; depends=[Formula gsubfn partykit sqldf]; }; smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; smcfcs = derive2 { name="smcfcs"; version="1.3.0"; sha256="1860qzhfpdr78a8ha8537izbkm0dx9j63l9fv6mswcs5sjl25i09"; depends=[MASS survival VGAM]; }; @@ -10945,7 +11164,7 @@ in with self; { smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; }; sme = derive2 { name="sme"; version="1.0.2"; sha256="0gszpy1sx2qsypps3iza79sab475wcrscl7wnbbrv97a3ry0ybp6"; depends=[lattice]; }; - smerc = derive2 { name="smerc"; version="0.2.2"; sha256="0x1n1plnq63grs09cijhy265xqrfg9az1pp9n5dg5wqlj6gf9rzi"; depends=[fields igraph maps smacpod SpatialTools spdep]; }; + smerc = derive2 { name="smerc"; version="0.4.5"; sha256="1455fjfihznzivz80jad7pyfjms8yyvmsz6wqdvqv3n6dsyr8fvb"; depends=[fields maps matrixStats smacpod sp SpatialTools spdep]; }; smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; }; smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; @@ -10957,6 +11176,7 @@ in with self; { smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; + smoothr = derive2 { name="smoothr"; version="0.1.0"; sha256="19ylhy7jz445yafdxlygs91vl4vrnnhggc2grwap0dcz0cazik1d"; depends=[sf units]; }; smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; }; smotefamily = derive2 { name="smotefamily"; version="1.2"; sha256="166gqwqljips2r0030m3q44zmxlnxcpb9hmwbg1bk3dqk9gfl8ra"; depends=[]; }; smovie = derive2 { name="smovie"; version="1.0.0"; sha256="07sf9nxanfkcp42bv4x12vrlsdr2nnyfgdm6bhcfpggavd4s8r9q"; depends=[revdbayes rpanel SuppDists]; }; @@ -10965,7 +11185,7 @@ in with self; { smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; sn = derive2 { name="sn"; version="1.5-1"; sha256="0l7qlah6dwkp8jswnr2mn3phlm15naba5zkmv0g5pcqy5ix0gz7w"; depends=[mnormt numDeriv]; }; sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; }; - snakecase = derive2 { name="snakecase"; version="0.9.0"; sha256="02s3avsdvdmqfrwlliw90yza8rq2wlf56iwpvj36a2qkzxg54b6a"; depends=[stringi stringr]; }; + snakecase = derive2 { name="snakecase"; version="0.9.1"; sha256="02462vd08asm4ah2brrc3z2s1lqcya80shrd6w743cylv3h3hpyv"; depends=[stringi stringr]; }; snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; }; snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; }; @@ -10980,7 +11200,7 @@ in with self; { snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; }; snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; }; snpRF = derive2 { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; }; - snpReady = derive2 { name="snpReady"; version="0.9.4"; sha256="16nfwjda15gjk0y1rvvnlbx350rgdvpk397glp7yl2ji0amwv20r"; depends=[Matrix matrixcalc stringr]; }; + snpReady = derive2 { name="snpReady"; version="0.9.6"; sha256="1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr"; depends=[impute Matrix matrixcalc rgl stringr]; }; snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; }; snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; }; snplist = derive2 { name="snplist"; version="0.18.1"; sha256="14x31h8h3lx25rm30vhp89byrzy3qrmawi07pmzy4xpxdf0rxm4s"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; }; @@ -11002,19 +11222,20 @@ in with self; { soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; soiltexture = derive2 { name="soiltexture"; version="1.4.5"; sha256="0a9n89ygfqpm6sir76ginri1l6gmw3gfd58szl4ikzaz8fk5hxqh"; depends=[MASS sp]; }; soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; }; + sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; }; solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; }; solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; }; solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; }; solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; }; solrium = derive2 { name="solrium"; version="1.0.0"; sha256="1rlf60kynqb8pvzllfdkiabxgnqx60hwm8vy86y9f2bh7d7jsdhf"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; }; - solvebio = derive2 { name="solvebio"; version="2.3.1"; sha256="0mbb7ri8shknlw1m7985as84i0m837awpsd89yxc5gr1hvzgdvlh"; depends=[dplyr httr jsonlite mime]; }; + solvebio = derive2 { name="solvebio"; version="2.4.0"; sha256="0sikq63i6x6vq0h5d8w92yjf6mhnb8nidn18zv27lfmnl0mwwpnm"; depends=[dplyr httr jsonlite mime]; }; som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; }; som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; }; soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; }; someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; - sommer = derive2 { name="sommer"; version="3.3"; sha256="1r83inm3b32gqaq2n39pj65h86lr9hxl7ciixqx90pxv15gr6xng"; depends=[data_table lattice MASS Matrix]; }; + sommer = derive2 { name="sommer"; version="3.4"; sha256="02ghcs0w5pkmc20drynd44cli3s4vkxpksw3h9f828maw2n7q9jk"; depends=[data_table lattice MASS Matrix]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; }; @@ -11040,27 +11261,28 @@ in with self; { spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; }; spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.2"; sha256="0m1432gkjkkqmzhksv19yca1wyvp5vjwcmpavhiik4ghfx72rgrr"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; - spData = derive2 { name="spData"; version="0.2.8.1"; sha256="0lbrgc701w8x248cmpl3pwngb9kjz1dqxfplrnr3jpyl9d3qkqv4"; depends=[]; }; + spData = derive2 { name="spData"; version="0.2.8.3"; sha256="0w638fmzir2z7mn2ybfb88hlfnx1s36ysv7rmhfyf1s6wpyqcswl"; depends=[]; }; + spGARCH = derive2 { name="spGARCH"; version="0.1.4"; sha256="1bvrhjvw1yyfajm6wyh38dvqkvrx9ymmk45pgbn4qwf47ckryhap"; depends=[Matrix Rcpp RcppEigen Rsolnp spdep truncnorm]; }; spMC = derive2 { name="spMC"; version="0.3.9"; sha256="10cvha5j2pi3b2qiq3jbrc10yi84a595zlg0wshx3wrzxb1rim85"; depends=[]; }; - spMaps = derive2 { name="spMaps"; version="0.2"; sha256="1rrrkbj9bvs217dgvwm686zczcwjqcbq0x268cwl6qnsm39mxzzf"; depends=[raster rgeos sp]; }; spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; }; spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; }; spTest = derive2 { name="spTest"; version="0.2.5"; sha256="11x2wq3031mqbj4n6hvb4l3sp4382qankdl1v1qh7ab2xa0h6xw8"; depends=[geoR sp]; }; spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.0-1"; sha256="1vl26d248642grca63kv1rsghqscchkhbybby0fgfg58v042qbs5"; depends=[coda sp spacetime]; }; spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; - spaMM = derive2 { name="spaMM"; version="2.3.0"; sha256="1625nplyxklviifhalfwylc0cr2qlhrr57zhm3dj3n2daxjhid87"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="2.4.8"; sha256="15hwz4824m3p7vn6faiffx62zwz0ipqs5z8q6r208vy0jivawwsl"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; }; + spaceNet = derive2 { name="spaceNet"; version="1.0.1"; sha256="005jz7bm3c7zi3pgm8wyivc2kl058c0lwdjjzv0qb1vdsq9mpxx1"; depends=[MASS permute RcppTN Rfast sna vegan]; }; spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; spacetime = derive2 { name="spacetime"; version="1.2-1"; sha256="1i6yrmyr9vc5lr99w7qhr0jqdx97ckjqay5g0lqdrk98sygpfl4g"; depends=[intervals lattice sp xts zoo]; }; spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; }; spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; - spacyr = derive2 { name="spacyr"; version="0.9.6"; sha256="0s4gn2nfd2bamvpzk68n4ym1nylzay8hrgkax6c9ghhvi3p7rch7"; depends=[data_table reticulate]; }; + spacyr = derive2 { name="spacyr"; version="0.9.9"; sha256="1zdn57k5iacy73xmac32mslqzidpn3d38qyrnbzkzv2slysqwgkw"; depends=[data_table reticulate]; }; spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; }; - spam = derive2 { name="spam"; version="2.1-2"; sha256="06c2bal2hj4qjb65qagfq6icy52cjn8sn8yl0c0dbzcz4gmidvy2"; depends=[dotCall64]; }; - spam64 = derive2 { name="spam64"; version="2.1-2"; sha256="15cjdz71fh04hcqjn93lnnqbmyfgm67p1x5lyiiq3wz7k1fk5a0h"; depends=[]; }; + spam = derive2 { name="spam"; version="2.1-4"; sha256="0xdr6rmbsx6qq3n4225hr9sma56f33p4pbfirb4r1wxspy5d0zi9"; depends=[dotCall64]; }; + spam64 = derive2 { name="spam64"; version="2.1-4"; sha256="186q2yl7kjmh13k51zysa6c86dcsydiaam51c2v9v8gk8pgagfgf"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.3.2"; sha256="1dg4wnvxhybhagag9xx27af6760dlclaivx27mfxywfha312xfpn"; depends=[magrittr xml2]; }; spant = derive2 { name="spant"; version="0.9.0"; sha256="0cfvi5pxg1wg9kl9rxrarbb3jaxwjfwy34lmg1yy5nj8ld8lzlfc"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd tkrplot]; }; @@ -11078,17 +11300,18 @@ in with self; { sparr = derive2 { name="sparr"; version="2.2-11"; sha256="01li60cybv9kg54zkc9rh4ra6danzbnap9rx59pgfj7zkhs2phmn"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; }; sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; }; sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; }; - sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.0"; sha256="0r7080d2s5vrcwi4h11iiapmdl0l59kd0j8r1avmw9x0d0qw6lh8"; depends=[data_table MASS Matrix mgcv refund]; }; - sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.2"; sha256="0475zyij6h19diaalnkj39j4n0lx6mgfq3sl479mlngf9fhr9zvx"; depends=[Matrix Rcpp RcppEigen]; }; + sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.2"; sha256="12143qij3p8vry9i02i52nj00m1ckkwg2rq99dq00dq43axcpvgw"; depends=[data_table MASS Matrix mgcv refund]; }; + sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.3"; sha256="1a0pkbb7yk9pp57zyy96k7p5xy1s44jbfy0nz8zyw4h774369yfm"; depends=[Matrix Rcpp RcppEigen]; }; sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; }; sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; }; - sparseMVN = derive2 { name="sparseMVN"; version="0.2.1"; sha256="1k4jiday24rdiscprwifrc0py13h707ijavspz15jannvjaz9qdh"; depends=[Matrix]; }; + sparseMVN = derive2 { name="sparseMVN"; version="0.2.1.1"; sha256="0ikh1i4vid6r4sx9pdjqc5wbh4xdj966mr0b7jb1vjw18wrzad8q"; depends=[Matrix]; }; sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; }; sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; }; sparsebn = derive2 { name="sparsebn"; version="0.0.5"; sha256="19315nzj9pz98498amlhas6ii3vwvn3qxz5a6136nh2xfwfg2bhc"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; - sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.5"; sha256="0hdzrp2wcjl849v7np7ybmyp15zjfqr8gkwhij2qjrpprf7z8s57"; depends=[Matrix nnet]; }; + sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.6"; sha256="02a75ldvxfn0awn2aaws3fgd4zzk1jjfry4nxjf3y1grdbbz396y"; depends=[Matrix nnet]; }; sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.4"; sha256="1sa3yssncbpx8yid5wrnxdq7jl3hy5rskyh60v5x592ijcb2mif0"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; }; - sparseinv = derive2 { name="sparseinv"; version="0.1.1"; sha256="1c0vkfq4kh78rs8x484jyi29rcswq9slljxvvc7km6qlz1mnrzlm"; depends=[Matrix spam]; }; + sparseinv = derive2 { name="sparseinv"; version="0.1.2"; sha256="1lf0lbk8dslasd6m1rq4wzpxa1v427j5i9j0rrw5xjx80z1gc206"; depends=[Matrix spam]; }; + sparsepca = derive2 { name="sparsepca"; version="0.1.2"; sha256="0wk2nm37p15gb8i4s45izzzdmwywr56kv4g0j3jd5s3slm224vv4"; depends=[rsvd]; }; sparsepp = derive2 { name="sparsepp"; version="0.2.0"; sha256="0ibadyv7lchxw3y1dspjnbhc4pin4dxwqj9rdrdxfbvlx0i3jgxr"; depends=[]; }; sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; }; sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; }; @@ -11097,7 +11320,6 @@ in with self; { sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; }; spartan = derive2 { name="spartan"; version="3.0.0"; sha256="1q78l04nbrllrsk14haln5s829rkkhkhmb34xzfgyd8glbi7z4ay"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; }; spass = derive2 { name="spass"; version="1.1"; sha256="1kr2ixyvsm82h2brdm51bzll69632mkj9f88a2ny0pcyqrbggg83"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; - spatcounts = derive2 { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; }; spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; }; @@ -11113,26 +11335,26 @@ in with self; { spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="1.0"; sha256="1j8zr9pv769ji9ynzrhah3nd56mjjap450c28g26ff00l3kr9l03"; depends=[ggplot2 moments plyr poweRlaw Rcpp RcppArmadillo reshape2 tidyr VGAM]; }; - spatstat = derive2 { name="spatstat"; version="1.55-0"; sha256="05mpw0zdw4mdlkcf8q9h0nmviq37ihwpgl472wyxqw69l93vk4k3"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; + spatstat = derive2 { name="spatstat"; version="1.55-1"; sha256="01rzaaws3nkzqdpqvq54glxxl611gz8vi7l7jv988685y8r8q4wa"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; spatstat_data = derive2 { name="spatstat.data"; version="1.2-0"; sha256="0nzw5y1in36mib5g4v076b9jii71jjidxajn3n8v67lvl48dmwgm"; depends=[spatstat_utils]; }; spatstat_local = derive2 { name="spatstat.local"; version="3.5-7"; sha256="1sdcx4qxv0z5q97rljn34mssbs4w6qbqxhn71xmkns01xypl1wr2"; depends=[spatstat spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="1.8-0"; sha256="053j67mrnjcw1mdbm3qjvf67hrfnhsma4770r7l67bs4xys2qhfg"; depends=[]; }; spatsurv = derive2 { name="spatsurv"; version="1.1"; sha256="0fakhz2qc5vb7ym2ik7hilv8g5fn3z7s16hzngq1n591xza5b74g"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; }; spbabel = derive2 { name="spbabel"; version="0.4.8"; sha256="1f0lradf7a3fjkdhbviw24awpqj1pzw1wfvigrqhnmf0jjw3nng3"; depends=[dplyr sp tibble]; }; - spc = derive2 { name="spc"; version="0.5.4"; sha256="1ii848jcpsg5jij1i17flhz4v5vgsb8j6iijgpha7sigmj7gynk3"; depends=[]; }; - spc4sts = derive2 { name="spc4sts"; version="0.2.1"; sha256="1mwgqj9gph3fzvmqp03khi541g13ljx8xn09ji9qcjl6j032rk2p"; depends=[gridExtra rpart]; }; + spc = derive2 { name="spc"; version="0.6.0"; sha256="118r2yjfmzm0bi3ccx9pzi56vw2kbjz0pbxrjqdks0075fk7ij0q"; depends=[]; }; + spc4sts = derive2 { name="spc4sts"; version="0.3.1"; sha256="1g7q3g486qns8qwpki2nbiy995v7fl1ibmk4645ws9yxgybw5mxj"; depends=[gridExtra rpart]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; - spcosa = derive2 { name="spcosa"; version="0.3-7"; sha256="11q6zr4y0hv1vnhl45g38f1906pq9a695ynn6yfkzlpz1kbf2jma"; depends=[ggplot2 rJava sp]; }; + spcosa = derive2 { name="spcosa"; version="0.3-8"; sha256="1hw3njn2c8wj8bk2qpnbi2mbhj485q3gpbjf1gq9k6my4brdp86b"; depends=[ggplot2 rJava sp]; }; spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; - spdep = derive2 { name="spdep"; version="0.7-4"; sha256="1iskcrlka8p49i3lvfp9l5y4q9vapdn0m6wlin7pq47017jz2hwn"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; }; + spdep = derive2 { name="spdep"; version="0.7-7"; sha256="0wrlximy4w5y5aszy3pacmf3ag224chl12q4rj4r7ky6zw2sn1ns"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; }; spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; }; spdplyr = derive2 { name="spdplyr"; version="0.1.3"; sha256="1f34yzj9z4f1dj7pqaayk0mvabzwa6kc3kwi1pmpikl1afgsyv25"; depends=[dplyr lazyeval rlang sp spbabel tibble]; }; spduration = derive2 { name="spduration"; version="0.17.0"; sha256="1s41rs5nbdrknn6ag7zn8ds3203q2x5z5mb9vf80y6ba6w3ksr32"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; }; spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; - speaq = derive2 { name="speaq"; version="2.2.0"; sha256="1y6sa639b2pcxcd2lh9ivfllvc734pmb0bv63hcnr74f8nmn3ywf"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; }; + speaq = derive2 { name="speaq"; version="2.3.1"; sha256="18v39nm9h4388asl0vk2w874kpg5spp7fyhib04cyb91hhx910sr"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; }; spec = derive2 { name="spec"; version="0.1.3"; sha256="0i1c5wjrca36zf5ak95i8n57hy1jj8w0qkkpnjqpn3xv3nvqccr2"; depends=[csv encode magrittr]; }; speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; speciesgeocodeR = derive2 { name="speciesgeocodeR"; version="1.0-4"; sha256="033877l9sxcvvzpyf9aw19sj8qfscim663j2y2az8bl9c79xw4ph"; depends=[maps raster sp]; }; @@ -11149,7 +11371,7 @@ in with self; { spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; }; spelling = derive2 { name="spelling"; version="1.1"; sha256="10zhzbpyjw5lkg4iyjwgs5xp2c8bgwyzjg146fcml6cjs6xhl8ni"; depends=[commonmark hunspell knitr xml2]; }; sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; }; - sperrorest = derive2 { name="sperrorest"; version="2.1.1"; sha256="0rbfr6dg8dx6lm3npsrinr2vxxsq0f3xwprzl0fyzabdhd82na4y"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; + sperrorest = derive2 { name="sperrorest"; version="2.1.5"; sha256="126vwk3bxs27gblakc5nplj0k90a21gks9d0kbyanlxc2ihsy243"; depends=[doFuture foreach future future_apply gdata glue magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; spew = derive2 { name="spew"; version="1.3.0"; sha256="09g8j5v5k455c3kqm1fn09ql3x34xy22igicakwl99s8gsln7v3p"; depends=[maptools plyr sp]; }; spex = derive2 { name="spex"; version="0.4.0"; sha256="0b2zcpbjr8lqfsmwvmy4lp88xz16v7fyqx1yv10yhcgxlgw0yw8p"; depends=[quadmesh raster sp]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; @@ -11158,7 +11380,7 @@ in with self; { spgs = derive2 { name="spgs"; version="1.0-1"; sha256="1jabgcc8bd6kikcd5rv9xczbg6r52mwyc68r8filn5i0gva4by57"; depends=[]; }; spgwr = derive2 { name="spgwr"; version="0.6-32"; sha256="0xdv0yy6md9kv1aay6xxj1k3x59apflip0qpfvyk2aa2wbn1sx2v"; depends=[sp spData]; }; sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; - sphet = derive2 { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; }; + sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; }; spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; }; spiderbar = derive2 { name="spiderbar"; version="0.2.1"; sha256="1mm9g58riyjxpfwjj28shlw9zlycsgcxl6xw8im0gm815v2plyhv"; depends=[Rcpp]; }; @@ -11166,29 +11388,31 @@ in with self; { spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-11"; sha256="1f16jvdj6kbiiypnbbj10nj7l88kkrxasrribqpjv7ai62dlximn"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; - spind = derive2 { name="spind"; version="2.1.2"; sha256="0z00fc9r6aycv5v9ms7v64xszfc58wvy6y7bd2z0xima1gpppq2r"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje splancs stringr waveslim]; }; + spind = derive2 { name="spind"; version="2.1.3"; sha256="173jpyq13vdhcwbxwx188fp7jg8l67yh6kxlai13z8lqnlpl1xqh"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje splancs stringr waveslim]; }; spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; }; splashr = derive2 { name="splashr"; version="0.4.1"; sha256="1gydnl6qdkqxvgzy3j6n8y4nan4wz6p7wybcgnm5p37n7q6m2rhk"; depends=[curl docker formatR HARtools httr jsonlite lubridate magick openssl purrr scales stringi xml2]; }; splines2 = derive2 { name="splines2"; version="0.2.7"; sha256="1hh7zd2gqmfc5xx91kjwi465yvq6lwrhgjdim1b40g6canh0ixlb"; depends=[]; }; + splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.1"; sha256="0gz65acnkil9xjspl2kzpzyhj7lslga9g3p0k79xh25ia6qal5ws"; depends=[lbfgs]; }; - splithalf = derive2 { name="splithalf"; version="0.2.0"; sha256="1bpw8mw88aryk4n0bdm4f356wsix6npdpl91qfbwayhdh0g5302f"; depends=[plyr]; }; - splitstackshape = derive2 { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; }; + splithalf = derive2 { name="splithalf"; version="0.3.1"; sha256="01ip3brnlyxlxr1hmnmc2w6jg4vm5gjk8fwavclmv7m7hr2bb4xh"; depends=[dplyr tidyr]; }; + splitstackshape = derive2 { name="splitstackshape"; version="1.4.4"; sha256="0vhgb4pysp7hbph7kq8b38m4gqhal40j4p7gij2wrc2rajspzhkq"; depends=[data_table]; }; splm = derive2 { name="splm"; version="1.4-10"; sha256="0zz28mfs84nqyvl1l0ba7yrhgcxxzw1v0542jc39h4pr537yz1nc"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; splot = derive2 { name="splot"; version="0.3.2"; sha256="1nix7pzqlla3iga99pw9jqcylg4j5xpfrf94y0abzpy3z4gq3kgc"; depends=[]; }; - spls = derive2 { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; }; + spls = derive2 { name="spls"; version="2.2-2"; sha256="11xp6wnxizc8g91ci9fd7lbjc8pin84c9ak8lr8yg2jyd2l351j9"; depends=[MASS nnet pls]; }; splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; }; splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-137"; sha256="0bpzv6a05hnqnnz2znnkb3f34r56krhc595zjnn82azxj4a53njh"; depends=[]; }; splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-74"; sha256="0aikw6ckc0a7lrgjlcdmqspgrx0fc4iysd7jynd2lsf1hxy4pz35"; depends=[splusTimeDate]; }; - spm = derive2 { name="spm"; version="1.0.0"; sha256="0q87sbp39axmlnj15srnsysm7d9rpm5q6zic0h6hc1xwp205v0sf"; depends=[gbm gstat psy randomForest sp]; }; + spm = derive2 { name="spm"; version="1.1.0"; sha256="0xx1g6ir0sanj2p6xgsdghymx1iy2bzsany2j87q49y5hah7349j"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; }; spm12r = derive2 { name="spm12r"; version="2.7.4"; sha256="0v0zmsbzk6446n1yipz3w99n0n4yya6idff3gfyj7fgq10pcalgz"; depends=[git2r matlabr neurobase oro_nifti R_utils]; }; - spmoran = derive2 { name="spmoran"; version="0.1.2"; sha256="19rl14w0zry649c3kgvrmb7bsw3dxsprf52naiqfxxs7qy3pxcm2"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; }; + spmoran = derive2 { name="spmoran"; version="0.1.3"; sha256="1bvq91k346w2cvb3yi10qgidabf3s8whlk6glqrlb1k6na7l8k3y"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; }; spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; + spnn = derive2 { name="spnn"; version="1.1"; sha256="0i77lpxrfa1jxi9znlmn5knmcjpf17q4hf8999b1x8lhqlhiizc1"; depends=[MASS]; }; spocc = derive2 { name="spocc"; version="0.7.0"; sha256="0ar107c7snbh1iaib3xddng88861h3gc56whicx5krl3zf2xgjqa"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; }; sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; spotifyr = derive2 { name="spotifyr"; version="1.0.0"; sha256="1f7sv6qc8bim8vkcsma96zdzd1ci73dpag2dp27mqjcbh716xfy0"; depends=[dplyr httr lubridate purrr tidyr]; }; - spp = derive2 { name="spp"; version="1.15.3"; sha256="1wn7a6aznxyvr6kwgf3bd8c1n1pxm4b43km3pgfw8mf2vx69cynd"; depends=[BH caTools Rcpp Rsamtools]; }; + spp = derive2 { name="spp"; version="1.15.4"; sha256="0gjg0g30y9w445mimrd29s44ryla1bmh1mdwj4hb85s1yi1l4h25"; depends=[BH caTools Rcpp Rsamtools]; }; sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; }; spray = derive2 { name="spray"; version="1.0-3"; sha256="0zy2dwzk33cwch0pdhhsyiy169z39iij3zvvjg81gxa29pq0h1ab"; depends=[magic partitions Rcpp]; }; sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; }; @@ -11202,8 +11426,8 @@ in with self; { spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; }; sptemExp = derive2 { name="sptemExp"; version="0.1.1"; sha256="0a4y355j24sll8jmm17lh4j13k21b3nlalsxzpzx2gp5xw1x7jr6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; }; - spuRs = derive2 { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; }; - spup = derive2 { name="spup"; version="0.1-1"; sha256="0iwmydvd6bwpyr4q3hk2hlvgrvpzrdhnbq0frxadwcaaap75pfv0"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; + spuRs = derive2 { name="spuRs"; version="2.0.1"; sha256="1vjyhm4dvqm5d4kqjiwk7yy85455dgv4sy9kr5427zci3jlmxqij"; depends=[lattice MASS]; }; + spup = derive2 { name="spup"; version="1.2-1"; sha256="05cl4kddg2f37238am92bbkyl5davd2a6jjb1akzn1v3ha6qbhpq"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; }; sqlscore = derive2 { name="sqlscore"; version="0.1.2"; sha256="0pl4nf59b8jy8rkqs2z684lxfqh01284h3cx97a1igpy4qqj712b"; depends=[dbplyr]; }; @@ -11216,7 +11440,7 @@ in with self; { ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; }; ssa = derive2 { name="ssa"; version="1.2.1"; sha256="10x58c57pa9x6svm4h4xrss72ikin9lpf3ihjwmnkgnaicvsd0bx"; depends=[iterators]; }; ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; }; - ssc = derive2 { name="ssc"; version="1.0"; sha256="1hhlpcm1mdwkcxrprk5nc2yi3l69lz13av50y3cyz5vj73jhsg44"; depends=[proxy]; }; + ssc = derive2 { name="ssc"; version="2.0.0"; sha256="0w7c0blqny7dyjh1a6l9lr7nysgpmasfqbf7wf368rwmv59pk0b3"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; @@ -11236,6 +11460,7 @@ in with self; { ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; }; st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; }; stR = derive2 { name="stR"; version="0.3"; sha256="0zad25s9wp4lapkww3rdbqsd4y7p8xhz9is7avq400srxakinx7n"; depends=[foreach forecast Matrix quantreg rgl SparseM]; }; + staRdom = derive2 { name="staRdom"; version="1.0.3"; sha256="07ciabm0wakzdybhgdmiakdh7mygc38c8vqs9czgq65729928aqq"; depends=[doParallel dplyr drc eemR foreach GGally ggplot2 multiway plotly pracma readr stringr tibble tidyr zoo]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stability = derive2 { name="stability"; version="0.2.0"; sha256="154dp26aghznibnp9h7j86hi30caylvyxp87jkf2p7cb4l3qn5r4"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; stable = derive2 { name="stable"; version="1.1.2"; sha256="11irpn0qfblzskdr71991jlmdrbqqqpszppn5pii3lr5hflqqr1d"; depends=[rmutil]; }; @@ -11247,7 +11472,7 @@ in with self; { stacomirtools = derive2 { name="stacomirtools"; version="0.5.2"; sha256="1a33yy594699b05lb32zwx6yhmvxzwly6vvf8xzqg6lac64p26r5"; depends=[RODBC xtable]; }; stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; - stampr = derive2 { name="stampr"; version="0.1"; sha256="1w7zp5n41gzahv4psdgw5a5mylcxlf12931fnjz0q2cwqj9cwql5"; depends=[deldir maptools raster rgdal rgeos sp spdep]; }; + stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; }; standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; }; stapler = derive2 { name="stapler"; version="0.6.5"; sha256="0xhwlm3iyxxmaaf0smj8g5zdawb51d7dc636czbvk5g551g7wfdb"; depends=[matrixStats RNifti]; }; staplr = derive2 { name="staplr"; version="1.1.0"; sha256="08kk1zi89ggyli05y7lr1vhq4xszjp6z5jscaaknp38gav7jd5lc"; depends=[]; }; @@ -11255,7 +11480,7 @@ in with self; { starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; - startup = derive2 { name="startup"; version="0.9.0"; sha256="0cr3lp5aq93d8mk55nhfpszjkr4iv5ysm7jj7igj7yy3ag93snm0"; depends=[]; }; + startup = derive2 { name="startup"; version="0.10.0"; sha256="1j9vb1008sg6wwbz8ilxqnqzy7b18cscxiyaijszzx4ygxmcq39j"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.4"; sha256="1r9dqrfznsrj7s11m56hkzgfnw3qcgzh07pqipl007zr2av9xwqw"; depends=[]; }; statGraph = derive2 { name="statGraph"; version="0.1.0"; sha256="13wfylb92lzw08fn3p000v87abs7ij2rb82np1rkgsl8w2kica73"; depends=[igraph MASS]; }; statar = derive2 { name="statar"; version="0.6.5"; sha256="0vmdrdq6db16vfl0rb39x8yfnbdzpcrvywfgp4lss6jby3nvjwd9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; }; @@ -11280,9 +11505,10 @@ in with self; { steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; steepness = derive2 { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; }; stellaR = derive2 { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; + stellaRbase = derive2 { name="stellaRbase"; version="0.1.0"; sha256="1jwhh14wk57z8acg8vjd7m3nwq0vq4w0x9ml8zhk3gnl4czq8m04"; depends=[data_table httr RJSONIO]; }; stepPenal = derive2 { name="stepPenal"; version="0.1"; sha256="09viapb4846g91jzf9364rdyd865b19v83pwcdm3p3xsjry9ffxk"; depends=[caret dfoptim glmnet mvtnorm pROC]; }; stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; }; - stepR = derive2 { name="stepR"; version="2.0-1"; sha256="1r45wxw9kvzyybkl4f1r9c2d7wmi0k4ji39w3nxqrf7n5kp2cnj4"; depends=[digest R_cache Rcpp]; }; + stepR = derive2 { name="stepR"; version="2.0-2"; sha256="0inxlgihyivfr0l4gk8zq0043l9s5w4r3x3hwjlzfwbqjkwy1rjs"; depends=[digest R_cache Rcpp]; }; stepp = derive2 { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; @@ -11310,26 +11536,26 @@ in with self; { stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; }; strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; }; - stranger = derive2 { name="stranger"; version="0.3.2"; sha256="05s4dv9w8dxy2x63ai8vyh3rwphr4h59axjsh7lqa05ja06pai5z"; depends=[assertthat data_table dplyr ggplot2 tidyr]; }; + stranger = derive2 { name="stranger"; version="0.3.3"; sha256="0p0ssba5q192g7pviv1shmh1lpcdjmzdim3rp1qs3hrd1d3pn4vq"; depends=[assertthat data_table dplyr ggplot2 tidyr]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; }; stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; }; stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; }; + stratifyR = derive2 { name="stratifyR"; version="1.0-1"; sha256="0w135smkgryx29ppa7khpay8w04b3g2pxka0wsqlhksrp5pqa086"; depends=[actuar fitdistrplus mc2d triangle zipfR]; }; stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; }; straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; }; stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; }; - streamMOA = derive2 { name="streamMOA"; version="1.1-3"; sha256="0vgnd27xl7lgir0ps3zsz7ca2vvjg8yp28zbfvdgvm3agk7dpra7"; depends=[rJava stream]; }; + streamMOA = derive2 { name="streamMOA"; version="1.1-4"; sha256="09vspcz806j2f397hr8h685vy4xbx419bbha91f44s3bhks1y7fr"; depends=[rJava stream]; }; streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; }; streambugs = derive2 { name="streambugs"; version="1.0"; sha256="1dyh5rwi47dn584nyy7f7vg5j5nlpz7ygcl8lwkj7prahplmzg5d"; depends=[deSolve]; }; - stremr = derive2 { name="stremr"; version="0.4"; sha256="0n8ickmzjqlxwrz8dsphh1nsbnsgp4mnwm52i5ji099ps5292f65"; depends=[assertthat data_table pander R6 Rcpp rmarkdown speedglm stringr zoo]; }; stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; }; strider = derive2 { name="strider"; version="1.1"; sha256="00r6gbvwmla5h27iyi7rdfd0kr4alxz19fd7g2ba0in3779za3sw"; depends=[BH Rcpp]; }; stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; }; - stringdist = derive2 { name="stringdist"; version="0.9.4.6"; sha256="0j5b7hr53nr9xq44famkpwzi4khix93ffani5pwldqkf8bpdvhci"; depends=[]; }; + stringdist = derive2 { name="stringdist"; version="0.9.4.7"; sha256="1qg80wmcrpkba9njvgjdg15bgw7ddks40kkfh5x61as9lhchy4i4"; depends=[]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; - stringi = derive2 { name="stringi"; version="1.1.6"; sha256="122im5m8x9bqpahc0hbxmvdq6hnsmgnxwwyjpvbihyv2jq5kd44m"; depends=[]; }; + stringi = derive2 { name="stringi"; version="1.1.7"; sha256="0nck1s2iglmkrn15ay2chrrwsy5lngcylz2sc87fxy5skxaahxdl"; depends=[]; }; stringr = derive2 { name="stringr"; version="1.3.0"; sha256="07dvfbkhv8gk6l32j43jvxpmqlhqp0mdby406h5a3bsc6k94ic13"; depends=[glue magrittr stringi]; }; strip = derive2 { name="strip"; version="0.1.1"; sha256="18pz6ix6d661fvg1k1yyyiiwa1gdixynmpxl725ffd9lpykmfqbw"; depends=[rlist]; }; stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; }; @@ -11343,7 +11569,7 @@ in with self; { stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; }; styler = derive2 { name="styler"; version="1.0.1"; sha256="01iy3p0jn57c2glq2a5wh7ds3fyxlmcjpvxnmafvvvlhca73zw88"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; }; - stylo = derive2 { name="stylo"; version="0.6.5"; sha256="15y7iwk1w9kkdhpbgbvi1cqzza4jgw8zxsp3xbqzhm4qaf4kymia"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; + stylo = derive2 { name="stylo"; version="0.6.6"; sha256="01kkwzhpcf6nrvbj2dgyh2a10p48gxlgq78smv5x8cn8vcfl1ixa"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; }; subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; @@ -11352,7 +11578,7 @@ in with self; { sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; }; submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; }; subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; }; - subplex = derive2 { name="subplex"; version="1.5-2"; sha256="1v9xrnkapnq7v1jbhlg32ignklzf2vn8rqpayc8pzk8wvz53r33g"; depends=[]; }; + subplex = derive2 { name="subplex"; version="1.5-4"; sha256="10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z"; depends=[]; }; subprocess = derive2 { name="subprocess"; version="0.8.2"; sha256="1qyl8726vq94vqd6iyh9kca6wwxi3g7yv4b784wn2ifrm4waixxd"; depends=[]; }; subrank = derive2 { name="subrank"; version="0.9.9"; sha256="1z6sp9rfmpy28gpw13bh0c7y98lbbgv1cciavg3gix01whqa49n3"; depends=[]; }; subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; }; @@ -11368,8 +11594,8 @@ in with self; { sugrrants = derive2 { name="sugrrants"; version="0.1.1"; sha256="08f5xdgimdvpivzrlwvdyrmy21nbh379pgfdrx4lxqcxd55y2hil"; depends=[dplyr ggplot2 lubridate purrr readr rlang tidyr timeDate]; }; sumFREGAT = derive2 { name="sumFREGAT"; version="1.0.0"; sha256="13g3px3c3dxacrvgwrvqdp8lm7k185npr0dlq3siq9x9mgjr7hsj"; depends=[Matrix]; }; summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; }; - summarytools = derive2 { name="summarytools"; version="0.8.2"; sha256="014hxyk0r87j5prqdckxy7h41agk2p1w1kxzl0a3pxwbj1j0r2fh"; depends=[htmltools matrixStats pander pryr rapportools RCurl]; }; - sunburstR = derive2 { name="sunburstR"; version="1.0.3"; sha256="0xxxi01klrm7kspi588n4h5zdzhph5vihs26n2x8fdm2k82jyjp9"; depends=[d3r dplyr htmltools htmlwidgets]; }; + summarytools = derive2 { name="summarytools"; version="0.8.3"; sha256="0b61131yns1ip4r5qgrfbwd6dqsgg349jfhlgfkvlszh5b9jqhnf"; depends=[htmltools matrixStats pander pryr rapportools RCurl]; }; + sunburstR = derive2 { name="sunburstR"; version="2.0.0"; sha256="1gkrgm90ps5i1k5cqdw6sbvd4jgbk4yq82gwd5m1z1jhv1shfsf4"; depends=[d3r dplyr htmltools htmlwidgets]; }; suncalc = derive2 { name="suncalc"; version="0.4"; sha256="190bnh26bl26piq6512ijrx2hygzdscryjsjyz8y4ara8bf646r3"; depends=[V8]; }; supc = derive2 { name="supc"; version="0.1"; sha256="1cq0lr04m409xr3i1hphww4ldr8z3kqq2gmp7hm3yp0iz2gy3m9a"; depends=[BH Rcpp]; }; supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; }; @@ -11404,21 +11630,21 @@ in with self; { survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; }; surveillance = derive2 { name="surveillance"; version="1.16.0"; sha256="1nbskhbs8qfwnchig4rckbgy296ifl1hx0w3v71knj693x54r9cj"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; - survey = derive2 { name="survey"; version="3.33"; sha256="11pmk26hirq5p7p4131crpb175hvgg4id5y5m14rskpx8nbp9l94"; depends=[lattice Matrix survival]; }; + survey = derive2 { name="survey"; version="3.33-2"; sha256="1c4q0005663b0y87ckmf1ra7gm2i5hnlw955pgb11bywh60hg9hl"; depends=[lattice Matrix survival]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; surveydata = derive2 { name="surveydata"; version="0.2.0"; sha256="1iwhjhazfy38dbcj224kz3zbw2nvpq01ry54wmmkg9d0n6mb02h4"; depends=[dplyr magrittr plyr purrr stringr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="2.9"; sha256="0ad4122m78hbzhkkaspzpr62bl59w1j8z0qa67slqljjldhq1akv"; depends=[data_table laeken]; }; - survidm = derive2 { name="survidm"; version="1.0.0"; sha256="13iwl687g4qps6s3d8x0xr916b2ja6487dwnyqwc3nwr6gadqicw"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; + survidm = derive2 { name="survidm"; version="1.1.0"; sha256="1piwhb8zsqnw284xp0l3ajs8r9amyn8yfng19hkci574mkdgsw4f"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; survivALL = derive2 { name="survivALL"; version="0.9.2"; sha256="0mqmlmip6lr1d6i8yj4kc1zzj5jvvqrkipqxlprsrqbwni2ipp7l"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; }; - survival = derive2 { name="survival"; version="2.41-3"; sha256="07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"; depends=[Matrix]; }; + survival = derive2 { name="survival"; version="2.42-3"; sha256="15pasbfzmg2r5bfpsadp9ia4cpybqz6n1kwm7ma02ykzf7bk4xx0"; depends=[Matrix]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; survminer = derive2 { name="survminer"; version="0.4.2"; sha256="15npx3q7xf7sl7pbb1476khgfpqrvidqcb101iim3iym125sl54r"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; }; - survtmle = derive2 { name="survtmle"; version="1.0.0"; sha256="1sdp88br1ry6yzzav67787n0clpq6vjffxqpkvld93dyvmlb6zb1"; depends=[ggplot2 Matrix plyr stringr SuperLearner tidyr]; }; + survtmle = derive2 { name="survtmle"; version="1.1.0"; sha256="0q1ym4a13xqy3lqjwg40wp28xlp1iqybwq7dd0gp6fnmx3n6373g"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; }; survutils = derive2 { name="survutils"; version="1.0.1"; sha256="09844i5nfyn0fm5i8ca96xz8dza21shh2f89w41zh17xaxvidjsw"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; }; sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; }; svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; }; @@ -11445,11 +11671,12 @@ in with self; { svglite = derive2 { name="svglite"; version="1.2.1"; sha256="1bws3lc4hlhln11zd7lalhiyc43yk6c6vrzy41fkxk1dkjazfx51"; depends=[BH gdtools Rcpp]; }; svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; }; svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; }; + svrpath = derive2 { name="svrpath"; version="0.1.1"; sha256="0j38m34ff5a8lqfsss8444fflprai3sgzi9kyrmingp07rx82ss5"; depends=[quadprog svmpath]; }; svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; }; svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; swCRTdesign = derive2 { name="swCRTdesign"; version="2.2"; sha256="0kggniy5p900cj074swh7g47zf8bhwjmqph9b5frw86nycxwyn3v"; depends=[]; }; swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; }; - swagger = derive2 { name="swagger"; version="3.4.0"; sha256="1590335n9l1s65li5018m0r3ss67ccgy10lnywxi2ypya71c58zs"; depends=[]; }; + swagger = derive2 { name="swagger"; version="3.9.2"; sha256="13scbzv65qzxh7kfwlb2k47zgvv7fz085g5lki6zr5w6a33g45q9"; depends=[]; }; swamp = derive2 { name="swamp"; version="1.3.1"; sha256="1l4rk79hbggn31y5skslqsz9bv7lmya4q5ligki3x1677345hyhv"; depends=[amap gplots impute MASS]; }; swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; }; swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; }; @@ -11460,7 +11687,7 @@ in with self; { swirlify = derive2 { name="swirlify"; version="0.5.2"; sha256="07r6rdj079ryafdgs0p8jhnk4h7iqm7agh9wjhvm12abbwjr9g1x"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; switchr = derive2 { name="switchr"; version="0.12.7"; sha256="1ymvghjvbrbsgn49mp8f9n4kv81626pa4pv05hrx813ly8h30mmq"; depends=[RCurl RJSONIO]; }; - swmmr = derive2 { name="swmmr"; version="0.8.0"; sha256="0cyr5x8k6agrgflqp14lxbas0yslwkz432ks71svqhdrl7dd5sg2"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; + swmmr = derive2 { name="swmmr"; version="0.8.1"; sha256="0zl00864x9q6a2aqdbqs3b5kw6z50wgr46c62kxk9xkns8317sa7"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; sybil = derive2 { name="sybil"; version="2.0.4"; sha256="0iyqr9iyb4bydmzjzrc721nzf5q36p2i3zciai9rzjlwx2mdw930"; depends=[lattice Matrix]; }; sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; }; sybilEFBA = derive2 { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; }; @@ -11469,22 +11696,23 @@ in with self; { sylcount = derive2 { name="sylcount"; version="0.1-0"; sha256="1dxbqbjyvkg7cx234icby9fjdjz1z4l4crqd7kv8m05fv69pg224"; depends=[]; }; syllable = derive2 { name="syllable"; version="0.1.3"; sha256="1ymnczwx58h720hsm0s9zq3ddwg6gn6bgg0m8zw24i0nlivx0yjg"; depends=[data_table stringi textclean textshape]; }; sylly = derive2 { name="sylly"; version="0.1-4"; sha256="14lw5sxrdvidk0465a7x0jz74cvqjbqv0wlqdy78qzbq4ilcmcaa"; depends=[]; }; + sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; }; symDMatrix = derive2 { name="symDMatrix"; version="1.0.0"; sha256="0xss7f7hkrf2afchccfavymylfybnp9nxawqxd2vdjni95kbd595"; depends=[]; }; - symbolicDA = derive2 { name="symbolicDA"; version="0.4-3"; sha256="012ha8m3137gns0q38lanpijdrqq6kcw934f2jgnxj6inl6drca0"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; }; + symbolicDA = derive2 { name="symbolicDA"; version="0.5-3"; sha256="1zbr8b19m3fnzx0bdajl86s6aijiycjdibf9q83wd6mgpq66jb85"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; }; symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; }; - synbreed = derive2 { name="synbreed"; version="0.12-6"; sha256="03h3j2g6ynnbmsc6yhbmmmrwj69jf3gjpp1wnsd02yc5kf4r1q57"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; }; + synbreed = derive2 { name="synbreed"; version="0.12-9"; sha256="0h85z9bhzgsr783qx3zjqyi461a0q52wbqifwm3gc1kapl5irxhd"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; }; synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; }; synchronicity = derive2 { name="synchronicity"; version="1.3.2"; sha256="1idrjzl7nkamf1ip55s6qcf64s63xs9j8z9jv3r89p6r5lw7k5mv"; depends=[BH bigmemory_sri Rcpp uuid]; }; synchrony = derive2 { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; synlik = derive2 { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; }; synthACS = derive2 { name="synthACS"; version="1.0.1"; sha256="0jbhiadgc8f6h7ga685cm5i8y59lf76r8sgd629xfjj4jxn8ckdm"; depends=[acs data_table Rcpp]; }; - synthpop = derive2 { name="synthpop"; version="1.4-1"; sha256="0725gv7b7kj564rf0nz6djvk58i39d9vv4g12qmgnsipgjs9rsrw"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; }; + synthpop = derive2 { name="synthpop"; version="1.4-3"; sha256="1smibiid3hav7w9yky0n6ci160h69v16kkilmm00gady6w7j8drh"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; }; sys = derive2 { name="sys"; version="1.5"; sha256="0yskm5mzps4435yvld9nfp6i5lqdy5ckpdwydvvbyjznz5yv01x2"; depends=[]; }; sysfonts = derive2 { name="sysfonts"; version="0.7.2"; sha256="1jl66pyw9khi117523zanjjzdpnpgqdqx190w829xc4ljxzi8n55"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; - systemfit = derive2 { name="systemfit"; version="1.1-20"; sha256="1qzgx4hn6f71hnk70ccf6inajprrb6my5af8q2manz41577z0ka7"; depends=[car lmtest MASS Matrix sandwich]; }; + systemfit = derive2 { name="systemfit"; version="1.1-22"; sha256="19nmhidnzyk2wcwi5v28n9lkvylfw4in63vg5naqlk3w4fbwm2wb"; depends=[car lmtest MASS Matrix sandwich]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.1"; sha256="1zimkyj58lk3iq5x4g6a76dain65j36s8c8jhx25sqjr5z2zmfsr"; depends=[lpSolve Rcpp]; }; syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; }; tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.5"; sha256="0qmkdsl0b2aw485vpbdqxdlfwg5a3i5bj4l67xv6h51fnbyfqfiz"; depends=[ArgumentCheck coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; }; @@ -11500,14 +11728,15 @@ in with self; { tables = derive2 { name="tables"; version="0.8.3"; sha256="1n0kqsvwx2vg7nwyz7hi708xpf2jc9bz3y84aflnzcmbspj1wvf3"; depends=[Hmisc]; }; tabplot = derive2 { name="tabplot"; version="1.3-1"; sha256="0yz3npn36q93gr0k9a4x5swap5fwxfc22b131kif3dfxkgklna06"; depends=[bit ff ffbase]; }; tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; }; - tabuSearch = derive2 { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; }; + tabr = derive2 { name="tabr"; version="0.1.2"; sha256="1c9r6lx12xadv0c0068zxgx29nnf2hdbbrybm6bs27scizaxzhd2"; depends=[dplyr magrittr purrr tibble]; }; + tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; tabularaster = derive2 { name="tabularaster"; version="0.4.0"; sha256="1hgbynjp19xwpin31j0647ldbzxam2kmkqnvj6v8kd4svps0kr3g"; depends=[dplyr raster sp spbabel spex tibble viridis]; }; tactile = derive2 { name="tactile"; version="0.1.0"; sha256="0ygray05jlxrg7mxg412s04jrxjyskxlrl0xgxir8s6mzjg79iqy"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; }; tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.0"; sha256="0i69zyiqq8mc5wfc9r43dpcjhwmq4iwj605n4a6h4hma37jjnc2g"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr viridis]; }; tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; }; tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; }; tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; }; - tailr = derive2 { name="tailr"; version="0.1.0"; sha256="1i7dvmmqrg2hylf5n1kwr5m6xc3ydcvfi5fx2dx9zapsv9bhlr4v"; depends=[glue rlang]; }; + tailr = derive2 { name="tailr"; version="0.1.1"; sha256="07irl0fzg9skpv9kl211ar3yf68lcrpd2rcplkzbm242yb772z1v"; depends=[glue rlang]; }; tangram = derive2 { name="tangram"; version="0.3.2"; sha256="1dyfyl608k6a7vx9w0s2r6jr0y430qvkqkrrv24wav7snza4d5q2"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; tatoo = derive2 { name="tatoo"; version="1.1.0"; sha256="1dsycdp3vln1m1w3nhhrr60x8raw6gbihjpav0d4ad8qla2fq8nh"; depends=[assertthat colt crayon data_table magrittr openxlsx purrr rlang stringi withr]; }; tau = derive2 { name="tau"; version="0.0-20"; sha256="1inpqc2cz1vvjkmp8h3jpjvnvj0y5cwbbj92jlq0322w5w45vip9"; depends=[]; }; @@ -11515,7 +11744,7 @@ in with self; { tawny = derive2 { name="tawny"; version="2.1.6"; sha256="0s6p0nnz1rpcnn2yfj1vvl54g57d8rv5s4y09azwz1z5ls7vnnlv"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; }; tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; }; taxa = derive2 { name="taxa"; version="0.2.0"; sha256="16jif3s5xf4cawwkhpmjrwb0c4ycmwicrshd5m0arlkcfmq85623"; depends=[dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr tibble]; }; - taxize = derive2 { name="taxize"; version="0.9.2"; sha256="15xv9j644a9zcbywx57ba6x6rsdj0pywdq58zak2fyx7c7fwpahm"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; }; + taxize = derive2 { name="taxize"; version="0.9.3"; sha256="05llhgv6a440va80fs45r8q6865q45gi4z28b1ldcln0dmx77r7c"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; }; taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; }; taxlist = derive2 { name="taxlist"; version="0.1.3"; sha256="0lsphap7brl67y458x29843wkxvvf2ppjn1crz4hby7wmn1psarx"; depends=[foreign taxize vegdata]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; }; @@ -11565,9 +11794,9 @@ in with self; { texmex = derive2 { name="texmex"; version="2.4"; sha256="0s3x681f1qnbgmzi5iwqpmkfzpx9gsccd3q1vz1dppzq8fbid3c2"; depends=[ggplot2 mvtnorm]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; text2vec = derive2 { name="text2vec"; version="0.5.1"; sha256="0vcp50mgpgxbf534vd8l56m8006i3sh8a4v9nrf9vxkq2pv7xygc"; depends=[data_table digest foreach futile_logger irlba Matrix mlapi R6 Rcpp RcppParallel sparsepp stringi]; }; - textTinyR = derive2 { name="textTinyR"; version="1.0.9"; sha256="1spzmxywzx6xk9z8jwhyab1g96rjq979zkb4sabl0sp362ccalfy"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; + textTinyR = derive2 { name="textTinyR"; version="1.1.0"; sha256="129ha0187vw4q5lw3xgch2k4fh9kfjrvvx2bb8bm3rd2skdhajj1"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; }; - textclean = derive2 { name="textclean"; version="0.6.3"; sha256="0i6linb782257clkdpl7rv354myl9wc1417ad2glhh53lgcprfk2"; depends=[data_table english lexicon qdapRegex stringi textshape]; }; + textclean = derive2 { name="textclean"; version="0.7.2"; sha256="13g8k7i7j33g4bzqps638k0j1gyms740wyz7d0205cqm70kzz8m3"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; }; texteffect = derive2 { name="texteffect"; version="0.1"; sha256="0fwcbz7bpynvcivac16z77j8d398bf7vl4l8sppi9yvg72l0k94w"; depends=[boot ggplot2 MASS]; }; textfeatures = derive2 { name="textfeatures"; version="0.1.1"; sha256="0pcs3nax21npb5blbwrmzl7q85ya8n7vgjn83z2abjr80gj3f5lj"; depends=[dplyr rlang tibble]; }; textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; }; @@ -11581,7 +11810,7 @@ in with self; { textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; textshape = derive2 { name="textshape"; version="1.5.0"; sha256="0hvp3mz7j2qkw38jg9cj92ikhyic1c9w8jk07z3vh3f5cm1klvbm"; depends=[data_table slam stringi]; }; - textstem = derive2 { name="textstem"; version="0.1.2"; sha256="172y1hvxhb33syqj5y369aq7fvcyn659cx6abcz7i5na8q1v9v0l"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC stringi textclean textshape]; }; + textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; }; tfdatasets = derive2 { name="tfdatasets"; version="1.5"; sha256="1ik6rzfnjmm54m7s2rvp1bq5jk0k2vl631bz3db3dk639jndiz6a"; depends=[magrittr reticulate rlang tensorflow tidyselect]; }; tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; @@ -11598,7 +11827,7 @@ in with self; { themetagenomics = derive2 { name="themetagenomics"; version="0.1.0"; sha256="1p8qyvll6a9yx2akny1087f73r6p5zi6cf1si7b8i786bcs9khwj"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; }; - thgenetics = derive2 { name="thgenetics"; version="0.3-4.1"; sha256="05g5rwdpnd1b4h1lay2l1s0ns2q6a7sav8d4zrxaqgzhaafnpxyv"; depends=[]; }; + thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.11"; sha256="1rr90q91nn406n2sbn3k9q5y1mjcb4i4ixsp05mh38r9qjkbirhk"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr ReporteRs stringi stringr tidyr XLConnect]; }; threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; @@ -11613,10 +11842,10 @@ in with self; { tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - tidyLPA = derive2 { name="tidyLPA"; version="0.1.2"; sha256="11xc8lnhs63ykaq2g3jzrp4kz48zz03cvw5s935fvhsp05drf6g5"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; }; + tidyLPA = derive2 { name="tidyLPA"; version="0.1.3"; sha256="1yk9abn21ycfdr1h43shjaymga5j9z862mp1zbwj2wbxxv6m5pp7"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; }; tidyRSS = derive2 { name="tidyRSS"; version="1.2.3"; sha256="1m21cwdbhial4h3084vqs0j6zwa267ia75gyjivprqjzcccjaqdp"; depends=[dplyr httr jsonlite lubridate magrittr purrr testthat tibble xml2]; }; - tidyboot = derive2 { name="tidyboot"; version="0.1.0"; sha256="1h997hrwacm91myhy93jrinx0h715da76wm9kwz9nwwzisv62m6k"; depends=[dplyr modelr purrr rlang tidyr]; }; - tidycensus = derive2 { name="tidycensus"; version="0.4.1"; sha256="1ay6qw25r809fpgs0fsvblgsrpi91ph82mm2w21vj59gba1bkr71"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; + tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; }; + tidycensus = derive2 { name="tidycensus"; version="0.4.6"; sha256="1czfdwm5bn0xpqm43mvb5bd30m5kdxikaq21gxkj41r78z69qncl"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; }; tidygraph = derive2 { name="tidygraph"; version="1.1.0"; sha256="1cqmii1pia5s8cj1hfm5jh4qgg9dn65dcb666bqfhq51nzgwy6b4"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; }; tidyhydat = derive2 { name="tidyhydat"; version="0.3.3"; sha256="01l4dwsrrmfavskbqxcq5v1ykggk363nn0m0nf6ks51xdr7lckf5"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr RSQLite tibble tidyr]; }; @@ -11629,10 +11858,10 @@ in with self; { tidyselect = derive2 { name="tidyselect"; version="0.2.4"; sha256="1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw"; depends=[glue purrr Rcpp rlang]; }; tidystats = derive2 { name="tidystats"; version="0.1"; sha256="0dy4yqdc0y8pmix29100x80q828rapnq9y3qn2p6rs763c7canmr"; depends=[dplyr magrittr purrr readr tibble tidyr]; }; tidystringdist = derive2 { name="tidystringdist"; version="0.1.2"; sha256="1jk5yqkjf33arbbfgfzk7ym943gy95n3yncybmvwbjsff07qpmaw"; depends=[attempt dplyr magrittr purrr rlang stringdist]; }; - tidytext = derive2 { name="tidytext"; version="0.1.7"; sha256="1pvf46z1jiwi1j0z917mml1cg9527zkdckh8h3d1ks4wawz099a9"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; - tidytree = derive2 { name="tidytree"; version="0.1.7"; sha256="1hf4xzdaww9vbh7ii88p43fpd8344zvqnw20ylvx58f7p82yl23b"; depends=[ape dplyr lazyeval magrittr tibble]; }; + tidytext = derive2 { name="tidytext"; version="0.1.8"; sha256="10w3h71pqbfa0n5b0a63vajc7hbwjy8bazdwmi8260zz82fvhfvl"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; + tidytree = derive2 { name="tidytree"; version="0.1.8"; sha256="0nhhr0qmigvvzchy4pgg7pm2cn50li4zg37b4bdlhkzfzhxz4y3m"; depends=[ape dplyr lazyeval magrittr tibble]; }; tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; - tidyxl = derive2 { name="tidyxl"; version="1.0.0"; sha256="1bsvxsz24qbk9wca8kh4qrb4fi22i49vpciq1pm5c48jb11bjb6b"; depends=[piton Rcpp]; }; + tidyxl = derive2 { name="tidyxl"; version="1.0.1"; sha256="10ckabv7aa744wxs3d5y9cd3a4c0x89gg91l23w7ddvcgjziq7an"; depends=[piton Rcpp]; }; tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; @@ -11640,8 +11869,8 @@ in with self; { tigger = derive2 { name="tigger"; version="0.2.11"; sha256="1kbqlfr3lsiiv0l7dzahna706zb4mx0gfx91220n2ckfc81pyrv5"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; }; - tigris = derive2 { name="tigris"; version="0.6.2"; sha256="0m4zramm38111rzifh0lqyly2dgdfgg5y39sns2rp8x1n0b69bc2"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; - tikzDevice = derive2 { name="tikzDevice"; version="0.10-1.2"; sha256="1rwxmjwmjr1dssg9dx7rc6nz11225pz2ac9rhp8581slwzw79icl"; depends=[filehash png]; }; + tigris = derive2 { name="tigris"; version="0.7"; sha256="0azfp8ahf63a10862669wsamf0270rcyrmknc331vjs52b3qlrvl"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; + tikzDevice = derive2 { name="tikzDevice"; version="0.11"; sha256="09qbwf7k2512q7yimabfr97birvspkn13hyybqsgqm1iiaiwwps3"; depends=[filehash png]; }; tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; }; time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; }; @@ -11664,9 +11893,9 @@ in with self; { timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; }; timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; }; tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; }; - tint = derive2 { name="tint"; version="0.0.5"; sha256="1283rik1ynnhy40lm1dipmwzihsy0pdn383k9m1yczl2fqf1qcfi"; depends=[htmltools knitr rmarkdown]; }; + tint = derive2 { name="tint"; version="0.1.0"; sha256="1hczc2nrm8xgvw3igkfnlqyz73686l447kigsrd6m796v8ny1gbf"; depends=[htmltools knitr rmarkdown]; }; tinyProject = derive2 { name="tinyProject"; version="0.5"; sha256="10sllhjcla4pfgp5n1y5vi318q9bcy82j88rx3k1sgzmbq1nc1c2"; depends=[brew devtools]; }; - tinytex = derive2 { name="tinytex"; version="0.4"; sha256="0ipmv5jrp6kkfj4m4zvhfys54x34zi15lzdxbgzmnil9lyn391zm"; depends=[]; }; + tinytex = derive2 { name="tinytex"; version="0.5"; sha256="1pg4jfyvandjwz3lmr38pbqi9d045iwkk3xklhsfhhxq6aviq9p7"; depends=[]; }; tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; }; tis = derive2 { name="tis"; version="1.34"; sha256="01bpl8q2n49wpr2gghkcv1zf16b3375xa71mv0q7wwn0da3n7m0n"; depends=[]; }; @@ -11687,12 +11916,12 @@ in with self; { tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3.1"; sha256="15k4bzx1p271yzskkijlf2pm6m7pb5dqxmfab9rhwynllszv96if"; depends=[ISOcodes NLP tm XML]; }; tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; - tmap = derive2 { name="tmap"; version="1.11-1"; sha256="0day8hy210a2v2ps9pqcv4mnlx39h7dcj47hkyjsm76qlcdccv3l"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; }; - tmaptools = derive2 { name="tmaptools"; version="1.2-3"; sha256="08m8dir5k7da72fp3hcsb055alwzpbxr2f9lxmhdbk991bmwacjr"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; }; + tmap = derive2 { name="tmap"; version="1.11-2"; sha256="1cinbsfhi8pngidxp3brmba1willknavlrpjzywm85wp7973y045"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; }; + tmaptools = derive2 { name="tmaptools"; version="1.2-4"; sha256="1dymngn3hrpky5v767lghijlbagmz57dqrkw57r0gy8a9k06bsx8"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; }; tmbstan = derive2 { name="tmbstan"; version="1.0.0"; sha256="01x1nw0mlbpsldrd6hx2g040d9slrhk7hm2pm1v7pci3vxgbpgy9"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; depends=[]; }; tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; }; - tmle = derive2 { name="tmle"; version="1.3.0"; sha256="0krnf2mzxmcb105gsx1b0gpc009lv27s0brh6sa1sm87a76p6dqd"; depends=[SuperLearner]; }; + tmle = derive2 { name="tmle"; version="1.3.0-1"; sha256="1y7fjj2492a70idnqwrlcdpz2bqphdxbaz96yjxnkfhx940y26b5"; depends=[SuperLearner]; }; tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; }; tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; }; tmod = derive2 { name="tmod"; version="0.36"; sha256="054kg3rwcmrn1y1x1ba8wflb6m76nmf69g4yj3x1vw0qjjs421nh"; depends=[beeswarm plotwidgets tagcloud XML]; }; @@ -11705,7 +11934,7 @@ in with self; { toOrdinal = derive2 { name="toOrdinal"; version="1.0-0.0"; sha256="1y46rcm6v2c5n71hdf5rgsgvy913wiazmml60mlxqb70dvz42649"; depends=[crayon testthat]; }; toaster = derive2 { name="toaster"; version="0.5.5"; sha256="0ga4l3zp422scrgvz701rjznn013vhsbp4gh7v1inqp7kpxafky9"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise network plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; }; togglr = derive2 { name="togglr"; version="0.1.3"; sha256="033d4mcl2w7nbjmaa5bc28skd63x34k4k4ib94nf11iwdj7bipkw"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr prettyunits purrr rstudioapi]; }; - tokenizers = derive2 { name="tokenizers"; version="0.1.4"; sha256="1qcsmcd74i39wql9p49g3pzc4flpi8jq9sxia5mcdx054viijgk9"; depends=[Rcpp SnowballC stringi]; }; + tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; }; tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; @@ -11719,6 +11948,7 @@ in with self; { tourr = derive2 { name="tourr"; version="0.5.5"; sha256="12293kp36kz056zd3fnsaf2gy4g8mcs79ws0vgbs7b0hx09sy9vp"; depends=[]; }; tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; }; toxboot = derive2 { name="toxboot"; version="0.1.1"; sha256="0sw0mxhcq5k11swlhfpn6xk0nfsambh2yx1721zx75lya27wkmq1"; depends=[data_table tcpl]; }; + toxplot = derive2 { name="toxplot"; version="0.1.1"; sha256="1g5q04ryn2dg675yp90x36z8iw3l5js50gpm4j2c17r88jb2fsl5"; depends=[dplyr ggplot2 ggthemes tcpl tidyr]; }; toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; @@ -11729,14 +11959,14 @@ in with self; { trackdem = derive2 { name="trackdem"; version="0.3.1"; sha256="10qq9217mpd4abhkwsh4yjzpi06qpqa5rnwhxls6yzmymf9apngl"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; }; trackeR = derive2 { name="trackeR"; version="1.0.0"; sha256="0z200jlkgcdxwss0ckbh3vqcfw56fi7pivr9vzf4rkwyf2n6v25s"; depends=[fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; }; trackr = derive2 { name="trackr"; version="0.7.5"; sha256="1achrnkqnpdjp2vr1s7xsl8fdfdyifgv5vr00b3xq9pkr4jggj6z"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools knitr lattice miniUI RJSONIO rmarkdown rsolr shiny]; }; - tractor_base = derive2 { name="tractor.base"; version="3.1.0"; sha256="0d3hkxqygyh02v63wny32zdxpsn6m6q8i1630zl1mhrbvq3kmqr5"; depends=[ore reportr]; }; + tractor_base = derive2 { name="tractor.base"; version="3.2.2"; sha256="1pbh9hand7h68vxap2qis3a7zs5qkrj2wxk8flqyvhx50p98wigv"; depends=[ore reportr shades]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; traits = derive2 { name="traits"; version="0.3.0"; sha256="155y8j69214xxi1bfk07k30zlpm3q6fmz7ydhnkvw0kv4l0i5pc5"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; }; trajr = derive2 { name="trajr"; version="1.0.0"; sha256="1q17lgwgxn9j3ym1vikrnnyqf61ri3vl7jqq3f1fvy2280nac0s8"; depends=[plotrix signal]; }; tram = derive2 { name="tram"; version="0.2-0"; sha256="02jbgp011qbinyjwdmj0nc2mpphmqlhm0dvvs7x2lfngrw1fw163"; depends=[basefun Formula mlt multcomp sandwich survival variables]; }; - tranSurv = derive2 { name="tranSurv"; version="1.1-4"; sha256="1vsp12x4h0s1lba1kf7n0v71kgm1dz6cjfp8lffm4ps80nahs63l"; depends=[rootSolve SQUAREM survival]; }; + tranSurv = derive2 { name="tranSurv"; version="1.1-5"; sha256="0vn3cywb331kxz6sxidprfh0lmgsmwlnzbv80bfrnahhmhmss8rl"; depends=[rootSolve SQUAREM survival]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; @@ -11745,15 +11975,15 @@ in with self; { transport = derive2 { name="transport"; version="0.9-4"; sha256="0ham0cla4qwfd6fqyckpdl2n2gm3qnl7ry1xi9kjvbajlcc0xwi2"; depends=[Rcpp]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; treatSens = derive2 { name="treatSens"; version="2.1.3"; sha256="159dpd4wg0i4cidg40lad665sm3j4qch8d1y3k9chwggbhcad5jn"; depends=[BH dbarts lme4 mvtnorm nlme Rcpp RcppEigen]; }; - tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; }; + tree = derive2 { name="tree"; version="1.0-39"; sha256="0q2dnl1hvyaw76lkfq0i9d92z68r29ssb3a9j8jknnzx896x055x"; depends=[]; }; tree_bins = derive2 { name="tree.bins"; version="0.1.0"; sha256="0cqpvh9cbnsk4qv886n2sc1v1s51z4m6aj0ydqzijvy6ckigbiij"; depends=[data_table dplyr rpart rpart_utils]; }; treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; }; - treeDA = derive2 { name="treeDA"; version="0.0.2"; sha256="0ldk7g0bfs8y0znivhj8db5si7glxawicc5zvapbf8d9djlaxxga"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; + treeDA = derive2 { name="treeDA"; version="0.0.3"; sha256="1m9959jya872sdkmw8hcwnjqj7r5x4h0c29g4j2rnxklbspn27j9"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; }; treeclim = derive2 { name="treeclim"; version="2.0.0"; sha256="0hiba5xc6rp5zzka31k5klmlllpgbnla4pm920zk12jxn796953l"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; - treeman = derive2 { name="treeman"; version="1.1.1"; sha256="0j76crs31qniibsdj7dpbbr2jdbhvclfvcscd5dgklvpcspbarch"; depends=[ape bigmemory plyr RJSONIO stringr]; }; + treeman = derive2 { name="treeman"; version="1.1.2"; sha256="0imwg4wi85gjhbhpym5gs0my8kacx28l74m5xbfwqdi4gxpz3kkc"; depends=[ape bigmemory plyr RJSONIO stringr]; }; treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; treemapify = derive2 { name="treemapify"; version="2.4.0"; sha256="1cg8jwlls3r3kjlmmxcm9id2spsn5ggsjrw0826ih2khdlnjc0jy"; depends=[ggfittext ggplot2 plyr]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; @@ -11788,7 +12018,7 @@ in with self; { truncnorm = derive2 { name="truncnorm"; version="1.0-8"; sha256="0zn88wdd58223kibk085rhsikl4yhlrwiyq109hzjg06hy6lwmj9"; depends=[]; }; truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; }; trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; }; - trustOptim = derive2 { name="trustOptim"; version="0.8.6.1"; sha256="07xkif11s3mdp4fmhl6zks6p2kdy4fdys2wpa8ibqpc6gd50vhvn"; depends=[Matrix Rcpp RcppEigen]; }; + trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; }; tsBSS = derive2 { name="tsBSS"; version="0.4"; sha256="0mli9y63bp7n21wzz5gga8i0c8f3db6cdcc5jp4zm529svilzkxm"; depends=[forecast ICtest JADE Rcpp RcppArmadillo]; }; tsDyn = derive2 { name="tsDyn"; version="0.9-46"; sha256="1cq36qxpimiwlzjnnjqj5rjb3l1h684day4kch99vza1v62h1lkv"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; @@ -11802,21 +12032,22 @@ in with self; { tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; tsdf = derive2 { name="tsdf"; version="1.1-4"; sha256="0kjcfh7vrnyg2aqzr5kkzdccriy2h5x1byzhdhvyb68fi4fjf4dh"; depends=[gsDesign]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; - tsensembler = derive2 { name="tsensembler"; version="0.0.3"; sha256="0f4n2w18cii19ls3706cw0kc2gky2x5nh2sz92f5k2smg28dhia4"; depends=[Cubist earth forecast gbm glmnet kernlab nnet pls ranger RcppRoll softImpute xts zoo]; }; - tseries = derive2 { name="tseries"; version="0.10-43"; sha256="1yjxhj7l1p2przczl6frggfcr5iwda9lbcsmh0y75gbbbps14yf2"; depends=[quadprog quantmod zoo]; }; + tsensembler = derive2 { name="tsensembler"; version="0.0.4"; sha256="0n5mh951799yd00sbxz0ia2s086kc12rk9xmkdyjvqj8d83vh1ff"; depends=[Cubist earth forecast gbm glmnet kernlab nnet opera pls ranger RcppRoll softImpute xts zoo]; }; + tseries = derive2 { name="tseries"; version="0.10-44"; sha256="0nz6v76hsxcprpgf84al5r0p08sr9qacqal4adndz9wmg604l4ag"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; }; tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; }; + tsfknn = derive2 { name="tsfknn"; version="0.1.0"; sha256="0gzij2fbgwavpsqmr7cp012lhii23fav4nsrbc2w9qingglcnqd1"; depends=[ggplot2]; }; tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; }; - tsibble = derive2 { name="tsibble"; version="0.1.3"; sha256="08m4k14hiab6nsqrc6qdnjvgqqngyjdv1m81dyk9v4p6l7x24rsj"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; }; + tsibble = derive2 { name="tsibble"; version="0.1.5"; sha256="054vdbgndi3zr1jizjyasp33l5ifbkfcj1gs8h4bk8vvkp96nqdv"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; }; tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; }; tsoutliers = derive2 { name="tsoutliers"; version="0.6-6"; sha256="0q4lkqasnsps8lzpiyk074nfhv29sbma080729c8l3ba1sa9pmyn"; depends=[forecast KFKSDS stsm]; }; tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; }; tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; }; - tstools = derive2 { name="tstools"; version="0.3.5.1"; sha256="11n56jd4hap8bl8dicdy1zvf916jc66nkg9v2i31n6n42v5dw699"; depends=[data_table jsonlite xts zoo]; }; + tstools = derive2 { name="tstools"; version="0.3.6"; sha256="0hk98czp6ban95jw7x9bv53n44z6wlkb9gc341x5pfjhslfqccal"; depends=[data_table jsonlite xts zoo]; }; tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; }; tsxtreme = derive2 { name="tsxtreme"; version="0.3.1"; sha256="0cfska93ws5x11pslcdhf5rrshxzh6ddlgmfkl9zlci2rqdbwz35"; depends=[evd MASS mvtnorm]; }; ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; }; @@ -11834,6 +12065,7 @@ in with self; { tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; }; tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; }; tuneR = derive2 { name="tuneR"; version="1.3.2"; sha256="1xk66rrahfvvbjzpx2mkbmlmyj0l3vidd8kz24f72wh56gbdgbsa"; depends=[signal]; }; + tuneRanger = derive2 { name="tuneRanger"; version="0.1"; sha256="1mjq64phnphx10mrllcdy1rgm44ar8zr3ba5c4f9fpz4a5kjm7i1"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; }; tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; turboEM = derive2 { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; }; turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; }; @@ -11855,15 +12087,15 @@ in with self; { twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; }; - uGMAR = derive2 { name="uGMAR"; version="2.0.0"; sha256="1qgbqqn70n5m0bw8nppzvf0gwgwic7iaidmp9xpmp4mpliybq2j0"; depends=[Brobdingnag]; }; + uGMAR = derive2 { name="uGMAR"; version="2.0.1"; sha256="038sy4blyz4dxqklk9g9r4glz0gvip84r6mb1ry4l7yh5nbii1dh"; depends=[Brobdingnag]; }; uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; }; uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; }; uavRmp = derive2 { name="uavRmp"; version="0.5.3"; sha256="05annx1vzpssxf5ycrgk2dizgl83zbwvl2x3bj8r5d8w5lvlpwrb"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; }; ubeR = derive2 { name="ubeR"; version="0.1.4"; sha256="1ilclna04hd1ykcp2b3gcj0v4qznwx0d24yavxnf2yh5d91wr6z2"; depends=[dplyr ggmap ggplot2 ggthemes googleway httpuv httr jsonlite]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; - udapi = derive2 { name="udapi"; version="0.1.0"; sha256="0hwnrx9qkazja288m6irmwwybiys9npk6sk60acjdczsfrn1hvl0"; depends=[curl httr]; }; - udpipe = derive2 { name="udpipe"; version="0.4"; sha256="00n4779g7idc29m7j32plqc4cnhrhhh28zmhd3lp74sxzfhi2vkb"; depends=[data_table Matrix Rcpp]; }; + udapi = derive2 { name="udapi"; version="0.1.1"; sha256="0mhkf1s7pv8d5hbianzcpc3jxps2i6y955n6bplikcz1l1pnb9ib"; depends=[curl httr]; }; + udpipe = derive2 { name="udpipe"; version="0.5"; sha256="0vbnfqbjpc27lazf96dwfp3rz0857hlbpld4hqhxkb2sqmrd17c1"; depends=[data_table Matrix Rcpp]; }; udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; }; uiucthemes = derive2 { name="uiucthemes"; version="0.2.0"; sha256="1z1wx89b2d7z1a2zc4ai05v9slfpidja8f561jcsrcdi9hz2yp81"; depends=[rmarkdown]; }; ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; @@ -11871,10 +12103,11 @@ in with self; { ukds = derive2 { name="ukds"; version="0.1.0"; sha256="00lgr9jy57bwa8p38mqcf4fk29g2w2wqk3pwf9av6f5lapzzgc94"; depends=[magrittr rio RSelenium stringr]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; - umx = derive2 { name="umx"; version="2.0.2"; sha256="1665h1yjs28zfpy7ziy0qnv8chm5nb5fcca1jj0cfbsspzndm24p"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; }; + umx = derive2 { name="umx"; version="2.4.0"; sha256="1i5sa6kwj57spjm1smz9835i92vs70hsq0yl7m1s0i0f3k18k3fx"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; }; unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; }; unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; - uncmbb = derive2 { name="uncmbb"; version="0.1.0"; sha256="0gkd475k4qbnfn3cgh8w4fq4g3i2fn3dlb8n89ih3xdk5ac4ns73"; depends=[]; }; + uncmbb = derive2 { name="uncmbb"; version="0.2.0"; sha256="0cvbh7a81g52hd2qzp23jwwjd5406iszf4wilgrz8sjfrfgybgfm"; depends=[dplyr rlang]; }; + understandBPMN = derive2 { name="understandBPMN"; version="1.0.0"; sha256="1rps8915r5chnagyqlr4m3jw9hfc3lgwkfnqpxfmxxl7k1dv3mnh"; depends=[dplyr purrr Rcpp tibble tidyr XML]; }; unfoldr = derive2 { name="unfoldr"; version="0.6.1"; sha256="1s1sy4x808w7nvc5kmskv7ksi2xcnfbb26qn0wkinbqma9aicqm2"; depends=[]; }; ungeneanno = derive2 { name="ungeneanno"; version="0.1.6"; sha256="0fm47vmzn4z73pn37p94r84lbkg5amk0sl78304ibwz0rhlda0y5"; depends=[httr XML]; }; uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; @@ -11895,12 +12128,12 @@ in with self; { unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; }; unrtf = derive2 { name="unrtf"; version="1.2"; sha256="11q2p6cnf1pqsh8sys45gb4xf713bh693lm59d8nw09kcbm23210"; depends=[sys]; }; unsystation = derive2 { name="unsystation"; version="0.1.1"; sha256="0w5llr2kyv7g5fx5yvlyqwj4da5k5fq1f2y70c9pjdzrny9lpz4q"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; - untb = derive2 { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; }; + untb = derive2 { name="untb"; version="1.7-3"; sha256="1324gn42qxw4cf3jg9vd8nwxiw4w4fg6p2xhzmn636q5wlziln5c"; depends=[Brobdingnag partitions polynom]; }; unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; }; upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; - uptasticsearch = derive2 { name="uptasticsearch"; version="0.1.0"; sha256="0kr9lmfp5fa3rcmk0s56pgr4h2pabic17m9yv2sljg7cvx50iss6"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; }; + uptasticsearch = derive2 { name="uptasticsearch"; version="0.2.0"; sha256="09vc26vpghc5lwlchmn7h8khy7s0jhcb8lqd1asr5l178kfpv3w8"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; upwaver = derive2 { name="upwaver"; version="1.0.1"; sha256="0pl5r1rh91s8i74zrsrblp6mjn371a2lp01f5d37d1vnjxc3dn9n"; depends=[assertthat httr rjson XLConnect]; }; uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; @@ -11913,6 +12146,7 @@ in with self; { useful = derive2 { name="useful"; version="1.2.3"; sha256="016fwnjrnq44m71jmiy8cpzncja77pii2ag2ir85jdk4fzgckn7l"; depends=[dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.0"; sha256="14wdy74mj9rzlpmrsy3b4fda5f2sx078w1k1lgahz0yra3bypl3k"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest fBasics GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists viridis XML xtable]; }; usethis = derive2 { name="usethis"; version="1.3.0"; sha256="0r61pf8qisjvrshm6jpcb76ck1v79s7lg9zwdgad4fasyyrzrcx2"; depends=[backports clipr clisymbols crayon curl desc gh git2r httr rematch2 rmarkdown rprojroot rstudioapi styler whisker]; }; + usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; }; usmap = derive2 { name="usmap"; version="0.2.1"; sha256="0ilg8fzrxpljdly8xkniirqa3lw74kfark75pv071aa4l6xkiwlg"; depends=[]; }; @@ -11921,19 +12155,19 @@ in with self; { utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; }; utility = derive2 { name="utility"; version="1.4.2"; sha256="0q08yc0sxbcjhsr0nkgc2pyxkd93zwlbf0jyq21cf535mj4036gq"; depends=[]; }; utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.5"; sha256="1kllm94c23pb176nazcfgsv38aawbzdwqdhyxx1c1n1jlsls2zk6"; depends=[data_table dplyr RCurl stringdist stringr]; }; - utiml = derive2 { name="utiml"; version="0.1.3"; sha256="08r2qfvxlz50jzvhl0k9pvzf9xs8jm838bv9ncg59ir1b3ijbkk5"; depends=[mldr]; }; + utiml = derive2 { name="utiml"; version="0.1.4"; sha256="1z93a7ldgkab6hsa9a0hzyhxsbac45sgqn7fy2jh615d2kw7pqr1"; depends=[mldr]; }; uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; }; - uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.4"; sha256="1kkmi2dqd2f4jryrkf9br4m6p7qxknlg62xyw28nirs4a12h52w8"; depends=[Exact geepack plyr sandwich survival]; }; + uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.5"; sha256="0zsbznvhnxihpxbkw3z4mywc66qx9qfxa0bz6748h19c885hjw01"; depends=[Exact geepack plyr sandwich survival]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; }; vagalumeR = derive2 { name="vagalumeR"; version="0.1.1"; sha256="1l1p63yhwqvkh8kgqii9n96vdm86jfc64nrinjp5l7jhx99sn013"; depends=[httr jsonlite plyr stringr]; }; valaddin = derive2 { name="valaddin"; version="0.1.2"; sha256="0j1c3g9gn2j0manz3jjh58cnl7b1rfwm9494xqrfqpia8948p9vq"; depends=[lazyeval purrr]; }; valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; }; validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; }; - validate = derive2 { name="validate"; version="0.2.0"; sha256="178paxywwiaa45pqhknpw2k6f08b35nlnhwvqv2d1d289fz4f6qh"; depends=[settings yaml]; }; + validate = derive2 { name="validate"; version="0.2.4"; sha256="0dg6jkc3g42fj0dx1m868v7p7jmxfdgihal9jmzphysyl36z8fp7"; depends=[settings yaml]; }; validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; }; validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; }; - validatetools = derive2 { name="validatetools"; version="0.4.1"; sha256="1ivwgva37j26csvp4w3w7d10yq6myqdg6gcgxrl9z8j3gldnzv7p"; depends=[lpSolveAPI validate]; }; + validatetools = derive2 { name="validatetools"; version="0.4.3"; sha256="1v6mmk3iq5nzzjkkj1spiqfmqq2133xg2qyy3y8h4pwwfynp4v7c"; depends=[lpSolveAPI validate]; }; valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; }; valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; }; valr = derive2 { name="valr"; version="0.4.0"; sha256="1km828lif5nh15fxc3kbk3xp14gmsd6f3n0g5ml9zbdimh9n990z"; depends=[BH bindrcpp broom dplyr ggplot2 plogr Rcpp readr rlang stringr tibble]; }; @@ -11954,7 +12188,7 @@ in with self; { vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; vcd = derive2 { name="vcd"; version="1.4-4"; sha256="1lp99h0wvsc61l1dgcqjxdrcgpgw88ak430cdsv43kmm43qssqd5"; depends=[colorspace lmtest MASS]; }; vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; }; - vcfR = derive2 { name="vcfR"; version="1.7.0"; sha256="1vx4s5z8h8mk8gqra2a5mkapz5xv1im76klq8qkpvj6ic4wcwsxs"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble tidyr vegan viridisLite]; }; + vcfR = derive2 { name="vcfR"; version="1.8.0"; sha256="1684lamsivwaqzvmwzhrrziwczkaqn3mhbdr86zbjdhr1jcgkz2z"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; }; @@ -11964,7 +12198,7 @@ in with self; { veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; }; vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; depends=[]; }; vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; }; - vegan = derive2 { name="vegan"; version="2.4-6"; sha256="175mqr42mmxy98gpf3rky8alnkw3w1k90ggdw3cispl36841p76w"; depends=[cluster lattice MASS mgcv permute]; }; + vegan = derive2 { name="vegan"; version="2.5-1"; sha256="0pynr02d1xngda6c3va8fc4nxpgfkawhzcnz1ws4dnarp9b1w90r"; depends=[cluster lattice MASS mgcv permute]; }; vegan3d = derive2 { name="vegan3d"; version="1.1-1"; sha256="1jd9m2immkhgb1zr39gsgl746y7qpi5fhj8awmqq5lyr5j6jp6jh"; depends=[cluster rgl scatterplot3d vegan]; }; vegclust = derive2 { name="vegclust"; version="1.7.1"; sha256="1k1dcw424s19f8ngsksvdmsayahl1hkxd9v2irf8ljpp688l8idi"; depends=[Rcpp sp vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; }; @@ -11975,7 +12209,7 @@ in with self; { velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; }; vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; }; venn = derive2 { name="venn"; version="1.5"; sha256="0mb8864kmn98184q007jnn7cydh02sx8bh1mhsskycmi70c8w8ai"; depends=[]; }; - vennLasso = derive2 { name="vennLasso"; version="0.1.1"; sha256="1xlf60xjvk0xq96mgzkj65q21mjk2k274xkcwsfmgir9xfdq60rd"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; }; + vennLasso = derive2 { name="vennLasso"; version="0.1.2"; sha256="1lma34msdl8ik0375bh4adbfgvcy0crv29gpsk7p6x75464jsp9y"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; }; venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; vennplot = derive2 { name="vennplot"; version="1.0"; sha256="0x59awa1zsjwk5qb1jzv6d2mn2fm4aq1lq8zlbnf1da0h4837yab"; depends=[Rcpp rgl stringr]; }; verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; }; @@ -11983,7 +12217,7 @@ in with self; { vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; }; - vetr = derive2 { name="vetr"; version="0.2.3"; sha256="1b35j8zzaj626dgz34hlprgsplnnskpl6zw3vppw27nnds7fdlh8"; depends=[]; }; + vetr = derive2 { name="vetr"; version="0.2.4"; sha256="16v31qkbn6nbng00465z6990n2hwzrv5i4m3ifv3ysfq28jnd28a"; depends=[]; }; vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; @@ -11992,14 +12226,14 @@ in with self; { vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; - viridis = derive2 { name="viridis"; version="0.5.0"; sha256="1ka6amybgzqkg3cbwfxwwqzzzpfn6q5jcia5am0bw48y5hbpg97y"; depends=[ggplot2 gridExtra viridisLite]; }; + viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.4-2"; sha256="19qw8vqf08x6fgm8w159qabpgr2wv2cxishpj6888ihcaa9ykp8f"; depends=[ade4 dismo raster rworldmap]; }; virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; }; visNetwork = derive2 { name="visNetwork"; version="2.0.3"; sha256="0bs6war8m6vnzyhmzfmry5sfc5v1crq8i8r8nn70shf19k7pabmw"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; visdat = derive2 { name="visdat"; version="0.1.0"; sha256="1r009jlg3wwg06j5066c09567q24986c74f0cd68kcbmihaxngbx"; depends=[dplyr ggplot2 magrittr purrr tidyr]; }; visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; depends=[lattice]; }; - vistime = derive2 { name="vistime"; version="0.4.0"; sha256="0fahih28q7lyywnm4mri9macdx4c5b3c5djmg557f7dxlyhhjw0l"; depends=[plotly RColorBrewer]; }; + vistime = derive2 { name="vistime"; version="0.5.0"; sha256="1h7dm66m0qx3hmfx1hlv5na65swdhdykyg1fsqzgnjl6p98cg81j"; depends=[plotly RColorBrewer]; }; visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; }; visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; }; visvow = derive2 { name="visvow"; version="0.1.0"; sha256="0nb849m6dqfanqlaqcargw0rlf4ch9v09zmf0zqmxkwcil0w0dka"; depends=[Cairo DT ggplot2 plot3D plyr pracma psych Rdpack readxl shiny shinyBS svglite WriteXLS]; }; @@ -12014,6 +12248,7 @@ in with self; { vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; }; vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; }; voteogram = derive2 { name="voteogram"; version="0.2.0"; sha256="0m4j7iz7mc6z536vk0kmqfd8ank87ingv5vnjl7mn62r53c5fbsf"; depends=[dplyr ggplot2 jsonlite scales]; }; + votesys = derive2 { name="votesys"; version="0.1.0"; sha256="1y86411khvn8yz0q75ky9ic7n8a11jckmpamj56h9cl5yh1rbm9w"; depends=[data_table]; }; vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; }; vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; depends=[]; }; vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; }; @@ -12024,6 +12259,7 @@ in with self; { vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; }; + vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; }; vtreat = derive2 { name="vtreat"; version="1.0.3"; sha256="04kicd7jxvcnvd0n9ssxv3jsi075wass30l3jg0ikdr3kc899vfs"; depends=[]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; }; @@ -12046,7 +12282,7 @@ in with self; { walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.1"; sha256="032s2k122z5cqkcjvh9gva4vvmj5prn6z3rs8j5y16d98kgambpy"; depends=[ggplot2 jmvcore R6 WRS2]; }; wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; }; - warbleR = derive2 { name="warbleR"; version="1.1.10"; sha256="0xwzrl08zvq4r280adz50rvr304i391l0g8m90dd5cdwxmfn071x"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR NatureSounds pbapply pbmcapply proxy RCurl rjson seewave signal tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.12"; sha256="1fb1pni00gphhwxzq75y5lbjqpyapc5vpqbbi2vq841dpn2jkcwm"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR NatureSounds pbapply pbmcapply pracma proxy RCurl rjson seewave signal Sim_DiffProc tuneR]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; }; wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; }; @@ -12054,7 +12290,7 @@ in with self; { waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; }; waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; }; waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; }; - waveband = derive2 { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; }; + waveband = derive2 { name="waveband"; version="4.7"; sha256="0b57g7jwvqgqjzd7x1pd4nqpx22rmiskvf8wjwrgplqzx4daxny2"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; }; wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; }; wavelets = derive2 { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; }; @@ -12069,8 +12305,8 @@ in with self; { weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; webTRISr = derive2 { name="webTRISr"; version="0.1.0"; sha256="19xal5zg9mg25vzvkz55zm6gkd8b0y3sw3zbbrxn73a1jg8x5v0l"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; }; - webchem = derive2 { name="webchem"; version="0.3.0"; sha256="11ryyniqcf6pa5avc5qks0hpksmapk3564bjva86626vml0mixby"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; - webdriver = derive2 { name="webdriver"; version="1.0.4"; sha256="0k031f26iihk2dxypqvfi60bhpj78yhwvhbmxqv7yrpa8s6j5flm"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage]; }; + webchem = derive2 { name="webchem"; version="0.4.0"; sha256="032bsfnkn7s33y42fyf8yradsh8jhms4ryjkh0r76hqnx3j00ph0"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; + webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; }; webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; }; webmockr = derive2 { name="webmockr"; version="0.2.0"; sha256="1zzfam380gy1d3k909ixbk61gmmv0w1x17qz8avrrnjlvqbp9gmn"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; }; webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; }; @@ -12088,7 +12324,7 @@ in with self; { weights = derive2 { name="weights"; version="0.85"; sha256="0nsvgx2yn2ynrkqvvy3fxjsi6aw8w3zknm80fyjrih2zmxc7v61f"; depends=[gdata Hmisc mice]; }; weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; }; welchADF = derive2 { name="welchADF"; version="0.2"; sha256="1gyii50khjd1pamv3v19ajx6b2vw2aspbzmqiqrqmvcl46nha24y"; depends=[lme4]; }; - wellknown = derive2 { name="wellknown"; version="0.1.0"; sha256="0cin4xi1780hglmcfyjiynvh1lm90yryl1m6z1snpprfzsxx3mmg"; depends=[jsonlite magrittr]; }; + wellknown = derive2 { name="wellknown"; version="0.5.0"; sha256="1y3hi5ajqaxx3s40cx24ayfcd3c6d1ydlhsm0gg2fxgmidm6bhwy"; depends=[jsonlite V8]; }; wesanderson = derive2 { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; }; wfe = derive2 { name="wfe"; version="1.6"; sha256="0y8f042hzlqwgsr63rl2apl7hkw9bs69a287dynvz9w078am61ch"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; @@ -12096,6 +12332,7 @@ in with self; { wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; }; wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; }; + wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; }; whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; }; whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; whitening = derive2 { name="whitening"; version="1.0.0"; sha256="0vncjbrw9gafplz6r02x0j1fnrfvxq027h1pqcbdwqykjzg0zcym"; depends=[corpcor]; }; @@ -12113,26 +12350,28 @@ in with self; { wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; }; wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; }; wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; + winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; }; windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; - windfarmGA = derive2 { name="windfarmGA"; version="1.2"; sha256="1g1m7q8gdkd4mawdxi06lsalhii2ymzqlmxfdqhp2cnvj4k7fqby"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; }; + windfarmGA = derive2 { name="windfarmGA"; version="1.2.1"; sha256="1v4brwi92a2kchak43z0vxjq11373amh190fnmpmnpz58zbls448"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; }; wiqid = derive2 { name="wiqid"; version="0.1.3"; sha256="06six8w77lf9rc49hnr42xgn2jvhb84wvqgi08ns22yn4z2iz9pz"; depends=[coda HDInterval MASS truncnorm]; }; - withr = derive2 { name="withr"; version="2.1.1"; sha256="17pbllxv18gf1mli9mm5px4wzp364907a4wrl20r1y5q8qwawpxx"; depends=[]; }; + withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; }; wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; }; wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; wmtsa = derive2 { name="wmtsa"; version="2.0-3"; sha256="1q436krz5p1f4a7a7sya6a9rh9x9mi8zzcgq66gbk9w9w4hcqcj6"; depends=[ifultools MASS splus2R]; }; wmwpow = derive2 { name="wmwpow"; version="0.1.0"; sha256="0hvim7b9zn6h6w6m6hgil919nkzkn8676x8b2f3lbmm8m7dwm3lq"; depends=[lamW MASS smoothmest]; }; - wnl = derive2 { name="wnl"; version="0.3.3"; sha256="1dcq7xicsbwwlw8f2g1f2q4b4ph0w5kjs3108cfg12yww0qjl4ss"; depends=[numDeriv]; }; + wnl = derive2 { name="wnl"; version="0.4.0"; sha256="02axa2xfbsvqiil240ywkj3r4yw5sqzk9mai1nccrvcx9fz8qlgc"; depends=[numDeriv]; }; wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; }; woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; }; woeBinning = derive2 { name="woeBinning"; version="0.1.5"; sha256="04pw32vng31v1n4r1g1fisvv8cacxmcx7m65vw4a2byamp2d25yq"; depends=[]; }; woeR = derive2 { name="woeR"; version="0.1.3"; sha256="15bdhgjq39svzaqzmfykyaq4r543lq15jf0sz8m9bwjv2c6vlx5l"; depends=[dplyr]; }; womblR = derive2 { name="womblR"; version="1.0.2"; sha256="0cnggwi47pmyjqz78vcvdzv3kpss6v4h404w2d7dii0zfqjr7bpk"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; - wooldridge = derive2 { name="wooldridge"; version="1.2.0"; sha256="1ib7qqmzybk7a171ny0zszh1lw2zgqyz35rb7g6y4ign2ng9ml9k"; depends=[]; }; + wooldridge = derive2 { name="wooldridge"; version="1.3.0"; sha256="029vdiglwkr7ilr7jvzarvphcc71n1majn6bh427b4qq7n01a7wb"; depends=[]; }; word_alignment = derive2 { name="word.alignment"; version="1.0.9"; sha256="02dy4a9agfb99rjbqxy35nf11bpxyjcq15bnyzjkbvcy0ppfgz0l"; depends=[data_table openxlsx quanteda]; }; + wordbankr = derive2 { name="wordbankr"; version="0.3.0"; sha256="0aa1gz3fg7h9wnk93ialwj0wjyk8wxani8galwkrms4fp7d5lmf4"; depends=[assertthat DBI dbplyr dplyr purrr rlang RMySQL robustbase stringr tidyr]; }; wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; }; wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; @@ -12146,12 +12385,12 @@ in with self; { wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; wpp2015 = derive2 { name="wpp2015"; version="1.1-0"; sha256="01vsdma2fgh0vd96ly4f704hl200v0w8ksz60gjxhm44ih3qszh3"; depends=[]; }; - wpp2017 = derive2 { name="wpp2017"; version="1.1-2"; sha256="18hyygk928kp25n5iy5nwz2fdicgpk3ncpkp2pksnp0cxzw3585w"; depends=[]; }; + wpp2017 = derive2 { name="wpp2017"; version="1.2-0"; sha256="0dk56wqs7g54r6jjb6wnppdf9d94474nja21j0bi6by0l8gn6lyc"; depends=[plyr]; }; wppExplorer = derive2 { name="wppExplorer"; version="2.1-1"; sha256="0n0ayn8bxkrabw2iyqv3hfkdchbk9bzv1lhkjpxnjb6z3zl1sggl"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2017]; }; wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; }; - wrapr = derive2 { name="wrapr"; version="1.2.0"; sha256="1dagjsbi75gplzkc44p4jqjbh3plp0kw9dz060kqsf0y7z6dk9vh"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="1.4.0"; sha256="0kxnpvqnr9whc8f5dr0xwff23pky9hp7mvrprvqnkwk0k44zd6c5"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="0.1.6"; sha256="1f6yyw6mmwc267cd9v17k6n4fhymi0y201bm6ii56rcw86n4ix77"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="0.2"; sha256="0hclrbn21sc0ifd2c5xfww84jf47412wzs86a73swxxjzcbrkg5k"; depends=[]; }; @@ -12171,7 +12410,9 @@ in with self; { x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; x13binary = derive2 { name="x13binary"; version="1.1.39-1"; sha256="1v6slh5136av3l7bk99a57gj6i6khx2j55qv4pyz1zmrzzgaayyc"; depends=[]; }; + x3ptools = derive2 { name="x3ptools"; version="0.0.1"; sha256="16kms5hbpa5hz5i0pdwx49yp2hmhyr8hd4w672vmwi94s5d84i1q"; depends=[digest rgl xml2 zoo]; }; xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; }; + xROI = derive2 { name="xROI"; version="0.1.2"; sha256="01xicw6ffrzs0df69dmylfxxfszqy5j81vba1w1l99h7hxq5a6bs"; depends=[colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; }; xSub = derive2 { name="xSub"; version="0.0.1"; sha256="0ccvkdylsia8qkfjlbbyggpy4l8z3r05cmvp4xb3j4628fa82jav"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; xaringan = derive2 { name="xaringan"; version="0.6"; sha256="0jgdixgbkwp9jnvjnrzdmlawz8f24z8in56cma3hn79glbvxfaw4"; depends=[htmltools knitr rmarkdown servr xfun]; }; @@ -12205,8 +12446,8 @@ in with self; { xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; }; xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; - xtractomatic = derive2 { name="xtractomatic"; version="3.4.1"; sha256="189lya8ijm8vxjki76gjdhv1nyp3860ydpzg5ij12ggd5qqn1zgy"; depends=[dplyr httr ncdf4 readr sp]; }; - xts = derive2 { name="xts"; version="0.10-1"; sha256="1j9ddh9v9081zrqlpylsk13fldilhjdyaw6r6pa726fhgnrsf8a2"; depends=[zoo]; }; + xtractomatic = derive2 { name="xtractomatic"; version="3.4.2"; sha256="1w70kk608avnf7zdjx79gxqmj12cw86ma4x0b9j92md1vmpw5389"; depends=[dplyr httr ncdf4 readr sp]; }; + xts = derive2 { name="xts"; version="0.10-2"; sha256="1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1"; depends=[zoo]; }; xwf = derive2 { name="xwf"; version="0.2-1"; sha256="1g94wbsq8flnkxxfxx6yg87siiwpyrx219an9a2cf1blnwjv9b68"; depends=[mgcv]; }; xxIRT = derive2 { name="xxIRT"; version="2.0.3"; sha256="10n9rrhp0v71gmn0s2l2qi6sfplwj7anydw6rxqk409wg5is3x93"; depends=[dplyr ggplot2 lpSolveAPI magrittr reshape2]; }; xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; }; @@ -12221,12 +12462,12 @@ in with self; { yasp = derive2 { name="yasp"; version="0.1.0"; sha256="082w1l0892v0vrvfmc1ssgy9ccj30hcrg7m56x61spgcmckfshy4"; depends=[]; }; ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; yearn = derive2 { name="yearn"; version="0.1.3"; sha256="03aqbf3q0nhg73pqpwlqdhpbmfa0rvv78b84b4mqir43601vjx65"; depends=[BiocInstaller devtools githubinstall]; }; - yesno = derive2 { name="yesno"; version="0.0.2"; sha256="0aa8kqcqlix9a9a2l4fnl2qv25dgdn4m7cfsh7m0kk76y8q5gbc9"; depends=[]; }; + yesno = derive2 { name="yesno"; version="0.1.0"; sha256="0l3v51kghbq9s00s736s4jvl8a0yhbgb908mjvhw6k5nqb2cgh8a"; depends=[]; }; yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; }; yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; }; yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; - yuima = derive2 { name="yuima"; version="1.6.8"; sha256="1x10q2l8xd3h86m333mi6hkb7fpf4q5fbs7gwmlynylkz216b65j"; depends=[cubature expm mvtnorm Rcpp RcppArmadillo zoo]; }; + yuima = derive2 { name="yuima"; version="1.7.10"; sha256="0g1jh81s2i6ilpcbrjbz9wmk65m6xsdv8dif88x6v5k8660k2ksl"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; }; yuimaGUI = derive2 { name="yuimaGUI"; version="1.2.0"; sha256="166hsq1nc0jzkqbz08y3dl0qdi58swascbkm1lc7zhsh6g93azjs"; depends=[DT ggplot2 plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; zCompositions = derive2 { name="zCompositions"; version="1.1.1"; sha256="1j6v7mfxhn67mr3q6cvcjj9pqc8a02w114z8q74h3l6jw8ahjg6m"; depends=[MASS NADA truncnorm]; }; @@ -12237,15 +12478,16 @@ in with self; { zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; zenplots = derive2 { name="zenplots"; version="0.0-3"; sha256="1ba9xv522knzbirl6ac5hzbmsw8ignsmymbkps2w057w0fsc9iyz"; depends=[graph MASS PairViz]; }; - zetadiv = derive2 { name="zetadiv"; version="1.0.1"; sha256="0a50xj7bgb2w3yx2ghpwq2y2hkilxx0dchhscspzjalyw77jhxvp"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; + zetadiv = derive2 { name="zetadiv"; version="1.1.0"; sha256="0z90gpwyi2d0xnwy2vz7an5wv7jrwhl99kd2s76dlxylfjp7j2rn"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; }; zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; }; zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; }; zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; }; - ziphsmm = derive2 { name="ziphsmm"; version="2.0.2"; sha256="0ki9slsrh9skb23svc9m5a0gbzf4crhgrricr0swr97n5h9xfzkw"; depends=[Rcpp RcppArmadillo]; }; + zipfextR = derive2 { name="zipfextR"; version="1.0.0"; sha256="007pw5z9rz8ng0llyd2088qxldc3sf0s35pcfqmm85qb94fdksdd"; depends=[tolerance VGAM]; }; + ziphsmm = derive2 { name="ziphsmm"; version="2.0.4"; sha256="19ypfx05z7c0skv1nvjivxarblizqqwaqpqyvnhqrckfb7lkhdby"; depends=[pracma Rcpp RcppArmadillo]; }; zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; }; - zoib = derive2 { name="zoib"; version="1.5.0"; sha256="133d5qxhv5vlxb9f1lh0zsmcb7ycbr42hjynzmd8f5fd91x8k43i"; depends=[abind coda Formula matrixcalc rjags]; }; + zoib = derive2 { name="zoib"; version="1.5.1"; sha256="0lsyr8hfhk4dk129x2l1793v6nmf2k97wnsc44ir6ymip3i4zfld"; depends=[abind coda Formula matrixcalc rjags]; }; zonator = derive2 { name="zonator"; version="0.5.9"; sha256="04gjrm9nxnxsigrc30zghmv37ijsx27134hfnrbm51smw2y60dm4"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; }; zoo = derive2 { name="zoo"; version="1.8-1"; sha256="16nc5jnpkf5j9vgq3pzssv7knj30mi055wj7q3sygz3l0d88hgfr"; depends=[lattice]; }; zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 37d6611cd9f0..6c00e58d9e73 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -438,7 +438,6 @@ let packagesRequireingX = [ "accrual" "ade4TkGUI" - "adehabitat" "analogue" "analogueExtra" "AnalyzeFMRI" @@ -585,7 +584,6 @@ let "ProbForecastGOP" "qtbase" "qtpaint" - "R2STATS" "r4ss" "RandomFields" "rareNMtests" From 84a6e18947fe961e97173f031318cd6111a43949 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 24 Apr 2018 01:50:23 +0200 Subject: [PATCH 2454/2743] nixos/tests/keymap: improve keymap tests simplify tests, prevent timeouts and non-deterministic failures --- nixos/tests/keymap.nix | 94 +++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 52 deletions(-) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index caa5f7107c23..abff90d5047d 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -3,46 +3,34 @@ with import ../lib/testing.nix { inherit system; }; let + readyFile = "/tmp/readerReady"; + resultFile = "/tmp/readerResult"; + testReader = pkgs.writeScript "test-input-reader" '' #!${pkgs.stdenv.shell} - readInput() { - touch /tmp/reader.ready - echo "Waiting for '$1' to be typed" - read -r -n1 c - if [ "$c" = "$2" ]; then - echo "SUCCESS: Got back '$c' as expected." - echo 0 >&2 - else - echo "FAIL: Expected '$2' but got '$c' instead." - echo 1 >&2 - fi - } + rm -f ${resultFile} + logger "testReader: START: Waiting for $1 characters, expecting '$2'." + touch ${readyFile} + read -r -N $1 chars + rm -f ${readyFile} - main() { - error=0 - while [ $# -gt 0 ]; do - ret="$((readInput "$2" "$3" | systemd-cat -t "$1") 2>&1)" - if [ $ret -ne 0 ]; then error=1; fi - shift 3 - done - return $error - } - - main "$@"; echo -n $? > /tmp/reader.exit + if [ "$chars" == "$2" ]; then + logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile} + else + logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile} + fi ''; - mkReaderInput = testname: { qwerty, expect }: with pkgs.lib; let - lq = length qwerty; - le = length expect; - msg = "`qwerty' (${lq}) and `expect' (${le}) lists" - + " need to be of the same length!"; - result = flatten (zipListsWith (a: b: [testname a b]) qwerty expect); - in if lq != le then throw msg else result; mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let - readerInput = flatten (mapAttrsToList mkReaderInput tests); + combinedTests = foldAttrs (acc: val: acc ++ val) [] (builtins.attrValues tests); perlStr = val: "'${escape ["'" "\\"] val}'"; - perlReaderInput = concatMapStringsSep ", " perlStr readerInput; + lq = length combinedTests.qwerty; + le = length combinedTests.expect; + msg = "length mismatch between qwerty (${toString lq}) and expect (${toString le}) lists!"; + send = concatMapStringsSep ", " perlStr combinedTests.qwerty; + expect = if (lq == le) then concatStrings combinedTests.expect else throw msg; + in makeTest { name = "keymap-${layout}"; @@ -50,38 +38,40 @@ let machine.i18n.consoleKeyMap = mkOverride 900 layout; machine.services.xserver.layout = mkOverride 900 layout; machine.imports = [ ./common/x11.nix extraConfig ]; - machine.services.xserver.displayManager.slim.enable = true; testScript = '' - sub waitCatAndDelete ($) { - return $machine->succeed( - "for i in \$(seq 600); do if [ -e '$_[0]' ]; then ". - "cat '$_[0]' && rm -f '$_[0]' && exit 0; ". - "fi; sleep 0.1; done; echo timed out after 60 seconds >&2; exit 1" - ); - }; sub mkTest ($$) { my ($desc, $cmd) = @_; - my @testdata = (${perlReaderInput}); - my $shellTestdata = join ' ', map { "'".s/'/'\\'''/gr."'" } @testdata; - subtest $desc, sub { - $machine->succeed("$cmd ${testReader} $shellTestdata &"); - while (my ($testname, $qwerty, $expect) = splice(@testdata, 0, 3)) { - waitCatAndDelete "/tmp/reader.ready"; - $machine->sendKeys($qwerty); - }; - my $exitcode = waitCatAndDelete "/tmp/reader.exit"; - die "tests for $desc failed" if $exitcode ne 0; + # prepare and start testReader + $machine->execute("rm -f ${readyFile} ${resultFile}"); + $machine->succeed("$cmd ${testReader} ${toString le} ".q(${escapeShellArg expect} & )); + + if ($desc eq "Xorg keymap") { + # make sure the xterm window is open and has focus + $machine->waitForWindow(qr/testterm/); + $machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync"); + } + + # wait for reader to be ready + $machine->waitForFile("${readyFile}"); + $machine->sleep(1); + + # send all keys + foreach ((${send})) { $machine->sendKeys($_); }; + + # wait for result and check + $machine->waitForFile("${resultFile}"); + $machine->succeed("grep -q 'PASS:' ${resultFile}"); }; - } + }; $machine->waitForX; mkTest "VT keymap", "openvt -sw --"; - mkTest "Xorg keymap", "DISPLAY=:0 xterm -fullscreen -e"; + mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e"; ''; }; From b707c91814134cb8002820e7d82ca7129b60ee45 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 11:16:55 +0200 Subject: [PATCH 2455/2743] maxima-ecl: Disable failing tests --- .../science/math/maxima/default.nix | 4 ++++ .../math/maxima/known-ecl-failures.patch | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/science/math/maxima/known-ecl-failures.patch diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index c3eeddef6694..892b9d9520e3 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -69,6 +69,10 @@ stdenv.mkDerivation ({ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; }) + # There are some transient test failures. I hope this disables all those tests. + # If those test failures ever happen in the non-ecl version, that should be + # reportetd upstream. + ./known-ecl-failures.patch ]; # Failures in the regression test suite won't abort the build process. We run diff --git a/pkgs/applications/science/math/maxima/known-ecl-failures.patch b/pkgs/applications/science/math/maxima/known-ecl-failures.patch new file mode 100644 index 000000000000..c32912b316e2 --- /dev/null +++ b/pkgs/applications/science/math/maxima/known-ecl-failures.patch @@ -0,0 +1,21 @@ +diff --git a/tests/testsuite.lisp b/tests/testsuite.lisp +index 45a81f4..36c35b8 100644 +--- a/tests/testsuite.lisp ++++ b/tests/testsuite.lisp +@@ -25,13 +25,14 @@ + ((mlist simp) "rtest10" 24 25) + ((mlist) "rtest11" #+(or gcl cmucl ccl64) 158 #+(or gcl cmucl ccl64) 174 #+gcl 175) + "rtest13" "rtest13s" +- "rtest14" ++ ((mlist simp) "rtest14" 250 307 310 312 319) ;; fails with ecl + "rtest15" + ;; ccl versions 1.11 and earlier fail test 50. Mark it as a + ;; known failure. Presumably 1.12 will have this fixed. + ((mlist simp) "rtest16" #+ccl 50) + "rtestode" "rtestode_zp" +- "rtest3" "rtest8" ++ "rtest3" ++ ((mlist simp) "rtest8" 104) ;; fails with ecl + ((mlist simp) "rtest12" 76 78) + "rexamples" + ((mlist simp) "rtesthyp" 105 112 113 123 124 128) From 847196143df811918b4a9cdb5da07364b30f7a92 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Tue, 24 Apr 2018 17:26:28 +0800 Subject: [PATCH 2456/2743] teseq: init at 1.1.1 --- pkgs/applications/misc/teseq/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/teseq/default.nix diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix new file mode 100644 index 000000000000..9502b3a0abe7 --- /dev/null +++ b/pkgs/applications/misc/teseq/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +let + version = "1.1.1"; +in +stdenv.mkDerivation { + name = "teseq-${version}"; + + src = fetchurl { + url = "mirror://gnu/teseq/teseq-${version}.tar.gz"; + sha256 = "08ln005qciy7f3jhv980kfhhfmh155naq59r5ah9crz1q4mx5yrj"; + }; + + meta = { + homepage = https://www.gnu.org/software/teseq/; + description = "Escape sequence illuminator"; + license = stdenv.lib.licenses.gpl3; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.vaibhavsagar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 946be093765d..1a088d6644b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21364,6 +21364,8 @@ with pkgs; wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { }; + teseq = callPackage ../applications/misc/teseq { }; + # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount From 9105db24ec7b2e8341ccebe8254038fbe81b0140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Apr 2018 10:30:53 +0100 Subject: [PATCH 2457/2743] telegraf: 1.5.3 -> 1.6.1 --- pkgs/servers/monitoring/telegraf/default.nix | 4 +- .../{deps-1.5.3.nix => deps-1.6.1.nix} | 56 +++++++++++++++---- 2 files changed, 48 insertions(+), 12 deletions(-) rename pkgs/servers/monitoring/telegraf/{deps-1.5.3.nix => deps-1.6.1.nix} (92%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index e06aaa9faa47..b7879cc763aa 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.5.3"; + version = "1.6.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "0h3v80qvb9xmkmgbp46sqh76y4k84c0da586vdy3xmmbrbagnypv"; + sha256 = "0zc3bgs1ad392lqv72rkppxmk33b404b8jfx3wbzll7fklwxa8g2"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix b/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix similarity index 92% rename from pkgs/servers/monitoring/telegraf/deps-1.5.3.nix rename to pkgs/servers/monitoring/telegraf/deps-1.6.1.nix index 916b4688a06e..fb98b8686cc2 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix @@ -185,8 +185,17 @@ fetch = { type = "git"; url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "d4f545eb108a2d19f9b1a735689dbfb719bc21fb"; - sha256 = "01cnca8y5caramqn6p8aigj6l5p6z0nrs2xqqv90658x584138kh"; + rev = "aff15770515e3c57fc6109da73d42b0d46f7f483"; + sha256 = "1blfvrp1d5jqxxqdw7xd0ns1qiml45k0nch9jwpi0ddg7hckii2d"; + }; + } + { + goPackagePath = "github.com/go-redis/redis"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "73b70592cdaa9e6abdfcfbf97b4a90d80728c836"; + sha256 = "0b6xwajnk65bdq98czv137gvypwnznkjnm2ksnxm87nyj2vyddm9"; }; } { @@ -257,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/influxdata/tail"; - rev = "a395bf99fe07c233f41fba0735fa2b13b58588ea"; - sha256 = "0bmkv932xhjpxwp8n74xy8wf34kiiknwq8agfbnz931apq6iw9b0"; + rev = "c43482518d410361b6c383d7aebce33d0471d7bc"; + sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b"; }; } { @@ -360,6 +369,15 @@ sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; }; } + { + goPackagePath = "github.com/nats-io/gnatsd"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/gnatsd"; + rev = "393bbb7c031433e68707c8810fda0bfcfbe6ab9b"; + sha256 = "1hnn4p24gm90siixdvj97csrxnr78svxmypglcjska474adhhnzz"; + }; + } { goPackagePath = "github.com/nats-io/go-nats"; fetch = { @@ -509,8 +527,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "384a55110aa5ae052eb93ea94940548c1e305a99"; - sha256 = "00idmnsmalxhm1y60lhm9vyck1ay7gbp0r35fgs8bbiwq351bs23"; + rev = "a5c2888e464b14fa882c2a059e0f95716bd45cf1"; + sha256 = "1czzl00lxcyhmf6x7wmw3dxmnyqij8lcahn5mv325csgyym4vm4w"; }; } { @@ -518,8 +536,8 @@ fetch = { type = "git"; url = "https://github.com/soniah/gosnmp"; - rev = "5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15"; - sha256 = "0dqz0w077xfk9fj5dd8xa6sqgdvjpb8vx997wnqpi3kbii1b9jnb"; + rev = "f15472a4cd6f6ea7929e4c7d9f163c49f059924f"; + sha256 = "1blhxq9sayfg7zih5rj0dg2qj9h10m6sbri57hxya9iz3jfgcx11"; }; } { @@ -536,8 +554,26 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; - sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; + }; + } + { + goPackagePath = "github.com/tidwall/gjson"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/gjson"; + rev = "0623bd8fbdbf97cc62b98d15108832851a658e59"; + sha256 = "0g6rhilcmqpdvjdds7ykzhrlsjx234chf73l8sjah0rsd03207k0"; + }; + } + { + goPackagePath = "github.com/tidwall/match"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/match"; + rev = "173748da739a410c5b0b813b956f89ff94730b4c"; + sha256 = "0a4hp323gnjam3nfxfljq7d24m7rgk5vxbscjmi3ik3ph78r5avg"; }; } { From ba389086de2fbd69866445460b7e80496a70c071 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 23 Apr 2018 16:28:25 +0200 Subject: [PATCH 2458/2743] singular: Fix ntl dependency --- .../science/math/singular/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 882d481a7f98..cec1a831c912 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig , autoreconfHook +, file , flint , ntl , cddlib @@ -18,7 +19,9 @@ stdenv.mkDerivation rec { sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1"; }; - configureFlags = stdenv.lib.optionals enableFactory [ + configureFlags = [ + "--with-ntl=${ntl}" + ] ++stdenv.lib.optionals enableFactory [ "--enable-factory" ] ++ stdenv.lib.optionals enableGfanlib [ "--enable-gfanlib" @@ -42,11 +45,19 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals enableGfanlib [ cddlib ]; - nativeBuildInputs = [ autoconf bison perl pkgconfig autoreconfHook ]; + nativeBuildInputs = [ + bison + perl + pkgconfig + autoreconfHook + ]; - preConfigure = '' - find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';' - find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';' + preAutoreconf = '' + find . -type f -readable -writable -exec sed \ + -e 's@/bin/rm@${coreutils}&@g' \ + -e 's@/bin/uname@${coreutils}&@g' \ + -e 's@/usr/bin/file@${file}/bin/file@g' \ + -i '{}' ';' ''; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; From 75b0866d0c750e4ef2fe1ed7ee1af9fd32f52874 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 23 Apr 2018 19:46:12 +0200 Subject: [PATCH 2459/2743] pari: Make pthread optional, remove unstable --- .../science/math/pari/default.nix | 20 +++++++++--- .../science/math/pari/unstable.nix | 31 ------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/science/math/pari/unstable.nix diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index a1ddbd9ab17d..8c24881f2152 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl -, gmp, readline, libX11, libpthreadstubs, tex, perl }: +, gmp, readline, libX11, tex, perl +, withThread ? true, libpthreadstubs +}: + +assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { @@ -11,14 +15,22 @@ stdenv.mkDerivation rec { sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g"; }; - buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ]; + buildInputs = [ + gmp + readline + libX11 + tex + perl + ] ++ stdenv.lib.optionals withThread [ + libpthreadstubs + ]; configureScript = "./Configure"; configureFlags = [ - "--mt=pthread" "--with-gmp=${gmp.dev}" "--with-readline=${readline.dev}" - ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin"; + ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin" + ++ stdenv.lib.optional withThread "--mt=pthread"; preConfigure = '' export LD=$CC diff --git a/pkgs/applications/science/math/pari/unstable.nix b/pkgs/applications/science/math/pari/unstable.nix deleted file mode 100644 index 65dd3005b4ab..000000000000 --- a/pkgs/applications/science/math/pari/unstable.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, gmp, readline, perl }: - -stdenv.mkDerivation rec { - version = "2.9.3"; - name = "pari-unstable-${version}"; - - src = fetchurl { - url = "http://pari.math.u-bordeaux.fr/pub/pari/unstable/pari-${version}.tar.gz"; - sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7"; - }; - - buildInputs = [gmp readline]; - nativeBuildInputs = [perl]; - - configureScript = "./Configure"; - configureFlags = - "--with-gmp=${gmp.dev} " + - "--with-readline=${readline.dev}"; - - meta = with stdenv.lib; { - description = "Computer algebra system for high-performance number theory computations"; - homepage = "http://pari.math.u-bordeaux.fr/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ertes raskin ]; - platforms = platforms.linux; - - inherit version; - downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; - updateWalker = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 946be093765d..d91d1e92c0b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20279,7 +20279,6 @@ with pkgs; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; gp2c = callPackage ../applications/science/math/pari/gp2c.nix { }; - pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {}; palp = callPackage ../applications/science/math/palp { }; From 5f6373d582c56dd1ff8a961ceeaccaced5ded953 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 11 Apr 2018 21:54:05 +0200 Subject: [PATCH 2460/2743] dragonfly-reverb: init at 0.9.1 --- .../audio/dragonfly-reverb/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/dragonfly-reverb/default.nix diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix new file mode 100644 index 000000000000..b3d9fd580288 --- /dev/null +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, libjack2, libGL, pkgconfig, xorg }: + +stdenv.mkDerivation rec { + name = "dragonfly-reverb-${src.rev}"; + + src = fetchgit { + url = "https://github.com/michaelwillis/dragonfly-reverb"; + rev = "0.9.1"; + sha256 = "1dbykx044h768bbzabdagl4jh65gqgfsxsrarjrkp07sqnhlnhpd"; + }; + + patchPhase = '' + patchShebangs dpf/utils/generate-ttl.sh + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libjack2 xorg.libX11 libGL + ]; + + installPhase = '' + mkdir -p $out/lib/lv2/ + cp -a bin/DragonflyReverb.lv2/ $out/lib/lv2/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/michaelwillis/dragonfly-reverb; + description = "A hall-style reverb based on freeverb3 algorithms"; + maintainers = [ maintainers.magnetophon ]; + license = licenses.gpl2; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67a5390aa6aa..d2019b1f25cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15269,6 +15269,8 @@ with pkgs; draftsight = callPackage ../applications/graphics/draftsight { }; + dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; + droopy = callPackage ../applications/networking/droopy { inherit (python3Packages) wrapPython; }; From 39a64b28b52ae0ea57f227941fa23bdced6cc334 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Apr 2018 12:50:48 +0200 Subject: [PATCH 2461/2743] =?UTF-8?q?orca:=203.28.0=20=E2=86=92=203.28.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 109c0afa12d0..abc8c3e78424 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -10,7 +10,7 @@ with lib; let pname = "orca"; - version = "3.28.0"; + version = "3.28.1"; in buildPythonApplication rec { name = "${pname}-${version}"; @@ -18,7 +18,7 @@ in buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2"; + sha256 = "04l5ccn7wf175gyq3blfpx0yh70ny06n161297jwc9idf951852g"; }; patches = [ From 6c15df2c91ce555574ec1ed1dd2f663bd5cc054d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Apr 2018 12:51:17 +0200 Subject: [PATCH 2462/2743] =?UTF-8?q?gnome3.epiphany:=203.28.1=20=E2=86=92?= =?UTF-8?q?=203.28.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 3ece64dc163f..c9537f497690 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.28.1"; + version = "3.28.1.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md"; + sha256 = "15d4dr4dwb1dyw3mvs7wp5gik57kdg0rxdc49n92wx46wfh6lhlr"; }; # Tests need an X display From fe5fcee1f271f53385c238ff9b46906b1cfcf4d7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Apr 2018 12:51:37 +0200 Subject: [PATCH 2463/2743] =?UTF-8?q?gnome3.sushi:=203.24.0=20=E2=86=92=20?= =?UTF-8?q?3.28.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/sushi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 00cec2f93b9f..114c0d8ac960 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "sushi-${version}"; - version = "3.24.0"; + version = "3.28.3"; src = fetchurl { url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; + sha256 = "1yydd34q7r05z0jdgym3r4f8jv8snrcvvhxw0vxn6damlvj5lbiw"; }; passthru = { From 1643713bf3bc0dd3ded6232ea225a46d6e796d87 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Apr 2018 12:52:04 +0200 Subject: [PATCH 2464/2743] =?UTF-8?q?libhttpseverywhere:=200.8.2=20?= =?UTF-8?q?=E2=86=92=200.8.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libhttpseverywhere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 6af3f5225d4d..332dd8444eb4 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -3,13 +3,13 @@ let pname = "libhttpseverywhere"; - version = "0.8.2"; + version = "0.8.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0vcnimlfcscyvjbh845xbnjb9qc8x0mliaqz2gczxxpakxrbl3gh"; + sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig ]; From af3565ca206831caac47758f4415ec1502e1f5d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 Apr 2018 13:10:58 +0200 Subject: [PATCH 2465/2743] =?UTF-8?q?geary:=200.12.1=20=E2=86=92=200.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/geary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 1994b587fbd3..548936dc5e52 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -6,14 +6,14 @@ let pname = "geary"; - version = "0.12.1"; + version = "0.12.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; + sha256 = "09j5gh4zm49fcg2ycvy00dkkw69rfppqwc3lqdi4994hry4jivx9"; }; nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; From 396b5d9c655247c776e7dc6789ad623502c1cc4b Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 24 Apr 2018 13:38:44 +0200 Subject: [PATCH 2466/2743] maxima-ecl: Disable more failing tests --- pkgs/applications/science/math/maxima/known-ecl-failures.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/maxima/known-ecl-failures.patch b/pkgs/applications/science/math/maxima/known-ecl-failures.patch index c32912b316e2..f1d612d993e6 100644 --- a/pkgs/applications/science/math/maxima/known-ecl-failures.patch +++ b/pkgs/applications/science/math/maxima/known-ecl-failures.patch @@ -7,7 +7,7 @@ index 45a81f4..36c35b8 100644 ((mlist) "rtest11" #+(or gcl cmucl ccl64) 158 #+(or gcl cmucl ccl64) 174 #+gcl 175) "rtest13" "rtest13s" - "rtest14" -+ ((mlist simp) "rtest14" 250 307 310 312 319) ;; fails with ecl ++ ;; "rtest14" ;; some tests sometimes fail with ecl, hard to reproduce. Observed failing: 250, 267, 297, 307, 310, 312, 315, 319 "rtest15" ;; ccl versions 1.11 and earlier fail test 50. Mark it as a ;; known failure. Presumably 1.12 will have this fixed. From 047d17b2d848c74a5c7ac5e97f047b83a1f9046b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 24 Apr 2018 08:10:36 -0400 Subject: [PATCH 2467/2743] linux: 4.4.128 -> 4.4.129 --- 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 b14418964da5..fe8633ed0da7 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.128"; + version = "4.4.129"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1c5nlxazn2ijfra1bn3x4fdz3fx02j76hg430jgyij61vndgi5ka"; + sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1"; }; } // (args.argsOverride or {})) From 93f1969b040646efe24dcb469e3b8049ef7ab330 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 24 Apr 2018 08:10:49 -0400 Subject: [PATCH 2468/2743] linux: 4.9.95 -> 4.9.96 --- 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 2f10bcc0ea80..63fe3db3b577 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.95"; + version = "4.9.96"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1x4z66v6zl4q0hzinzb1wvlq9fd3v4sbwj9lay69f3vdq8knsnly"; + sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2"; }; } // (args.argsOverride or {})) From d9f9b588732b53d3bbba4ad2bb63b35fb70c98bb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 24 Apr 2018 08:11:10 -0400 Subject: [PATCH 2469/2743] linux: 4.14.35 -> 4.14.36 --- 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 e064dbfd85bd..47784e770127 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.35"; + version = "4.14.36"; # 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 = "01zfbd766y8hfsd248lffaj6d4ghl4j918m3yvl892p84xsp5aq2"; + sha256 = "0hxwd3kl5g7zrcl3b00nxdv0zjkmmfrk1i5v3hrjm0dmsw249qna"; }; } // (args.argsOverride or {})) From 6a8b57799d2565aea1b8641f8c37c619bc48f342 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 24 Apr 2018 08:11:21 -0400 Subject: [PATCH 2470/2743] linux: 4.16.3 -> 4.16.4 --- 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 343d7c9f9dac..d46c95e1a593 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.3"; + version = "4.16.4"; # 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 = "18w1dhq5dnmcqc3d8imwm90zwfw0fhda7sy5fjwkhzm93nl72s8d"; + sha256 = "0v494vm1vbyfk8xmvgf27chsjpy9x7q0iwdaana8vnih2ai6vdcs"; }; } // (args.argsOverride or {})) From 93324dbfa6a003476eb84d4532c8f629578bf6a0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 24 Apr 2018 08:11:40 -0400 Subject: [PATCH 2471/2743] linux: 4.17-rc1 -> 4.17-rc2 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6c0f01fb8ad7..6370f82235a7 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.17-rc1"; - modDirVersion = "4.17.0-rc1"; + version = "4.17-rc2"; + modDirVersion = "4.17.0-rc2"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0a3lrax6f8f98lj65aawpqkzkmxcl2x4h20kr0cr7wf0jvpnn5y3"; + sha256 = "1z4kl25x8m498wicbzhx21kvksp63ab8l2s0nfxf7fwj7dd13cld"; }; # Should the testing kernels ever be built on Hydra? From fc79bf4374b5b254081bb84bfb4e69009c50d775 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 24 Apr 2018 08:14:31 -0400 Subject: [PATCH 2472/2743] linux: Remove 4.15.x --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 16 ---------------- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.15.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix deleted file mode 100644 index 07f408027d8e..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - 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"))); - - # 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 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a088d6644b7..62093afc8204 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13374,21 +13374,6 @@ with pkgs; ]; }; - linux_4_15 = callPackage ../os-specific/linux/kernel/linux-4.15.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_16 = callPackage ../os-specific/linux/kernel/linux-4.16.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13608,7 +13593,6 @@ with pkgs; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15); linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16); # Don't forget to update linuxPackages_latest! From c9b3a2452f7e216260b36794e48a43a052c813d4 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sun, 22 Apr 2018 19:57:23 +0100 Subject: [PATCH 2473/2743] coursera-dl: init at 0.10.0 --- maintainers/maintainer-list.nix | 5 +++ .../applications/misc/coursera-dl/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/coursera-dl/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e6a89f93acc5..40f8342f3ed8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -310,6 +310,11 @@ email = "alex@farfromthere.net"; github = "AJChapman"; }; + alexfmpe = { + email = "alexandre.fmp.esteves@gmail.com"; + github = "alexfmpe"; + name = "Alexandre Esteves"; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix new file mode 100644 index 000000000000..a7a2dac26c6e --- /dev/null +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }: + +let + pythonPackages = python3.pkgs; + +in pythonPackages.buildPythonApplication rec { + name = "coursera-dl-${version}"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "coursera-dl"; + repo = "coursera-dl"; + rev = version; + sha256 = "0m3f6ly8c3mkb8yy2y398afswqgy17rz159s1054wzxpb4f85zlb"; + }; + + nativeBuildInputs = with pythonPackages; [ pandoc ]; + + buildInputs = with pythonPackages; [ glibcLocales ]; + + propagatedBuildInputs = with pythonPackages; [ beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; + + checkInputs = with pythonPackages; [ pytest mock ]; + + preConfigure = '' + export LC_ALL=en_US.utf-8 + ''; + + checkPhase = '' + # requires dbus service + py.test -k 'not test_get_credentials_with_keyring' . + ''; + + meta = with stdenv.lib; { + description = "CLI for downloading Coursera.org videos and naming them"; + homepage = https://github.com/coursera-dl/coursera-dl; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ alexfmpe ]; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b575c9c4a974..ea37582d74ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15121,6 +15121,8 @@ with pkgs; convchain = callPackage ../tools/graphics/convchain {}; + coursera-dl = callPackage ../applications/misc/coursera-dl {}; + coyim = callPackage ../applications/networking/instant-messengers/coyim {}; cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; From 49f02db58c1feacdb1b00f2986443084746dd1c8 Mon Sep 17 00:00:00 2001 From: Carlos D'Agostino Date: Tue, 24 Apr 2018 23:40:37 +1000 Subject: [PATCH 2474/2743] go-jira: init at 1.0.17 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/misc/go-jira/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/go-jira/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cd73469e78a..3e5231ab9aba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -710,6 +710,11 @@ github = "canndrew"; name = "Andrew Cann"; }; + carlosdagos = { + email = "m@cdagostino.io"; + github = "carlosdagos"; + name = "Carlos D'Agostino"; + }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix new file mode 100644 index 000000000000..b80ddb8f303f --- /dev/null +++ b/pkgs/applications/misc/go-jira/default.nix @@ -0,0 +1,22 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "go-jira-${version}"; + version = "1.0.17"; + + goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1"; + + src = fetchgit { + rev = "v${version}"; + url = "https://gopkg.in/Netflix-Skunkworks/go-jira.v1"; + sha256 = "0ap5dzikp934mawigmv7ighajr5yxpck2gpnb2cmkc1p6qa6gn4v"; + }; + + meta = with stdenv.lib; { + description = "Simple command line client for Atlassian's Jira service written in Go"; + homepage = "https://github.com/Netflix-Skunkworks/go-jira"; + license = licenses.asl20; + maintainers = [ maintainers.carlosdagos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e320dc31fc..ba49ed395b1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3118,6 +3118,8 @@ with pkgs; jnettop = callPackage ../tools/networking/jnettop { }; + go-jira = callPackage ../applications/misc/go-jira { }; + john = callPackage ../tools/security/john { gcc = gcc49; # doesn't build with gcc5 }; From 46ce1047b6cf2cf76eb9ce7e95aac70361f36d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Apr 2018 17:01:29 +0200 Subject: [PATCH 2475/2743] knot-dns: remove .out/lib/*.la They're really useless here AFAIK. _Currently_ this doesn't reduce the (transitive) closure at all, but perhaps in future... --- pkgs/servers/dns/knot-dns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index de37aeaa590b..88fa07009f83 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { #doCheck = true; problems in combination with dynamic linking - postInstall = ''rm -r "$out"/var''; + postInstall = ''rm -r "$out"/var "$out"/lib/*.la''; meta = with stdenv.lib; { description = "Authoritative-only DNS server from .cz domain registry"; From 05206347258f1e70d2e96e10bbb6402f8e567edc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Apr 2018 17:04:25 +0200 Subject: [PATCH 2476/2743] xmr-stak: doesn't build with gcc7 if cuda is enabled --- pkgs/applications/misc/xmr-stak/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index c24e1b0c2f1f..51fd2ee80648 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,11 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv, stdenvGcc6, lib +, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false , openclSupport ? true }: -stdenv.mkDerivation rec { +let + stdenv' = if cudaSupport then stdenvGcc6 else stdenv; +in + +stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; version = "2.4.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e68c48d89966..eba8440aff4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16785,6 +16785,7 @@ with pkgs; }; xmr-stak = callPackage ../applications/misc/xmr-stak { + stdenvGcc6 = overrideCC stdenv gcc6; hwloc = hwloc-nox; }; From b6dbdaa28c4c9fce3801fcc1e0e3e627d23b54f1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Apr 2018 17:04:47 +0200 Subject: [PATCH 2477/2743] openarena: needs libcurl for fast assets downloads --- pkgs/games/openarena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 1e396318bbbd..22ce05cb38a7 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis }: +{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis, curl }: stdenv.mkDerivation rec { name = "openarena-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = let gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; - libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ]; + libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis curl ]; in '' mkdir -pv $out/bin cd $out From 0ada4b37d7728f74f6077f503ced5d0c18c134f7 Mon Sep 17 00:00:00 2001 From: nocent Date: Tue, 24 Apr 2018 15:32:47 +0000 Subject: [PATCH 2478/2743] Added version info, set compatible platforms Thanks for the review @nlewo and @Infinisil --- pkgs/applications/editors/bonzomatic/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index 57aa381e68c5..9f1db1464482 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -1,14 +1,14 @@ { stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: -let - name = "bonzomatic"; -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "bonzomatic"; + version = "2018-03-29"; src = fetchFromGitHub { - repo = name; owner = "Gargaj"; - rev = "2018-03-29"; + repo = pname; + rev = version; sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg"; }; @@ -25,7 +25,6 @@ in stdenv.mkDerivation { unfreeRedistributable # contains libbass.so in repository ]; maintainers = [ maintainers.nocent ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } - From 51a345c6bb5010fda083ed7e1467b1b5e267fe4e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 Apr 2018 18:22:25 +0200 Subject: [PATCH 2479/2743] =?UTF-8?q?gnome3.gjs:=201.52.1=20=E2=86=92=201.?= =?UTF-8?q?52.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 68b85d9dfe0f..fc352de2acf8 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.52.1"; + version = "1.52.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1s1m8xv3ixgl0hah3r364ws249d6w8yn56q2ahfn3dg2j54rmz58"; + sha256 = "00x08ypx61i3k84bmvkhdj37q81g79lzm5sxqm1lz4xzzad9rg98"; }; passthru = { From 6d9eb6c8a9aedfc6d5fe5f8a5ad6d791588dacf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 09:59:29 -0700 Subject: [PATCH 2480/2743] openfortivpn: 1.6.0 -> 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/openfortivpn/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn -h’ got 0 exit code - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn --help’ got 0 exit code - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn help’ got 0 exit code - ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn --version’ and found version 1.7.0 - found 1.7.0 with grep in /nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0 - directory tree listing: https://gist.github.com/34708b90f0d4fc975a7b9dbd4670bfee --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6eafdde10824..b265cdb4c326 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.6.0"; + version = "1.7.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192"; + sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 378630f477cc6e141bcc447982116da4d3a085f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 10:18:10 -0700 Subject: [PATCH 2481/2743] osrm-backend: 5.16.4 -> 5.17.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/osrm-backend/versions. These checks were done: - built on NixOS - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore --version’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed -h’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed --help’ got 0 exit code - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed -v’ and found version 5.17.2 - ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed --version’ and found version 5.17.2 - found 5.17.2 with grep in /nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2 - directory tree listing: https://gist.github.com/82e852d822486a83285e755488f6d056 --- pkgs/servers/osrm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index b7c85a8f9a4b..3b11f26d6ce2 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.16.4"; + version = "5.17.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "01wghly0rqv4f9lfabmbfddjp2pclcfip45rmn0fvnj5c6x23v6v"; + sha256 = "0ar94wpsc2vr6pn4x5wy7mkpjlilgnyw545wm0l78174q43460y9"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 3c546c2da99d62584186d2e9b4945eebdb255096 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 10:20:14 -0700 Subject: [PATCH 2482/2743] pcmanfm: 1.2.5 -> 1.3.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/pcmanfm/versions. These checks were done: - built on NixOS - ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/pcmanfm -h’ got 0 exit code - ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/pcmanfm --help’ got 0 exit code - ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/.pcmanfm-wrapped -h’ got 0 exit code - ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/.pcmanfm-wrapped --help’ got 0 exit code - found 1.3.0 with grep in /nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0 - directory tree listing: https://gist.github.com/f15deaa66af5124a632abbca797f7240 --- pkgs/applications/misc/pcmanfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 148dd427fbc7..a77b2d17ecb4 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -7,10 +7,10 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.2.5"; + name = "pcmanfm-1.3.0"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; + sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas"; }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; From 866940303c5239eaf0a7261ad00f575641fe2931 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 12:25:43 -0500 Subject: [PATCH 2483/2743] mendeley: 1.17.13 -> 1.18, touchup update script (support "1.18" instead of "1.18.0") --- pkgs/applications/office/mendeley/default.nix | 6 +++--- pkgs/applications/office/mendeley/update.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index a8664e6820a4..a0a825201524 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -44,14 +44,14 @@ let then "i386" else "amd64"; - shortVersion = "1.17.13-stable"; + shortVersion = "1.18-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "0q4x62k00whmq8lskphpcxc610cvclxzcr5k0v7pxjxs9sx5yx43" - else "01ylyily1hip35z0d4qkdpbzp5yn4r015psc5773xsqlgrnlwjm3"; + then "046v1j4sc6m0bf89f52zsg8riygrhldplyih5p0cjhcsd45q6fx8" + else "072fppgxhiryb6m1fb4qvq8nbblx88xpknnklygch1sw0lyks69h"; deps = [ qtbase diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix index 9ac82615c561..cb9ee02702dd 100644 --- a/pkgs/applications/office/mendeley/update.nix +++ b/pkgs/applications/office/mendeley/update.nix @@ -15,9 +15,9 @@ writeScript "update-mendeley" '' } amd64URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/amd64/mendeleydesktop-latest) - amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+") + amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?") i386URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/i386/mendeleydesktop-latest) - i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+") + i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?") echo "amd64 version: $amd64V" echo "i386 version: $i386V" From bec9726946daada8e14d2c329c53dbb69ce79fae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 12:55:16 -0500 Subject: [PATCH 2484/2743] ngx_brotli: -> 0.1.1 --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 95e156f96275..0e53b35e06d0 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -5,8 +5,8 @@ src = let gitsrc = pkgs.fetchFromGitHub { owner = "eustas"; repo = "ngx_brotli"; - rev = "6a1174446f5a866d3d13615dd2824177570f0a69"; - sha256 = "148xfh6w1wgql2jj922ryiddrs93dyacs903j2hnil67cpia45p6"; + rev = "37ab9b2933a0b756ba3447000b7f31d432ed8228"; # v0.1.1 + sha256 = "114ai8v9ns23qm12wp9dgdjvldqjnrmb3cmarkn0d3k6n3bm01bf"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/config \ From 2dbde855ebd39bfe2ea6d9431c11b0344e48ff4e Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 19 Apr 2018 14:47:40 +0000 Subject: [PATCH 2485/2743] pythonPackages.dataclasses: init at 0.5 --- .../python-modules/dataclasses/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/dataclasses/default.nix diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix new file mode 100644 index 000000000000..083ea6d6347b --- /dev/null +++ b/pkgs/development/python-modules/dataclasses/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: + +buildPythonPackage rec { + pname = "dataclasses"; + version = "0.5"; + + # backport only works on Python 3.6, and is in the standard library in Python 3.7 + disabled = !isPy36; + + src = fetchPypi { + inherit pname version; + sha256 = "07lgn1k56sqpw7yfzv5a6mwshsgaipjawflgyr6lrkryjl64481z"; + }; + + meta = with stdenv.lib; { + description = "An implementation of PEP 557: Data Classes"; + homepage = "https://github.com/ericvsmith/dataclasses"; + license = licenses.asl20; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93e821fb719d..2043277f2361 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1200,6 +1200,8 @@ in { datadog = callPackage ../development/python-modules/datadog {}; + dataclasses = callPackage ../development/python-modules/dataclasses { }; + debian = callPackage ../development/python-modules/debian {}; defusedxml = callPackage ../development/python-modules/defusedxml {}; From e4a6e320bb8f2adb79a3c9b83478da753de4eedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 24 Apr 2018 00:12:19 +0200 Subject: [PATCH 2486/2743] home-assistant: simplify definition of configFile --- nixos/modules/services/misc/home-assistant.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index b9a972967792..1dc7b44ee37b 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -5,9 +5,10 @@ with lib; let cfg = config.services.home-assistant; - configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig - then (lib.recursiveUpdate defaultConfig (if (isNull cfg.config) then {} else cfg.config)) - else cfg.config)); + # cfg.config != null can be assumed here + configFile = pkgs.writeText "configuration.json" + (builtins.toJSON (if cfg.applyDefaultConfig then + (lib.recursiveUpdate defaultConfig cfg.config) else cfg.config)); availableComponents = pkgs.home-assistant.availableComponents; From daea65c8e21c5cf02b97ea4df00d38fd55cc7085 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 11:51:25 -0700 Subject: [PATCH 2487/2743] libre: 0.5.7 -> 0.5.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libre/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.8 with grep in /nix/store/rqyqr2gb6pxqqah435xznnqwr9zi0xi2-libre-0.5.8 - directory tree listing: https://gist.github.com/a84247052706f314827aca34a1869d10 --- pkgs/development/libraries/libre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index ebe765a0d0d4..c996c5c25f94 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.5.7"; + version = "0.5.8"; name = "libre-${version}"; src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0f8h224xfzvnb2ngvhxz8gzxqjlkkfr6d0nj8zqivzr81ihibk2x"; + sha256 = "0w0f8j43j0nzgvkmv3ayzrssppgjmsh6z8mpa5iqsz8nv99dc3qr"; }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] From ab7aaf1b94cf2ea7c90e4c3cfb5738ff90a9094a Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 24 Apr 2018 13:54:12 -0500 Subject: [PATCH 2488/2743] Revert "libretro.mame: 2017-06-04 -> 2017-03-02" --- pkgs/misc/emulators/retroarch/cores.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 8a3f7796aef4..d6b3b6a98706 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -232,11 +232,10 @@ in with stdenv.lib.licenses; mame = (mkLibRetroCore { core = "mame"; - version = "2018-03-02"; src = fetchRetro { repo = "mame"; - rev = "893f1ac2231b348b63209fd5b2545f770458ae8f"; - sha256 = "1j9p82q9jhf5lf4w392zd09bq0j4iw1afhznymg0v60jv592h3gz"; + rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e"; + sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1"; }; description = "Port of MAME to libretro"; license = gpl2Plus; From 78a2238c506882c44e5b891f991c074f51c0ec6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 11:54:42 -0700 Subject: [PATCH 2489/2743] librem: 0.5.2 -> 0.5.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/librem/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.3 with grep in /nix/store/x20d9fh0yfyzm28p3sghxq01c3f2wrmw-librem-0.5.3 - directory tree listing: https://gist.github.com/b80b5c5f4dc93169cf0cfc46f4306e73 --- pkgs/development/libraries/librem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index f6e041e57322..b173eddda7d0 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { - version = "0.5.2"; + version = "0.5.3"; name = "librem-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "1sv4986yyq42irk9alwp20gc3r5y0r6kix15sl8qmljgxn0lxigv"; + sha256 = "0l401sn8lkzz9gvnvww6839xa0ys1q7w66krln194w6l8ycsg64z"; }; buildInputs = [zlib openssl libre]; makeFlags = [ From ae0a14d25dfa8da22e20d5164c8243e32a34b44a Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 22 Apr 2018 15:22:34 -0400 Subject: [PATCH 2490/2743] git: Refactor makeFlags using lib.optionals --- .../git-and-tools/git/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 cf44cf5ef981..10b70626197e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -56,11 +56,14 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; - makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " - + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") - + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") - + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") - + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); + makeFlags = [ + "prefix=\${out}" + "SHELL_PATH=${stdenv.shell}" + ] + ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"]) + ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] + ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"]) + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]; # build git-credential-osxkeychain if darwin postBuild = stdenv.lib.optionalString stdenv.isDarwin '' From 432df5b1cf9fc6b36634ee26c621cda462dd98b2 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Dec 2017 14:08:23 -0500 Subject: [PATCH 2491/2743] git: Fix USE_LIBPCRE2 configuration Previously this was injected during install, causing the build system to rebuild the entire package. --- .../version-management/git-and-tools/git/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 10b70626197e..23b7e24965e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -63,7 +63,8 @@ stdenv.mkDerivation { ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"]) ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"]) - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]; + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] + ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1"; # build git-credential-osxkeychain if darwin postBuild = stdenv.lib.optionalString stdenv.isDarwin '' @@ -76,9 +77,7 @@ stdenv.mkDerivation { # so that `SPARSE_FLAGS' corresponds to the current architecture... #doCheck = true; - installFlags = "NO_INSTALL_HARDLINKS=1" - + (if withpcre2 then " USE_LIBPCRE2=1" else ""); - + installFlags = "NO_INSTALL_HARDLINKS=1"; preInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin From 2d397f1b76199fa877b6091e4f63e980582faeff Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 22 Apr 2018 13:58:30 -0400 Subject: [PATCH 2492/2743] git: Allow perl support to be disabled --- .../git-and-tools/git/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) 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 23b7e24965e8..08be2a618f79 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -4,6 +4,7 @@ , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs +, perlSupport ? true , guiSupport , withManual ? true , pythonSupport ? true @@ -12,9 +13,12 @@ , darwin }: +assert sendEmailSupport -> perlSupport; +assert svnSupport -> perlSupport; + let version = "2.16.3"; - svn = subversionClient.override { perlBindings = true; }; + svn = subversionClient.override { perlBindings = perlSupport; }; in stdenv.mkDerivation { @@ -25,7 +29,7 @@ stdenv.mkDerivation { sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; - outputs = [ "out" "gitweb" ]; + outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; hardeningDisable = [ "format" ]; @@ -44,7 +48,9 @@ stdenv.mkDerivation { done ''; - buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv perl] + nativeBuildInputs = [ perl ]; + buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] + ++ stdenv.lib.optionals perlSupport [ perl ] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk] @@ -60,6 +66,7 @@ stdenv.mkDerivation { "prefix=\${out}" "SHELL_PATH=${stdenv.shell}" ] + ++ (if perlSupport then ["PERL_PATH=${perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"]) ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"]) @@ -117,9 +124,10 @@ stdenv.mkDerivation { SCRIPT="$(cat <<'EOS' BEGIN{ @a=( - '${perl}/bin/perl', '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk', + '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk', '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname', '${coreutils}/bin/wc', '${coreutils}/bin/tr' + ${stdenv.lib.optionalString perlSupport ", '${perl}/bin/perl'"} ); } foreach $c (@a) { @@ -135,12 +143,12 @@ stdenv.mkDerivation { substituteInPlace $out/libexec/git-core/git-sh-i18n \ --subst-var-by gettext ${gettext} - # 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 ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend + '' + stdenv.lib.optionalString perlSupport '' + # put in separate package for simpler maintenance + mv $out/share/gitweb $gitweb/ # wrap perl commands gitperllib=$out/lib/perl5/site_perl @@ -186,7 +194,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \ + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cmd-list.made install install-info \ -C Documentation '' + (if guiSupport then '' From d111a42772bc4c878a2ba3106cf573d5bcf0c9fe Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Dec 2017 13:52:34 -0500 Subject: [PATCH 2493/2743] git: Enable cross-compilation --- .../git-and-tools/git/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 08be2a618f79..4e9f2bf16cea 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation { done ''; - nativeBuildInputs = [ perl ]; - buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] - ++ stdenv.lib.optionals perlSupport [ perl ] + nativeBuildInputs = [ gettext perl ] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_45 libxslt ] + docbook_xsl docbook_xml_dtd_45 libxslt ]; + buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] + ++ stdenv.lib.optionals perlSupport [ perl ] ++ stdenv.lib.optionals guiSupport [tcl tk] ++ stdenv.lib.optionals withpcre2 [ pcre2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; @@ -62,6 +62,11 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; + configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_fread_reads_directories=yes" + "ac_cv_snprintf_returns_bogus=no" + ]; + makeFlags = [ "prefix=\${out}" "SHELL_PATH=${stdenv.shell}" From 768f1d968c002ada292704e729a9b867496cee6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 11:59:32 -0700 Subject: [PATCH 2494/2743] latte-dock: 0.7.4 -> 0.7.5 (#39418) 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/latte-dock/versions. These checks were done: - built on NixOS - ran ‘/nix/store/6nvkkskm7j4ngqfy722ajp289gqhg1a9-latte-dock-0.7.5/bin/latte-dock -h’ got 0 exit code - ran ‘/nix/store/6nvkkskm7j4ngqfy722ajp289gqhg1a9-latte-dock-0.7.5/bin/latte-dock --help’ got 0 exit code - found 0.7.5 with grep in /nix/store/6nvkkskm7j4ngqfy722ajp289gqhg1a9-latte-dock-0.7.5 - directory tree listing: https://gist.github.com/8f58b4f85d4c80752b6d66e912ce92c0 --- pkgs/applications/misc/latte-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 1867ec3a9c62..eafe0b9b5c64 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: -let version = "0.7.4"; in +let version = "0.7.5"; in mkDerivation { name = "latte-dock-${version}"; @@ -10,7 +10,7 @@ mkDerivation { owner = "psifidotos"; repo = "Latte-Dock"; rev = "v${version}"; - sha256 = "0w4fphgpdvql31wrypxyfahmr4cv5ap96wjc4270yyawnrqrx0y6"; + sha256 = "0fblbx6qk4miag1mhiyns7idsw03p9pj3xc3xxxnb5rpj1fy0ifv"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; From 0dc26d0e7edfd6849643147b8e6c2d21ea7f5d5d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 19 Apr 2018 21:51:40 -0500 Subject: [PATCH 2495/2743] cvs: support ssh access hacky wrapper handles ssh issues in nix builders --- pkgs/build-support/fetchcvs/builder.sh | 6 ++++++ pkgs/build-support/fetchcvs/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 6ee594b33b27..47ae909f3aba 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,5 +1,11 @@ source $stdenv/setup +(echo '#!/usr/bin/env sh'; \ + echo 'echo $@'; \ + echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh +chmod +x ssh +export CVS_RSH=$PWD/ssh + # creating the export drictory and checking out there only to be able to # move the content without the root directory into $out ... # cvs -f -d "$url" export $tag -d "$out" "$module" diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index 9d9deb3f629e..1f7947d4d452 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -3,18 +3,18 @@ # tag="" (get version by tag name) # If you don't specify neither one date="NOW" will be used (get latest) -{stdenvNoCC, cvs}: +{stdenvNoCC, cvs, openssh}: {cvsRoot, module, tag ? null, date ? null, sha256}: stdenvNoCC.mkDerivation { name = "cvs-export"; builder = ./builder.sh; - nativeBuildInputs = [cvs]; + nativeBuildInputs = [cvs openssh]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - + inherit cvsRoot module sha256 tag date; } From 31ef995e37ad4291afdaebb2c6480280fd058858 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 00:14:15 -0500 Subject: [PATCH 2496/2743] bsd: init netbsd & openbsd userland Adds a couple of useful NetBSD and OpenBSD derivations. Some of these will be integrated into Nixpkgs later. Noncomprehensive list: - netbsd.getent - netbsd.getconf - netbsd.fts - openbsd.mg - netbsd.compat (can replace libbsd) --- pkgs/build-support/fetchcvs/builder.sh | 1 - pkgs/os-specific/bsd/default.nix | 8 + .../bsd/netbsd/compat-setup-hook.sh | 18 + pkgs/os-specific/bsd/netbsd/default.nix | 404 ++++++++++++++++ pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh | 16 + pkgs/os-specific/bsd/netbsd/getent.patch | 455 ++++++++++++++++++ pkgs/os-specific/bsd/openbsd/default.nix | 42 ++ pkgs/os-specific/bsd/openbsd/nc.patch | 421 ++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 9 files changed, 1367 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/bsd/default.nix create mode 100644 pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh create mode 100644 pkgs/os-specific/bsd/netbsd/default.nix create mode 100644 pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh create mode 100644 pkgs/os-specific/bsd/netbsd/getent.patch create mode 100644 pkgs/os-specific/bsd/openbsd/default.nix create mode 100644 pkgs/os-specific/bsd/openbsd/nc.patch diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 47ae909f3aba..0975c3478820 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,7 +1,6 @@ source $stdenv/setup (echo '#!/usr/bin/env sh'; \ - echo 'echo $@'; \ echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh chmod +x ssh export CVS_RSH=$PWD/ssh diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix new file mode 100644 index 000000000000..a8301ea2a8fc --- /dev/null +++ b/pkgs/os-specific/bsd/default.nix @@ -0,0 +1,8 @@ +{ callPackages, recurseIntoAttrs }: + +rec { + netbsd = recurseIntoAttrs (callPackages ./netbsd {}); + openbsd = recurseIntoAttrs (callPackages ./openbsd { + inherit (netbsd) compat netBSDDerivation libcurses; + }); +} diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh new file mode 100644 index 000000000000..d47d602e2edb --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh @@ -0,0 +1,18 @@ +setupCompatFlags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -lnbcompat" + export NIX_${role}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H" + export NIX_${role}CFLAGS_COMPILE+=" -include nbtool_config.h" +} + +addEnvHooks "$hostOffset" setupCompatFlags diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix new file mode 100644 index 000000000000..8cbc765ec9e6 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -0,0 +1,404 @@ +{ stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils +, yacc, flex, libressl, bash }: + +let + fetchNetBSD = path: version: sha256: fetchcvs { + cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; + module = "src/${path}"; + inherit sha256; + tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE"; + }; + + netBSDDerivation = attrs: stdenv.mkDerivation ((rec { + name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + src = fetchNetBSD attrs.path attrs.version attrs.sha256; + + extraPaths = [ ]; + + nativeBuildInputs = [ makeMinimal mandoc groff install yacc flex ]; + buildInputs = [ compat ]; + installFlags = [ "includes" ]; + + # These should be coverd in nbcompat, but are missing, sadly + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__warn_references(a,b)=" + "-D__strong_alias(a,b)=" + "-D__va_list=va_list" + ]; + + # Definitions passed to share/mk/*.mk. Should be pretty simple - + # eventually maybe move it to a configure script. + DESTDIR = "$(out)"; + TOOLDIR = "$(out)"; + USETOOLS = "never"; + NOCLANGERROR="yes"; + NOGCCERROR="yes"; + LEX = "flex"; + + # libs will be provided by cc-wrapper + LIBCRT0=""; + LIBCRTI=""; + LIBCRTEND=""; + LIBCRTBEGIN=""; + LIBC=""; + LIBUTIL=""; + LIBSSL = ""; + LIBCRYPTO = ""; + LIBCURSES = ""; + "LIBDO.terminfo" = "_external"; + _GCC_CRTBEGIN = ""; + _GCC_CRTBEGINS = ""; + _GCC_CRTEND = ""; + _GCC_CRTENDS = ""; + _GCC_LIBGCCDIR = ""; + _GCC_CRTI = ""; + _GCC_CRTDIR = ""; + _GCC_CRTN = ""; + + # all dirs will be prefixed with DESTDIR + BINDIR = "/bin"; + LIBDIR = "/lib"; + SHLIBDIR = "/lib"; + MANDIR = "/share/man"; + INFODIR = "/share/info"; + DOCDIR = "/share/doc"; + LOCALEDIR = "/share/locale"; + X11BINDIR = "/bin"; + X11USRLIBDIR = "/lib"; + X11MANDIR = "/share/man"; + SHLINKDIR = "/usr/libexec"; + + HOST_SH = "${bash}/bin/sh"; + + # not using bsd binutils + SHLIB_WARNTEXTREL = "no"; + SHLIB_MKMAP = "no"; + OBJCOPY = "true"; + PRESERVE = "-p"; + + MACHINE_ARCH = hostPlatform.parsed.cpu.name; + MACHINE_CPU = hostPlatform.parsed.cpu.name; + + # NetBSD makefiles should be able to detect this + # but without they end up using gcc on Darwin stdenv + preConfigure = '' + export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} + '' + lib.optionalString (!builtins.hasAttr "nativeBuildInputs" attrs) '' + # hack until #38657 is fixed + export PATH=${install}/bin:$PATH + ''; + + postUnpack = '' + # merge together all extra paths + # there should be a better way to do this + sourceRoot=$PWD/$sourceRoot + export NETBSDSRCDIR=$sourceRoot + export BSDSRCDIR=$NETBSDSRCDIR + chmod -R u+w $sourceRoot + for path in $extraPaths; do + cd $path + find . -type d -exec mkdir -p $sourceRoot/\{} \; + find . -type f -exec cp -pr \{} $sourceRoot/\{} \; + chmod -R u+w $sourceRoot + done + + cd $sourceRoot + if [ -d ${attrs.path} ] + then sourceRoot=$sourceRoot/${attrs.path} + fi + ''; + + # need to create directories for xinstall to work + preInstall = '' + mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ + $out$DOCDIR $out$LOCALEDIR + for i in 1 2 3 4 5 6 7 8 9; do + mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i + done + mkdir -p $out/usr/include + ''; + + postInstall = '' + # Remove lingering /usr references + if [ -d $out/usr ]; then + cd $out/usr + find . -type d -exec mkdir -p $out/\{} \; + find . -type f -exec mv \{} $out/\{} \; + find . -type d -delete + fi + + find $out -type d -empty -delete + ''; + + meta = with lib; { + maintainers = with maintainers; [matthewbauer]; + platforms = platforms.unix; + license = licenses.bsd2; + }; + }) // attrs); + + # BOOTSTRAPPING + makeMinimal = netBSDDerivation rec { + path = "tools/make"; + sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb"; + version = "7.1.2"; + + buildInputs = []; + nativeBuildInputs = []; + NIX_CFLAGS_COMPILE = ""; + NIX_LDFLAGS = ""; + + patchPhase = '' + patchShebangs configure + ${make.patchPhase} + ''; + buildPhase = "sh ./buildmake.sh"; + installPhase = '' + install -D nbmake $out/bin/nbmake + ln -s $out/bin/nbmake $out/bin/make + mkdir -p $out/share + cp -r ../../share/mk $out/share/mk + ''; + extraPaths = [ make.src ] ++ make.extraPaths; + }; + + compat = netBSDDerivation { + path = "tools/compat"; + sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z"; + version = "7.1.2"; + + setupHook = ./compat-setup-hook.sh; + + # override defaults to prevent infinite recursion + nativeBuildInputs = [ makeMinimal ]; + buildInputs = [ zlib ]; + NIX_CFLAGS_COMPILE = ""; + NIX_LDFLAGS = ""; + + # temporarily use gnuinstall for bootstrapping + # bsdinstall will be built later + makeFlags = "INSTALL=${coreutils}/bin/install"; + RENAME = "-D"; + + postInstall = '' + mv $out/include/compat/* $out/include + rmdir $out/include/compat + + # why aren't these installed by netbsd? + install -D compat_defs.h $out/include/compat_defs.h + install -D $NETBSDSRCDIR/include/cdbw.h $out/include/cdbw.h + install -D $NETBSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h + install -D $NETBSDSRCDIR/sys/sys/featuretest.h \ + $out/include/sys/featuretest.h + install -D $NETBSDSRCDIR/sys/sys/md5.h $out/include/md5.h + install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h + install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h + install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h + ''; + extraPaths = [ libc.src libutil.src + (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") + (fetchNetBSD "external/bsd/flex" "7.1.2" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq") + (fetchNetBSD "sys/sys" "7.1.2" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93") + ] ++ libutil.extraPaths ++ libc.extraPaths; + }; + + install = netBSDDerivation { + path = "usr.bin/xinstall"; + version = "7.1.2"; + sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; + extraPaths = [ mtree.src make.src ]; + nativeBuildInputs = [ makeMinimal mandoc groff compat ]; + RENAME = "-D"; + }; + # END BOOTSTRAPPING + + libutil = netBSDDerivation { + path = "lib/libutil"; + version = "7.1.2"; + sha256 = "12848ynizz13mvn2kndrkq482xhkw323b7c8fg0zli1nhfsmwsm8"; + extraPaths = [ + (fetchNetBSD "common/lib/libutil" "7.1.2" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") + ]; + }; + + libc = netBSDDerivation { + path = "lib/libc"; + version = "7.1.2"; + sha256 = "13rcx3mbx2644z01zgk9gggdfr0hqdbsvd7zrsm2l13yf9aix6pg"; + extraPaths = [ + (fetchNetBSD "common/lib/libc" "7.1.2" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha") + ]; + }; + + make = netBSDDerivation { + path = "usr.bin/make"; + sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar"; + version = "7.1.2"; + patchPhase = '' + # make needs this to pick up our sys make files + NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + + # can't set owner or group in Nix build + # maybe there is a better way to trick it? + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ + --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}:U''${SCRIPTSOWN}}' "" \ + --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}:U''${SCRIPTSGRP}}' "" \ + --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ + --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ + --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \ + --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \ + --replace '-o ''${DOCOWN} -g ''${DOCGRP}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \ + --replace '-o ''${MANOWN} -g ''${MANGRP}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \ + --replace '-o ''${FILESOWN_''${.ALLSRC:T}:U''${FILESOWN}}' "" \ + --replace '-g ''${FILESGRP_''${.ALLSRC:T}:U''${FILESGRP}}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.inc.mk \ + --replace '-o ''${BINOWN} -g ''${BINGRP}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \ + --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" + + substituteInPlace $NETBSDSRCDIR/share/mk/Makefile \ + --replace /usr/share/mk /share/mk + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace ' ''${_ARFL} ''${.TARGET} `NM=''${NM} ''${LORDER} ''${.ALLSRC:M*o} | ''${TSORT}`' ' ''${_ARFL} ''${.TARGET} ''${.ALLSRC:M*o}' \ + --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ + --replace '-Wl,--whole-archive' "" \ + --replace '-Wl,--no-whole-archive' "" + ''; + postInstall = '' + (cd $NETBSDSRCDIR/share/mk && make install) + ''; + extraPaths = [ + (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") + ]; + }; + + mtree = netBSDDerivation { + path = "usr.sbin/mtree"; + version = "7.1.2"; + sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m"; + }; + +in rec { + inherit compat libc libutil install make mtree netBSDDerivation; + + getent = netBSDDerivation { + path = "usr.bin/getent"; + sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz"; + version = "7.1.2"; + patches = [ ./getent.patch ]; + }; + + getconf = netBSDDerivation { + path = "usr.bin/getconf"; + sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; + version = "7.1.2"; + }; + + fts = netBSDDerivation { + pname = "fts"; + path = "include/fts.h"; + sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; + version = "7.1.2"; + nativeBuildInputs = [ ]; + extraPaths = [ + (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") + (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") + (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + ]; + buildPhase = '' + cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ + -o lib/libc/gen/fts.o + ar -rsc libfts.a lib/libc/gen/fts.o + ''; + installPhase = '' + install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 + install -D include/fts.h $out/include/fts.h + install -D lib/libc/include/namespace.h $out/include/namespace.h + install -D libfts.a $out/lib/libfts.a + ''; + setupHook = ./fts-setup-hook.sh; + }; + + games = netBSDDerivation { + path = "games"; + sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; + version = "7.1.2"; + patchPhase = '' + sed -i '1i #include ' adventure/save.c + ''; + }; + + who = netBSDDerivation { + path = "usr.bin/who"; + version = "7.1.2"; + sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; + }; + + finger = netBSDDerivation { + path = "usr.bin/finger"; + sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + version = "7.1.2"; + extraPaths = [ who.src ]; + }; + + fingerd = netBSDDerivation { + path = "usr.bin/fingerd"; + sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqz00"; + version = "7.1.2"; + }; + + libedit = netBSDDerivation { + path = "lib/libedit"; + buildInputs = [ compat libterminfo ]; + patchPhase = '' + sed -i '1i #undef bool_t' el.h + ''; + version = "7.1.2"; + sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca"; + }; + + libterminfo = netBSDDerivation { + path = "lib/libterminfo"; + version = "7.1.2"; + sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; + buildInputs = [ compat tic nbperf ]; + extraPaths = [ + (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") + ]; + }; + + libcurses = netBSDDerivation { + path = "lib/libcurses"; + version = "7.1.2"; + sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; + buildInputs = [ compat libterminfo ]; + MKDOC = "no"; # missing vfontedpr + }; + + nbperf = netBSDDerivation { + path = "usr.bin/nbperf"; + version = "7.1.2"; + sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb"; + }; + + tic = netBSDDerivation { + path = "tools/tic"; + version = "7.1.2"; + sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; + HOSTPROG = "tic"; + buildInputs = [ compat nbperf ]; + extraPaths = [ + libterminfo.src + (fetchNetBSD "usr.bin/tic" "7.1.2" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa") + (fetchNetBSD "tools/Makefile.host" "7.1.2" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8") + ]; + }; + +} diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh new file mode 100644 index 000000000000..6b7064174931 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh @@ -0,0 +1,16 @@ +ftsLdflags() { + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in + -1) local role='BUILD_' ;; + 0) local role='' ;; + 1) local role='TARGET_' ;; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; + return 1 ;; + esac + + export NIX_${role}LDFLAGS+=" -lfts" +} + +addEnvHooks "$hostOffset" ftsLdflags diff --git a/pkgs/os-specific/bsd/netbsd/getent.patch b/pkgs/os-specific/bsd/netbsd/getent.patch new file mode 100644 index 000000000000..e9e34d19a315 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/getent.patch @@ -0,0 +1,455 @@ +Author: Matthew Bauer +Description: Remove unavailable getent databases +Version: 7.1.2 +--- a/getent.c 2018-04-16 13:33:49.000000000 -0500 ++++ b/getent.c 2018-04-16 13:29:30.000000000 -0500 +@@ -42,7 +42,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -57,27 +56,16 @@ + #include + + #include +-#include + + #include /* for INET6_ADDRSTRLEN */ + +-#include +- +-#include +- + static int usage(void) __attribute__((__noreturn__)); + static int parsenum(const char *, unsigned long *); +-static int disktab(int, char *[]); +-static int gettytab(int, char *[]); +-static int ethers(int, char *[]); + static int group(int, char *[]); + static int hosts(int, char *[]); +-static int netgroup(int, char *[]); + static int networks(int, char *[]); + static int passwd(int, char *[]); +-static int printcap(int, char *[]); + static int protocols(int, char *[]); +-static int rpc(int, char *[]); + static int services(int, char *[]); + static int shells(int, char *[]); + +@@ -92,17 +80,11 @@ + const char *name; + int (*callback)(int, char *[]); + } databases[] = { +- { "disktab", disktab, }, +- { "ethers", ethers, }, +- { "gettytab", gettytab, }, + { "group", group, }, + { "hosts", hosts, }, +- { "netgroup", netgroup, }, + { "networks", networks, }, + { "passwd", passwd, }, +- { "printcap", printcap, }, + { "protocols", protocols, }, +- { "rpc", rpc, }, + { "services", services, }, + { "shells", shells, }, + +@@ -195,49 +177,6 @@ + (void)printf("\n"); + } + +- +- /* +- * ethers +- */ +- +-static int +-ethers(int argc, char *argv[]) +-{ +- char hostname[MAXHOSTNAMELEN + 1], *hp; +- struct ether_addr ea, *eap; +- int i, rv; +- +- assert(argc > 1); +- assert(argv != NULL); +- +-#define ETHERSPRINT (void)printf("%-17s %s\n", ether_ntoa(eap), hp) +- +- rv = RV_OK; +- if (argc == 2) { +- warnx("Enumeration not supported on ethers"); +- rv = RV_NOENUM; +- } else { +- for (i = 2; i < argc; i++) { +- if ((eap = ether_aton(argv[i])) == NULL) { +- eap = &ea; +- hp = argv[i]; +- if (ether_hostton(hp, eap) != 0) { +- rv = RV_NOTFOUND; +- break; +- } +- } else { +- hp = hostname; +- if (ether_ntohost(hp, eap) != 0) { +- rv = RV_NOTFOUND; +- break; +- } +- } +- ETHERSPRINT; +- } +- } +- return rv; +-} +- + /* + * group + */ +@@ -298,7 +237,7 @@ + hosts(int argc, char *argv[]) + { + struct hostent *he; +- char addr[IN6ADDRSZ]; ++ char addr[NS_IN6ADDRSZ]; + int i, rv; + + assert(argc > 1); +@@ -312,9 +251,9 @@ + } else { + for (i = 2; i < argc; i++) { + if (inet_pton(AF_INET6, argv[i], (void *)addr) > 0) +- he = gethostbyaddr(addr, IN6ADDRSZ, AF_INET6); ++ he = gethostbyaddr(addr, NS_IN6ADDRSZ, AF_INET6); + else if (inet_pton(AF_INET, argv[i], (void *)addr) > 0) +- he = gethostbyaddr(addr, INADDRSZ, AF_INET); ++ he = gethostbyaddr(addr, NS_INADDRSZ, AF_INET); + else + he = gethostbyname(argv[i]); + if (he != NULL) +@@ -330,48 +269,6 @@ + } + + /* +- * netgroup +- */ +-static int +-netgroup(int argc, char *argv[]) +-{ +- int rv, i; +- bool first; +- const char *host, *user, *domain; +- +- assert(argc > 1); +- assert(argv != NULL); +- +-#define NETGROUPPRINT(s) (((s) != NULL) ? (s) : "") +- +- rv = RV_OK; +- if (argc == 2) { +- warnx("Enumeration not supported on netgroup"); +- rv = RV_NOENUM; +- } else { +- for (i = 2; i < argc; i++) { +- setnetgrent(argv[i]); +- first = true; +- while (getnetgrent(&host, &user, &domain) != 0) { +- if (first) { +- first = false; +- (void)fputs(argv[i], stdout); +- } +- (void)printf(" (%s,%s,%s)", +- NETGROUPPRINT(host), +- NETGROUPPRINT(user), +- NETGROUPPRINT(domain)); +- } +- if (!first) +- (void)putchar('\n'); +- endnetgrent(); +- } +- } +- +- return rv; +-} +- +- /* + * networks + */ + +@@ -464,227 +361,6 @@ + return rv; + } + +-static char * +-mygetent(const char * const * db_array, const char *name) +-{ +- char *buf = NULL; +- int error; +- +- switch (error = cgetent(&buf, db_array, name)) { +- case -3: +- warnx("tc= loop in record `%s' in `%s'", name, db_array[0]); +- break; +- case -2: +- warn("system error fetching record `%s' in `%s'", name, +- db_array[0]); +- break; +- case -1: +- case 0: +- break; +- case 1: +- warnx("tc= reference not found in record for `%s' in `%s'", +- name, db_array[0]); +- break; +- default: +- warnx("unknown error %d in record `%s' in `%s'", error, name, +- db_array[0]); +- break; +- } +- return buf; +-} +- +-static char * +-mygetone(const char * const * db_array, int first) +-{ +- char *buf = NULL; +- int error; +- +- switch (error = (first ? cgetfirst : cgetnext)(&buf, db_array)) { +- case -2: +- warnx("tc= loop in `%s'", db_array[0]); +- break; +- case -1: +- warn("system error fetching record in `%s'", db_array[0]); +- break; +- case 0: +- case 1: +- break; +- case 2: +- warnx("tc= reference not found in `%s'", db_array[0]); +- break; +- default: +- warnx("unknown error %d in `%s'", error, db_array[0]); +- break; +- } +- return buf; +-} +- +-static void +-capprint(const char *cap) +-{ +- char *c = strchr(cap, ':'); +- if (c) +- if (c == cap) +- (void)printf("true\n"); +- else { +- int l = (int)(c - cap); +- (void)printf("%*.*s\n", l, l, cap); +- } +- else +- (void)printf("%s\n", cap); +-} +- +-static void +-prettyprint(char *b) +-{ +-#define TERMWIDTH 65 +- int did = 0; +- size_t len; +- char *s, c; +- +- for (;;) { +- len = strlen(b); +- if (len <= TERMWIDTH) { +-done: +- if (did) +- printf("\t:"); +- printf("%s\n", b); +- return; +- } +- for (s = b + TERMWIDTH; s > b && *s != ':'; s--) +- continue; +- if (*s++ != ':') +- goto done; +- c = *s; +- *s = '\0'; +- if (did) +- printf("\t:"); +- did++; +- printf("%s\\\n", b); +- *s = c; +- b = s; +- } +-} +- +-static void +-handleone(const char * const *db_array, char *b, int recurse, int pretty, +- int level) +-{ +- char *tc; +- +- if (level && pretty) +- printf("\n"); +- if (pretty) +- prettyprint(b); +- else +- printf("%s\n", b); +- if (!recurse || cgetstr(b, "tc", &tc) <= 0) +- return; +- +- b = mygetent(db_array, tc); +- free(tc); +- +- if (b == NULL) +- return; +- +- handleone(db_array, b, recurse, pretty, ++level); +- free(b); +-} +- +-static int +-handlecap(const char *db, int argc, char *argv[]) +-{ +- static const char sfx[] = "=#:"; +- const char *db_array[] = { db, NULL }; +- char *b, *cap; +- int i, rv, c; +- size_t j; +- int expand = 1, recurse = 0, pretty = 0; +- +- assert(argc > 1); +- assert(argv != NULL); +- +- argc--; +- argv++; +- while ((c = getopt(argc, argv, "pnr")) != -1) +- switch (c) { +- case 'n': +- expand = 0; +- break; +- case 'r': +- expand = 0; +- recurse = 1; +- break; +- case 'p': +- pretty = 1; +- break; +- default: +- usage(); +- break; +- } +- +- argc -= optind; +- argv += optind; +- csetexpandtc(expand); +- rv = RV_OK; +- if (argc == 0) { +- for (b = mygetone(db_array, 1); b; b = mygetone(db_array, 0)) { +- handleone(db_array, b, recurse, pretty, 0); +- free(b); +- } +- } else { +- if ((b = mygetent(db_array, argv[0])) == NULL) +- return RV_NOTFOUND; +- if (argc == 1) +- handleone(db_array, b, recurse, pretty, 0); +- else { +- for (i = 2; i < argc; i++) { +- for (j = 0; j < sizeof(sfx) - 1; j++) { +- cap = cgetcap(b, argv[i], sfx[j]); +- if (cap) { +- capprint(cap); +- break; +- } +- } +- if (j == sizeof(sfx) - 1) +- printf("false\n"); +- } +- } +- free(b); +- } +- return rv; +-} +- +- /* +- * gettytab +- */ +- +-static int +-gettytab(int argc, char *argv[]) +-{ +- return handlecap(_PATH_GETTYTAB, argc, argv); +-} +- +- /* +- * printcap +- */ +- +-static int +-printcap(int argc, char *argv[]) +-{ +- return handlecap(_PATH_PRINTCAP, argc, argv); +-} +- +- /* +- * disktab +- */ +- +-static int +-disktab(int argc, char *argv[]) +-{ +- return handlecap(_PATH_DISKTAB, argc, argv); +-} +- + /* + * protocols + */ +@@ -726,47 +402,6 @@ + } + + /* +- * rpc +- */ +- +-static int +-rpc(int argc, char *argv[]) +-{ +- struct rpcent *re; +- unsigned long id; +- int i, rv; +- +- assert(argc > 1); +- assert(argv != NULL); +- +-#define RPCPRINT printfmtstrings(re->r_aliases, " ", " ", \ +- "%-16s %6d", \ +- re->r_name, re->r_number) +- +- setrpcent(1); +- rv = RV_OK; +- if (argc == 2) { +- while ((re = getrpcent()) != NULL) +- RPCPRINT; +- } else { +- for (i = 2; i < argc; i++) { +- if (parsenum(argv[i], &id)) +- re = getrpcbynumber((int)id); +- else +- re = getrpcbyname(argv[i]); +- if (re != NULL) +- RPCPRINT; +- else { +- rv = RV_NOTFOUND; +- break; +- } +- } +- } +- endrpcent(); +- return rv; +-} +- +- /* + * services + */ + diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix new file mode 100644 index 000000000000..9ccc0adaa2df --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/default.nix @@ -0,0 +1,42 @@ +{ fetchcvs, netBSDDerivation, compat, libcurses, libressl }: + +let + fetchOpenBSD = path: version: sha256: fetchcvs { + cvsRoot = "anoncvs@anoncvs.ca.openbsd.org:/cvs"; + module = "src/${path}"; + inherit sha256; + tag = "OPENBSD_${builtins.replaceStrings ["."] ["_"] version}"; + }; + + # OpenBSD is a fork of NetBSD + # We can build it with minimal changes + openBSDDerivation = attrs: netBSDDerivation (attrs // { + name = "${attrs.pname or (baseNameOf attrs.path)}-openbsd-${attrs.version}"; + src = fetchOpenBSD attrs.path attrs.version attrs.sha256; + }); + +in { + + mg = openBSDDerivation { + path = "usr.bin/mg"; + version = "6.3"; + sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc"; + buildInputs = [ compat libcurses ]; + patchPhase = '' + NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys" + ''; + extraPaths = [ + (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9") + (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr") + ]; + }; + + nc = openBSDDerivation { + path = "usr.bin/nc"; + version = "6.3"; + sha256 = "0fmnh6ccxab0qvhmgspyd3wra1ps2516i0j6hwkvna2lcny20xvr"; + patches = [ ./nc.patch ]; + buildInputs = [ compat libressl ]; + }; + +} diff --git a/pkgs/os-specific/bsd/openbsd/nc.patch b/pkgs/os-specific/bsd/openbsd/nc.patch new file mode 100644 index 000000000000..de6fb2d04c41 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/nc.patch @@ -0,0 +1,421 @@ +--- a/nc.1 ++++ b/nc.1 +@@ -204,9 +204,6 @@ Proxy authentication is only supported f + Specifies the source port + .Nm + should use, subject to privilege restrictions and availability. +-It is an error to use this option in conjunction with the +-.Fl l +-option. + .It Fl R Ar CAfile + Specifies the filename from which the root CA bundle for certificate + verification is loaded, in PEM format. +@@ -258,6 +255,7 @@ For IPv4 TOS value + may be one of + .Ar critical , + .Ar inetcontrol , ++.Ar lowcost , + .Ar lowdelay , + .Ar netcontrol , + .Ar throughput , +--- a/netcat.c ++++ b/netcat.c +@@ -32,6 +32,8 @@ + * *Hobbit* . + */ + ++#define _GNU_SOURCE ++ + #include + #include + #include +@@ -41,6 +43,49 @@ + #include + #include + #include ++#ifdef __linux__ ++# include ++#endif ++ ++#ifndef IPTOS_LOWDELAY ++# define IPTOS_LOWDELAY 0x10 ++# define IPTOS_THROUGHPUT 0x08 ++# define IPTOS_RELIABILITY 0x04 ++# define IPTOS_LOWCOST 0x02 ++# define IPTOS_MINCOST IPTOS_LOWCOST ++#endif /* IPTOS_LOWDELAY */ ++ ++# ifndef IPTOS_DSCP_AF11 ++# define IPTOS_DSCP_AF11 0x28 ++# define IPTOS_DSCP_AF12 0x30 ++# define IPTOS_DSCP_AF13 0x38 ++# define IPTOS_DSCP_AF21 0x48 ++# define IPTOS_DSCP_AF22 0x50 ++# define IPTOS_DSCP_AF23 0x58 ++# define IPTOS_DSCP_AF31 0x68 ++# define IPTOS_DSCP_AF32 0x70 ++# define IPTOS_DSCP_AF33 0x78 ++# define IPTOS_DSCP_AF41 0x88 ++# define IPTOS_DSCP_AF42 0x90 ++# define IPTOS_DSCP_AF43 0x98 ++# define IPTOS_DSCP_EF 0xb8 ++#endif /* IPTOS_DSCP_AF11 */ ++ ++#ifndef IPTOS_DSCP_CS0 ++# define IPTOS_DSCP_CS0 0x00 ++# define IPTOS_DSCP_CS1 0x20 ++# define IPTOS_DSCP_CS2 0x40 ++# define IPTOS_DSCP_CS3 0x60 ++# define IPTOS_DSCP_CS4 0x80 ++# define IPTOS_DSCP_CS5 0xa0 ++# define IPTOS_DSCP_CS6 0xc0 ++# define IPTOS_DSCP_CS7 0xe0 ++#endif /* IPTOS_DSCP_CS0 */ ++ ++#ifndef IPTOS_DSCP_EF ++# define IPTOS_DSCP_EF 0xb8 ++#endif /* IPTOS_DSCP_EF */ ++ + + #include + #include +@@ -268,10 +315,14 @@ main(int argc, char *argv[]) + uflag = 1; + break; + case 'V': ++# if defined(RT_TABLEID_MAX) + rtableid = (int)strtonum(optarg, 0, + RT_TABLEID_MAX, &errstr); + if (errstr) + errx(1, "rtable %s: %s", errstr, optarg); ++# else ++ errx(1, "no alternate routing table support available"); ++# endif + break; + case 'v': + vflag = 1; +@@ -320,7 +371,11 @@ main(int argc, char *argv[]) + oflag = optarg; + break; + case 'S': ++# if defined(TCP_MD5SIG) + Sflag = 1; ++# else ++ errx(1, "no TCP MD5 signature support available"); ++# endif + break; + case 'T': + errstr = NULL; +@@ -345,35 +400,23 @@ main(int argc, char *argv[]) + argc -= optind; + argv += optind; + ++# if defined(RT_TABLEID_MAX) + if (rtableid >= 0) + if (setrtable(rtableid) == -1) + err(1, "setrtable"); +- +- if (family == AF_UNIX) { +- if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1) +- err(1, "pledge"); +- } else if (Fflag && Pflag) { +- if (pledge("stdio inet dns sendfd tty", NULL) == -1) +- err(1, "pledge"); +- } else if (Fflag) { +- if (pledge("stdio inet dns sendfd", NULL) == -1) +- err(1, "pledge"); +- } else if (Pflag && usetls) { +- if (pledge("stdio rpath inet dns tty", NULL) == -1) +- err(1, "pledge"); +- } else if (Pflag) { +- if (pledge("stdio inet dns tty", NULL) == -1) +- err(1, "pledge"); +- } else if (usetls) { +- if (pledge("stdio rpath inet dns", NULL) == -1) +- err(1, "pledge"); +- } else if (pledge("stdio inet dns", NULL) == -1) +- err(1, "pledge"); ++# endif + + /* Cruft to make sure options are clean, and used properly. */ + if (argv[0] && !argv[1] && family == AF_UNIX) { + host = argv[0]; + uport = NULL; ++ } else if (!argv[0] && lflag) { ++ if (sflag) ++ errx(1, "cannot use -s and -l"); ++ if (pflag) ++ errx(1, "cannot use -p and -l"); ++ if (zflag) ++ errx(1, "cannot use -z and -l"); + } else if (argv[0] && !argv[1]) { + if (!lflag) + usage(1); +@@ -385,12 +428,6 @@ main(int argc, char *argv[]) + } else + usage(1); + +- if (lflag && sflag) +- errx(1, "cannot use -s and -l"); +- if (lflag && pflag) +- errx(1, "cannot use -p and -l"); +- if (lflag && zflag) +- errx(1, "cannot use -z and -l"); + if (!lflag && kflag) + errx(1, "must use -l with -k"); + if (uflag && usetls) +@@ -425,8 +462,8 @@ main(int argc, char *argv[]) + } else { + strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX", + UNIX_DG_TMP_SOCKET_SIZE); +- if (mktemp(unix_dg_tmp_socket_buf) == NULL) +- err(1, "mktemp"); ++ if (mkstemp(unix_dg_tmp_socket_buf) == -1) ++ err(1, "mkstemp"); + unix_dg_tmp_socket = unix_dg_tmp_socket_buf; + } + } +@@ -901,8 +938,10 @@ remote_connect(const char *host, const c + if (sflag || pflag) { + struct addrinfo ahints, *ares; + ++# if defined (SO_BINDANY) + /* try SO_BINDANY, but don't insist */ + setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)); ++# endif + memset(&ahints, 0, sizeof(struct addrinfo)); + ahints.ai_family = res->ai_family; + ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; +@@ -994,9 +1033,15 @@ local_listen(char *host, char *port, str + res->ai_protocol)) < 0) + continue; + ++ ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x)); ++ if (ret == -1) ++ err(1, NULL); ++ ++# if defined(SO_REUSEPORT) + ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); + if (ret == -1) + err(1, NULL); ++# endif + + set_common_sockopts(s, res->ai_family); + +@@ -1452,11 +1497,13 @@ set_common_sockopts(int s, int af) + { + int x = 1; + ++# if defined(TCP_MD5SIG) + if (Sflag) { + if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, + &x, sizeof(x)) == -1) + err(1, NULL); + } ++# endif + if (Dflag) { + if (setsockopt(s, SOL_SOCKET, SO_DEBUG, + &x, sizeof(x)) == -1) +@@ -1467,9 +1514,14 @@ set_common_sockopts(int s, int af) + IP_TOS, &Tflag, sizeof(Tflag)) == -1) + err(1, "set IP ToS"); + ++#if defined(IPV6_TCLASS) + else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, + IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1) + err(1, "set IPv6 traffic class"); ++#else ++ else if (af == AF_INET6) ++ errx(1, "can't set IPv6 traffic class (unavailable)"); ++#endif + } + if (Iflag) { + if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, +@@ -1487,19 +1539,34 @@ set_common_sockopts(int s, int af) + IP_TTL, &ttl, sizeof(ttl))) + err(1, "set IP TTL"); + ++#if defined(IPV6_UNICAST_HOPS) + else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, + IPV6_UNICAST_HOPS, &ttl, sizeof(ttl))) + err(1, "set IPv6 unicast hops"); ++#else ++ else if (af == AF_INET6) ++ errx(1, "can't set IPv6 unicast hops (unavailable)"); ++#endif + } + + if (minttl != -1) { ++#if defined(IP_MINTTL) + if (af == AF_INET && setsockopt(s, IPPROTO_IP, + IP_MINTTL, &minttl, sizeof(minttl))) + err(1, "set IP min TTL"); ++#else ++ if (af == AF_INET) ++ errx(1, "can't set IP min TTL (unavailable)"); ++#endif + ++#if defined(IPV6_MINHOPCOUNT) + else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6, + IPV6_MINHOPCOUNT, &minttl, sizeof(minttl))) + err(1, "set IPv6 min hop count"); ++#else ++ else if (af == AF_INET6) ++ errx(1, "can't set IPv6 min hop count (unavailable)"); ++#endif + } + } + +@@ -1534,6 +1601,7 @@ process_tos_opt(char *s, int *val) + { "cs7", IPTOS_DSCP_CS7 }, + { "ef", IPTOS_DSCP_EF }, + { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, ++ { "lowcost", IPTOS_LOWCOST }, + { "lowdelay", IPTOS_LOWDELAY }, + { "netcontrol", IPTOS_PREC_NETCONTROL }, + { "reliability", IPTOS_RELIABILITY }, +@@ -1741,7 +1812,7 @@ help(void) + \t-Z Peer certificate file\n\ + \t-z Zero-I/O mode [used for scanning]\n\ + Port numbers can be individual or ranges: lo-hi [inclusive]\n"); +- exit(1); ++ exit(0); + } + + void +--- a/socks.c ++++ b/socks.c +@@ -219,11 +219,11 @@ socks_connect(const char *host, const ch + buf[2] = SOCKS_NOAUTH; + cnt = atomicio(vwrite, proxyfd, buf, 3); + if (cnt != 3) +- err(1, "write failed (%zu/3)", cnt); ++ err(1, "write failed (%zu/3)", (size_t)cnt); + + cnt = atomicio(read, proxyfd, buf, 2); + if (cnt != 2) +- err(1, "read failed (%zu/3)", cnt); ++ err(1, "read failed (%zu/3)", (size_t)cnt); + + if (buf[1] == SOCKS_NOMETHOD) + errx(1, "authentication method negotiation failed"); +@@ -272,11 +272,11 @@ socks_connect(const char *host, const ch + + cnt = atomicio(vwrite, proxyfd, buf, wlen); + if (cnt != wlen) +- err(1, "write failed (%zu/%zu)", cnt, wlen); ++ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); + + cnt = atomicio(read, proxyfd, buf, 4); + if (cnt != 4) +- err(1, "read failed (%zu/4)", cnt); ++ err(1, "read failed (%zu/4)", (size_t)cnt); + if (buf[1] != 0) { + errx(1, "connection failed, SOCKSv5 error: %s", + socks5_strerror(buf[1])); +@@ -285,12 +285,12 @@ socks_connect(const char *host, const ch + case SOCKS_IPV4: + cnt = atomicio(read, proxyfd, buf + 4, 6); + if (cnt != 6) +- err(1, "read failed (%zu/6)", cnt); ++ err(1, "read failed (%zu/6)", (size_t)cnt); + break; + case SOCKS_IPV6: + cnt = atomicio(read, proxyfd, buf + 4, 18); + if (cnt != 18) +- err(1, "read failed (%zu/18)", cnt); ++ err(1, "read failed (%zu/18)", (size_t)cnt); + break; + default: + errx(1, "connection failed, unsupported address type"); +@@ -310,11 +310,11 @@ socks_connect(const char *host, const ch + + cnt = atomicio(vwrite, proxyfd, buf, wlen); + if (cnt != wlen) +- err(1, "write failed (%zu/%zu)", cnt, wlen); ++ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); + + cnt = atomicio(read, proxyfd, buf, 8); + if (cnt != 8) +- err(1, "read failed (%zu/8)", cnt); ++ err(1, "read failed (%zu/8)", (size_t)cnt); + if (buf[1] != 90) { + errx(1, "connection failed, SOCKSv4 error: %s", + socks4_strerror(buf[1])); +@@ -328,39 +328,39 @@ socks_connect(const char *host, const ch + + /* Try to be sane about numeric IPv6 addresses */ + if (strchr(host, ':') != NULL) { +- r = snprintf(buf, sizeof(buf), ++ r = snprintf((char*)buf, sizeof(buf), + "CONNECT [%s]:%d HTTP/1.0\r\n", + host, ntohs(serverport)); + } else { +- r = snprintf(buf, sizeof(buf), ++ r = snprintf((char*)buf, sizeof(buf), + "CONNECT %s:%d HTTP/1.0\r\n", + host, ntohs(serverport)); + } + if (r == -1 || (size_t)r >= sizeof(buf)) + errx(1, "hostname too long"); +- r = strlen(buf); ++ r = strlen((char*)buf); + + cnt = atomicio(vwrite, proxyfd, buf, r); + if (cnt != r) +- err(1, "write failed (%zu/%d)", cnt, r); ++ err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r); + + if (authretry > 1) { + char resp[1024]; + + proxypass = getproxypass(proxyuser, proxyhost); +- r = snprintf(buf, sizeof(buf), "%s:%s", ++ r = snprintf((char*)buf, sizeof(buf), "%s:%s", + proxyuser, proxypass); + if (r == -1 || (size_t)r >= sizeof(buf) || +- b64_ntop(buf, strlen(buf), resp, ++ b64_ntop(buf, strlen((char*)buf), resp, + sizeof(resp)) == -1) + errx(1, "Proxy username/password too long"); +- r = snprintf(buf, sizeof(buf), "Proxy-Authorization: " ++ r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: " + "Basic %s\r\n", resp); + if (r == -1 || (size_t)r >= sizeof(buf)) + errx(1, "Proxy auth response too long"); +- r = strlen(buf); ++ r = strlen((char*)buf); + if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r) +- err(1, "write failed (%zu/%d)", cnt, r); ++ err(1, "write failed (%zu/%d)", (size_t)cnt, r); + } + + /* Terminate headers */ +@@ -368,22 +368,22 @@ socks_connect(const char *host, const ch + err(1, "write failed (%zu/2)", cnt); + + /* Read status reply */ +- proxy_read_line(proxyfd, buf, sizeof(buf)); ++ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); + if (proxyuser != NULL && +- strncmp(buf, "HTTP/1.0 407 ", 12) == 0) { ++ strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) { + if (authretry > 1) { + fprintf(stderr, "Proxy authentication " + "failed\n"); + } + close(proxyfd); + goto again; +- } else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 && +- strncmp(buf, "HTTP/1.1 200 ", 12) != 0) ++ } else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 && ++ strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0) + errx(1, "Proxy error: \"%s\"", buf); + + /* Headers continue until we hit an empty line */ + for (r = 0; r < HTTP_MAXHDRS; r++) { +- proxy_read_line(proxyfd, buf, sizeof(buf)); ++ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); + if (*buf == '\0') + break; + } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2618fce479d..5aca1a0025d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21301,4 +21301,7 @@ with pkgs; unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount mount wall hostname more sysctl; + + inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) + netbsd openbsd; } From d48e9ff92a111482676504ff244663ca049ec841 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 Apr 2018 21:26:37 +0200 Subject: [PATCH 2497/2743] liblouis: mark as broken --- pkgs/applications/misc/orca/default.nix | 3 ++- pkgs/development/libraries/liblouis/default.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index abc8c3e78424..3abefae9c6b5 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,7 +34,8 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = [ - pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle + # TODO: re-add liblouis when it is fixed + pygobject3 pyatspi dbus-python pyxdg brltty speechd gst-python setproctitle ]; buildInputs = [ diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index bde1ff4e4936..a6005d66b4d6 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -50,6 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source braille translator and back-translator"; homepage = http://liblouis.org/; + broken = true; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; From ddc48afccaa340d4a166fd2e5e183a4fd7185e24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 Apr 2018 21:39:33 +0200 Subject: [PATCH 2498/2743] =?UTF-8?q?python3.pkgs.pyatspi:=202.18.0=20?= =?UTF-8?q?=E2=86=92=202.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/pyatspi/default.nix | 32 +++++++++++-------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 6192f94445f3..5960551abc72 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,29 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: -stdenv.mkDerivation rec { +buildPythonPackage rec { pname = "pyatspi"; - version = "2.18.0"; - name = "${pname}-${version}"; + version = "2.26.0"; + format = "other"; src = fetchurl { - url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz"; - sha256 = "0imbyk2v6c11da7pkwz91313pkkldxs8zfg81zb2ql6h0nnh6vzq"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0xdnix7gxzgf75xy9ris4dd6b05mqwicw190b98xqmypydyf95n6"; }; - broken = true; - buildInputs = [ at-spi2-core pkgconfig - pythonPackages.python - pythonPackages.pygobject3 + pygobject3 ]; + disabled = !isPy3k; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "python3.pkgs.${pname}"; + }; + }; + meta = with stdenv.lib; { - description = "Python 3 bindings for at-spi"; - homepage = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus; + description = "Python client bindings for D-Bus AT-SPI"; + homepage = https://wiki.linuxfoundation.org/accessibility/d-bus; license = licenses.gpl2; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ jgeerds jtojnar ]; platforms = with platforms; unix; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 127e4ac9c0e6..86c5e882ab2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -315,7 +315,7 @@ in { inherit (pkgs) arrow-cpp cmake pkgconfig; }; - pyatspi = disabledIf (!isPy3k) (callPackage ../development/python-modules/pyatspi { }); + pyatspi = callPackage ../development/python-modules/pyatspi { }; pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; From 5979e886955c0a1e4b7609b5bdd68582d3ec925e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 Apr 2018 21:39:53 +0200 Subject: [PATCH 2499/2743] orca: fix typelib lookup --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 3abefae9c6b5..e05cb0ad6f9d 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgconfig, fetchurl, buildPythonApplication -, autoreconfHook, wrapGAppsHook +, autoreconfHook, wrapGAppsHook, gobjectIntrospection , intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg @@ -30,7 +30,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 - intltool yelp-tools itstool + intltool yelp-tools itstool gobjectIntrospection ]; propagatedBuildInputs = [ From 2ac306c91cefc585d23239b54e5539abb64c0c04 Mon Sep 17 00:00:00 2001 From: Felix Dietze Date: Tue, 24 Apr 2018 21:57:51 +0200 Subject: [PATCH 2500/2743] nixos manual: Fix typo in Syntax Summary --- nixos/doc/manual/configuration/summary.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index be1f2263149e..38032c5d9dc3 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -53,7 +53,7 @@ manual for the rest. { x = 1; y = 2; } - An set with attributes names x and y + A set with attributes named x and y { foo.bar = 1; } From dad3714ec16c96b4512d5ebdff84f88867dfb291 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:06:15 -0500 Subject: [PATCH 2501/2743] live555: supports darwin --- .../development/libraries/live555/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 1479f7b6153b..69c16878fdf5 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib, darwin }: # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD let @@ -12,19 +12,22 @@ stdenv.mkDerivation { sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d"; }; - postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles" - + stdenv.lib.optionalString (stdenv ? glibc) '' - + postPatch = '' + sed 's,/bin/rm,rm,g' -i genMakefiles + sed \ + -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ + -i config.linux + '' + stdenv.lib.optionalString (stdenv ? glibc) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' ''; configurePhase = '' - sed \ - -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ - -i config.linux - - ./genMakefiles linux + ./genMakefiles ${{ + x86_64-darwin = "macosx"; + i686-linux = "linux"; + x86_64-linux = "linux-64bit"; + }.${stdenv.system}} ''; installPhase = '' @@ -35,10 +38,12 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; + + meta = with lib; { description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; homepage = http://www.live555.com/liveMedia/; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From db6cc5623945c6594475303a838accce41a9729a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:08:12 -0500 Subject: [PATCH 2502/2743] libmtp: supports darwin --- pkgs/development/libraries/libmtp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 88ef55715a7c..c3061626a6ae 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }: stdenv.mkDerivation rec { name = "libmtp-1.1.15"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; + buildInputs = [ libiconv ]; propagatedBuildInputs = [ libusb1 ]; nativeBuildInputs = [ pkgconfig ]; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { in the form of a library suitable primarily for POSIX compliant operating systems. We implement MTP Basic, the stuff proposed for standardization. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; } From 9c406d2ac8574ea03ba68db9b843c36ac43e3289 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:09:07 -0500 Subject: [PATCH 2503/2743] libdvdnav: supports Darwin --- pkgs/development/libraries/libdvdnav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 42321b2f866a..b0dfd1e8fc12 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A library that implements DVD navigation features such as DVD menus"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; passthru = { inherit libdvdread; }; From 00bf1150473dedb02f22696450b250e04875faab Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 15:16:12 -0500 Subject: [PATCH 2504/2743] schroedinger: add Darwin patch --- .../libraries/schroedinger/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 2309719c2bdc..167fe4190764 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, orc, pkgconfig }: +{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }: stdenv.mkDerivation { name = "schroedinger-1.0.11"; @@ -13,15 +13,23 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ orc ]; - doCheck = true; + doCheck = (!stdenv.isDarwin); + + patchFlags = "-p0"; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/schroedinger/files/patch-testsuite-Makefile.am.diff"; + sha256 = "0cc8ymvgjgwy7ghca2dd8m8pxpinf27s2i8krf2m3fzv2ckq09v3"; + }) + ]; meta = with stdenv.lib; { homepage = http://diracvideo.org/; maintainers = [ maintainers.spwhitt ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From bfd213aa2d1bdc04c09766764355fdfae8f336a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 Apr 2018 22:41:47 +0200 Subject: [PATCH 2505/2743] rhythmbox: fix build with GStreamer 1.14 --- pkgs/applications/audio/rhythmbox/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index a23324c7fdac..8dab9e32f982 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -24,6 +24,15 @@ in stdenv.mkDerivation rec { sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2"; }; + patches = [ + # build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706 + (fetchurl { + name = "fmradio-Fix-build-with-GStreamer-master.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=361178; + sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool perl perlPackages.XMLParser From 1c3d38c69b0b795a6a445a3fa3af3780cb4c8f06 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Apr 2018 22:56:25 +0200 Subject: [PATCH 2506/2743] vim_configurable: replace default ftNix patch with sources from vim-nix --- .../applications/editors/vim/configurable.nix | 6 ++ .../editors/vim/ft-nix-support.patch | 78 +------------------ 2 files changed, 7 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 0f81b0bdd640..9ffa31f2f2e0 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -4,6 +4,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE +, vimPlugins # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -80,6 +81,11 @@ composableDerivation { flags = { ftNix = { patches = [ ./ft-nix-support.patch ]; + preConfigure = '' + cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim + cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim + cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim + ''; }; } // edf { diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 5feb9c879517..274d855731fd 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -6,7 +6,7 @@ index a8e6261..2b008fc 100644 " Z80 assembler asz80 au BufNewFile,BufRead *.z8a setf z8a -+" NIX ++" Nix +au BufNewFile,BufRead *.nix setf nix + augroup END @@ -18,79 +18,3 @@ index a8e6261..2b008fc 100644 unlet s:cpo_save + + -diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim -new file mode 100644 -index 0000000..a2f9918 ---- /dev/null -+++ b/runtime/syntax/nix.vim -@@ -0,0 +1,56 @@ -+" Vim syntax file -+" Language: nix -+" Maintainer: Marc Weber -+" Modify and commit if you feel that way -+" Last Change: 2011 Jun -+" -+" this syntax file can be still be enhanced very much.. -+" Don't ask, do it :-) -+" This file (github.com/MarcWeber/vim-addon-nix) is periodically synced with -+" the patch found in vim_configurable (nixpkgs) -+ -+" Quit when a (custom) syntax file was already loaded -+if exists("b:current_syntax") -+ finish -+endif -+ -+ -+sy cluster nixStrings contains=nixStringParam,nixStringIndented -+ -+syn keyword nixKeyword let throw inherit import true false null with -+syn keyword nixConditional if else then -+syn keyword nixBrace ( ) { } = -+syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists -+ \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList -+ \ __head __tail __add __sub __lessThan __substring __stringLength -+ -+syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam -+" syn region nixString start=+"+ skip=+\\"+ end=+"+ -+syn match nixAttr "\w\+\ze\s*=" -+syn match nixFuncArg "\zs\w\+\ze\s*:" -+syn region nixStringParam start=+\${+ end=+}+ contains=@nixStrings -+syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+ -+syn match nixEndOfLineComment "#.*$" -+ -+hi def link nixKeyword Keyword -+hi def link nixConditional Conditional -+hi def link nixBrace Special -+hi def link nixString String -+hi def link nixStringIndented String -+hi def link nixBuiltin Special -+hi def link nixStringParam Macro -+hi def link nixMultiLineComment Comment -+hi def link nixEndOfLineComment Comment -+hi def link nixAttr Identifier -+hi def link nixFuncArg Identifier -+ -+syn sync maxlines=20000 -+syn sync minlines=50000 -+ -+let b:current_syntax = "nix" -+ -+" thanks to domenkozar -+" scan backwards to find begining of multiline statements -+syn sync ccomment nixMultiLineComment minlines=10 maxlines=500 -+syn sync ccomment nixStringIndented minlines=10 maxlines=500 -+syn sync ccomment nixString maxlines=10 -diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim -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 shiftwidth=2 expandtab softtabstop=2 -+let b:undo_ftplugin = "setlocal sw< et< sts<" From f54a9994e3fd6e3942b3c761615f106eca2d8965 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 24 Apr 2018 22:58:15 +0200 Subject: [PATCH 2507/2743] eclipse-plugin-spotbugs: 3.1.2 -> 3.1.3 Also switch to using zipped update site provided on GitHub. --- pkgs/applications/editors/eclipse/plugins.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 1710c0e35531..136ef7dfc23d 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -530,18 +530,13 @@ rec { }; }; - spotbugs = buildEclipsePlugin rec { + spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.2.r201802250230-59118d9"; + version = "3.1.3"; - srcFeature = fetchurl { - url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1p0pz7znpfi5h1wr60sl8clkpd7rzkh7krmc0nxc6w43gkgkg9h4"; - }; - - srcPlugin = fetchurl { - url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1z3jjbcjif4qip1gx2dhfcm9fyhps96ms7z3ngbdcakgw7wai9v4"; + src = fetchzip { + url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; + sha256 = "01zrmk497bxzqgwgbpsvi5iz5qk9b4q949h4918abm54zvkgndlg"; }; meta = with stdenv.lib; { From a4ba8c654403c1f1e6ba006533e3306dd32a638e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Apr 2018 23:27:45 +0200 Subject: [PATCH 2508/2743] clementine: each output should hav a wrapped `GST_PLUGIN_SYSTEM_PATH_1_0` see https://github.com/NixOS/nixpkgs/commit/ef5e212d20959d4d883df2ff2a54e5ef4b2512a5#r28723596 /cc @jtojnar --- pkgs/applications/audio/clementine/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b8ff3daec606..6379975e951c 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -70,7 +70,9 @@ let free = stdenv.mkDerivation { name = "clementine-free-${version}"; - inherit src patches nativeBuildInputs buildInputs postPatch; + inherit src patches nativeBuildInputs postPatch; + + buildInputs = buildInputs ++ [ makeWrapper ]; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; @@ -78,6 +80,11 @@ let passthru.unfree = unfree; + postInstall = '' + wrapProgram $out/bin/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -108,8 +115,7 @@ let rmdir $out/bin makeWrapper ${free}/bin/clementine $out/bin/clementine \ - --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine mkdir -p $out/share for dir in applications icons kde4; do From 3f42a6eb84cfc56790c1347f081551650f7701f3 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 24 Apr 2018 16:53:56 -0500 Subject: [PATCH 2509/2743] netbsd: small fixups --- pkgs/os-specific/bsd/netbsd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 8cbc765ec9e6..42633232c71a 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -114,7 +114,7 @@ let mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \ $out$DOCDIR $out$LOCALEDIR for i in 1 2 3 4 5 6 7 8 9; do - mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i + mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i $out$DOCDIR/reference/ref$i done mkdir -p $out/usr/include ''; @@ -195,6 +195,7 @@ let install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h + install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") From c3ab285ce20934c439ab63473e27b37f0e240ba4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 22 Apr 2018 22:02:38 -0500 Subject: [PATCH 2510/2743] glibc: use local copy of patch to fix w/musl fetchpatch doesn't work with bootstrap fetchurl, so just use local file like we do for other glibc patches. --- pkgs/development/libraries/glibc/common.nix | 7 +--- .../glibc/fix-rpc-types-musl-conflicts.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index c8716bfdc796..31567f0049dd 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -95,12 +95,7 @@ stdenv.mkDerivation ({ ./allow-kernel-2.6.32.patch ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch - ++ lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - name = "fix-with-musl.patch"; - url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw"; - sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2"; - }); + ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch; postPatch = '' diff --git a/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch b/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch new file mode 100644 index 000000000000..19f8bfc7cce8 --- /dev/null +++ b/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch @@ -0,0 +1,38 @@ +@@ -, +, @@ +--- + sunrpc/rpc/types.h | 22 ++++++---------------- + 1 file changed, 6 insertions(+), 16 deletions(-) +--- a/sunrpc/rpc/types.h ++++ a/sunrpc/rpc/types.h +@@ -69,24 +69,14 @@ typedef unsigned long rpcport_t; + #include + #endif + +-#if defined __APPLE_CC__ || defined __FreeBSD__ +-# define __u_char_defined +-# define __daddr_t_defined +-#endif +- +-#ifndef __u_char_defined +-typedef __u_char u_char; +-typedef __u_short u_short; +-typedef __u_int u_int; +-typedef __u_long u_long; +-typedef __quad_t quad_t; +-typedef __u_quad_t u_quad_t; +-typedef __fsid_t fsid_t; ++/* IMPORTANT NOTE: This has been modified to build against the musl C ++ * library and it probably now ONLY builds with the musl C library. ++ * ++ * See: https://sourceware.org/bugzilla/show_bug.cgi?id=21604 ++ */ + # define __u_char_defined +-#endif + #ifndef __daddr_t_defined +-typedef __daddr_t daddr_t; +-typedef __caddr_t caddr_t; ++typedef int daddr_t; + # define __daddr_t_defined + #endif + +-- From 3e53f00a1f5ca65b5740e6974bed118e993ac18c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 15:12:21 -0700 Subject: [PATCH 2511/2743] eccodes: 2.7.0 -> 2.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/eccodes/versions. These checks were done: - built on NixOS - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/codes_info -v’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_histogram -h’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_histogram --help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_merge -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib2ppm -h’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib2ppm --help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_set -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_get_data -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_index_build help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_index_build -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_set -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_index_build help’ got 0 exit code - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_index_build -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_dump -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_ls -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_compare -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_get -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_copy -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_to_netcdf -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/codes_bufr_filter -V’ and found version 2.7.3 - ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_filter -V’ and found version 2.7.3 - found 2.7.3 with grep in /nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3 - directory tree listing: https://gist.github.com/f485bc3b3d6105246360c970ac7462e1 --- pkgs/development/libraries/eccodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 49dcb31c0478..a453a70dcad7 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.7.0"; + version = "2.7.3"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0slfim64wdyd97nwv7ry0xwhiarphl93ij2v19c8a1c0dz7ld3qi"; + sha256 = "1nvip0cmbhzmgzyi65qw8406p460alw1842dw2r4nq1lpcyi9avg"; }; nativeBuildInputs = [ cmake ]; From 64c2e058e678303ca8b23c68f5011b6dda9dc319 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 3 Apr 2018 16:45:43 -0500 Subject: [PATCH 2512/2743] mesa, libglvnd, xorg: disable tls w/musl --- pkgs/development/libraries/libglvnd/default.nix | 3 +++ pkgs/development/libraries/mesa/default.nix | 3 ++- pkgs/servers/x11/xorg/overrides.nix | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 4bc1d1addcfb..7e1a2b549681 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -22,6 +22,9 @@ in stdenv.mkDerivation rec { "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" ]; + # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 + configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; + # Upstream patch fixing use of libdl, should be in next release. patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e77a4e1414e9..a3c03c4f2e53 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -125,7 +125,8 @@ let self = stdenv.mkDerivation { "--enable-gles1" "--enable-gles2" "--enable-glx" - "--enable-glx-tls" + # https://bugs.freedesktop.org/show_bug.cgi?id=35268 + (enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls") "--enable-gallium-osmesa" # used by wine "--enable-llvm" "--enable-egl" diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 55eb54622d51..5efa4bfcfd5d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -512,6 +512,8 @@ in "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" "--with-xkb-output=$out/share/X11/xkb/compiled" "--enable-glamor" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "--disable-tls" ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it From 85161629c5239f70db8711d9190795edc0264c51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 15:33:02 -0700 Subject: [PATCH 2513/2743] baresip: 0.5.8 -> 0.5.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/baresip/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.9 with grep in /nix/store/qh69vw5jdwnw82vb6gkwz4f0k8gpjjry-baresip-0.5.9 - directory tree listing: https://gist.github.com/f67689bcf18570ad0408e54fa06db37c --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 225d622c69f9..538e9a3786be 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { - version = "0.5.8"; + version = "0.5.9"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "0qk6y83mm7cz4j66d7zy72l7890k7ifqnqbqnjd3bjfn1yjivwfr"; + sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem From b5bfd8a173175d7a36e4399db3dde4e0e4cb4408 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 15:35:46 -0700 Subject: [PATCH 2514/2743] appstream-glib: 0.7.7 -> 0.7.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/appstream-glib/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.7.8 with grep in /nix/store/52vkj80m85n3jhzbqhw5abxdrqqac2yk-appstream-glib-0.7.8 - directory tree listing: https://gist.github.com/c3d5906e2b4ff1a38510f114a6c58819 --- pkgs/development/libraries/appstream-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 2499a424c85c..6ad6b158826f 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -4,7 +4,7 @@ , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.7"; + name = "appstream-glib-0.7.8"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "127m5ds355i1vfvmn9nd4zqqnqm16jpqcn4p2p2pvn7i4wqxra40"; + sha256 = "10hcl3sl3g8ajg9mssq3g4dbzz0d4b2ybimrcq71cpycqrqhilhx"; }; nativeBuildInputs = [ From 296bc1e56975c6514d6dbbb16e721aad31091ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Apr 2018 23:39:08 +0100 Subject: [PATCH 2515/2743] dino: 2018-03-10 -> 2018-04-19 --- .../networking/instant-messengers/dino/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index fd253c389a27..46b82f05c90a 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-03-10"; + name = "dino-unstable-2018-04-19"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "4ccdc1d0920a93b313d81b4014b6f45efb49b1fe"; - sha256 = "0d9698zi09s107zva6cgip7xxmdby0zfmqvka4n0khxrsnii5awq"; + rev = "e80da806022d8aaa32f77f3c7f0333cc1c80829b"; + sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gib"; fetchSubmodules = true; }; From cf68bb33cb797d4e6802ef5f3e6b68715fca1e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Apr 2018 23:44:32 +0100 Subject: [PATCH 2516/2743] dino: fix checksum --- .../applications/networking/instant-messengers/dino/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 46b82f05c90a..32808f720bf1 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "dino"; repo = "dino"; rev = "e80da806022d8aaa32f77f3c7f0333cc1c80829b"; - sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gib"; + sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gibm"; fetchSubmodules = true; }; From b26ae506a94026d044124d3620a4fe1cdfd568ad Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 24 Apr 2018 18:53:33 -0400 Subject: [PATCH 2517/2743] git: Set PERL_PATH when building manual Otherwise the build fails with the perplexing error make: *** No rule to make target 'cmd-list.made', needed by 'doc.dep'. Stop. make: Leaving directory '/tmp/nix-build-git-2.16.3.drv-0/git-2.16.3/Documentation' on NixOS (but not on Debian, where it succeeds, presumably since it picks up the system perl). --- .../version-management/git-and-tools/git/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 4e9f2bf16cea..74e88430239d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio +{ fetchurl, stdenv, buildPackages +, curl, openssl, zlib, expat, perl, python, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 @@ -199,7 +200,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cmd-list.made install install-info \ + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-info \ -C Documentation '' + (if guiSupport then '' From 1e0d2306fc9f4d59bb5fab8781f1b17f76347820 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Apr 2018 16:02:42 -0700 Subject: [PATCH 2518/2743] armadillo: 8.400.0 -> 8.500.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/armadillo/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 8.500.0 with grep in /nix/store/4b5v6xvxsbdqgwlqnj421wa0cwhdpw4p-armadillo-8.500.0 - directory tree listing: https://gist.github.com/5849376cdd72ab243c8f004589cb24ec --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index a5ca79c0d82e..4c98bbc182c8 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "8.400.0"; + version = "8.500.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "16yxhn904ll48879vmycv84rja28im0mrcfgb03nm7bs8lpvrdjw"; + sha256 = "1wdvii5sncq3d8dh272s1n79mpcwzz437lyyfwy7gm7vbks6j77m"; }; nativeBuildInputs = [ cmake ]; From b75b5cdc792970957cf828a95a5340b5f414a6f4 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 25 Apr 2018 01:23:44 +0200 Subject: [PATCH 2519/2743] pythonPackages.entrypoints: Fix buildInputs (#39449) --- pkgs/development/python-modules/entrypoints/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index c4f5410bc518..9ee0810571ad 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f"; }; - checkInputs = [ pytest]; + checkInputs = [ pytest ]; - propagatedBuildInputs = [] ++ lib.optional (!isPy3k) [ configparser ]; + propagatedBuildInputs = lib.optional (!isPy3k) configparser; checkPhase = '' py.test tests @@ -28,4 +28,4 @@ buildPythonPackage rec { homepage = https://github.com/takluyver/entrypoints; license = lib.licenses.mit; }; -} \ No newline at end of file +} From 734b13a817376f0b96f2e1e7a71034bdbcacbd7c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 18:35:54 -0500 Subject: [PATCH 2520/2743] gst-plugins: fix on Darwin --- pkgs/development/libraries/gstreamer/bad/default.nix | 1 + pkgs/development/libraries/gstreamer/good/default.nix | 5 +++++ pkgs/development/libraries/gstreamer/ugly/default.nix | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 73cbaa0f8070..8ebd70921135 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; }; preConfigure = '' diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 5c10221b27d7..21376ce79c1c 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -6,6 +6,7 @@ , libsoup, libpulseaudio, libintl , darwin, lame, mpg123, twolame , gtkSupport ? false, gtk3 ? null +, ncurses }: assert gtkSupport -> gtk3 != null; @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; }; src = fetchurl { @@ -39,11 +41,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python meson ninja gettext ]; + NIX_LDFLAGS = "-lncurses"; + buildInputs = [ gst-plugins-base orc bzip2 libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca libsoup libshout lame mpg123 twolame libintl + ncurses ] ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index a5449abb9f7d..004bb0715f26 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, python , gst-plugins-base, orc, gettext , a52dec, libcdio, libdvdread -, libmad, libmpeg2, x264, libintl +, libmad, libmpeg2, x264, libintl, lib +, darwin }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-1.14.0"; - meta = with stdenv.lib; { + meta = with lib; { description = "Gstreamer Ugly Plugins"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' @@ -18,6 +19,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; }; src = fetchurl { @@ -34,5 +36,6 @@ stdenv.mkDerivation rec { a52dec libcdio libdvdread libmad libmpeg2 x264 libintl - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; + [ IOKit CoreFoundation DiskArbitration ]); } From 49ff3665a5268ff715b52a3ad0f9869de04d9ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 25 Apr 2018 00:49:13 +0100 Subject: [PATCH 2521/2743] alacritty: 2018-03-04 -> 2018-04-1 --- pkgs/applications/misc/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index a5db33a0bb5a..4a10d68ee4dc 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -32,18 +32,18 @@ let ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2018-03-04"; + version = "2018-04-16"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0pxnc6r75c7rwnsqc0idi4a60arpgchl1i8yppibhv0px5w11mwa"; + sha256 = "14qsfaij631pk0gxrhmp594f72v0z7kzymf4hnqv4k5w9xlxciwx"; fetchSubmodules = true; }; - cargoSha256 = "0q2yy9cldng8znkmhysgrwi43z2x7a8nb1bnxpy9z170q8ds0m0j"; + cargoSha256 = "0gg28fbx0kisv7hqxgzqhv4z4ikk074djfjlj90nmmi4nddp017p"; nativeBuildInputs = [ cmake From 7e33e374db487ed87db316db3b2687f917aa7f90 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Apr 2018 02:04:13 +0200 Subject: [PATCH 2522/2743] =?UTF-8?q?gupnp-tools:=200.8.13=20=E2=86=92=200?= =?UTF-8?q?.8.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/gupnp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 1b306bc5e363..4d1796eb2ac9 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -2,13 +2,13 @@ let pname = "gupnp-tools"; - version = "0.8.13"; + version = "0.8.14"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; + sha256 = "1ykybsljjnngj8rsn808a0h37r2jx99c2jbmsb3ihf7l7hmraav8"; }; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; From 24600635755cea965bf21b1b1073076d7bfd498a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 00:17:31 +0000 Subject: [PATCH 2523/2743] nixos: installer: cleanup a bit --- nixos/modules/installer/cd-dvd/iso-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 83f8a2586bd3..08923970cd38 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -73,7 +73,8 @@ let APPEND ${toString config.boot.loader.grub.memtest86.params} ''; - isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + isolinuxCfg = concatStringsSep "\n" + ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); # The EFI boot image. efiDir = pkgs.runCommand "efi-directory" {} '' From 3e0a443203acb5c70c4d4686360da4c5820ff8b4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 19:09:21 -0500 Subject: [PATCH 2524/2743] musl: provide 'iconv' utility occasionally expected as part of libiconv --- pkgs/os-specific/linux/musl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 4d1c2cad2e33..a3d09127c085 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -17,6 +17,13 @@ let sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; }; + # iconv tool, implemented by musl author: + iconv_c = fetchurl { + name = "iconv.c"; + url = "http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f"; + sha256 = "1yafz6y509zxpa1i830p5463p91g0y70q60z8q054078qrpln8hp"; + }; + in stdenv.mkDerivation rec { name = "musl-${version}"; @@ -77,6 +84,9 @@ stdenv.mkDerivation rec { moveToOutput lib/musl-gcc.specs $dev substituteInPlace $dev/bin/musl-gcc \ --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs + + # provide 'iconv' utility + $CC ${iconv_c} -o $out/bin/iconv '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h From de00c0d7fbdbc27fd4a7a5addf5d42d3a90e3181 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 19:31:56 -0500 Subject: [PATCH 2525/2743] musl/iconv: use copy from Alpine for minor touchups to error messages --- pkgs/os-specific/linux/musl/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index a3d09127c085..0912f427430b 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -17,11 +17,14 @@ let sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; }; - # iconv tool, implemented by musl author: + # iconv tool, implemented by musl author. + # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f + # We use copy from Alpine which fixes error messages, see: + # https://git.alpinelinux.org/cgit/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f iconv_c = fetchurl { name = "iconv.c"; - url = "http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f"; - sha256 = "1yafz6y509zxpa1i830p5463p91g0y70q60z8q054078qrpln8hp"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; + sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; }; in From b933157f44b5b432d248fec56151ba0646a00e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 20 Apr 2018 13:57:36 +0200 Subject: [PATCH 2526/2743] kholidays: Move from kde_applications to kde_frameworks --- pkgs/applications/kde/default.nix | 1 - pkgs/development/libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks}/kholidays.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{applications/kde => development/libraries/kde-frameworks}/kholidays.nix (81%) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 36dd1773b39e..451fdbe151f4 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -107,7 +107,6 @@ let kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; - kholidays = callPackage ./kholidays.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 08eebfd83aee..f54139836b1d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -129,6 +129,7 @@ let syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; kirigami2 = callPackage ./kirigami2.nix {}; + kholidays = callPackage ./kholidays.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix similarity index 81% rename from pkgs/applications/kde/kholidays.nix rename to pkgs/development/libraries/kde-frameworks/kholidays.nix index 352bec094922..2ede69e74953 100644 --- a/pkgs/applications/kde/kholidays.nix +++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, qtbase, qtdeclarative, qttools, }: @@ -8,7 +8,7 @@ mkDerivation { name = "kholidays"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; + maintainers = with lib.maintainers; [ bkchr ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtbase qtdeclarative qttools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc008b7beb6..78b8cff8215c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11153,7 +11153,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver kirigami2; + threadweaver kirigami2 kholidays; ### KDE PLASMA 5 @@ -11163,7 +11163,7 @@ with pkgs; ### KDE APPLICATIONS inherit (kdeApplications.override { libsForQt5 = self; }) - kholidays libkdcraw libkexiv2 libkipi libkomparediff2 libksane; + libkdcraw libkexiv2 libkipi libkomparediff2 libksane; ### LIBRARIES From faed18320652bd9d08d609ec663cbdb3aaec0be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 20 Apr 2018 16:24:00 +0200 Subject: [PATCH 2527/2743] kde_applications: 17.12.3 -> 18.04.0 --- .../kde/akonadi/akonadi-paths.patch | 121 +- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/kalarmcal.nix | 4 +- pkgs/applications/kde/konsole.nix | 4 +- pkgs/applications/kde/okular.nix | 4 +- pkgs/applications/kde/spectacle.nix | 3 +- pkgs/applications/kde/srcs.nix | 1712 +++++++++-------- 7 files changed, 929 insertions(+), 921 deletions(-) diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index 91fd934b1ecc..4743c36c44d0 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -1,8 +1,40 @@ -Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett +diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp +index 2e9f1acf4..ecc80afdc 100644 +--- a/src/akonadicontrol/agentmanager.cpp ++++ b/src/akonadicontrol/agentmanager.cpp +@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent) + mStorageController = new Akonadi::ProcessControl; + mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld + connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); +- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + + if (mAgentServerEnabled) { + mAgentServer = new Akonadi::ProcessControl; + connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); +- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + } + + #ifndef QT_NO_DEBUG +diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp +index be1cc4afb..6d0c1d7e5 100644 +--- a/src/akonadicontrol/agentprocessinstance.cpp ++++ b/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) + } else { + Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); + const QStringList arguments = QStringList() << executable << identifier(); +- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); + mController->start(agentLauncherExec, arguments); + } + return true; +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index a32e86602..48ea4e52e 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -10,7 +42,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett +@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -29,28 +61,28 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp - << QStringLiteral("/opt/local/lib/mysql5/bin") - << QStringLiteral("/opt/mysql/sbin"); - if (defaultServerPath.isEmpty()) { -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath); - } - -- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); +- +- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath); + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett +@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } -- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath); +- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath); + mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; -- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath); +- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath); + mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett +@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -59,7 +91,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -69,7 +101,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -79,20 +111,20 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer( +@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file -- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); +- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); + const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); - const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf")); + const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { -Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings +diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp +index 60e6272f2..ad7cefbfe 100644 +--- a/src/server/storage/dbconfigpostgresql.cpp ++++ b/src/server/storage/dbconfigpostgresql.cpp +@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -100,7 +132,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp QString defaultInitDbPath; QString defaultPgData; -@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { @@ -130,14 +162,13 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - } - } - postgresSearchPath.append(postgresVersionedSearchPaths); -- -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath); -- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath); +- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath); + defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -149,7 +180,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { -@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings +@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings) settings.setValue(QStringLiteral("Port"), mHostPort); } settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -157,35 +188,3 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); -Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A - } else { - Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); - const QStringList arguments = QStringList() << executable << identifier(); -- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher")); -+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); - mController->start(agentLauncherExec, arguments); - } - return true; -Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose, - mStorageController = new Akonadi::ProcessControl; - mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld - connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); -- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - - if (mAgentServerEnabled) { - mAgentServer = new Akonadi::ProcessControl; - connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); -- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - } - - #ifndef QT_NO_DEBUG diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 9ad488f63ab4..a2feeac7cd9f 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix index f2fb6f4d8bbd..46832477cc60 100644 --- a/pkgs/applications/kde/kalarmcal.nix +++ b/pkgs/applications/kde/kalarmcal.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement, - kpimtextedit, + kpimtextedit, kcalutils }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit + akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 5269941fa113..2847e312d00a 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -4,7 +4,7 @@ kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, - kwindowsystem, kxmlgui, qtscript + kwindowsystem, kxmlgui, qtscript, knewstuff }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty - kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript + kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 5f6f28c95b08..39fb232b3421 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -5,7 +5,7 @@ kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, - qtdeclarative, qtsvg, threadweaver + qtdeclarative, qtsvg, threadweaver, kcrash }: mkDerivation { @@ -16,7 +16,7 @@ mkDerivation { kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver + qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; meta = with lib; { homepage = http://www.kde.org; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 6deec6aaabb4..f036e8cf632c 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,7 +4,7 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras + qtx11extras, knewstuff }: mkDerivation { @@ -14,6 +14,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor + knewstuff ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index d61784805e45..36c18a3f9979 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1691 +3,1699 @@ { akonadi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz"; - sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi"; - name = "akonadi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz"; + sha256 = "1scbc6k2w23qmw4qa147ji7r6p88b97yi9wr46xlshgcn2kj684d"; + name = "akonadi-18.04.0.tar.xz"; }; }; akonadi-calendar = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz"; - sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a"; - name = "akonadi-calendar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz"; + sha256 = "09fk8n69f83ygwfsdjx4mv9hwqpifpv9nbdnl19pjgw2ffp99rna"; + name = "akonadi-calendar-18.04.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz"; - sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9"; - name = "akonadi-calendar-tools-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz"; + sha256 = "1b10kybjj803qwsz74dhism6q7q0lmslqvsb8b9ma8wqk9ajs33f"; + name = "akonadi-calendar-tools-18.04.0.tar.xz"; }; }; akonadiconsole = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz"; - sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b"; - name = "akonadiconsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadiconsole-18.04.0.tar.xz"; + sha256 = "053w5ywm8wlv7ssbvyq0z36jsir9mk0ywlqb0ybnlbvr5dawxnnz"; + name = "akonadiconsole-18.04.0.tar.xz"; }; }; akonadi-contacts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz"; - sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v"; - name = "akonadi-contacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz"; + sha256 = "01cfxia8vnwizzavk1vbrxbszsyg1sa3qbz79fab7iw8380zqdm2"; + name = "akonadi-contacts-18.04.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz"; - sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4"; - name = "akonadi-import-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz"; + sha256 = "123gaxs5zi5b8x1ripr8ldjipx6rpmr3f51mgv40ibx1h967in19"; + name = "akonadi-import-wizard-18.04.0.tar.xz"; }; }; akonadi-mime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz"; - sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2"; - name = "akonadi-mime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz"; + sha256 = "14xgi5saylbp19gg0lnqpasz5x335wz6dnmpfsicz0j5452yfznw"; + name = "akonadi-mime-18.04.0.tar.xz"; }; }; akonadi-notes = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz"; - sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g"; - name = "akonadi-notes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz"; + sha256 = "0ahr185jjyh68qf57vaja6c867rm0iy8jp78g4nmzf3dc6y7r01v"; + name = "akonadi-notes-18.04.0.tar.xz"; }; }; akonadi-search = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz"; - sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x"; - name = "akonadi-search-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz"; + sha256 = "1jn23rr9yah2c4cccbkcvxn4rr6p0q4327b0kwjqzag4lkwd2fy0"; + name = "akonadi-search-18.04.0.tar.xz"; }; }; akregator = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz"; - sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp"; - name = "akregator-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akregator-18.04.0.tar.xz"; + sha256 = "10hid155gszwh7gxp4pqbcfch6hrf0bsikj8ah2fvdgii96dn9gc"; + name = "akregator-18.04.0.tar.xz"; }; }; analitza = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz"; - sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw"; - name = "analitza-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/analitza-18.04.0.tar.xz"; + sha256 = "1yx18mbxvkswpn120rhi092l5wz6s60194q076wdgimx71ngn2v2"; + name = "analitza-18.04.0.tar.xz"; }; }; ark = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz"; - sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi"; - name = "ark-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ark-18.04.0.tar.xz"; + sha256 = "19bh71j5dvz80mz9xff4ygd0qdvjwsihyx5cb5ay6a2gdf1fhm12"; + name = "ark-18.04.0.tar.xz"; }; }; artikulate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz"; - sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx"; - name = "artikulate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz"; + sha256 = "1fqv71przn3yfv4dk511bh5bd0cdmwkixwcg17r037nmj3z0xdhg"; + name = "artikulate-18.04.0.tar.xz"; }; }; audiocd-kio = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz"; - sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26"; - name = "audiocd-kio-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/audiocd-kio-18.04.0.tar.xz"; + sha256 = "0rf8gk8wymk6lff5g4ivx5lfl31rml1ag40fq78nrvnw0sxkm2b1"; + name = "audiocd-kio-18.04.0.tar.xz"; }; }; baloo-widgets = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz"; - sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h"; - name = "baloo-widgets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz"; + sha256 = "1y1wxgwyjdarw6sj7mrsqgljh2fib0vcwwd0nzbnn8ys1v8gqyxj"; + name = "baloo-widgets-18.04.0.tar.xz"; }; }; blinken = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz"; - sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0"; - name = "blinken-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/blinken-18.04.0.tar.xz"; + sha256 = "19chf9d9d537a5daqca1i4a58gmxz98x4i5palqs3635w1655ln9"; + name = "blinken-18.04.0.tar.xz"; }; }; bomber = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz"; - sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s"; - name = "bomber-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/bomber-18.04.0.tar.xz"; + sha256 = "1vzqmjkxlw2v63f49ix63p6ypjgg31j8r0rzmq8m41262m3pp0sn"; + name = "bomber-18.04.0.tar.xz"; }; }; bovo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz"; - sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9"; - name = "bovo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/bovo-18.04.0.tar.xz"; + sha256 = "1p4s7kjrjndcqkrkk3y7dqvyfdrn1yy5id3z3wj06ciwpygvv500"; + name = "bovo-18.04.0.tar.xz"; }; }; calendarsupport = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz"; - sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84"; - name = "calendarsupport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/calendarsupport-18.04.0.tar.xz"; + sha256 = "0hd1pbqjd75d8fm86b358xd8dni019b2190ly2r3armanjcmdc4r"; + name = "calendarsupport-18.04.0.tar.xz"; }; }; cantor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz"; - sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w"; - name = "cantor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz"; + sha256 = "1zkpa0ihkylzdf5wlywdvnf34dk21nj5cyczjyh9x5psbr6q0151"; + name = "cantor-18.04.0.tar.xz"; }; }; cervisia = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz"; - sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr"; - name = "cervisia-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/cervisia-18.04.0.tar.xz"; + sha256 = "1ji8i0k6rzmgshpgpk613vkn6kvdwb0ns32cp19j0bd5ljr701wq"; + name = "cervisia-18.04.0.tar.xz"; }; }; dolphin = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz"; - sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20"; - name = "dolphin-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz"; + sha256 = "0lvdpa3mq6mhfl97a4q1wwg22zccwjf7ja1mbz1dlbjfnck8l1mm"; + name = "dolphin-18.04.0.tar.xz"; }; }; dolphin-plugins = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz"; - sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf"; - name = "dolphin-plugins-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dolphin-plugins-18.04.0.tar.xz"; + sha256 = "10kdf2h8i1jnbsnx9j4c8zs6ryakinhxrggrid038xqgxm4fyxcq"; + name = "dolphin-plugins-18.04.0.tar.xz"; }; }; dragon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz"; - sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4"; - name = "dragon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dragon-18.04.0.tar.xz"; + sha256 = "0maxlhac9znqsm7qf3c9g7vlramivy63wd8c9aj64c78jqj6l54w"; + name = "dragon-18.04.0.tar.xz"; }; }; eventviews = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz"; - sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc"; - name = "eventviews-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/eventviews-18.04.0.tar.xz"; + sha256 = "0ai0259ygriza057dn3l6kfapqc2zdp7prv7qrz0x2akssnvn5f3"; + name = "eventviews-18.04.0.tar.xz"; }; }; ffmpegthumbs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz"; - sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5"; - name = "ffmpegthumbs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz"; + sha256 = "08hirsm7gbk51i76kkavv50z3289zvphmkfh26lh6rg123f003i6"; + name = "ffmpegthumbs-18.04.0.tar.xz"; }; }; filelight = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz"; - sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf"; - name = "filelight-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/filelight-18.04.0.tar.xz"; + sha256 = "1mk46a9x40yj7vfjgprhdhmx151lhkv8zb1i4rks01zjpq8bpa43"; + name = "filelight-18.04.0.tar.xz"; }; }; granatier = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz"; - sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x"; - name = "granatier-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/granatier-18.04.0.tar.xz"; + sha256 = "1vfp4wqv13qxj5vaiqd6hn07hvmdkyrcdicxn693yprn32gqrn33"; + name = "granatier-18.04.0.tar.xz"; }; }; grantlee-editor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz"; - sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4"; - name = "grantlee-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/grantlee-editor-18.04.0.tar.xz"; + sha256 = "04mw1mskfaqp7klwc0bdwfm3j365pwkwi0yhp86dggxzyisqbx9h"; + name = "grantlee-editor-18.04.0.tar.xz"; }; }; grantleetheme = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz"; - sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx"; - name = "grantleetheme-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz"; + sha256 = "1i3axg318skx2ifg8fln5blpyj6qnzb0r7frqb9prm0rawk6cr03"; + name = "grantleetheme-18.04.0.tar.xz"; }; }; gwenview = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz"; - sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr"; - name = "gwenview-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz"; + sha256 = "0i87k3f1g9w36rzr60c2xw6r41k7zgnbda51mpd3i8q5mvi8r4z5"; + name = "gwenview-18.04.0.tar.xz"; }; }; incidenceeditor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz"; - sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka"; - name = "incidenceeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/incidenceeditor-18.04.0.tar.xz"; + sha256 = "1z76lz8h0f6h81xvk690h1pz6i1ca4k2kcdvxxj99xm3fxdw5gi4"; + name = "incidenceeditor-18.04.0.tar.xz"; }; }; juk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz"; - sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6"; - name = "juk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/juk-18.04.0.tar.xz"; + sha256 = "0k0kiksqmnp14y3ymfiwg0amv4wyk2ls4cbdimbwg0mvpyvfnnqa"; + name = "juk-18.04.0.tar.xz"; }; }; k3b = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz"; - sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l"; - name = "k3b-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz"; + sha256 = "167x2mcxj4zq05brxzvhm157sis13xahkv79i9pzbgjb1zx17s3l"; + name = "k3b-18.04.0.tar.xz"; }; }; kaccounts-integration = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz"; - sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9"; - name = "kaccounts-integration-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz"; + sha256 = "09l1ycy4000mxx86hkqigbg803190r159d2yjsfrs7q5i2jrsl09"; + name = "kaccounts-integration-18.04.0.tar.xz"; }; }; kaccounts-providers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz"; - sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5"; - name = "kaccounts-providers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaccounts-providers-18.04.0.tar.xz"; + sha256 = "07ra8pjd89qklvb771wcczbxwll86caz07v43a7fhs3f70nwizia"; + name = "kaccounts-providers-18.04.0.tar.xz"; }; }; kaddressbook = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz"; - sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq"; - name = "kaddressbook-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaddressbook-18.04.0.tar.xz"; + sha256 = "0fi5nxhp93i1j4dym2yjsnvbxkqvqlanka3cnzbya4abdzrjd9ir"; + name = "kaddressbook-18.04.0.tar.xz"; }; }; kajongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz"; - sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa"; - name = "kajongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz"; + sha256 = "0cbgy6zkjd5yd6ybm9v7gvp2hs99m7m8w2my36fqp1sczghjs7x5"; + name = "kajongg-18.04.0.tar.xz"; }; }; kalarm = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz"; - sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7"; - name = "kalarm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalarm-18.04.0.tar.xz"; + sha256 = "0v4zfv48n116j68cfd34vlgk9jyr1zfc8i36i7gjkaq2x9m80g02"; + name = "kalarm-18.04.0.tar.xz"; }; }; kalarmcal = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz"; - sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km"; - name = "kalarmcal-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalarmcal-18.04.0.tar.xz"; + sha256 = "0npvwjzrxyf447xyq4kbx5wh94fv7clfjvikwnla9l0s8xwv9gf7"; + name = "kalarmcal-18.04.0.tar.xz"; }; }; kalgebra = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz"; - sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7"; - name = "kalgebra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalgebra-18.04.0.tar.xz"; + sha256 = "0qk9dchqlklbxssmhfz38s792nidlfh1bkhrmxh5kvpkjziqg7k6"; + name = "kalgebra-18.04.0.tar.xz"; }; }; kalzium = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz"; - sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h"; - name = "kalzium-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalzium-18.04.0.tar.xz"; + sha256 = "02c51r4pqj9iyy2wzrilpzd5z8b1lvbv2mian2qr1psi56l3magv"; + name = "kalzium-18.04.0.tar.xz"; }; }; kamera = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz"; - sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9"; - name = "kamera-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kamera-18.04.0.tar.xz"; + sha256 = "07p51jjp0lj04gfs1mfbg6k6cdh6ms55yjcag7qhcz32ism0y1vc"; + name = "kamera-18.04.0.tar.xz"; + }; + }; + kamoso = { + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz"; + sha256 = "1d7989jr3g02yh10hmnf8mlqypp35xll52v5q6jjqrzbfcmna7dk"; + name = "kamoso-18.04.0.tar.xz"; }; }; kanagram = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz"; - sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k"; - name = "kanagram-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kanagram-18.04.0.tar.xz"; + sha256 = "1drz8641ns1c1070a98w2wasyvf5nc6jrpn1pzfqmv9bljxrmyrc"; + name = "kanagram-18.04.0.tar.xz"; }; }; kapman = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz"; - sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z"; - name = "kapman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kapman-18.04.0.tar.xz"; + sha256 = "0cpsm35sah99rxy42v5isd90w0j839537jmjck4lg40dx38sdz7m"; + name = "kapman-18.04.0.tar.xz"; }; }; kapptemplate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz"; - sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3"; - name = "kapptemplate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kapptemplate-18.04.0.tar.xz"; + sha256 = "1w61s7bj34vq3s9ca3d6kyv9k43qirnyj4mw73wfpxf6ldx19yzp"; + name = "kapptemplate-18.04.0.tar.xz"; }; }; kate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz"; - sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5"; - name = "kate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kate-18.04.0.tar.xz"; + sha256 = "04kb8ynkq6xwmjbrgfg4zv652p3zgr2127f6sb8sq0j9qy55pvq5"; + name = "kate-18.04.0.tar.xz"; }; }; katomic = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz"; - sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl"; - name = "katomic-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/katomic-18.04.0.tar.xz"; + sha256 = "119v88k2l1bpmf1gm9njkfv90pv595wwjlzkap06c6rx95scpi0q"; + name = "katomic-18.04.0.tar.xz"; + }; + }; + kbackup = { + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kbackup-18.04.0.tar.xz"; + sha256 = "0vayj48zgblsphwffs6b0xphzair6sywy0ksp6ab9x64n8f1mw5q"; + name = "kbackup-18.04.0.tar.xz"; }; }; kblackbox = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz"; - sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm"; - name = "kblackbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblackbox-18.04.0.tar.xz"; + sha256 = "1gpjnic6n4kyh7b6x0mb9162qv223fs6lm7iqh6qxwkixcp06qlx"; + name = "kblackbox-18.04.0.tar.xz"; }; }; kblocks = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz"; - sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2"; - name = "kblocks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblocks-18.04.0.tar.xz"; + sha256 = "1y2h1nwgr67b05ggl2v34jh097mzbljhz9ji332xv4vf2rffwqar"; + name = "kblocks-18.04.0.tar.xz"; }; }; kblog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz"; - sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb"; - name = "kblog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblog-18.04.0.tar.xz"; + sha256 = "1jnsd6fw3pyip71a2cw65y9yrm4zwczh0770n15jcg5yn5whswgs"; + name = "kblog-18.04.0.tar.xz"; }; }; kbounce = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz"; - sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw"; - name = "kbounce-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbounce-18.04.0.tar.xz"; + sha256 = "15926m75gysd6gl2vg7d08y4m0cnfazc9jlyx0cnb8a5nfzh5z21"; + name = "kbounce-18.04.0.tar.xz"; }; }; kbreakout = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz"; - sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c"; - name = "kbreakout-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbreakout-18.04.0.tar.xz"; + sha256 = "0i5pbiimrn2bkq94ggwlx7jhfw4wna5srgffa5531jpn28gq456n"; + name = "kbreakout-18.04.0.tar.xz"; }; }; kbruch = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz"; - sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r"; - name = "kbruch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbruch-18.04.0.tar.xz"; + sha256 = "0s7r0hqy4nyrg0ndrb93pd8akldc5k8xx31m4jc8gi23aqvz5wwk"; + name = "kbruch-18.04.0.tar.xz"; }; }; kcachegrind = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz"; - sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd"; - name = "kcachegrind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcachegrind-18.04.0.tar.xz"; + sha256 = "0f6f8wx0kffhhzjjcdn47m3428jbh95nzajm8vhbs789h69ax2a0"; + name = "kcachegrind-18.04.0.tar.xz"; }; }; kcalc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz"; - sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j"; - name = "kcalc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalc-18.04.0.tar.xz"; + sha256 = "03q09q5whg1wfgm30p426hlljignjs0lvwfak2n4ka9ggyk3vc9d"; + name = "kcalc-18.04.0.tar.xz"; }; }; kcalcore = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz"; - sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z"; - name = "kcalcore-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz"; + sha256 = "0g4gm47yniy4f11v6rhs3gp2lk8dcrnw8ajchz88s7spii0riv2m"; + name = "kcalcore-18.04.0.tar.xz"; }; }; kcalutils = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz"; - sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb"; - name = "kcalutils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz"; + sha256 = "1hh3gd81bfkbyr7qvppk8iaywac77y55rwkpvbvin62snipw6ap1"; + name = "kcalutils-18.04.0.tar.xz"; }; }; kcharselect = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz"; - sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4"; - name = "kcharselect-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcharselect-18.04.0.tar.xz"; + sha256 = "08qgwfz23634wv0fw0rx162rcav5fivsp63srdf4c6my5151nxa9"; + name = "kcharselect-18.04.0.tar.xz"; }; }; kcolorchooser = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz"; - sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl"; - name = "kcolorchooser-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcolorchooser-18.04.0.tar.xz"; + sha256 = "02lqg4ra2nrkfnlhirs148bsd3b5a1j81s9z84wg11z8havrabfn"; + name = "kcolorchooser-18.04.0.tar.xz"; }; }; kcontacts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz"; - sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl"; - name = "kcontacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcontacts-18.04.0.tar.xz"; + sha256 = "0ja9xbpvv6klwwg0rzppxhfj2nfb7dydadxw5f9471rzniywn1xb"; + name = "kcontacts-18.04.0.tar.xz"; }; }; kcron = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz"; - sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf"; - name = "kcron-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcron-18.04.0.tar.xz"; + sha256 = "0pm532pajm7kbzg7w7azi5qx5xnkc9k5crxbahpw8n32lq34lm18"; + name = "kcron-18.04.0.tar.xz"; }; }; kdav = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz"; - sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4"; - name = "kdav-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdav-18.04.0.tar.xz"; + sha256 = "159bll2b3anxj5i7i92cqsz7hqm66n5ihlzk1g7waqdc9b429hr2"; + name = "kdav-18.04.0.tar.xz"; }; }; kdebugsettings = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz"; - sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr"; - name = "kdebugsettings-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz"; + sha256 = "0fr5a0k9jv8zkzv7fl7r71c2gbd1jj3c0vwpyf5riskymznnrx9g"; + name = "kdebugsettings-18.04.0.tar.xz"; }; }; kde-dev-scripts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz"; - sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554"; - name = "kde-dev-scripts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz"; + sha256 = "0nnrzpqgzmfg3msx6vqc8js7yzdpscm9599pr4xs4jl4cx5m8vp8"; + name = "kde-dev-scripts-18.04.0.tar.xz"; }; }; kde-dev-utils = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz"; - sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6"; - name = "kde-dev-utils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kde-dev-utils-18.04.0.tar.xz"; + sha256 = "020dyzf078l91rs7sl1dkdbd08viizinsmbvf1f0kfbkfysccfci"; + name = "kde-dev-utils-18.04.0.tar.xz"; }; }; kdeedu-data = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz"; - sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr"; - name = "kdeedu-data-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz"; + sha256 = "0rx9ymyv6x29fwl6hvznvylq6gvw992rg3l8mk4qmmzjs4rbjb5q"; + name = "kdeedu-data-18.04.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz"; - sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j"; - name = "kdegraphics-mobipocket-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz"; + sha256 = "01g00k3yqsrahslshybd1azd9w0vgmacfs0yrz5ia93amw4azfhn"; + name = "kdegraphics-mobipocket-18.04.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz"; - sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4"; - name = "kdegraphics-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz"; + sha256 = "1j04bwp9hc9jc7si6jgg4y61jqic27zj094nv2xpwrxnnaz4y4nh"; + name = "kdegraphics-thumbnailers-18.04.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz"; - sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh"; - name = "kdenetwork-filesharing-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz"; + sha256 = "1qfd7jr171bc4alm139hhdiv9q0x8y7mhrkyb7qspr7a8ki8j5cg"; + name = "kdenetwork-filesharing-18.04.0.tar.xz"; }; }; kdenlive = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz"; - sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp"; - name = "kdenlive-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdenlive-18.04.0.tar.xz"; + sha256 = "0v54cisilijdq0hyl38fhz0m7lpvphqjvx046ighcqxbrcg6pgah"; + name = "kdenlive-18.04.0.tar.xz"; }; }; kdepim-addons = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz"; - sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h"; - name = "kdepim-addons-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz"; + sha256 = "0rcfx07cvpm22kskwry78wzhglpc0vzxavmjydi24lll9ac12mvc"; + name = "kdepim-addons-18.04.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz"; - sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24"; - name = "kdepim-apps-libs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz"; + sha256 = "1ax5y6cdw7klgxky121mk8ilpm257bc8h90pc89ziha888l39wgz"; + name = "kdepim-apps-libs-18.04.0.tar.xz"; }; }; kdepim-runtime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz"; - sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn"; - name = "kdepim-runtime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz"; + sha256 = "1pxbrr3rcm3yr7il5abz9r06xvd0j1hsphbskjyphylb3r0xv7mz"; + name = "kdepim-runtime-18.04.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz"; - sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa"; - name = "kdesdk-kioslaves-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz"; + sha256 = "18w55iism0b26m6v1j6qlpa4y8zdc12bbc8hi8rwz6nyra2a4r6h"; + name = "kdesdk-kioslaves-18.04.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz"; - sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci"; - name = "kdesdk-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz"; + sha256 = "1gsfn3km6dggnwav17vrbv077dj6xsxixjqrypqf8v5n29vzl72g"; + name = "kdesdk-thumbnailers-18.04.0.tar.xz"; }; }; kdf = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz"; - sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp"; - name = "kdf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdf-18.04.0.tar.xz"; + sha256 = "1dxm9q25a9vjja3cx7zd9afx08i84l498sykbnvflf56qq6p9jdv"; + name = "kdf-18.04.0.tar.xz"; }; }; kdialog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz"; - sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4"; - name = "kdialog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdialog-18.04.0.tar.xz"; + sha256 = "0ni5imk1a153j4n923im3rs3g691cwlw3g180wcarrg7iads6icn"; + name = "kdialog-18.04.0.tar.xz"; }; }; kdiamond = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz"; - sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc"; - name = "kdiamond-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdiamond-18.04.0.tar.xz"; + sha256 = "0gzxpk3llgh45w3iwbqsshv4mc4whshv7zwaz8ik4wpp9kc72xj9"; + name = "kdiamond-18.04.0.tar.xz"; }; }; keditbookmarks = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz"; - sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya"; - name = "keditbookmarks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/keditbookmarks-18.04.0.tar.xz"; + sha256 = "18x6cgligwqqj20q69ins33fvkz3is8a11nkp4zx3kb9q50xsdv7"; + name = "keditbookmarks-18.04.0.tar.xz"; }; }; kfind = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz"; - sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s"; - name = "kfind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfind-18.04.0.tar.xz"; + sha256 = "11wgdyparz26gqxlbnawwmhjr2lkqa1j0qqwmiihs0pxfq6q9arw"; + name = "kfind-18.04.0.tar.xz"; }; }; kfloppy = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz"; - sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p"; - name = "kfloppy-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfloppy-18.04.0.tar.xz"; + sha256 = "039lryi6nk69d054svm0yq5x4yd8pja6f8fx0q2wqpnffrsis5yj"; + name = "kfloppy-18.04.0.tar.xz"; }; }; kfourinline = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz"; - sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw"; - name = "kfourinline-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfourinline-18.04.0.tar.xz"; + sha256 = "101h7y2vmg966h92k6360qc3rrgcwvnhg2lz09yffgwf8mqyp19q"; + name = "kfourinline-18.04.0.tar.xz"; }; }; kgeography = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz"; - sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih"; - name = "kgeography-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgeography-18.04.0.tar.xz"; + sha256 = "1syky2a8crh5vrn3419a1rzv37ld0kh9llkmcszm9h8jaqdsiw5v"; + name = "kgeography-18.04.0.tar.xz"; }; }; kget = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz"; - sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww"; - name = "kget-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kget-18.04.0.tar.xz"; + sha256 = "16dj0w8rkiybhdcgp9cf4r50nh790psx4b9xxqgfnab3b8lq35mx"; + name = "kget-18.04.0.tar.xz"; }; }; kgoldrunner = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz"; - sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx"; - name = "kgoldrunner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgoldrunner-18.04.0.tar.xz"; + sha256 = "0ydhz0pm0adwjrbsiqkq6d1cs6l8nw2cj4mxf36144gs333nly1z"; + name = "kgoldrunner-18.04.0.tar.xz"; }; }; kgpg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz"; - sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp"; - name = "kgpg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgpg-18.04.0.tar.xz"; + sha256 = "1ayyzc7vwdrhp2pc41yh01lkc9n0q4icy05z6yg14si0c7a62s78"; + name = "kgpg-18.04.0.tar.xz"; }; }; khangman = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz"; - sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk"; - name = "khangman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/khangman-18.04.0.tar.xz"; + sha256 = "01xmvljp3z4x4aihbz4b22avh10hhnvv8y8jy0nd3pggln4mj15c"; + name = "khangman-18.04.0.tar.xz"; }; }; khelpcenter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz"; - sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n"; - name = "khelpcenter-17.12.3.tar.xz"; - }; - }; - kholidays = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz"; - sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di"; - name = "kholidays-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/khelpcenter-18.04.0.tar.xz"; + sha256 = "1pc6dd4rn4c636sn8lbkdq2svijrpp4fcgf76infk7dsqrxrgnsr"; + name = "khelpcenter-18.04.0.tar.xz"; }; }; kidentitymanagement = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz"; - sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y"; - name = "kidentitymanagement-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz"; + sha256 = "129a38ajkpzgm2z921riyawlnx70c41ln3z7hvx159x3ghcsacyw"; + name = "kidentitymanagement-18.04.0.tar.xz"; }; }; kig = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz"; - sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid"; - name = "kig-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kig-18.04.0.tar.xz"; + sha256 = "1djy20lcs50ykb99akhfw873br9q0x72r3pma6mv69dpv5jpk3v3"; + name = "kig-18.04.0.tar.xz"; }; }; kigo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz"; - sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh"; - name = "kigo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kigo-18.04.0.tar.xz"; + sha256 = "0jqkab57z0xhbxf2hcagg5b0pgn2z4dnzirp6ccfybl835nwr4rp"; + name = "kigo-18.04.0.tar.xz"; }; }; killbots = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz"; - sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an"; - name = "killbots-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/killbots-18.04.0.tar.xz"; + sha256 = "10j82a9yv5v21pp9249nzm42ys104ickwavqys5j43230h0qlyl2"; + name = "killbots-18.04.0.tar.xz"; }; }; kimagemapeditor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz"; - sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn"; - name = "kimagemapeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz"; + sha256 = "01cy4nfi9gzgyfqb16vsy3b15bgag0g3dz2l9v0d4fijxpf157br"; + name = "kimagemapeditor-18.04.0.tar.xz"; }; }; kimap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz"; - sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw"; - name = "kimap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kimap-18.04.0.tar.xz"; + sha256 = "1l22fzslf0zrr230hq17rfg88ifngfwcc1n0v3fzpxnia4cm68by"; + name = "kimap-18.04.0.tar.xz"; }; }; kio-extras = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz"; - sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks"; - name = "kio-extras-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz"; + sha256 = "15icgvanjhvxi2k9hihadvxnx2jpjp2r3gy89brvdsh8lhj9kzil"; + name = "kio-extras-18.04.0.tar.xz"; }; }; kiriki = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz"; - sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q"; - name = "kiriki-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kiriki-18.04.0.tar.xz"; + sha256 = "0m98fqnrk1vinkammf5fjkbvj5wwk45v8m4m951nvn0wpzrb0clf"; + name = "kiriki-18.04.0.tar.xz"; }; }; kiten = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz"; - sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5"; - name = "kiten-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kiten-18.04.0.tar.xz"; + sha256 = "1xk58q89hdpy4fhk8ic2ybf60d0xgwfm6ay1gny4qb6klr5xx7ah"; + name = "kiten-18.04.0.tar.xz"; }; }; kjumpingcube = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz"; - sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l"; - name = "kjumpingcube-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kjumpingcube-18.04.0.tar.xz"; + sha256 = "1j9v6j3yams0azdc27g76x3baz6wcw173lam5r8z0q5f6xayv9zl"; + name = "kjumpingcube-18.04.0.tar.xz"; }; }; kldap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz"; - sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy"; - name = "kldap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kldap-18.04.0.tar.xz"; + sha256 = "1fjh6insnmnl4yk5n11bsp9xrhyzkb7cf3vsbx6yjn13gwg06xm9"; + name = "kldap-18.04.0.tar.xz"; }; }; kleopatra = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz"; - sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd"; - name = "kleopatra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz"; + sha256 = "1lqqhy0pyv8v9x20if6sjklbmfnjmip4nfm0adp5wh7r3n9c0908"; + name = "kleopatra-18.04.0.tar.xz"; }; }; klettres = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz"; - sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0"; - name = "klettres-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klettres-18.04.0.tar.xz"; + sha256 = "0x2vj449dgzlyhyagdcs5f12rd3w025iq5q8qcsml7mnr5vy06n3"; + name = "klettres-18.04.0.tar.xz"; }; }; klickety = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz"; - sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8"; - name = "klickety-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klickety-18.04.0.tar.xz"; + sha256 = "1l81xk00bkbxm9fmqjyphf8wijgxp979kfsflvy7zyzga43k64fc"; + name = "klickety-18.04.0.tar.xz"; }; }; klines = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz"; - sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0"; - name = "klines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klines-18.04.0.tar.xz"; + sha256 = "1axp8mv1hxdddw86wsd6dkv7cbzk5b3lswqvwxdbbrpsq8j8vjz1"; + name = "klines-18.04.0.tar.xz"; }; }; kmag = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz"; - sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w"; - name = "kmag-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmag-18.04.0.tar.xz"; + sha256 = "1yaryycwy5h3pafzsvn4xr96p96j3a3302x6y73i9xm94nz7a60f"; + name = "kmag-18.04.0.tar.xz"; }; }; kmahjongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz"; - sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a"; - name = "kmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmahjongg-18.04.0.tar.xz"; + sha256 = "191cl5cnq6q8b3fr22frfwrg0a2bqf9c2x454ab0ysc2qapblfkx"; + name = "kmahjongg-18.04.0.tar.xz"; }; }; kmail = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz"; - sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs"; - name = "kmail-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz"; + sha256 = "1faw94imrr30bg155zs4hszfbv9fszywyk1v24d0l03vyh4w0x8r"; + name = "kmail-18.04.0.tar.xz"; }; }; kmail-account-wizard = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz"; - sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx"; - name = "kmail-account-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz"; + sha256 = "0sgasycw0ixh6c04kibyii6f5aygkhwanidnmidhgdnqhgcg31gp"; + name = "kmail-account-wizard-18.04.0.tar.xz"; }; }; kmailtransport = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz"; - sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0"; - name = "kmailtransport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz"; + sha256 = "122zcgz9vlqzmr2xy4msrzg9ajvyjlwcf7g4br7bja42f5nk704f"; + name = "kmailtransport-18.04.0.tar.xz"; }; }; kmbox = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz"; - sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm"; - name = "kmbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmbox-18.04.0.tar.xz"; + sha256 = "0qljbixj2jka8sngavi41jjcssy293acy1d6syjyagad7z5f0d0k"; + name = "kmbox-18.04.0.tar.xz"; }; }; kmime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz"; - sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm"; - name = "kmime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmime-18.04.0.tar.xz"; + sha256 = "03hwvwdkb1176d837hbwm8wqj0bl29fdfzirgrp1yri4vadmhrqx"; + name = "kmime-18.04.0.tar.xz"; }; }; kmines = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz"; - sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9"; - name = "kmines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmines-18.04.0.tar.xz"; + sha256 = "0jyrynqqzk5dwwfd05kdzx5lc6cjkbhhp5l8ijyfwdqs63wzj705"; + name = "kmines-18.04.0.tar.xz"; }; }; kmix = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz"; - sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp"; - name = "kmix-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmix-18.04.0.tar.xz"; + sha256 = "0xq5jd5nrjb95lhc38n0b6kmmdbr2hrnpq8kvdywv6xazhb0h9mg"; + name = "kmix-18.04.0.tar.xz"; }; }; kmousetool = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz"; - sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z"; - name = "kmousetool-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmousetool-18.04.0.tar.xz"; + sha256 = "1n36myw2j43mnlawkymyv73l4xkpc5ynqalqka2jigdzqin87gr7"; + name = "kmousetool-18.04.0.tar.xz"; }; }; kmouth = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz"; - sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n"; - name = "kmouth-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz"; + sha256 = "03m4ia8s2qg6pnih6i8df3y2dxc8qcxwcnn7kyjd1ygw8i3gjkyk"; + name = "kmouth-18.04.0.tar.xz"; }; }; kmplot = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz"; - sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9"; - name = "kmplot-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmplot-18.04.0.tar.xz"; + sha256 = "1bl0sw58p4qnbka1kss2w3p0w7r91c29hg3h3ljxlarj8yg7z95v"; + name = "kmplot-18.04.0.tar.xz"; }; }; knavalbattle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz"; - sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f"; - name = "knavalbattle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knavalbattle-18.04.0.tar.xz"; + sha256 = "0hw5syv8csnx1myjdfsd96bxvqcg2c21fpcgmb9dc8gj4nzqqabv"; + name = "knavalbattle-18.04.0.tar.xz"; }; }; knetwalk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz"; - sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k"; - name = "knetwalk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knetwalk-18.04.0.tar.xz"; + sha256 = "0r3a9pa9nwhfg5xbp062dsaq8n20mrykfbcp52m9wlln8rwjiz1x"; + name = "knetwalk-18.04.0.tar.xz"; }; }; knotes = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz"; - sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3"; - name = "knotes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knotes-18.04.0.tar.xz"; + sha256 = "1gkz3vrsj9irzyhc1djvmkbikiqxn7bgv913ynax8akbbmlh9xlh"; + name = "knotes-18.04.0.tar.xz"; }; }; kolf = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz"; - sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj"; - name = "kolf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz"; + sha256 = "0cjvm5xg09wnx5n5hz9w3ckxfyhnwxn423f4hm5c8qwij4gnsfsn"; + name = "kolf-18.04.0.tar.xz"; }; }; kollision = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz"; - sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz"; - name = "kollision-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kollision-18.04.0.tar.xz"; + sha256 = "03lkrdh11q4vmbc8a5hflsbk2w39ffr96r6rwazkas7svc2hky6i"; + name = "kollision-18.04.0.tar.xz"; }; }; kolourpaint = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz"; - sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w"; - name = "kolourpaint-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kolourpaint-18.04.0.tar.xz"; + sha256 = "18b01w44bp7hyhxyj5cbfhlmhvcr1bbi1j6i0j62h67sm9fy65vr"; + name = "kolourpaint-18.04.0.tar.xz"; }; }; kompare = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz"; - sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl"; - name = "kompare-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kompare-18.04.0.tar.xz"; + sha256 = "019z54h9dlcxy7hfzxrh0nh3l2jzc993jhdw4s70h7mf2yddl6zi"; + name = "kompare-18.04.0.tar.xz"; }; }; konqueror = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz"; - sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw"; - name = "konqueror-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz"; + sha256 = "0z7b8w47xs2wm13c82fkcf07qd7ikyi67dg8abfnxhvmri4bsxn2"; + name = "konqueror-18.04.0.tar.xz"; }; }; konquest = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz"; - sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli"; - name = "konquest-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konquest-18.04.0.tar.xz"; + sha256 = "0344hjkhq5czxi3wl9vfavli79lh7mqhk8qby0hj53xp6mqh7xfx"; + name = "konquest-18.04.0.tar.xz"; }; }; konsole = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz"; - sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs"; - name = "konsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konsole-18.04.0.tar.xz"; + sha256 = "0r2al3ja1fpkyyq7hrzis9pmkp54idivfmrj71rqk74jfjjjky2k"; + name = "konsole-18.04.0.tar.xz"; }; }; kontact = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz"; - sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas"; - name = "kontact-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kontact-18.04.0.tar.xz"; + sha256 = "14kpnfa2bl92frz6vssfs1q3065vsgl5bfgrgyvbbpxfviy5ciaz"; + name = "kontact-18.04.0.tar.xz"; }; }; kontactinterface = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz"; - sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks"; - name = "kontactinterface-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kontactinterface-18.04.0.tar.xz"; + sha256 = "12hmh1wxsxb1n1727qpmarhs83nziy93kb7a8xyahpkky82jn62x"; + name = "kontactinterface-18.04.0.tar.xz"; + }; + }; + kopete = { + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz"; + sha256 = "0p22yjpzrgqmdr74pw9pxasb25w9ikdgsrlbcq5yy95il1zppwfl"; + name = "kopete-18.04.0.tar.xz"; }; }; korganizer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz"; - sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40"; - name = "korganizer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/korganizer-18.04.0.tar.xz"; + sha256 = "02vyycpiqdfik2902pk97jz28s4nh2wax129y6n1mdxjjvw15gp2"; + name = "korganizer-18.04.0.tar.xz"; }; }; kpat = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz"; - sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh"; - name = "kpat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kpat-18.04.0.tar.xz"; + sha256 = "02s74cwyp3mpdc8xk6hky3p8s3svdwwkrdfbaxbkh6ysywbm7728"; + name = "kpat-18.04.0.tar.xz"; }; }; kpimtextedit = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz"; - sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c"; - name = "kpimtextedit-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz"; + sha256 = "101jj454b4p52yxzcp837075fp3lh3wnkjw8spcfb6k1rjf0ss68"; + name = "kpimtextedit-18.04.0.tar.xz"; }; }; kqtquickcharts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz"; - sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0"; - name = "kqtquickcharts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kqtquickcharts-18.04.0.tar.xz"; + sha256 = "1ccfgbm1dbrf0nkkpg7qzrpa0sjdv46cvdn7qc86qqqmbb96zij8"; + name = "kqtquickcharts-18.04.0.tar.xz"; }; }; krdc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz"; - sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps"; - name = "krdc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/krdc-18.04.0.tar.xz"; + sha256 = "11nk01vhpqlhgn7b928svvpdn5r9hbrc01248xzqkj16iwrdrqr9"; + name = "krdc-18.04.0.tar.xz"; }; }; kreversi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz"; - sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg"; - name = "kreversi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kreversi-18.04.0.tar.xz"; + sha256 = "1jbvsldl1g1ljl4mzn1l93gi5kb8jrzwqjzfga4dbribif8shmq8"; + name = "kreversi-18.04.0.tar.xz"; }; }; krfb = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz"; - sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv"; - name = "krfb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/krfb-18.04.0.tar.xz"; + sha256 = "1aq285jn4k0s9vwy99w2a1wm4nzwzjafz8a0gy47ydi0m29b1rkc"; + name = "krfb-18.04.0.tar.xz"; }; }; kross-interpreters = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz"; - sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s"; - name = "kross-interpreters-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz"; + sha256 = "15cbpq7cs0hnm42c03kyvyshfa10xdsajlbmsixzbmvks34c8b1y"; + name = "kross-interpreters-18.04.0.tar.xz"; }; }; kruler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz"; - sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa"; - name = "kruler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kruler-18.04.0.tar.xz"; + sha256 = "0bm1d8n0v4qg8jaciws247bda7q5nab0i80qlg2xb20lygi2fwwr"; + name = "kruler-18.04.0.tar.xz"; }; }; kshisen = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz"; - sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0"; - name = "kshisen-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kshisen-18.04.0.tar.xz"; + sha256 = "1m9wa59iz3p2x7zxngp2wqf99ab6p1gai3h0fb4zbqbib98jpmyf"; + name = "kshisen-18.04.0.tar.xz"; }; }; ksirk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz"; - sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz"; - name = "ksirk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz"; + sha256 = "0msw4lkrjj5ihbdg9ibjrk7ddcw933kqhbf6aap5jc4lz0r6y1d8"; + name = "ksirk-18.04.0.tar.xz"; }; }; ksmtp = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz"; - sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b"; - name = "ksmtp-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz"; + sha256 = "1r89wm8q4vxaqdd1j8qb84qr7zg1dfb731r7qypilvkcc8z1samn"; + name = "ksmtp-18.04.0.tar.xz"; }; }; ksnakeduel = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz"; - sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy"; - name = "ksnakeduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksnakeduel-18.04.0.tar.xz"; + sha256 = "04lpcp7l4xwnwk073yji84kaw16gi0ybkzlvcg1plpqj6w1y1y8w"; + name = "ksnakeduel-18.04.0.tar.xz"; }; }; kspaceduel = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz"; - sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6"; - name = "kspaceduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kspaceduel-18.04.0.tar.xz"; + sha256 = "04shgk89xfp3z26683mc9g612fmnqg01fp8qah7y8mbac3cv4f5i"; + name = "kspaceduel-18.04.0.tar.xz"; }; }; ksquares = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz"; - sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667"; - name = "ksquares-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksquares-18.04.0.tar.xz"; + sha256 = "17siqdj6l2g2rnaswdzipxlxxx8x4q5wb4z2rc12gf08fggxfmgn"; + name = "ksquares-18.04.0.tar.xz"; }; }; ksudoku = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz"; - sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n"; - name = "ksudoku-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksudoku-18.04.0.tar.xz"; + sha256 = "1slmfps0861n8p4rqc1ng4981v1jdyppzr990abadqzf344d3ab3"; + name = "ksudoku-18.04.0.tar.xz"; }; }; ksystemlog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz"; - sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr"; - name = "ksystemlog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz"; + sha256 = "164cfzfjya7yg5pzzpxzfr0r1yf6napvibpjs9y784fl4r2qb780"; + name = "ksystemlog-18.04.0.tar.xz"; }; }; kteatime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz"; - sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz"; - name = "kteatime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kteatime-18.04.0.tar.xz"; + sha256 = "0sm4kcq618qp5ihnvcw2zp0frnj21mmjapksy7q63skh9ncjgmj3"; + name = "kteatime-18.04.0.tar.xz"; }; }; ktimer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz"; - sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x"; - name = "ktimer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktimer-18.04.0.tar.xz"; + sha256 = "1mgjgs8j4wfkjq766w9lyc21h3l3cfv5qb5a3x1anc74y1vanksj"; + name = "ktimer-18.04.0.tar.xz"; }; }; ktnef = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz"; - sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n"; - name = "ktnef-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktnef-18.04.0.tar.xz"; + sha256 = "1rys8l7rmwzv79mwmm97yxfq8gsfz4sh6hf7bjq6zhc9q42n3r36"; + name = "ktnef-18.04.0.tar.xz"; }; }; ktouch = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz"; - sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795"; - name = "ktouch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktouch-18.04.0.tar.xz"; + sha256 = "10lwc2gz1gwghz95f1dgdv33n4rwly0f8maslv3hb47cr14c259v"; + name = "ktouch-18.04.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz"; - sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm"; - name = "ktp-accounts-kcm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz"; + sha256 = "1arcg0wabjqla5mc773vrbwd2abl5zwhhchf88f1i4krcv2crn3s"; + name = "ktp-accounts-kcm-18.04.0.tar.xz"; }; }; ktp-approver = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz"; - sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp"; - name = "ktp-approver-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-approver-18.04.0.tar.xz"; + sha256 = "0afgd08x857mi7s5br3m5q41k8rm77p6dnvb3idjsmv0m8324md4"; + name = "ktp-approver-18.04.0.tar.xz"; }; }; ktp-auth-handler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz"; - sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21"; - name = "ktp-auth-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz"; + sha256 = "1d7s1rqh231k57bygbyzxiz3cs9diqx4x2f7v66awm20la2p804y"; + name = "ktp-auth-handler-18.04.0.tar.xz"; }; }; ktp-call-ui = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz"; - sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m"; - name = "ktp-call-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-call-ui-18.04.0.tar.xz"; + sha256 = "1qffsq9nnhzlgmm42vg98g172361zra06wgpa7n8y3pvl9mwlrbm"; + name = "ktp-call-ui-18.04.0.tar.xz"; }; }; ktp-common-internals = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz"; - sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80"; - name = "ktp-common-internals-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-common-internals-18.04.0.tar.xz"; + sha256 = "0cvyw7rs8afi7c1dl58jmibzqy1jdnbkjqsxilnlkj5rmplg10av"; + name = "ktp-common-internals-18.04.0.tar.xz"; }; }; ktp-contact-list = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz"; - sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb"; - name = "ktp-contact-list-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-list-18.04.0.tar.xz"; + sha256 = "1384rps2wp1qgqq0jj1p9rjkg3gdrsjid87jhdjv95kjxc1a7a1y"; + name = "ktp-contact-list-18.04.0.tar.xz"; }; }; ktp-contact-runner = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz"; - sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq"; - name = "ktp-contact-runner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz"; + sha256 = "02hr0g619h30hr49rxs5yvwna6skzkvca03p9yy70ib22gzpfxli"; + name = "ktp-contact-runner-18.04.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz"; - sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj"; - name = "ktp-desktop-applets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz"; + sha256 = "09jfw3sn6yn4znir0rcgwwc5h1zp2vc39y4i7fi1rznhdagwy1ji"; + name = "ktp-desktop-applets-18.04.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz"; - sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8"; - name = "ktp-filetransfer-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz"; + sha256 = "1wc72ghl2v6bjrw1pb8h8ajigqhyb53nlhya2cqhdf1banpjv0n5"; + name = "ktp-filetransfer-handler-18.04.0.tar.xz"; }; }; ktp-kded-module = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz"; - sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp"; - name = "ktp-kded-module-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-kded-module-18.04.0.tar.xz"; + sha256 = "1845csv2ci5589iws49ma5qrkgs5q6hqb2hzrk6znr6w3d1smbbj"; + name = "ktp-kded-module-18.04.0.tar.xz"; }; }; ktp-send-file = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz"; - sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch"; - name = "ktp-send-file-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-send-file-18.04.0.tar.xz"; + sha256 = "137l6b4dpd78x8z99cpz0sp8f5lbdlvzkd2w742jsiylxchrjr5l"; + name = "ktp-send-file-18.04.0.tar.xz"; }; }; ktp-text-ui = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz"; - sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v"; - name = "ktp-text-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-text-ui-18.04.0.tar.xz"; + sha256 = "12hhfkjglqbd4qxhl10xczk9ha0j494vjldkg05lhm0l233zr9km"; + name = "ktp-text-ui-18.04.0.tar.xz"; }; }; ktuberling = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz"; - sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4"; - name = "ktuberling-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktuberling-18.04.0.tar.xz"; + sha256 = "12mrb0a5k5z02mjwdn8vlcwr8jxwp7x2f04wzac749csyn0sj86d"; + name = "ktuberling-18.04.0.tar.xz"; }; }; kturtle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz"; - sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8"; - name = "kturtle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kturtle-18.04.0.tar.xz"; + sha256 = "0vm28xngj52l6fs7sd54wg4fhss131kh6ihs1ibnzi9in0hvga62"; + name = "kturtle-18.04.0.tar.xz"; }; }; kubrick = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz"; - sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp"; - name = "kubrick-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kubrick-18.04.0.tar.xz"; + sha256 = "0as99qx9vi6zcx61kai7y3ym4vzm8r7ma4p0a2z8rxymps1nk3dy"; + name = "kubrick-18.04.0.tar.xz"; }; }; kwalletmanager = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz"; - sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1"; - name = "kwalletmanager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwalletmanager-18.04.0.tar.xz"; + sha256 = "1f4124bm86aqbv36v961jca647vvxrlssq5ydnvi1yfx0saza94q"; + name = "kwalletmanager-18.04.0.tar.xz"; }; }; kwave = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz"; - sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng"; - name = "kwave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwave-18.04.0.tar.xz"; + sha256 = "1bw6lcl95aqcvzp2z31krdaiq0hfhndicynarai58rcg2ngbsm53"; + name = "kwave-18.04.0.tar.xz"; }; }; kwordquiz = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz"; - sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx"; - name = "kwordquiz-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwordquiz-18.04.0.tar.xz"; + sha256 = "1rfr1hc6xkciyx5wknzikf4ml1sgcqj8lflxpksdsg9m5nk7w73y"; + name = "kwordquiz-18.04.0.tar.xz"; }; }; libgravatar = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz"; - sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm"; - name = "libgravatar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libgravatar-18.04.0.tar.xz"; + sha256 = "1wzfvp5acdkpj37bg1hphy0fszvbakzx0azg56zk0h9526h6qrq1"; + name = "libgravatar-18.04.0.tar.xz"; }; }; libkcddb = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz"; - sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi"; - name = "libkcddb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz"; + sha256 = "1967in5041lyjapi3avlns1g7ps8sqvq547gw13snhkjn0dbs1aa"; + name = "libkcddb-18.04.0.tar.xz"; }; }; libkcompactdisc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz"; - sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v"; - name = "libkcompactdisc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkcompactdisc-18.04.0.tar.xz"; + sha256 = "01c1pmb2v7bd03jdkwdw4l37736ad8igrrwa9cf5jwg6q5ps9xgb"; + name = "libkcompactdisc-18.04.0.tar.xz"; }; }; libkdcraw = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz"; - sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc"; - name = "libkdcraw-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdcraw-18.04.0.tar.xz"; + sha256 = "04gc0m4ndkx02yavqmc5xh488rmxw5ppicv902iby0m9ywrjinik"; + name = "libkdcraw-18.04.0.tar.xz"; }; }; libkdegames = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz"; - sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd"; - name = "libkdegames-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdegames-18.04.0.tar.xz"; + sha256 = "09wxdvd2ahhh11ncylh5il5fbx1jx6jpwzp1r18cx5k71fw2idp6"; + name = "libkdegames-18.04.0.tar.xz"; }; }; libkdepim = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz"; - sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q"; - name = "libkdepim-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdepim-18.04.0.tar.xz"; + sha256 = "0m3rlwdy010v4s3157w8jlb6ahcmn4frqxp1ibachpmz6y77gkkq"; + name = "libkdepim-18.04.0.tar.xz"; }; }; libkeduvocdocument = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz"; - sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v"; - name = "libkeduvocdocument-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz"; + sha256 = "1g10c955gy0530xypr62x9dp4736s6qwr5afb90nlj8rhnq2zmbw"; + name = "libkeduvocdocument-18.04.0.tar.xz"; }; }; libkexiv2 = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz"; - sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg"; - name = "libkexiv2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkexiv2-18.04.0.tar.xz"; + sha256 = "11ydba6jdvyvp3j3zzy7gjcmz20zv6nwg07r00xgs34y9n50rhzy"; + name = "libkexiv2-18.04.0.tar.xz"; }; }; libkgapi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz"; - sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y"; - name = "libkgapi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkgapi-18.04.0.tar.xz"; + sha256 = "0bp7y1wjajzzq6q3sygl2vxk685k5hmcvy1i42q5fph28q2b0dli"; + name = "libkgapi-18.04.0.tar.xz"; }; }; libkgeomap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz"; - sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi"; - name = "libkgeomap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkgeomap-18.04.0.tar.xz"; + sha256 = "0814ql6xpj02sirmz9crn649rabqclhzjnrlk47isgjwsgk5kqmh"; + name = "libkgeomap-18.04.0.tar.xz"; }; }; libkipi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz"; - sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq"; - name = "libkipi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkipi-18.04.0.tar.xz"; + sha256 = "10d7yb6psrj1xl34pkhw6fpmja7mk8bkq80id0snc5nxlr0v1jdb"; + name = "libkipi-18.04.0.tar.xz"; }; }; libkleo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz"; - sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k"; - name = "libkleo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkleo-18.04.0.tar.xz"; + sha256 = "179abszgi7nm763cvyqi2274x7107vb4irblsdfkqmlp924xssdd"; + name = "libkleo-18.04.0.tar.xz"; }; }; libkmahjongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz"; - sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd"; - name = "libkmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkmahjongg-18.04.0.tar.xz"; + sha256 = "1grsyjsghjk3ikj7lpib3k94qcsz6r1l3czcawwamf2m83jydk2k"; + name = "libkmahjongg-18.04.0.tar.xz"; }; }; libkomparediff2 = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz"; - sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l"; - name = "libkomparediff2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkomparediff2-18.04.0.tar.xz"; + sha256 = "0vzq25q9hihv8np0l0jdyfipf3w86wm6y7n46dhhqkqw380wrxwy"; + name = "libkomparediff2-18.04.0.tar.xz"; }; }; libksane = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz"; - sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2"; - name = "libksane-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libksane-18.04.0.tar.xz"; + sha256 = "1vc7z3dzr0nk3rrfq96p6phbb3rfnkn6wpjnzmc66f4mvq96hn7i"; + name = "libksane-18.04.0.tar.xz"; }; }; libksieve = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz"; - sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433"; - name = "libksieve-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz"; + sha256 = "16x419wzpyl9jj4q49rwmfm75x6minwrg0jvkad5kh541r52a5bn"; + name = "libksieve-18.04.0.tar.xz"; }; }; lokalize = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz"; - sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9"; - name = "lokalize-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz"; + sha256 = "19j0jqn3xzawsyy4fzsy3c2hrjp9920bihzpbq8yalws6w0v8li4"; + name = "lokalize-18.04.0.tar.xz"; }; }; lskat = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz"; - sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0"; - name = "lskat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/lskat-18.04.0.tar.xz"; + sha256 = "1dk73c6v5h5abx5244rnjjfxi2cn2sya1jav3020nif111c2c9f7"; + name = "lskat-18.04.0.tar.xz"; }; }; mailcommon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz"; - sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f"; - name = "mailcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz"; + sha256 = "10psdddw3wzyalh5662rvq68l8i9sxmcl5pavgn03np3g3fws8fd"; + name = "mailcommon-18.04.0.tar.xz"; }; }; mailimporter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz"; - sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc"; - name = "mailimporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mailimporter-18.04.0.tar.xz"; + sha256 = "0wwclx24bfczqxvcf5jdfpqa9cx0dv9ygsj5blaqk9g5pgych5hi"; + name = "mailimporter-18.04.0.tar.xz"; }; }; marble = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz"; - sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i"; - name = "marble-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/marble-18.04.0.tar.xz"; + sha256 = "0q1dr2p4qwcik86fcr0jqvplkwfnj14fysqcqk2pwwdkfnqlsppv"; + name = "marble-18.04.0.tar.xz"; }; }; mbox-importer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz"; - sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp"; - name = "mbox-importer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mbox-importer-18.04.0.tar.xz"; + sha256 = "1kai38svb4bsj1kfhyv94sgxqavj4fgb4laxl2sxvwah3rk6avd5"; + name = "mbox-importer-18.04.0.tar.xz"; }; }; messagelib = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz"; - sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald"; - name = "messagelib-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz"; + sha256 = "14nn6aw1831j0iwwb7d4swxh6i4855izglmifq2ijsbpbdqsq5p2"; + name = "messagelib-18.04.0.tar.xz"; }; }; minuet = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz"; - sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b"; - name = "minuet-17.12.3.tar.xz"; - }; - }; - okteta = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz"; - sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; - name = "okteta-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/minuet-18.04.0.tar.xz"; + sha256 = "0fdyv0qbj04pxsbyvrmbqs7bff7cld28iyw7n8lgv2gdm3n45vbh"; + name = "minuet-18.04.0.tar.xz"; }; }; okular = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz"; - sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha"; - name = "okular-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/okular-18.04.0.tar.xz"; + sha256 = "1ywzpdahnfc0ydvpidphdyh61ql7zwk4m6cpfj2zg9njh276w1d8"; + name = "okular-18.04.0.tar.xz"; }; }; palapeli = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz"; - sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln"; - name = "palapeli-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz"; + sha256 = "0m4h5h15qcqdhlrsi73c8jxkb3zhz07m2jw3r37603w4g6jk9g8b"; + name = "palapeli-18.04.0.tar.xz"; }; }; parley = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz"; - sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6"; - name = "parley-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/parley-18.04.0.tar.xz"; + sha256 = "0h87zfqssbbvwyvar9yf8hv53bdpv7arncs63l6hfr6ajspla9if"; + name = "parley-18.04.0.tar.xz"; }; }; picmi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz"; - sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn"; - name = "picmi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/picmi-18.04.0.tar.xz"; + sha256 = "1pxa4xql2c78n0jqswgll2hpfn33fgw6yz7g8ydgn5nnbcsfhs6r"; + name = "picmi-18.04.0.tar.xz"; }; }; pimcommon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz"; - sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq"; - name = "pimcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pimcommon-18.04.0.tar.xz"; + sha256 = "0xnh0xys4sfqashimc1zsdxbssd3821bp9cx6hb0d8l3bq5x2vrp"; + name = "pimcommon-18.04.0.tar.xz"; }; }; pim-data-exporter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz"; - sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b"; - name = "pim-data-exporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pim-data-exporter-18.04.0.tar.xz"; + sha256 = "0isr1hv74n9mbihirk4qr109d4shh42k8jgcy9v2hmkplq72vwc7"; + name = "pim-data-exporter-18.04.0.tar.xz"; }; }; pim-sieve-editor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz"; - sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp"; - name = "pim-sieve-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz"; + sha256 = "0q1f72mb925qzikqfpv74dcc5f9ipxszvm0z05lsp1dhrmz1pf9a"; + name = "pim-sieve-editor-18.04.0.tar.xz"; }; }; poxml = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz"; - sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp"; - name = "poxml-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/poxml-18.04.0.tar.xz"; + sha256 = "1rwr1ldrkwyfxm56i16mpq0vmqiq2397gcbzg4skqpc727s55nlv"; + name = "poxml-18.04.0.tar.xz"; }; }; print-manager = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz"; - sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7"; - name = "print-manager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/print-manager-18.04.0.tar.xz"; + sha256 = "1x70xia2rph40flx4r3cpxcvxfzny83v87l4kgc1n0khavhp9lpx"; + name = "print-manager-18.04.0.tar.xz"; }; }; rocs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz"; - sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46"; - name = "rocs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz"; + sha256 = "0q0q9bnmsw23jdbrxrkmmjvyr5jv4s1z8v9h7nsaxqs1k2prflp4"; + name = "rocs-18.04.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz"; - sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m"; - name = "signon-kwallet-extension-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz"; + sha256 = "04r92pc8l2vw1dc916n658484v14smqrgg4ngx6rccffm58jfvk0"; + name = "signon-kwallet-extension-18.04.0.tar.xz"; }; }; spectacle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz"; - sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr"; - name = "spectacle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/spectacle-18.04.0.tar.xz"; + sha256 = "1slqgp1rgzcw4nikh6zmxpp3yc04dfbjcqqx2j4wpa1p2xwfv0c2"; + name = "spectacle-18.04.0.tar.xz"; }; }; step = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz"; - sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v"; - name = "step-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/step-18.04.0.tar.xz"; + sha256 = "048f4n24819vj41a0hdabmqvw6k7wkwwicz0q0slvfqws5c3h1l4"; + name = "step-18.04.0.tar.xz"; }; }; svgpart = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz"; - sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5"; - name = "svgpart-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/svgpart-18.04.0.tar.xz"; + sha256 = "1yf535ry8xc7lqhcavn2kjmjs0ngkwinm369q0qp7hfddcpsyfbp"; + name = "svgpart-18.04.0.tar.xz"; }; }; sweeper = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz"; - sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x"; - name = "sweeper-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz"; + sha256 = "1yf1xfbv516ia3aqj3l8qcdsbjac9pnm8qb23l26g6n3jnq4b331"; + name = "sweeper-18.04.0.tar.xz"; }; }; syndication = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz"; - sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808"; - name = "syndication-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/syndication-18.04.0.tar.xz"; + sha256 = "11fx8f9sfc51w5dg6mylbvk0yaaxvc9y2dsg9xxasiw8v6rjjq3n"; + name = "syndication-18.04.0.tar.xz"; }; }; umbrello = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz"; - sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0"; - name = "umbrello-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/umbrello-18.04.0.tar.xz"; + sha256 = "1lbf82j04j8qax7qnsqwsjrz1m4yq0ca6xc9fdhmvkpnzn5z9ydp"; + name = "umbrello-18.04.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz"; - sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i"; - name = "zeroconf-ioslave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz"; + sha256 = "0lqh70bmlrj22d82vhm5a9ylm2yj9rz4zgncfwrh9952q1xkzl22"; + name = "zeroconf-ioslave-18.04.0.tar.xz"; }; }; } From 58f53dc4d4b8b87172956e3658d24f158f9abaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sat, 21 Apr 2018 14:40:10 +0200 Subject: [PATCH 2528/2743] okteta: Move into own package Okteta was removed from kde applications and will now be released independently. So, we currently use the released version from 17.12.3. --- .../{kde/okteta.nix => editors/okteta/default.nix} | 12 +++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) rename pkgs/applications/{kde/okteta.nix => editors/okteta/default.nix} (58%) diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/editors/okteta/default.nix similarity index 58% rename from pkgs/applications/kde/okteta.nix rename to pkgs/applications/editors/okteta/default.nix index 0ac8ddebc75d..770eb63dc69e 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,16 +1,22 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, shared-mime-info }: -mkDerivation { +let + version = "17.12.3"; +in mkDerivation rec { name = "okteta"; + src = fetchurl { + url = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz"; + sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; + }; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg ]; + maintainers = with lib.maintainers; [ peterhoeg bkchr ]; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; buildInputs = [ shared-mime-info ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78b8cff8215c..a82de21279b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16419,7 +16419,9 @@ with pkgs; akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okteta okular spectacle; + kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; + + okteta = libsForQt5.callPackage ../applications/editors/okteta { }; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; From 337e9723ce402c74996453b27088f2aa53e9e013 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 24 Apr 2018 15:16:45 +0800 Subject: [PATCH 2529/2743] kde-applications: Create alias to okteta --- pkgs/applications/kde/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 451fdbe151f4..5870179b6c0b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -28,6 +28,7 @@ still shows most of the available features is in `./gwenview.nix`. { stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, plasma5, attica, phonon, + okteta }: let @@ -151,7 +152,6 @@ let mbox-importer = callPackage ./mbox-importer.nix {}; messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; - okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; @@ -159,6 +159,9 @@ let print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; syndication = callPackage ./syndication.nix {}; + # Okteta was removed from kde applications and will now be released independently + # Lets keep an alias for compatibility reasons + inherit okteta; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a82de21279b6..d5e8b16e017c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16411,6 +16411,7 @@ with pkgs; inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; inherit plasma5; inherit attica phonon; + inherit okteta; }; in recurseIntoAttrs (makeOverridable mkApplications attrs); From a2f617f49f7c256b6baba65d621ef660658733fe Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 24 Apr 2018 20:40:52 +0800 Subject: [PATCH 2530/2743] qcachegrind: Remove qt 5.10 build fix patch, now applied upstream --- pkgs/development/tools/analysis/qcachegrind/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 15be7554c198..30d82aca83ae 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -12,14 +12,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; - patches = [ - (fetchpatch { - name = "fix-qt5_10-build.patch"; - url = https://github.com/KDE/kcachegrind/commit/c41607a.patch; - sha256 = "00kh5im3hpcarch8rc2dsgxsajfmd8vd7rry9x6mxrbkgr4ifq8y"; - }) - ]; - postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree From 8945e6b105d6a9481b4dd1c2506dbdcca4327e36 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:37:19 +0800 Subject: [PATCH 2531/2743] kproperty: 3.0.2 -> 3.1.0 --- pkgs/development/libraries/kproperty/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix index 52b5d944b413..455fb5a711c0 100644 --- a/pkgs/development/libraries/kproperty/default.nix +++ b/pkgs/development/libraries/kproperty/default.nix @@ -1,22 +1,23 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons + qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, + qttools }: mkDerivation rec { pname = "kproperty"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm"; + sha256 = "18qlwp7ajpx16bd0lfzqfx8y9cbrs8k4nax3cr30wj5sd3l8xpky"; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ]; + buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons qttools ]; propagatedBuildInputs = [ qtbase ]; From d5121536b80911264b3f55870d5253ede8a2b395 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:37:46 +0800 Subject: [PATCH 2532/2743] kreport: 3.0.2 -> 3.1.0 --- pkgs/development/libraries/kreport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index 561e964c9610..3f44dbb9c138 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "kreport"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0"; + sha256 = "0v7krpfx0isij9wzwam28fqn039i4wcznbplvnvl6hsykdi8ar1v"; }; nativeBuildInputs = [ extra-cmake-modules ]; From 1bde5c59307f1e2d8f786f366f5171f04d60c1e9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:38:04 +0800 Subject: [PATCH 2533/2743] kexi: 3.0.2 -> 3.1.0 --- pkgs/applications/office/kexi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 8463703c0179..2aa19dea1c24 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -9,12 +9,12 @@ mkDerivation rec { pname = "kexi"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf"; + sha256 = "1ysj44qq75wglw4d080l3gfw47695gapf29scxhb1g3py55csmbd"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From b20a82cd7592ad8ebcfb1e94ce5b44f067355b83 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 09:38:17 +0800 Subject: [PATCH 2534/2743] calligra: 3.0.1 -> 3.1.0 --- pkgs/applications/office/calligra/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 8449cdf05def..01014e6687cb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -15,24 +15,16 @@ mkDerivation rec { pname = "calligra"; - version = "3.0.1"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; + sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; enableParallelBuilding = true; - patches = [ - (fetchpatch { - name = "calligra-build-with-newer-kcalcore.patch"; - url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff"; - sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ From 04e13de94f1909afc4711a92cf83d5969afa0981 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 20:54:36 -0500 Subject: [PATCH 2535/2743] gn: fix Darwin build --- .../tools/build-managers/gn/default.nix | 139 ++++++++++++------ 1 file changed, 93 insertions(+), 46 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 5e7dd5214a04..bfbb2b4e3308 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,77 +1,124 @@ -{ stdenv, lib, fetchgit, fetchurl, libevent, ninja, python }: +{ stdenv, lib, fetchgit, fetchurl, fetchpatch +, libevent, ninja, python, darwin }: let depsGit = { "tools/gn" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/tools/gn"; - rev = "d0c518db129975ce88ff1de26c857873b0619c4b"; - sha256 = "0l15vzmjyx6bwlz1qhn3fy7yx3qzzxr3drnkj3l0p0fmyxza52vx"; + rev = "0fa417a0d2d8484e9a5a636e3301da322f586601"; + sha256 = "0pigcl14yc4aak6q1ghfjxdz2ah4fg4m2r5y3asw2rz6mpr5y9z0"; }; "base" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/base"; - rev = "bc6e3ce8ca01b894751e1f7b22b561e3ae2e7f17"; - sha256 = "1yl49v6nxbrfms52xf7fiwh7d4301m2aj744pa3hzzh989c5j6g5"; + rev = "ab1d7c3b92ce9c9bc756bdefb8338360d1a33a1e"; + sha256 = "15wis6qg9ka62k6v1vamg0bp3v5vkpapg485jsn4bbfcaqp6di0f"; }; "build" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/build"; - rev = "e934a19ae908081fba13769924e4ea45a7a451ce"; - sha256 = "0jhy418vaiin7djg9zvk83f8zhasigki4442x5j7gkmgmgmyc4am"; + rev = "8d44c08a4c9997695db8098198bdd5026bc7a6f9"; + sha256 = "19sajgf55xfmvnwvy2ss7g6pyljp751cfsws30w415m6m00lmpxl"; }; "config" = fetchgit { url = "https://chromium.googlesource.com/chromium/src/build/config"; - rev = "df16c6a2c070704b0a25efe46ee9af16de1e65b3"; - sha256 = "1x18syzz1scwhd8lf448hy5lnfpq118l403x9qmwm0np318w09wg"; + rev = "14116c0cdcb9e28995ca8bb384a12e5c9dbd1dbb"; + sha256 = "04nif0lm4wcy05b7xhal023874s4r0iq067q57cgwdm72i2gml40"; }; "testing/gtest" = fetchgit { url = "https://chromium.googlesource.com/chromium/testing/gtest"; rev = "585ec31ea716f08233a815e680fc0d4699843938"; sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; }; + "third_party/apple_apsl" = fetchurl { + url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz"; + sha256 = "0sc7b7zdw7f9piyyijl7xq3v1fzflqlck1apwm8kvgdhkyz3l63k"; + }; }; -in - stdenv.mkDerivation rec { - name = "gn"; - version = "0.0.0.20170629"; - sourceRoot = "."; +in stdenv.mkDerivation { + name = "gn"; + version = "20180423"; + sourceRoot = "."; - unpackPhase = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} + unpackPhase = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + if [ -d ${v} ]; then cp -r ${v}/* $sourceRoot/${n} - '') depsGit)} - ''; + else + mkdir -p $sourceRoot/${n} + pushd $sourceRoot/${n} + unpackFile ${v} + popd + fi + '') depsGit)} - postPatch = '' - # Patch shebands (for sandbox build) - chmod u+w -R build - patchShebangs build + chmod u+w -R $sourceRoot + ''; - # Patch out Chromium-bundled libevent - chmod u+w tools/gn/bootstrap tools/gn/bootstrap/bootstrap.py - sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ - tools/gn/bootstrap/bootstrap.py - ''; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch"; + sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a"; + }) + ]; - NIX_LDFLAGS = "-levent"; + postPatch = '' + # Disable libevent bootstrapping (we will provide it). + sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ + tools/gn/bootstrap/bootstrap.py - nativeBuildInputs = [ ninja python ]; - buildInputs = [ libevent ]; + # FIXME Needed with old Apple SDKs + substituteInPlace base/mac/foundation_util.mm \ + --replace "NSArray*" "NSArray*" + substituteInPlace base/mac/sdk_forward_declarations.h \ + --replace "NSDictionary*" "NSDictionary*" \ + --replace "NSArray*" "NSArray*" \ + --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" - buildPhase = '' - python tools/gn/bootstrap/bootstrap.py -s - ''; + # Patch shebangs (for sandbox build) + patchShebangs build + ''; - installPhase = '' - install -vD out/Release/gn "$out/bin/gn" - ''; + # FIXME again this shouldn't be necessary but I can't figure out a better way + NIX_CFLAGS_COMPILE = "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; - meta = with stdenv.lib; { - description = "A meta-build system that generates NinjaBuild files"; - homepage = https://chromium.googlesource.com/chromium/src/tools/gn; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.stesie ]; - }; - } + NIX_LDFLAGS = "-levent"; + + nativeBuildInputs = [ ninja python ]; + buildInputs = [ libevent ] + + # FIXME These dependencies shouldn't be needed but can't find a way + # around it. Chromium pulls this in while bootstrapping GN. + ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + libobjc + cctools + + # frameworks + ApplicationServices + Foundation + AppKit + ImageCaptureCore + CoreBluetooth + IOBluetooth + CoreWLAN + Quartz + Cocoa + ]); + + buildPhase = '' + python tools/gn/bootstrap/bootstrap.py -s + ''; + + installPhase = '' + install -vD out/Release/gn "$out/bin/gn" + ''; + + meta = with lib; { + description = "A meta-build system that generates NinjaBuild files"; + homepage = https://chromium.googlesource.com/chromium/src/tools/gn; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ stesie matthewbauer ]; + }; +} From 791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 24 Apr 2018 21:22:52 -0500 Subject: [PATCH 2536/2743] musl bootstrap: remove libiconv --- .../bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh index 8b5070dc6d6f..b160a748d8dc 100644 --- a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh @@ -26,7 +26,7 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" done -for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do +for i in $out/lib/libpcre* $out/lib/libc.so; do if [ -L "$i" ]; then continue; fi echo patching "$i" $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 5522bc5dea25..4fc9999b538c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -136,8 +136,6 @@ in with pkgs; rec { cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib - '' + lib.optionalString (hostPlatform.libc == "musl") '' - cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib '' + lib.optionalString (hostPlatform != buildPlatform) '' # These needed for cross but not native tools because the stdenv From a276d5160cc4b307d97261b419e183fb3a2214aa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 22:38:38 -0500 Subject: [PATCH 2537/2743] inkscape: fix on Darwin Fixes #39175 --- .../graphics/inkscape/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 47452eb43e88..b5d11d912a5e 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,9 +2,15 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake +, libvisio, libcdr, libexif, potrace, autoreconfHook +, intltool +, lib }: +# Note that originally this Nix expression used CMake to build but +# this led to errors on MacOS of "Too many arguments". Inkscape +# supports autoconf and we will use this for now on. + let python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); in @@ -17,12 +23,6 @@ stdenv.mkDerivation rec { sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; }; - unpackPhase = '' - cp $src ${name}.tar.bz2 - tar xvjf ${name}.tar.bz2 > /dev/null - cd ${name} - ''; - postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct @@ -33,25 +33,26 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook intltool ]; buildInputs = [ perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace cmake python2Env + libvisio libcdr libexif potrace python2Env ]; enableParallelBuilding = true; + preConfigure = '' + intltoolize -f + ''; + postInstall = '' # Make sure PyXML modules can be found at run-time. rm "$out/share/icons/hicolor/icon-theme.cache" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; - meta = with stdenv.lib; { + meta = with lib; { license = "GPL"; homepage = https://www.inkscape.org; description = "Vector graphics editor"; @@ -62,5 +63,6 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; + maintainers = with maintainters; [ matthewbauer ]; }; } From 7587f9804f23f6ab9973f8735b10cd0bb87e0c7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 22:58:45 -0500 Subject: [PATCH 2538/2743] glibmm: fix High Sierra segfault --- pkgs/development/libraries/glibmm/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index a3af96d51edc..86ed94d7bf34 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }: let ver_maj = "2.54"; @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patchFlags = "-p0"; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e864b2340be9ef003d8ff4aef92e7151d06287dd/devel/glibmm/files/0001-ustring-Fix-wchar-conversion-on-macOS-with-libc.patch"; + sha256 = "02qvnailw1i59cjbj3cy7y02kfcivsvkdjrf4njkp4plarayyqp9"; + }) + ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; From b87cb29d1be6a7729199aa33a5f0e5fd5f9801ef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 23:00:27 -0500 Subject: [PATCH 2539/2743] =?UTF-8?q?glibmm:=202.54.1=20=E2=86=92=202.56.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Noticed this was out of date. --- pkgs/development/libraries/glibmm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 86ed94d7bf34..3c3b49e66161 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.54"; - ver_min = "1"; + ver_maj = "2.56"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw"; + sha256 = "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f"; }; outputs = [ "out" "dev" ]; From 656f69bea5b5cdbb1a25192b89448e43952aeba4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 25 Apr 2018 12:11:43 +0800 Subject: [PATCH 2540/2743] buildbot-plugins.wsgi-dashboards: Remove maintainer akazakov Missing from maintainers file --- pkgs/development/tools/build-managers/buildbot/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 1d1b963df993..35c8ed8c71cd 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -97,7 +97,7 @@ meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot WSGI dashboards Plugin"; - maintainers = with maintainers; [ akazakov ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; }; }; From bd1d0e02922d0d18a3e4d99a82bdf8c6db23055d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 02:45:58 +0000 Subject: [PATCH 2541/2743] flashrom: fix build with gcc7 --- pkgs/tools/misc/flashrom/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b1e093126584..1bdab1e841f8 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; }; + # Newer versions of libusb deprecate some API flashrom uses. + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libftdi pciutils ]; From ec632b745fb72e5070983dd3dff78ed81466243d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 24 Apr 2018 23:18:35 -0500 Subject: [PATCH 2542/2743] qtwebengine: rewrite Fixes #39334 and Fixes #36729 Also, Fixes #36932 (hopefully it's still building) (This might be able to be able to be cherry-picked to 18.03 but be careful - chromium is extremely touchy. Probably best to wait for it to be built successfully on Hydra a few times.) --- .../libraries/qt-5/mkDerivation.nix | 5 +- .../libraries/qt-5/modules/qtwebengine.nix | 95 ++++++++++++++++--- 2 files changed, 82 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 739c9b4a1608..96014cfbc779 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -9,9 +9,8 @@ args: let args_ = { - qmakeFlags = - (args.qmakeFlags or []) - ++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ]; + qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] + ++ (args.qmakeFlags or []); NIX_CFLAGS_COMPILE = optional (!debug) "-DQT_NO_DEBUG" diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 08345510d787..e798d529ce1b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -11,9 +11,8 @@ , libcap , pciutils , systemd - , enableProprietaryCodecs ? true - +, gn, darwin, openbsm , lib, stdenv # lib.optional, needsPax }: @@ -25,7 +24,7 @@ qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkgconfig python2 which + bison coreutils flex git gperf ninja pkgconfig python2 which gn ]; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -61,8 +60,50 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + '' + + optionalString stdenv.isDarwin '' + # Remove annoying xcode check + substituteInPlace mkspecs/features/platform.prf \ + --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false + substituteInPlace src/core/config/mac_osx.pri \ + --replace /usr ${stdenv.cc} \ + --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false + + # FIXME Needed with old Apple SDKs + # Abandon all hope ye who try to make sense of this. + substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ + --replace "NSArray*" "NSArray*" + substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ + --replace "NSDictionary*" "NSDictionary*" \ + --replace "NSArray*" "NSArray*" \ + --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" + + cat < src/3rdparty/chromium/build/mac/find_sdk.py +#!/usr/bin/env python +print("10.10.0") +print("") +EOF + + cat < src/3rdparty/chromium/build/config/mac/sdk_info.py +#!/usr/bin/env python +print('xcode_version="9.1"') +print('xcode_version_int=9') +print('xcode_build="9B55"') +print('machine_os_build="17E199"') +print('sdk_path=""') +print('sdk_version="10.10"') +print('sdk_platform_path=""') +print('sdk_build="17B41"') +EOF + + # Apple has some secret stuff they don't share with OpenBSM + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ + --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" + substituteInPlace src/3rdparty/chromium/sandbox/mac/bootstrap_sandbox.cc \ + --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" ''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES @@ -70,13 +111,9 @@ qtModule { if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fi - ''; + ''; - qmakeFlags = - [ - # Use system Ninja because bootstrapping it is fragile - "WEBENGINE_CONFIG+=use_system_ninja" - ] ++ optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; + qmakeFlags = optional enableProprietaryCodecs "-- -proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -90,9 +127,10 @@ qtModule { # Text rendering harfbuzz icu - ] - ++ optionals (!stdenv.isDarwin) [ - dbus zlib minizip snappy nss protobuf jsoncpp libevent + + libevent + ] ++ optionals (!stdenv.isDarwin) [ + dbus zlib minizip snappy nss protobuf jsoncpp # Audio formats alsaLib @@ -106,17 +144,44 @@ qtModule { # X11 libs xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm - ]; + ] + + # FIXME These dependencies shouldn't be needed but can't find a way + # around it. Chromium pulls this in while bootstrapping GN. + ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + libobjc + cctools + + # frameworks + ApplicationServices + Foundation + AppKit + ImageCaptureCore + CoreBluetooth + IOBluetooth + CoreWLAN + Quartz + Cocoa + + openbsm + libunwind + ]); dontUseNinjaBuild = true; dontUseNinjaInstall = true; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' cat > $out/libexec/qt.conf < Date: Wed, 25 Apr 2018 00:05:18 -0500 Subject: [PATCH 2543/2743] nixos: typofixes/tab deletion in some foundationdb docs/module Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 8 ++++---- nixos/modules/services/databases/foundationdb.xml | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index ba921a9c1521..22acddc8ca91 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -206,7 +206,7 @@ in default = null; type = types.nullOr types.str; description = '' - Machine identifier key. All processes on a machine should share a + Machine identifier key. All processes on a machine should share a unique id. By default, processes on a machine determine a unique id to share. This does not generally need to be set. ''; @@ -216,7 +216,7 @@ in default = null; type = types.nullOr types.str; description = '' - Zone identifier key. Processes that share a zone id are + Zone identifier key. Processes that share a zone id are considered non-unique for the purposes of data replication. If unset, defaults to machine id. ''; @@ -226,7 +226,7 @@ in default = null; type = types.nullOr types.str; description = '' - Data center identifier key. All processes physically located in a + Data center identifier key. All processes physically located in a data center should share the id. If you are depending on data center based replication this must be set on all processes. ''; @@ -236,7 +236,7 @@ in default = null; type = types.nullOr types.str; description = '' - Data hall identifier key. All processes physically located in a + Data hall identifier key. All processes physically located in a data hall should share the id. If you are depending on data hall based replication this must be set on all processes. ''; diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index d10a5cfe836e..2a0e3c76c9d8 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -16,8 +16,8 @@ FoundationDB (or "FDB") is a distributed, open source, high performance, transactional key-value store. It can store petabytes of data and deliver -exceptional performance while maintaining consistency and ACID semantics over a -large cluster. +exceptional performance while maintaining consistency and ACID semantics +(serializable transactions) over a large cluster.
Configuring and basic setup @@ -101,7 +101,7 @@ FoundationDB worker processes that should be started on the machine. FoundationDB worker processes typically require 4GB of RAM per-process at minimum for good performance, so this option is set to 1 by default since the -maximum aount of RAM is unknown. You're advised to abide by this restriction, +maximum amount of RAM is unknown. You're advised to abide by this restriction, so pick a number of processes so that each has 4GB or more. A similar option exists in order to scale backup agent processes, @@ -129,7 +129,8 @@ client applications will use to find and join coordinators. Note that this file can not be managed by NixOS so easily: FoundationDB is designed so that it will rewrite the file at runtime for all clients and nodes when cluster coordinators change, with clients transparently handling this -without intervention. +without intervention. It is fundamentally a mutable file, and you should not +try to manage it in any way in NixOS. When dealing with a cluster, there are two main things you want to do: From 22fb762e1a939299ecad27179ca6c5d4013c367e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 25 Apr 2018 00:10:08 -0500 Subject: [PATCH 2544/2743] live555: add aarch64-linux entry Fixes eval --- pkgs/development/libraries/live555/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 69c16878fdf5..e0cf3328bac2 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { x86_64-darwin = "macosx"; i686-linux = "linux"; x86_64-linux = "linux-64bit"; + aarch64-linux = "linux-64bit"; }.${stdenv.system}} ''; From 0a8c91a931ea270e8b1d66f592f6acba9b4b5fcf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 25 Apr 2018 00:17:21 -0500 Subject: [PATCH 2545/2743] inkscape: typo --- pkgs/applications/graphics/inkscape/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index b5d11d912a5e..9a8ef6bd7744 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; - maintainers = with maintainters; [ matthewbauer ]; + maintainers = with maintainers; [ matthewbauer ]; }; } From 31e9e752ae0b998598ee1650b8c0db9cb04a0349 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 25 Apr 2018 03:16:13 -0400 Subject: [PATCH 2546/2743] fio: 3.5 -> 3.6, enable on darwin (#39452) --- pkgs/tools/system/fio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index ee7c70240b0a..6e63f467f600 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -15,11 +15,15 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ libaio python zlib ]; + buildInputs = [ python zlib ] + ++ stdenv.lib.optional (!stdenv.isDarwin) libaio; enableParallelBuilding = true; postPatch = '' + substituteInPlace Makefile \ + --replace "mandir = /usr/share/man" "mandir = \$(prefix)/man" \ + --replace "sharedir = /usr/share/fio" "sharedir = \$(prefix)/share/fio" substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; From 6891bda37071bbecdb343ff941ba893511f5fd70 Mon Sep 17 00:00:00 2001 From: xeji Date: Wed, 25 Apr 2018 00:06:11 +0200 Subject: [PATCH 2547/2743] nixos/tests/keymap: wait for xdotool to succeed xdotool failed in rare cases when a window was already created but not yet decorated by the window manager. also prevent a (never observed but possible) race condition --- nixos/tests/keymap.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index abff90d5047d..be880388314c 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -8,17 +8,19 @@ let testReader = pkgs.writeScript "test-input-reader" '' #!${pkgs.stdenv.shell} - rm -f ${resultFile} + rm -f ${resultFile} ${resultFile}.tmp logger "testReader: START: Waiting for $1 characters, expecting '$2'." touch ${readyFile} read -r -N $1 chars rm -f ${readyFile} if [ "$chars" == "$2" ]; then - logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile} + logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp else - logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile} + logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp fi + # rename after the file is written to prevent a race condition + mv ${resultFile}.tmp ${resultFile} ''; @@ -52,7 +54,7 @@ let if ($desc eq "Xorg keymap") { # make sure the xterm window is open and has focus $machine->waitForWindow(qr/testterm/); - $machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync"); + $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync"); } # wait for reader to be ready @@ -71,7 +73,7 @@ let $machine->waitForX; mkTest "VT keymap", "openvt -sw --"; - mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e"; + mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e"; ''; }; From 8ffaeecfca73704c67831e83d59890c52197b9c0 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:28:52 +0300 Subject: [PATCH 2548/2743] clion: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 84ba32c41256..de98c4b049f3 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -239,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ + sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From a52b5be4a26ea74f3f6062330d5a6e63239ac5d7 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:07 +0300 Subject: [PATCH 2549/2743] goland: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index de98c4b049f3..f6db50a106b7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -265,12 +265,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ + sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; From e74d28ef96827252dc9abd53423439fbd7fac5d4 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:23 +0300 Subject: [PATCH 2550/2743] idea-community: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f6db50a106b7..5f08271c5cd1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -278,12 +278,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ + sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; From 21feb8a2eda7a309a2498cdcebd18cf1e698a12f Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:36 +0300 Subject: [PATCH 2551/2743] idea-ultimate: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5f08271c5cd1..f5b87eb26e77 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -291,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ + sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; From 12f07ac1bc9f5ca718305a7199456f802c4cd058 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:29:54 +0300 Subject: [PATCH 2552/2743] pycharm-community: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f5b87eb26e77..0dd4bc2a9b67 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -317,12 +317,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ + sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; From 609766bf80598d58445a2099741e07686ddac96b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:12 +0300 Subject: [PATCH 2553/2743] pycharm-professional: 2018.1 -> 2018.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 0dd4bc2a9b67..cd792cb31b81 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -330,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ + sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; From ef038375f8701125b35832147cfbf7706a52c809 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:37 +0300 Subject: [PATCH 2554/2743] ruby-mine: 2017.3.3 -> 2017.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index cd792cb31b81..e6c84a308e95 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -356,12 +356,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */ + sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.3"; From 2479b449b6db3409abf7752e0455dc08a19805c3 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Wed, 18 Apr 2018 11:30:53 +0300 Subject: [PATCH 2555/2743] webstorm: 2018.1 -> 2018.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e6c84a308e95..aedfb1fec3de 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -369,12 +369,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ + sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; From 2848b5db7d303fcb276958dbc4a78c185f5e1264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 25 Apr 2018 11:16:06 +0200 Subject: [PATCH 2556/2743] nix-zsh-completions: 0.3.8 -> 0.3.9 --- pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 2bcff6b809dc..8e15476451a8 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.8"; + version = "0.3.9"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "05ynd38br2kn657g7l01jg1q8ja9xwrdyb95w02gh7j9cww2k06w"; + sha256 = "1ysc9g72yj63ygm915a316f1hcklmgswyrwsq5abwwj48001y01n"; }; installPhase = '' From 954e02f835ca42d20f6fd01a940f06edd3fbb0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 25 Apr 2018 11:19:51 +0200 Subject: [PATCH 2557/2743] nix-bash-completions: 0.6.5 -> 0.6.6 --- pkgs/shells/bash/nix-bash-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 739dbd538a6e..b76e65ca8719 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.5"; + version = "0.6.6"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "10f70jw81vky52s3fidf7vzl725fihiypsw39825wnkpynayhmrg"; + sha256 = "1lz9cgacyd4cphr7l90x4hn0ifhxwzz2d5829w1jcglasfacfpsw"; }; # To enable lazy loading via. bash-completion we need a symlink to the script From c60a874ef5a325fd881a2fa11b7dfe405c41022f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:01:58 +0200 Subject: [PATCH 2558/2743] LTS Haskell 11.6 --- .../configuration-hackage2nix.yaml | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e15482a6708c..5e12e90a3c3d 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.5 + # LTS Haskell 11.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -69,7 +69,7 @@ default-package-overrides: - aeson-compat ==0.3.7.1 - aeson-diff ==1.1.0.4 - aeson-extra ==0.4.1.0 - - aeson-generic-compat ==0.0.1.1 + - aeson-generic-compat ==0.0.1.2 - aeson-injector ==1.1.0.0 - aeson-picker ==0.1.0.4 - aeson-pretty ==0.8.7 @@ -83,10 +83,10 @@ default-package-overrides: - alerts ==0.1.0.0 - alex ==3.2.4 - algebra ==4.3.1 - - algebraic-graphs ==0.0.5 + - algebraic-graphs ==0.1.1.1 - alsa-core ==0.5.0.1 - alsa-mixer ==0.2.0.3 - - alsa-pcm ==0.6.0.4 + - alsa-pcm ==0.6.1 - alsa-seq ==0.6.0.7 - alternative-vector ==0.0.0 - alternators ==0.1.2.0 @@ -132,7 +132,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - attoparsec-time ==1 - attoparsec-uri ==0.0.4 - - audacity ==0.0.1.2 + - audacity ==0.0.2 - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 @@ -140,7 +140,7 @@ default-package-overrides: - auto-update ==0.1.4 - avwx ==0.3.0.2 - axiom ==0.4.6 - - b9 ==0.5.44 + - b9 ==0.5.47 - backprop ==0.1.5.1 - bank-holidays-england ==0.1.0.6 - barrier ==0.1.1 @@ -263,7 +263,7 @@ default-package-overrides: - cabal-rpm ==0.12.2 - cabal-toolkit ==0.0.5 - cache ==0.1.1.0 - - cairo ==0.13.4.2 + - cairo ==0.13.5.0 - calendar-recycling ==0.0 - call-stack ==0.1.0 - capataz ==0.1.0.1 @@ -291,12 +291,12 @@ default-package-overrides: - Chart-cairo ==1.8.3 - chaselev-deque ==0.5.0.5 - ChasingBottoms ==1.3.1.4 - - chatwork ==0.1.3.1 + - chatwork ==0.1.3.2 - cheapskate ==0.1.1 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.9.5 + - checkers ==0.4.10 - choice ==0.2.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -471,7 +471,7 @@ default-package-overrides: - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - dbus ==0.10.15 - - debian-build ==0.10.1.0 + - debian-build ==0.10.1.1 - debug ==0.1.1 - Decimal ==0.5.1 - declarative ==0.5.2 @@ -610,7 +610,7 @@ default-package-overrides: - extensible ==0.4.8 - extensible-effects ==2.4.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.5 + - extra ==1.6.6 - extractable-singleton ==0.0.1 - extrapolate ==0.3.1 - fail ==4.9.0.0 @@ -666,7 +666,7 @@ default-package-overrides: - ForestStructures ==0.0.0.2 - forma ==0.2.0 - format-numbers ==0.1.0.0 - - formatting ==6.3.2 + - formatting ==6.3.4 - foundation ==0.0.20 - FPretty ==1.1 - Frames ==0.3.0.2 @@ -734,10 +734,10 @@ default-package-overrides: - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.1 - ghc-syb-utils ==0.2.3.3 - - ghc-tcplugins-extra ==0.2.4 + - ghc-tcplugins-extra ==0.2.5 - ghc-typelits-extra ==0.2.4 - - ghc-typelits-knownnat ==0.4.1 - - ghc-typelits-natnormalise ==0.5.9 + - ghc-typelits-knownnat ==0.4.2 + - ghc-typelits-natnormalise ==0.5.10 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.15 - gi-cairo ==1.0.15 @@ -759,7 +759,7 @@ default-package-overrides: - glazier ==0.11.0.1 - glazier-pipes ==0.1.5.1 - GLFW-b ==1.4.8.3 - - glib ==0.13.5.0 + - glib ==0.13.6.0 - Glob ==0.9.2 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 @@ -792,7 +792,7 @@ default-package-overrides: - group-by-date ==0.1.0.2 - grouped-list ==0.2.2.0 - groups ==0.4.1.0 - - gtk2hs-buildtools ==0.13.3.1 + - gtk2hs-buildtools ==0.13.4.0 - H ==0.9.0.1 - h2c ==1.0.0 - hackage-db ==2.0 @@ -817,8 +817,8 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.0 - haskeline ==0.7.4.2 - - haskell-gi ==0.21.0 - - haskell-gi-base ==0.21.0 + - haskell-gi ==0.21.2 + - haskell-gi-base ==0.21.1 - haskell-gi-overloading ==0.0 - haskell-lexer ==1.0.1 - haskell-lsp ==0.2.0.1 @@ -931,8 +931,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -982,12 +982,12 @@ default-package-overrides: - HTTP ==4000.3.11 - http2 ==1.6.3 - http-api-data ==0.3.7.2 - - http-client ==0.5.12 + - http-client ==0.5.12.1 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - http-conduit ==2.3.1 - - http-date ==0.0.6.1 + - http-date ==0.0.7 - http-link-header ==1.0.3 - http-media ==0.7.1.2 - http-reverse-proxy ==0.5.0.1 @@ -1007,13 +1007,13 @@ default-package-overrides: - hw-fingertree ==0.1.0.1 - hw-fingertree-strict ==0.1.0.3 - hw-hedgehog ==0.1.0.1 - - hw-hspec-hedgehog ==0.1.0.3 + - hw-hspec-hedgehog ==0.1.0.4 - hw-int ==0.0.0.3 - hw-json ==0.6.0.0 - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.5.0.0 + - hw-prim ==0.5.0.2 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.2.0.2 - hw-string-parse ==0.0.0.4 @@ -1071,7 +1071,7 @@ default-package-overrides: - intervals ==0.8.1 - intro ==0.3.1.0 - invariant ==0.5 - - invertible ==0.2.0.4 + - invertible ==0.2.0.5 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1082,7 +1082,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.2 - ip ==1.1.2 - ip6addr ==0.5.3 - - iproute ==1.7.3 + - iproute ==1.7.4 - IPv6Addr ==1.0.2 - IPv6DB ==0.2.6 - ipython-kernel ==0.9.0.2 @@ -1245,7 +1245,7 @@ default-package-overrides: - markup ==4.0.4 - marvin-interpolate ==1.1.2 - massiv ==0.1.6.1 - - massiv-io ==0.1.2.0 + - massiv-io ==0.1.3.0 - mathexpr ==0.3.0.0 - math-functions ==0.2.1.0 - matplotlib ==0.6.0 @@ -1282,7 +1282,7 @@ default-package-overrides: - mighty-metropolis ==1.2.0 - milena ==0.5.2.1 - mime-mail ==0.4.14 - - mime-mail-ses ==0.4.0.0 + - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.7 - minimorph ==0.1.6.1 - miniutter ==0.4.7.0 @@ -1312,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.4 + - monad-logger ==0.3.28.5 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.9 - monad-logger-syslog ==0.1.4.0 @@ -1436,7 +1436,7 @@ default-package-overrides: - old-time ==1.1.0.3 - once ==0.2 - one-liner ==0.9.2 - - one-liner-instances ==0.1.1.0 + - one-liner-instances ==0.1.2.1 - OneTuple ==0.2.1 - online ==0.2.1.0 - Only ==0.1 @@ -1470,7 +1470,7 @@ default-package-overrides: - pandoc ==2.1.2 - pandoc-citeproc ==0.14.3 - pandoc-types ==1.17.3.1 - - pango ==0.13.4.0 + - pango ==0.13.5.0 - papillon ==0.1.0.5 - parallel ==3.2.1.1 - parallel-io ==0.3.3 @@ -1533,7 +1533,7 @@ default-package-overrides: - pipes-category ==0.3.0.0 - pipes-concurrency ==2.0.10 - pipes-csv ==1.4.3 - - pipes-extras ==1.0.13 + - pipes-extras ==1.0.14 - pipes-fastx ==0.3.0.0 - pipes-fluid ==0.6.0.0 - pipes-group ==1.0.9 @@ -1652,7 +1652,7 @@ default-package-overrides: - raaz ==0.2.0 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - - rakuten ==0.1.1.0 + - rakuten ==0.1.1.1 - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 @@ -1748,13 +1748,13 @@ default-package-overrides: - SafeSemaphore ==0.10.1 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - - sampling ==0.3.2 + - sampling ==0.3.3 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbp ==2.3.13 + - sbp ==2.3.16 - sbv ==7.5 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1889,7 +1889,7 @@ default-package-overrides: - Spock-worker ==0.3.1.0 - spreadsheet ==0.1.3.7 - sqlite-simple ==0.4.15.0 - - sql-words ==0.1.5.1 + - sql-words ==0.1.6.0 - squeal-postgresql ==0.1.1.4 - srcloc ==0.5.1.2 - stache ==1.2.1 @@ -1898,7 +1898,7 @@ default-package-overrides: - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - - StateVar ==1.1.0.4 + - StateVar ==1.1.1.0 - stateWriter ==0.2.10 - static-text ==0.2.0.1 - statistics ==0.14.0.2 @@ -2020,7 +2020,7 @@ default-package-overrides: - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - - text-ldap ==0.1.1.11 + - text-ldap ==0.1.1.12 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 @@ -2034,7 +2034,7 @@ default-package-overrides: - tfp ==1.0.0.2 - tf-random ==0.5 - th-abstraction ==0.2.6.0 - - th-data-compat ==0.0.2.5 + - th-data-compat ==0.0.2.6 - th-desugar ==1.7 - these ==0.7.4 - th-expand-syns ==0.4.4.0 @@ -2049,7 +2049,7 @@ default-package-overrides: - threepenny-editors ==0.5.6 - threepenny-gui ==0.8.2.3 - threepenny-gui-flexbox ==0.4.2 - - th-reify-compat ==0.0.1.3 + - th-reify-compat ==0.0.1.4 - th-reify-many ==0.1.8 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 @@ -2058,7 +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.8 + - tidal ==0.9.9 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2104,7 +2104,7 @@ default-package-overrides: - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.7 + - turtle ==1.5.8 - turtle-options ==0.1.0.4 - type-assertions ==0.1.0.0 - type-combinators ==0.2.4.3 @@ -2150,7 +2150,7 @@ default-package-overrides: - universe-instances-extended ==1.0.0.1 - universe-instances-trans ==1.0.0.1 - universe-reverse-instances ==1.0 - - universum ==1.1.0 + - universum ==1.1.1 - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.0.1 - unix-time ==0.3.8 @@ -2241,8 +2241,8 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.2 - - warp ==3.2.18.2 - - warp-tls ==3.2.4.2 + - warp ==3.2.19 + - warp-tls ==3.2.4.3 - wave ==0.1.5 - wavefront ==0.7.1.2 - webdriver ==0.8.5 @@ -2273,7 +2273,7 @@ default-package-overrides: - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.2 - - wl-pprint ==1.2 + - wl-pprint ==1.2.1 - wl-pprint-annotated ==0.1.0.0 - wl-pprint-console ==0.1.0.1 - wl-pprint-extras ==3.5.0.5 @@ -2327,7 +2327,7 @@ default-package-overrides: - xml-types ==0.3.6 - xmonad ==0.13 - xmonad-contrib ==0.13 - - xmonad-extras ==0.13.2 + - xmonad-extras ==0.13.3 - xss-sanitize ==0.3.5.7 - xturtle ==0.2.0.0 - xxhash ==0.0.2 From 46cce6ef9924e1961171b2207f5e707974141620 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Apr 2018 10:56:04 +0200 Subject: [PATCH 2559/2743] 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/5dcdcbfee8248cc4b7fbe7ce08857000b39d77d6. --- .../haskell-modules/hackage-packages.nix | 2001 ++++++++++------- 1 file changed, 1161 insertions(+), 840 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bf7838b2b21b..8d25c173d75a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17550,8 +17550,8 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.1.0.4"; - sha256 = "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks"; + version = "1.1.1.0"; + sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s"; libraryHaskellDepends = [ base stm transformers ]; homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; @@ -19613,6 +19613,26 @@ self: { inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_9" = callPackage + ({ mkDerivation, base, data-default, libX11, libXext, libXinerama + , libXrandr, libXrender, libXScrnSaver + }: + mkDerivation { + pname = "X11"; + version = "1.9"; + sha256 = "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh"; + libraryHaskellDepends = [ base data-default ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver + ]; + homepage = "https://github.com/xmonad/X11"; + description = "A binding to the X11 graphics library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -22499,17 +22519,6 @@ self: { }) {}; "aeson-generic-compat" = callPackage - ({ mkDerivation, aeson, base }: - mkDerivation { - pname = "aeson-generic-compat"; - version = "0.0.1.1"; - sha256 = "1davhg48x4k9nsizpafjlicwryi05ijfh902bn35x76pay7alims"; - libraryHaskellDepends = [ aeson base ]; - description = "Compatible generic class names of Aeson"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-generic-compat_0_0_1_2" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-generic-compat"; @@ -22518,7 +22527,6 @@ self: { libraryHaskellDepends = [ aeson base ]; description = "Compatible generic class names of Aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-injector" = callPackage @@ -23717,8 +23725,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "alg"; - version = "0.2.0.0"; - sha256 = "1lh5pz3zmzyq9dkgzabgi8xhlssxccxw24ng97lynmsvc7jjras8"; + version = "0.2.1.0"; + sha256 = "13glk774rdd6fwi427djkc1q4xqmdf44smhp5lgv24vfwd5fffcq"; libraryHaskellDepends = [ base ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; @@ -23841,22 +23849,6 @@ self: { }) {}; "algebraic-graphs" = callPackage - ({ mkDerivation, array, base, containers, criterion, extra - , QuickCheck - }: - mkDerivation { - pname = "algebraic-graphs"; - version = "0.0.5"; - sha256 = "046507r77wn4f6grxzrh2n90rnllp1inhdvn4fg9ki36k5qgqyzx"; - libraryHaskellDepends = [ array base containers ]; - testHaskellDepends = [ base containers extra QuickCheck ]; - benchmarkHaskellDepends = [ base containers criterion ]; - homepage = "https://github.com/snowleopard/alga"; - description = "A library for algebraic graph construction and transformation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "algebraic-graphs_0_1_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, containers , criterion, deepseq, extra, QuickCheck }: @@ -23876,7 +23868,6 @@ self: { homepage = "https://github.com/snowleopard/alga"; description = "A library for algebraic graph construction and transformation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algebraic-prelude" = callPackage @@ -24181,27 +24172,6 @@ self: { }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage - ({ mkDerivation, alsa-core, alsaLib, array, base - , extensible-exceptions, sample-frame, storable-record - }: - mkDerivation { - pname = "alsa-pcm"; - version = "0.6.0.4"; - sha256 = "0anafqzml5haacb7ax27a82b815rhv7nqawa7w3lb11vj1wi7bls"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - alsa-core array base extensible-exceptions sample-frame - 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 = [ "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 }: @@ -24219,7 +24189,7 @@ self: { 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; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -28446,6 +28416,8 @@ self: { pname = "arbtt"; version = "0.10.0.1"; sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877"; + revision = "1"; + editedCabalFile = "1mmrv81c9gwa2gqlp0agipg5sdxm88fhiza84y2sv8vg7zf88x82"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29885,6 +29857,8 @@ self: { pname = "async-pool"; version = "0.9.0.2"; sha256 = "1wg78y80zd7qyizyis073dmmvq4s67ni1pkaq31jl5klr49rs5g0"; + revision = "1"; + editedCabalFile = "0w3l3lbnfdm9ihp7pfda4sf1y1cqpc6g6q6wjzafdi088l3lklkn"; libraryHaskellDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -30447,8 +30421,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.10.0.8"; - sha256 = "159nf1dfb4zh7kbk534xxhvap3gi6943j9vrp7k6lkyvp3p2s1q9"; + version = "2.10.0.11"; + sha256 = "09c2nldzaqm8a203gqk6lc81gfhmvz30pxicxi9g1971y1q0nklj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -30897,27 +30871,6 @@ self: { }) {}; "audacity" = callPackage - ({ mkDerivation, base, bytestring, deepseq, directory - , explicit-exception, filepath, non-empty, storable-record - , storablevector, tagchup, transformers, utility-ht, xml-basic - }: - mkDerivation { - pname = "audacity"; - version = "0.0.1.2"; - sha256 = "1df9vk6f1gj0jpj3rmq63s3xjqc5p02hprfvq1nqgws0vfnp5lab"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring deepseq directory explicit-exception filepath - non-empty 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; - }) {}; - - "audacity_0_0_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory , explicit-exception, filepath, non-empty, semigroups , storable-record, storablevector, tagchup, transformers @@ -30937,7 +30890,6 @@ self: { 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 @@ -32423,39 +32375,6 @@ self: { }) {}; "b9" = 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.44"; - sha256 = "0fr9s2s4gwh6l80s9j4jj5s10mp92dkxs5fwjlk8vbyg6xi6sgza"; - 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; - }) {}; - - "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 @@ -32486,7 +32405,6 @@ self: { 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 @@ -32998,12 +32916,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_11_0_0" = callPackage + "base_4_11_1_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.11.0.0"; - sha256 = "1p18cm61ql911nqfld1kc7h6qpmhfxrf1xyahik180a7rbygbkq3"; + version = "4.11.1.0"; + sha256 = "0q2ygfqy4qim8h9fmlb5iwfnf2lrly27bqqvnckdlmh775fmq07g"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -33127,8 +33045,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; - version = "4.11.0.0"; - sha256 = "11q2cqy865q13hy2kc9k41cprdmlzh172prh5dhy3xp6zsbppjnh"; + version = "4.11.1.0"; + sha256 = "19d1x487kwhc60qjix7xx53dlszbx08rdhxd2zab1pwjw62ws3c8"; libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "https://github.com/hvr/base-noprelude"; @@ -33898,18 +33816,18 @@ self: { ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring , case-insensitive, conduit, free, hashable, haskell-src-exts , lifted-base, monad-control, mtl, network-uri, postgresql-libpq - , postgresql-simple, scientific, text, time, unordered-containers - , uuid, vector + , postgresql-simple, scientific, tagged, text, time + , unordered-containers, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.3.1.0"; - sha256 = "1nv7r50b4khx1ski5c64dywphzbn1x9xx9hp8b8zfh88i05b5jf6"; + version = "0.3.2.0"; + sha256 = "09iv1ji1kpavi42z0p4nng057h0q5f16cdsx0yiq53c3ji3yvbnf"; libraryHaskellDepends = [ aeson base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base monad-control - mtl network-uri postgresql-libpq postgresql-simple scientific text - time unordered-containers uuid vector + mtl network-uri postgresql-libpq postgresql-simple scientific + tagged text time unordered-containers uuid-types vector ]; homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres"; description = "Connection layer between beam and postgres"; @@ -35419,15 +35337,15 @@ self: { inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; - "bindings-GLFW_3_2_1_0" = callPackage + "bindings-GLFW_3_2_1_1" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr , libXxf86vm, test-framework, test-framework-hunit }: mkDerivation { pname = "bindings-GLFW"; - version = "3.2.1.0"; - sha256 = "1sbbms17yyrv5cmf584bc5k4bh8l2vrrhkz2693nyhkadvjxiavb"; + version = "3.2.1.1"; + sha256 = "03hn12bdqypwd6x9hxa7685bm6w86nsf6cmcwkr8zzgb41mwc93b"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ libGL libX11 libXcursor libXext libXfixes libXi libXinerama @@ -39194,7 +39112,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_36" = callPackage + "brick_0_36_2" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -39202,8 +39120,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.36"; - sha256 = "1i1np31hncgz5cvygraxcv9x6l7yn9y3f8f92jih1im38drhp65z"; + version = "0.36.2"; + sha256 = "0zzd3lwlb60n3zdcyyqf89b066337f6qny5m4clf1fbvqiw7g771"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41150,6 +41068,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ca" = callPackage + ({ mkDerivation, alg, base }: + mkDerivation { + pname = "ca"; + version = "0.0.0.1"; + sha256 = "0fkqbpgbbp1g6q5vjmgnfddrilyqwqsvd6w7w3vmgg6q7zdh6fy2"; + libraryHaskellDepends = [ alg base ]; + description = "Cellular Automata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cab" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, conduit , conduit-extra, containers, directory, filepath, process @@ -42385,8 +42314,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.4.2"; - sha256 = "0sm3367ikrjfzwhz1f9bkamk6i33p5cginzc9kpgw3x0lk6pbrhg"; + version = "0.13.5.0"; + sha256 = "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -44215,6 +44144,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {dttools = null;}; + "cdeps" = callPackage + ({ mkDerivation, alex, array, base, bytestring, directory, filepath + , hspec, optparse-applicative, text + }: + mkDerivation { + pname = "cdeps"; + version = "0.1.0.0"; + sha256 = "1klj3cx7cx39iyskv7fs6s28jplyn13dwv4khz79kxgg1sxd9gv5"; + revision = "2"; + editedCabalFile = "1r2ihgk5yj6xv4qc276b29gfzblksf82qdp0qg06cz590kxb8v2x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring directory filepath text + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ base hspec ]; + description = "Extract dependencies from C code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cedict" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, parsec , utf8-string @@ -45123,35 +45074,6 @@ self: { }) {}; "chatwork" = 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.1"; - sha256 = "0wsr84yk8l9s8fpb6fg4vbjyzlvy0608qply1h12zi09b5zr149i"; - 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; - }) {}; - - "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 @@ -45178,7 +45100,6 @@ self: { 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 @@ -45311,20 +45232,6 @@ self: { }) {}; "checkers" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; - version = "0.4.9.5"; - sha256 = "1xaffx0vmq4swciyq3qzjfklfj19nnhd5yama9di5sas4f8v517i"; - 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; - }) {}; - - "checkers_0_4_10" = callPackage ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; @@ -45336,7 +45243,6 @@ self: { 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 @@ -48595,6 +48501,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "coerce-util" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "coerce-util"; + version = "0.1.0.0"; + sha256 = "0v4ymcrqij8q9s8pcgbfrnl8y379fki3zp80lg4xqvbx0i89vsxf"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/chessai/coerce-util.git"; + description = "utils for Data.Coerce"; + license = stdenv.lib.licenses.mit; + }) {}; + "cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50202,6 +50120,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude_1_4_0_1" = callPackage + ({ mkDerivation, base, cpphs }: + mkDerivation { + pname = "composition-prelude"; + version = "1.4.0.1"; + sha256 = "172fnixh4jgmwfsaxg0fyji0i745pbjwk00l3yh5pwng9swzi6ik"; + libraryHaskellDepends = [ base ]; + libraryToolDepends = [ cpphs ]; + homepage = "https://github.com/vmchale/composition-prelude#readme"; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -52475,6 +52407,8 @@ self: { pname = "contravariant"; version = "1.4.1"; sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9"; + revision = "1"; + editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx"; libraryHaskellDepends = [ base StateVar transformers transformers-compat ]; @@ -53674,8 +53608,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.4.1"; - sha256 = "1sd6h0xw76iwvgl7i4c9wy6q5fmq75inq5vh79rzf3bhmahb1529"; + version = "3.5.0"; + sha256 = "0x8l31zbgcx4idcvpjsipsc3k610hj6g6rjpxbbpaz7zcb2ykvn1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -54210,8 +54144,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "9.3"; - sha256 = "1w1mb43hb6zn8n8r261j623jrgxx54h8jifhcby8nnfyl3h97c69"; + version = "10.0"; + sha256 = "10wg1s47r70gxgl9bfg3cxhj8w74k7wn0c3lh418mxypb2p3ffww"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -57780,16 +57714,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_3_0_0_2" = callPackage - ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens - , profunctors, tagged + "data-diverse-lens_3_1_0_0" = callPackage + ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec + , lens, profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "3.0.0.2"; - sha256 = "0hahvbyb6yr3bq36dlrvdsgzg3nifckyp10h83d2ryqgla7p7rbp"; + version = "3.1.0.0"; + sha256 = "0g1cnn1kw36ac68wm8qmd8pdzjpl4xcil7shailxwawldi52v549"; libraryHaskellDepends = [ - base data-diverse generic-lens lens profunctors tagged + base data-diverse data-has generic-lens lens profunctors tagged ]; testHaskellDepends = [ base data-diverse generic-lens hspec lens tagged @@ -60052,25 +59986,6 @@ self: { }) {}; "debian-build" = callPackage - ({ mkDerivation, base, directory, filepath, process, split - , transformers - }: - mkDerivation { - pname = "debian-build"; - version = "0.10.1.0"; - sha256 = "1d4h3r0v82fwiwazvcgrbv9f7nslbgw94hbsyyibsiikwpg36454"; - 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; - }) {}; - - "debian-build_0_10_1_1" = callPackage ({ mkDerivation, base, directory, filepath, process, split , transformers }: @@ -60087,7 +60002,6 @@ self: { homepage = "http://twitter.com/khibino/"; description = "Debian package build sequence tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debug" = callPackage @@ -72239,15 +72153,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_5_3_0" = callPackage + "extensible-effects_2_6_0_1" = 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.3.0"; - sha256 = "0dp6wsrlqivghmhwkj5js807i5m71lp9g3v3v8qb7xd3c08awy86"; + version = "2.6.0.1"; + sha256 = "1c39hn8iskn71s3hd3af3q1xym9mzdvrjswcnyqrkibws47k2lmx"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control QuickCheck silently test-framework @@ -72300,23 +72214,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.6.5"; - sha256 = "05x89gclm8vw1rx4945p3asmsa28055y81nwzvgq91yr5qc4lbgi"; - 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; - }) {}; - - "extra_1_6_6" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: @@ -72331,7 +72228,6 @@ self: { 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 @@ -72760,8 +72656,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.5.0.0"; - sha256 = "17jv9ysnd0bvlzc0sircj0mnbxpwzzby98wf6p6hj76m284acdx6"; + version = "0.6.0.1"; + sha256 = "1am161zrjaann9pnazsv9ic43cnw1bimqcy6vvh5qinigc33p08f"; libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat-compat hspec QuickCheck @@ -77161,24 +77057,6 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec - , integer-gmp, old-locale, scientific, semigroups, text, time - , transformers - }: - mkDerivation { - pname = "formatting"; - version = "6.3.2"; - sha256 = "1h5jy7y2cd1qaymypw8hfr52924szas0jd2hvjpbr5mrwssvhkqf"; - 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; - }) {}; - - "formatting_6_3_4" = callPackage ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec , integer-gmp, old-locale, scientific, semigroups, text, time , transformers @@ -77194,7 +77072,6 @@ self: { 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 @@ -78593,6 +78470,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fsnotify_0_2_1_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , filepath, hinotify, tasty, tasty-hunit, temporary, text, time + , unix-compat + }: + mkDerivation { + pname = "fsnotify"; + version = "0.2.1.2"; + sha256 = "1384yksg5v1rsbbhncairxh8ahwqmg661mgc2yrcs6hbnv5jzjyp"; + libraryHaskellDepends = [ + async base bytestring containers directory filepath hinotify text + time unix-compat + ]; + testHaskellDepends = [ + async base directory filepath tasty tasty-hunit temporary + unix-compat + ]; + homepage = "https://github.com/haskell-fswatch/hfsnotify"; + description = "Cross platform library for file change notification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fsnotify-conduit" = callPackage ({ mkDerivation, async, base, conduit, directory, filepath , fsnotify, hspec, resourcet, temporary, transformers @@ -81042,6 +80942,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_5_0_0" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.5.0.0"; + sha256 = "0s640ql6i9lr8s8m39fvjv7iz1pbcnjnvb8xsdbygb49cwk3khcz"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -81066,6 +80980,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, genvalidity-vector, hspec + , QuickCheck, validity, validity-aeson + }: + mkDerivation { + pname = "genvalidity-aeson"; + version = "0.2.0.0"; + sha256 = "0lwy2r7gb5s26hilgxs2hf8zcn4dhdwqhr8r05zrvjcry4inn5mm"; + libraryHaskellDepends = [ + aeson base genvalidity genvalidity-scientific genvalidity-text + genvalidity-unordered-containers genvalidity-vector QuickCheck + validity validity-aeson + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec hspec + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-bytestring" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring @@ -81086,6 +81024,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-bytestring_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.2.0.0"; + sha256 = "0ai3pmybs2xky8b596s0xs6511ab1h28ywbaishn5s0217q225zf"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring genvalidity genvalidity-hspec hspec QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers @@ -81127,6 +81085,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec_0_6_0_0" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-property + , hspec, hspec-core, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-hspec"; + version = "0.6.0.0"; + sha256 = "0pa4wx08yipr59nsdf5prh6j5pcixnxxfd9i4vm1rb4v89nws6al"; + libraryHaskellDepends = [ + base genvalidity genvalidity-property hspec hspec-core QuickCheck + validity + ]; + testHaskellDepends = [ + base doctest genvalidity hspec hspec-core QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for GenValidity instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec @@ -81150,6 +81129,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , genvalidity, genvalidity-aeson, genvalidity-hspec + , genvalidity-text, hspec, QuickCheck, text + }: + mkDerivation { + pname = "genvalidity-hspec-aeson"; + version = "0.2.0.0"; + sha256 = "0xkignwkq1hdyvachslwf5clzvnw0bmyi00mv3nkigxn8q1vbf7h"; + libraryHaskellDepends = [ + aeson base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck + ]; + testHaskellDepends = [ + aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec + genvalidity-text hspec text + ]; + homepage = "http://cs-syd.eu"; + description = "Standard spec's for aeson-related instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-binary" = callPackage ({ mkDerivation, base, binary, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck @@ -81168,6 +81170,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-binary_0_2_0_0" = callPackage + ({ mkDerivation, base, binary, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-binary"; + version = "0.2.0.0"; + sha256 = "0qmmhbka2ba9x9ypafij5q9gmmm7x4v1frf9mrfi4ffw91fnfnpv"; + libraryHaskellDepends = [ + base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for binary-related Instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-cereal" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck @@ -81186,6 +81206,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-cereal_0_2_0_0" = callPackage + ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-cereal"; + version = "0.2.0.0"; + sha256 = "18fz57lwn6ljrm9fszb1n2jzn93kqvqi7x9fyp6a0kh733lyzrnn"; + libraryHaskellDepends = [ + base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "http://cs-syd.eu"; + description = "Standard spec's for cereal-related instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec-hashable" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck @@ -81209,6 +81247,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-hashable_0_2_0_0" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec + , genvalidity-property, hashable, hspec, hspec-core, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-hashable"; + version = "0.2.0.0"; + sha256 = "1mw3lg792hssbfasb0av9x9n7ksqcjwxpgab0n9ia1jspxacrxr4"; + libraryHaskellDepends = [ + base genvalidity genvalidity-hspec genvalidity-property hashable + hspec QuickCheck validity + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-hspec hashable hspec + hspec-core QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for Hashable instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-path" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path , validity-path @@ -81225,6 +81286,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-path_0_3_0_0" = callPackage + ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec + , hspec, path, QuickCheck, validity-path + }: + mkDerivation { + pname = "genvalidity-path"; + version = "0.3.0.0"; + sha256 = "00rbizzxy9ccd85gr0bf4kw6b5bz15pzhg05qzsifpjj6vfy4izf"; + libraryHaskellDepends = [ + base genvalidity path QuickCheck validity-path + ]; + testHaskellDepends = [ base genvalidity-hspec hspec path ]; + benchmarkHaskellDepends = [ + base criterion genvalidity path QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Path"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-property" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity @@ -81242,6 +81324,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-property_0_2_0_0" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, genvalidity + , hspec, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-property"; + version = "0.2.0.0"; + sha256 = "10przvvqrmjyr9cmbna79kj15wjhi0r4j64qn5824gslyy7g39pa"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard properties for functions on `Validity` types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-scientific" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, scientific, validity, validity-scientific @@ -81262,6 +81362,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-scientific_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, scientific, validity, validity-scientific + }: + mkDerivation { + pname = "genvalidity-scientific"; + version = "0.2.0.0"; + sha256 = "0zf0akzbggyy79h48m78cfsp82nmdgk0py8crfp81sh0pd3cydpi"; + libraryHaskellDepends = [ + base genvalidity QuickCheck scientific validity validity-scientific + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck scientific + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Scientific"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text @@ -81282,6 +81402,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-text_0_5_0_0" = callPackage + ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, text, validity, validity-text + }: + mkDerivation { + pname = "genvalidity-text"; + version = "0.5.0.0"; + sha256 = "0vyw27l0b9snndl1nixidg8ghk6i95qv2xk59fbj1r1ybg27b837"; + libraryHaskellDepends = [ + array base genvalidity QuickCheck text validity validity-text + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck text + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for Text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-time" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time @@ -81300,6 +81440,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-time_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, time, validity-time + }: + mkDerivation { + pname = "genvalidity-time"; + version = "0.2.0.0"; + sha256 = "04kfqs4mc9p5flr3vvb6qj3nb4agpl3hww62g7np6sl5s36cbycb"; + libraryHaskellDepends = [ + base genvalidity QuickCheck time validity-time + ]; + testHaskellDepends = [ base genvalidity-hspec hspec time ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-unordered-containers" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity @@ -81322,6 +81480,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-unordered-containers_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "0.2.0.0"; + sha256 = "1kfn6g3h33g215qy0iffhr35vd2np9nsf6634fjk40mbz1san0m8"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for unordered-containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-uuid" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid @@ -81342,6 +81522,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-uuid_0_1_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, uuid, validity, validity-uuid + }: + mkDerivation { + pname = "genvalidity-uuid"; + version = "0.1.0.0"; + sha256 = "1j4q3smhz812cfgsv6vmjgng068knd9v7xg0hkvx868wbndgk37h"; + libraryHaskellDepends = [ + base genvalidity QuickCheck uuid validity validity-uuid + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck uuid + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for UUID"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-vector" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector @@ -81362,6 +81562,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-vector_0_2_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, validity, validity-vector, vector + }: + mkDerivation { + pname = "genvalidity-vector"; + version = "0.2.0.0"; + sha256 = "0ww3hzkzhblx8qp062vz74vwaqvv38l0sl0dwyxrqra68qglxr4f"; + libraryHaskellDepends = [ + base genvalidity QuickCheck validity validity-vector vector + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for vector"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geo-resolver" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, http-conduit, http-types, HUnit, QuickCheck @@ -81758,14 +81978,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_4_1" = callPackage + "ghc-boot_8_4_2" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.4.1"; - sha256 = "0abgzvqra66hi61bn901dlk0r0n4s2fg6y7d8w2k2a6w437vgzdd"; + version = "8.4.2"; + sha256 = "120vdlb6gyv6mndv8n3sssnif1m4zz6wrjlq9xmr2sha27pgsx9r"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -81774,12 +81994,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_4_1" = callPackage + "ghc-boot-th_8_4_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.4.1"; - sha256 = "0l9fv1sp4dbq1ssw0l55riw9zpcii8fz75i0yj0vlihccf10lbj9"; + version = "8.4.2"; + sha256 = "1c7crailwqgwn7a8mqpggmkzzz7067z3hz710vx7wp71wynzj8ff"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -82546,18 +82766,6 @@ self: { }) {}; "ghc-tcplugins-extra" = callPackage - ({ mkDerivation, base, ghc }: - mkDerivation { - pname = "ghc-tcplugins-extra"; - version = "0.2.4"; - sha256 = "03lxph20m33ipa117i917khgk8rv3fljly3fh31j92d0l02bh9sb"; - 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; - }) {}; - - "ghc-tcplugins-extra_0_2_5" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; @@ -82567,7 +82775,6 @@ self: { 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 @@ -82626,27 +82833,6 @@ self: { }) {}; "ghc-typelits-knownnat" = 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.1"; - sha256 = "0m3flri3y82wvqania3yj7mhnnxvx8z5hxwl6mr5ppavxak169q9"; - 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; - }) {}; - - "ghc-typelits-knownnat_0_4_2" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck , template-haskell, transformers @@ -82665,27 +82851,9 @@ self: { 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 - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.5.9"; - sha256 = "1aw0pgcplljll86gk9jvqc22zpnb17amamna11n9b4xzrw2lrnkg"; - 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; - }) {}; - - "ghc-typelits-natnormalise_0_5_10" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: @@ -82700,6 +82868,23 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; + }) {}; + + "ghc-typelits-natnormalise_0_6" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.6"; + sha256 = "0xs5d7bsyp53nzg509gs2qyfrj5fjp7bpyw3pjnnqk8d4xcgmf2w"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp transformers + ]; + 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; }) {}; @@ -82756,15 +82941,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_4_1" = callPackage + "ghci_8_4_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell , transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.4.1"; - sha256 = "0jlnzkwj4xxs57c0zi3rcy96rksqakx65a7m8xq04055ip388sws"; + version = "8.4.2"; + sha256 = "0pdhy6p3axq6jwl84mcq6404r1mnld7fbyspkmzninvdd46wr74l"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th template-haskell transformers unix @@ -84123,8 +84308,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.4.1"; - sha256 = "11w567c4zafcdm5i6wpi1dr4m6mpfvyqyda4llq7wgvjbshy5fqk"; + version = "0.13.5.0"; + sha256 = "0p1mwzbrzb74wxlykasza4qvvlck2b0wgnhvfa0j3h27x4ii8xjw"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -85574,8 +85759,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.5.0"; - sha256 = "1bd6lfl8l08s28g9wky2bpyl2kh8vhycdni2wh3m7iq91madxgbj"; + version = "0.13.6.0"; + sha256 = "1sz8mvac39sxj7skw8zasbp6srm4k92223l29lll1125d8n0cwaf"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -90416,8 +90601,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.14.7"; - sha256 = "0fqbr1h2zxa4g6jyias163bnlsnsdhfzfansc63qzh9y10vc2hn4"; + version = "0.14.9"; + sha256 = "1khz6ymwga07h7s1k9gadf212m242l9qq09qn2fvx8v67p4wvxxz"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -90522,6 +90707,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "gtk-sni-tray" = callPackage + ({ mkDerivation, base, bytestring, containers, dbus, directory + , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut + , gtk3, hslogger, optparse-applicative, status-notifier-item, text + , transformers, unix + }: + mkDerivation { + pname = "gtk-sni-tray"; + version = "0.1.0.0"; + sha256 = "0a9yxhir33zg1bkv9nyazkrjawv2w9qr43n4prrifib7r976b7pj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk + gi-gdkpixbuf gi-glib gi-gtk hslogger status-notifier-item text + transformers unix + ]; + libraryPkgconfigDepends = [ gtk3 ]; + executableHaskellDepends = [ + base dbus gi-gdk gi-gtk gtk-strut hslogger optparse-applicative + status-notifier-item text unix + ]; + homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme"; + description = "A standalone StatusNotifierItem/AppIndicator tray"; + license = stdenv.lib.licenses.bsd3; + }) {gtk3 = pkgs.gnome3.gtk;}; + "gtk-strut" = callPackage ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: mkDerivation { @@ -90578,8 +90790,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.3.1"; - sha256 = "0m3irv9cs8f602wc5lq84c7k1pd9yg4vydfzzn2qa6z0l552y3r2"; + version = "0.13.4.0"; + sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90731,8 +90943,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.8"; - sha256 = "0sxk3dhzhqkmlwqkpvmi1b0ycyqdz19z7zfr5nxhskzn5b522ikw"; + version = "0.14.9"; + sha256 = "1rcn0x6q0r0a3waxdsyvbyzfswsi6j7yr9fsixqr1c0g334lmqa8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -92834,8 +93046,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.6.2"; - sha256 = "0nkq1qlhpd6gmrj75vik51a4fndn6sy3vwx2nk91vmdd7ml2f0v8"; + version = "1.6.5"; + sha256 = "10pn82hichabqxxk931zwqkis8p0z235ydv7dlcrl8nisj6lzda1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93661,6 +93873,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "half_0_3" = callPackage + ({ mkDerivation, base, deepseq, hspec, QuickCheck, template-haskell + }: + mkDerivation { + pname = "half"; + version = "0.3"; + sha256 = "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6"; + libraryHaskellDepends = [ base deepseq template-haskell ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/ekmett/half"; + description = "Half-precision floating-point"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "halfs" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, filepath, fingertree, HFuse, mtl, QuickCheck, random @@ -94278,6 +94505,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_5" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.5"; + sha256 = "1imgfnn58cmfi383zfi0flx8w2430f5kplsy2m27djy5fv6brmpv"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -95366,8 +95621,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.4"; - sha256 = "0dclanbd07knph3bxn5a3kyl9qkqcwhy00y5jnah9sxk4qqhjkk5"; + version = "0.0.0.7"; + sha256 = "0bbyrbs1rm83sd5nsd65yxxfyz4day20hs3vz7rlkh2hjxhpvxjv"; libraryHaskellDepends = [ base containers hasbolt lens neat-interpolation template-haskell text th-lift-instances @@ -96527,37 +96782,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.21.0"; - sha256 = "109jgixxrb9xjlkqnwkch9zgb2rj79knd8ivgfi1cc4v30299vwi"; - 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_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"; + version = "0.21.2"; + sha256 = "0g32zgj89n1nihldvn756bz0z25h1ip8as2xvp3d10prx92i4qgi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96581,8 +96807,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.21.0"; - sha256 = "1vrz2vrmvsbahzsp1c06x4qmny5qhbrnz5ybzh5p8z1g3ji9z166"; + version = "0.21.1"; + sha256 = "0p992mpyy9z699zpvp8i8b5v8a3jhiq6c4n29zlf7qbcxc8z4z36"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -96663,25 +96889,27 @@ self: { }) {}; "haskell-igraph" = callPackage - ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs - , colour, data-default-class, data-ordlist, hashable, hxt, igraph - , matrices, primitive, random, split, tasty, tasty-golden - , tasty-hunit, unordered-containers + ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, cereal + , cereal-conduit, colour, conduit, data-default-class, data-ordlist + , hashable, hxt, igraph, matrices, primitive, random, split, tasty + , tasty-golden, tasty-hunit, unordered-containers }: mkDerivation { pname = "haskell-igraph"; - version = "0.3.0"; - sha256 = "1d0phlb2c7dibvs6ayvwgqslkzxmvcij7iw9mqxqk67zp12ga0pv"; + version = "0.4.0"; + sha256 = "19bhfcrfj4jxd6znqzslax6sd4w1icwp4rn3h0w31qpjv54x171f"; libraryHaskellDepends = [ - base binary bytestring bytestring-lexing colour data-default-class - hashable hxt primitive split unordered-containers + base bytestring bytestring-lexing cereal cereal-conduit colour + conduit data-default-class hashable hxt primitive split + unordered-containers ]; librarySystemDepends = [ igraph ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base data-ordlist matrices random tasty tasty-golden tasty-hunit + base cereal conduit data-ordlist matrices random tasty tasty-golden + tasty-hunit ]; - description = "Imcomplete igraph bindings"; + description = "Haskell interface of the igraph library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {igraph = null;}; @@ -101292,8 +101520,8 @@ self: { }: mkDerivation { pname = "hedis-config"; - version = "0.0.3"; - sha256 = "0n78gh1qz8d7xjc74bb20mvxjk4lf8acc1a3glhyr8ycw05sap2b"; + version = "1.0.0"; + sha256 = "19p0g83ybn9iajy5r8ymc8mapml34zw1a7s5hmpxdayv6slabg7r"; libraryHaskellDepends = [ aeson base bytestring hedis scientific text time ]; @@ -103120,23 +103348,19 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart , Chart-cairo, Chart-diagrams, colour, composition-prelude , data-binary-ieee754, data-default, directory, filepath, hspec - , lens, monad-loops, optparse-applicative + , lens, monad-loops }: mkDerivation { pname = "hgis"; - version = "0.1.3.8"; - sha256 = "10lqv0v4lnah22qwlyh1ixhcvl0abs9brlpddw0a24xdym4j0xhf"; - isLibrary = true; - isExecutable = true; + version = "1.0.0.0"; + sha256 = "1j70p3bgy8v1nzpqiv20lpxq7vxi54f9j3mwl8046hanra99wdr5"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring Chart Chart-cairo Chart-diagrams colour composition-prelude data-binary-ieee754 data-default directory filepath lens monad-loops - optparse-applicative ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - description = "Package and command-line for GIS with Haskell"; + description = "Library and for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -105468,6 +105692,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; + "hmatrix_0_19_0_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , openblasCompat, random, semigroups, split, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix"; + version = "0.19.0.0"; + sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj"; + configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; + libraryHaskellDepends = [ + array base binary bytestring deepseq random semigroups split + storable-complex vector + ]; + librarySystemDepends = [ openblasCompat ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numeric Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openblasCompat;}; + "hmatrix-backprop" = callPackage ({ mkDerivation, ANum, backprop, base, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog @@ -105523,13 +105768,13 @@ self: { ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.6.0.0"; - sha256 = "0x5ghi0rqv6zir304cjg2plpvzgihg31b5irkpf5alig6v7jdjn1"; + version = "0.19.0.0"; + sha256 = "1rbbzz1jc9r7blbqd37jb8f054xfk521q54b3srz3k34nkp05yb1"; libraryHaskellDepends = [ base containers hmatrix ]; librarySystemDepends = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -105548,6 +105793,23 @@ self: { license = "GPL"; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl_0_19_0_1" = callPackage + ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector + }: + mkDerivation { + pname = "hmatrix-gsl"; + version = "0.19.0.1"; + sha256 = "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm"; + libraryHaskellDepends = [ + array base hmatrix process random vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector @@ -105654,6 +105916,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hmatrix-sparse" = callPackage + ({ mkDerivation, base, hmatrix, mkl_core, mkl_intel, mkl_sequential + }: + mkDerivation { + pname = "hmatrix-sparse"; + version = "0.19.0.0"; + sha256 = "04h9vf4aayhmjnlk8wnf9mg3rfjx9n6dhnv49vpwv7j8c4qhbd4s"; + libraryHaskellDepends = [ base hmatrix ]; + librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Sparse linear solver"; + license = stdenv.lib.licenses.bsd3; + }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;}; + "hmatrix-special" = callPackage ({ mkDerivation, base, hmatrix, hmatrix-gsl }: mkDerivation { @@ -105666,6 +105942,19 @@ self: { license = "GPL"; }) {}; + "hmatrix-special_0_19_0_0" = callPackage + ({ mkDerivation, base, hmatrix, hmatrix-gsl }: + mkDerivation { + pname = "hmatrix-special"; + version = "0.19.0.0"; + sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz"; + libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Interface to GSL special functions"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-static" = callPackage ({ mkDerivation, array, base, haskell-src-meta, hmatrix, parsec , template-haskell, tfp @@ -105683,6 +105972,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-sundials" = callPackage + ({ mkDerivation, base, containers, diagrams-lib + , diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots + , sundials_arkode, template-haskell, vector + }: + mkDerivation { + pname = "hmatrix-sundials"; + version = "0.19.0.0"; + sha256 = "03pil8zkkixlgv2m07zyiyribpkphhl75ixvazb36c6rznvkg6nd"; + libraryHaskellDepends = [ + base containers hmatrix inline-c template-haskell vector + ]; + librarySystemDepends = [ sundials_arkode ]; + testHaskellDepends = [ + base containers diagrams-lib diagrams-rasterific hmatrix hspec + inline-c lens plots template-haskell vector + ]; + testSystemDepends = [ sundials_arkode ]; + homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials"; + description = "hmatrix interface to sundials"; + license = stdenv.lib.licenses.bsd3; + }) {sundials_arkode = null;}; + "hmatrix-svdlibc" = callPackage ({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck , vector @@ -105722,8 +106034,8 @@ self: { }: mkDerivation { pname = "hmatrix-tests"; - version = "0.6.0.0"; - sha256 = "1my4w6nxlwizlysk4ika9xaqjjgjxi2lal83zqgjkc05jxs1p9ih"; + version = "0.19.0.0"; + sha256 = "18adrcwd8zgw8x9dn5fvpjq4l88iqvlm5z0yxzr96zppi8z5w6fw"; libraryHaskellDepends = [ base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random ]; @@ -108112,6 +108424,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpc-threshold" = callPackage + ({ mkDerivation, base, bytestring, interpolate, pcre-heavy }: + mkDerivation { + pname = "hpc-threshold"; + version = "0.1.0.0"; + sha256 = "113m7fpm4zffvzwnqjzd45mbc18acgj5c1b9z5hqwklygjjjpx4a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/eckyputrady/hpc-threshold#readme"; + description = "Small utility for validating whether HPC result is above defined thresholds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hpc-tracer" = callPackage ({ mkDerivation, array, base, containers, haskell98, hpc, network , parsec, pretty, process, unix @@ -113542,34 +113870,6 @@ self: { }) {}; "http-client" = 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"; - sha256 = "1m4c4zyl8y3i8bzyrgqv9kcjqzj17rwnf49dvn6745bn8kiyq6v0"; - 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; - }) {}; - - "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 @@ -113595,7 +113895,6 @@ self: { 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 @@ -113901,22 +114200,6 @@ self: { }) {}; "http-date" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, doctest - , hspec, old-locale, time - }: - mkDerivation { - pname = "http-date"; - version = "0.0.6.1"; - sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj"; - libraryHaskellDepends = [ array attoparsec base bytestring ]; - testHaskellDepends = [ - base bytestring doctest hspec old-locale time - ]; - description = "HTTP Date parser/formatter"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-date_0_0_7" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, doctest , hspec, old-locale, time }: @@ -113930,7 +114213,6 @@ self: { ]; description = "HTTP Date parser/formatter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-dispatch" = callPackage @@ -115388,8 +115670,8 @@ self: { ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: mkDerivation { pname = "hw-hspec-hedgehog"; - version = "0.1.0.3"; - sha256 = "0bnqvbh8jkpnannfgx1ghv5b4qvj37w1p29ap730s2bbfpsaldq2"; + version = "0.1.0.4"; + sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; testHaskellDepends = [ base hedgehog hspec ]; homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme"; @@ -115409,6 +115691,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-ip" = callPackage + ({ mkDerivation, base, hedgehog, hspec, hw-hspec-hedgehog }: + mkDerivation { + pname = "hw-ip"; + version = "0.1.0.0"; + sha256 = "1gw0g6xd6q2rbnpb8j2yi8ddq39r2l8rplx8nfwk9mqzpgxx0r1n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + homepage = "https://github.com/haskell-works/hw-ip#readme"; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, conduit, containers, criterion, dlist, hspec @@ -115615,18 +115910,48 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector + }: mkDerivation { pname = "hw-prim"; - version = "0.5.0.0"; - sha256 = "00sivy11g7haafpqy12sxgslffw841bx0i25phaz5vcfwp5xrp9j"; - libraryHaskellDepends = [ base bytestring vector ]; - testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; + version = "0.5.0.2"; + sha256 = "0pqg7a46j63n8gp4c2hsxh98f0xppfhaww00zbjy45zx8h2gb1qm"; + libraryHaskellDepends = [ base bytestring mmap vector ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap vector + ]; homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_5_0_3" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.5.0.3"; + sha256 = "1cnh8qm4kz4fxh34wn9039dxbb54mwhkls21m5s73q773q9fx4rz"; + libraryHaskellDepends = [ base bytestring mmap vector ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap vector + ]; + homepage = "http://github.com/haskell-works/hw-prim#readme"; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -119389,7 +119714,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0" = callPackage + "influxdb_1_6_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -119399,8 +119724,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0"; - sha256 = "1fmz5n3mp3w1v2axp9g1nw9h5sj6cw3xbs44xczn59sgpmz5hv34"; + version = "1.6.0.1"; + sha256 = "14xk27qg5w7pdrmbz7fys96x4yywv0hk82z46802dlnxlfpikyc3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -119990,14 +120315,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "integer-gmp_1_0_1_0" = callPackage + "integer-gmp_1_0_2_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.1.0"; - sha256 = "1xrdqksharn0jg8m1d7zm8nhbsq3abw2k25kzw0z7m0zm14n1nlw"; - revision = "1"; - editedCabalFile = "02xp5ldq3xxx1qdxg7gbs2zcqpf1dxbdrvrzizxnjwhpiqxcigy3"; + version = "1.0.2.0"; + sha256 = "1aaz2mdmwbrfxahhycpiz92hdvfn9mm7964wfypf8m0m8libhs6k"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -120559,25 +120882,6 @@ self: { }) {}; "invertible" = callPackage - ({ mkDerivation, base, haskell-src-meta, invariant, lens - , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell - , transformers, TypeCompose - }: - mkDerivation { - pname = "invertible"; - version = "0.2.0.4"; - sha256 = "0hrg58p5yz97n2xi9mbad69skldr163mr1wdvykdsvwyyxhfl4q4"; - libraryHaskellDepends = [ - base haskell-src-meta invariant lens partial-isomorphisms - semigroupoids template-haskell transformers TypeCompose - ]; - testHaskellDepends = [ base QuickCheck transformers ]; - description = "bidirectional arrows, bijective functions, and invariant functors"; - license = stdenv.lib.licenses.bsd3; - 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 @@ -121113,8 +121417,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.3"; - sha256 = "0zhfn0rxwakspx1b9pxcqb9vbi8lr786hhb5s9j15xiszkl8hf4s"; + version = "1.7.4"; + sha256 = "17gcmw9m8c30cm3j5hdcqhpkvbir9js1k6s3ad141yszxymmnq8q"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -128102,15 +128406,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "language-docker_4_0_1" = callPackage + "language-docker_5_0_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, free, Glob , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split , template-haskell, text, th-lift, time }: mkDerivation { pname = "language-docker"; - version = "4.0.1"; - sha256 = "0z1jifvinq90qh4106azd6ss80ds5p8acvl8x73j4zmqpn2d95xa"; + version = "5.0.0"; + sha256 = "16shdy1dh0bsalj0ciwg7h9dkjfjgkrfmq7g81z3k8fgy1w2y81n"; libraryHaskellDepends = [ base bytestring free mtl parsec pretty split template-haskell text th-lift time @@ -128748,7 +129052,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -128828,8 +129132,8 @@ self: { }: mkDerivation { pname = "language-rust"; - version = "0.1.1.26"; - sha256 = "1f363j2kpvww0v7l13lg8a2a0v0h2zw7q3x8fyssvrw3yn5afwyn"; + version = "0.2.0.27"; + sha256 = "04xyw05i5fbk766igpa5kx9wa4801s84wr6nyl4y9dwy8fcnq9va"; libraryHaskellDepends = [ array base bytestring deepseq prettyprinter template-haskell transformers utf8-string @@ -130432,8 +130736,8 @@ self: { }: mkDerivation { pname = "lens-toml-parser"; - version = "0.1.0.1"; - sha256 = "1mcbba5ff2jfr91jlzi5s5jf09p92jbpg37gf525bhv23hhid7xy"; + version = "0.1.0.2"; + sha256 = "1akp8mm62pnz8ncg235rdxzcrxv36paw723m7dcyr3139qflzxkn"; libraryHaskellDepends = [ base profunctors text time toml-parser ]; testHaskellDepends = [ base containers dwergaz hlint lens-family text toml-parser @@ -130459,14 +130763,15 @@ self: { "lens-utils" = callPackage ({ mkDerivation, aeson, base, containers, data-default, lens - , monoid, template-haskell + , monoid, split, template-haskell }: mkDerivation { pname = "lens-utils"; - version = "1.4.2"; - sha256 = "1sgsahb2cgfhbv3vw0h1cqls5g5kgbq9crx4w0rfjxcwk9d5jzds"; + version = "1.4.4"; + sha256 = "0ry04ghvbyxa236s150hfs5fa0fsip312ivflg70j49n02ypxr91"; libraryHaskellDepends = [ - aeson base containers data-default lens monoid template-haskell + aeson base containers data-default lens monoid split + template-haskell ]; homepage = "https://github.com/luna/lens-utils"; description = "Collection of missing lens utilities"; @@ -137622,17 +137927,18 @@ self: { }) {}; "marihana" = callPackage - ({ mkDerivation, base, directory }: + ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "marihana"; - version = "0.1.1.0"; - sha256 = "1wcrmjxw39pcarvwn4cfzd4wimvsf57qg8vl5lykcd9s4p2dnyvw"; + version = "0.2.1.0"; + sha256 = "03aw0chicgmyj3ix7nz0dc5mpck0409bv1d7lfs5wn9z4mmynqiv"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base directory ]; - executableHaskellDepends = [ base directory ]; - testHaskellDepends = [ base directory ]; + libraryHaskellDepends = [ base directory filepath process ]; + executableHaskellDepends = [ base directory filepath process ]; + testHaskellDepends = [ base directory filepath process ]; homepage = "https://github.com/suzukeno/marihana#readme"; + description = "Minimal tool to make your blog in Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -138072,8 +138378,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.1.2.0"; - sha256 = "02va411j1alsja009xms30x0zhwansjiy81djz2za06ghyg4f6a1"; + version = "0.1.3.0"; + sha256 = "08jngww0ki28d2mhfj9vw4rlxigzzvgb295k5fnj0cr7xmhr48zx"; libraryHaskellDepends = [ base bytestring data-default deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -140915,26 +141221,6 @@ self: { }) {}; "mime-mail-ses" = callPackage - ({ mkDerivation, base, base64-bytestring, byteable, bytestring - , conduit, cryptohash, http-client, http-conduit, http-types - , mime-mail, old-locale, text, time, transformers, xml-conduit - , xml-types - }: - mkDerivation { - pname = "mime-mail-ses"; - version = "0.4.0.0"; - sha256 = "0w87ba8a5kli7xv7d8x5viz1c2rmm3ahaxp5d797n8bb13yn09mw"; - libraryHaskellDepends = [ - base base64-bytestring byteable bytestring conduit cryptohash - http-client 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; - }) {}; - - "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 @@ -140952,7 +141238,6 @@ self: { 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 @@ -141134,35 +141419,32 @@ self: { }) {}; "minio-hs" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , case-insensitive, conduit, conduit-combinators, conduit-extra - , containers, cryptonite, cryptonite-conduit, data-default - , directory, exceptions, filepath, http-client, http-conduit - , http-types, lifted-async, lifted-base, memory, monad-control - , protolude, QuickCheck, resourcet, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, temporary, text, text-format - , time, transformers, transformers-base, vector, xml-conduit + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, data-default, directory, exceptions, filepath + , http-client, http-conduit, http-types, memory, protolude + , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, temporary, text, text-format, time + , transformers, unliftio, unliftio-core, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "0.3.2"; - sha256 = "0yfhnvngw27h05hxywxp76fcy4566djsm0l3x2kx8n4ppwi5p6r4"; + version = "1.0.0"; + sha256 = "0q6qzzkkbm9b0a7c630yj2rlg54imir1yjbpsy4x9fh3kc7vx0i2"; libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring case-insensitive - conduit conduit-combinators conduit-extra containers cryptonite - cryptonite-conduit data-default exceptions filepath http-client - http-conduit http-types lifted-async lifted-base memory - monad-control protolude resourcet text text-format time - transformers transformers-base vector xml-conduit + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit data-default + exceptions filepath http-client http-conduit http-types memory + protolude resourcet text text-format time transformers unliftio + unliftio-core xml-conduit ]; testHaskellDepends = [ - aeson async base base64-bytestring bytestring case-insensitive - conduit conduit-combinators conduit-extra containers cryptonite - cryptonite-conduit data-default directory exceptions filepath - http-client http-conduit http-types lifted-async lifted-base memory - monad-control protolude QuickCheck resourcet tasty tasty-hunit + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit data-default + directory exceptions filepath http-client http-conduit http-types + memory protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck temporary text text-format time - transformers transformers-base vector xml-conduit + transformers unliftio unliftio-core xml-conduit ]; homepage = "https://github.com/minio/minio-hs#readme"; description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; @@ -141429,15 +141711,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_19_0_0" = callPackage + "miso_0_20_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.19.0.0"; - sha256 = "0xnnhs36rnbaq8q4s6r2lhm9g4qdvm0qm0pj3hgrkgn22cs2fq21"; + version = "0.20.0.0"; + sha256 = "0nr7j9065mrwmmqwjsgl9krh21mhxjddbwmkwja0b207aglc072j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141660,6 +141942,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; + revision = "1"; + editedCabalFile = "02b0ycywjhzx1ll36l38mwp2gy677hgsqpq2mwyi277ykbrwnsdk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -141708,8 +141992,8 @@ self: { pname = "mmark-ext"; version = "0.2.0.0"; sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k"; - revision = "1"; - editedCabalFile = "0sql0z4123v5kzqcganfaag6ijl3j7lw52d3c50r9qwwg8q2dydz"; + revision = "2"; + editedCabalFile = "0h47hy97mdan3cnxppf0yarmis81irc0c92nm1xv9f6w35li7rkq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl lucid microlens mmark modern-uri skylighting text @@ -142614,28 +142898,6 @@ self: { }) {}; "monad-logger" = 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.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/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 @@ -142655,7 +142917,6 @@ self: { 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 @@ -146247,6 +146508,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability-transition" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, logging-effect, mtl + , mwc-probability, primitive, QuickCheck, transformers + }: + mkDerivation { + pname = "mwc-probability-transition"; + version = "0.3.0.3"; + sha256 = "04jnszan9723ycrf1xgh2k87vcx0xyq5ga8q3fjskr3937j0ydxj"; + libraryHaskellDepends = [ + base ghc-prim logging-effect mtl mwc-probability primitive + transformers + ]; + testHaskellDepends = [ + base hspec logging-effect mwc-probability QuickCheck + ]; + homepage = "https://github.com/ocramz/mwc-probability-transition"; + description = "A Markov stochastic transition operator with logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mwc-random" = callPackage ({ mkDerivation, base, math-functions, primitive, time, vector }: mkDerivation { @@ -152582,12 +152863,12 @@ self: { }) {}; "one-liner-instances" = callPackage - ({ mkDerivation, base, one-liner }: + ({ mkDerivation, base, one-liner, random }: mkDerivation { pname = "one-liner-instances"; - version = "0.1.1.0"; - sha256 = "0yb5rdy735lalwrxvmvvjnpyikdqs2y2fjldjcbjj0r3d912azxn"; - libraryHaskellDepends = [ base one-liner ]; + version = "0.1.2.1"; + sha256 = "1gy900nd5n6cffqw63hlkqg4ly86wjlfqgdcm1zy2nyx7dxg914k"; + libraryHaskellDepends = [ base one-liner random ]; homepage = "https://github.com/mstksg/one-liner-instances#readme"; description = "Generics-based implementations for common typeclasses"; license = stdenv.lib.licenses.bsd3; @@ -152930,8 +153211,8 @@ self: { ({ mkDerivation, base, type-fun }: mkDerivation { pname = "open-union"; - version = "0.3.0.0"; - sha256 = "01wxkla0034d5i331vzbjm5ilkdn2570qhl0pa6lf3m58aghmccn"; + version = "0.4.0.0"; + sha256 = "0mf37xya4bb8za8jrhnzr9pddsd93dw0vycmjlks5w50x10d4a55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base type-fun ]; @@ -155682,8 +155963,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.4.0"; - sha256 = "1m7as420nh55n0hywnl6rbm7zj4s1ry38xvb1gk3np7k87lwf20z"; + version = "0.13.5.0"; + sha256 = "1s29dmds28ffbcbic8pw3bsixkb6lzjm78j8qv4x3r9l64kvjndz"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -160924,8 +161205,8 @@ self: { }: mkDerivation { pname = "pipes-extras"; - version = "1.0.13"; - sha256 = "04adszpz02a72zz8kjj9lcw62n296p74rq4xds3b8g345m6c51g1"; + version = "1.0.14"; + sha256 = "17f8aj6p074yryk0a26vg1iiy7dva5cjb1gzsrvsq41dhy28j7gx"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -166813,8 +167094,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.1.7"; - sha256 = "024ygn8q24sxdxdr1mip9pcjjmzm254am7fyzbqpmj5cjg1kykq6"; + version = "3.2.0"; + sha256 = "19q61qjmygjah49qjy4a89hpn8ra8z9pq0f72p1c7wzgk38zp55r"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -166992,8 +167273,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.4"; - sha256 = "0wzaca3hcvbdfb326srj6sivzkbyshxv6j0lvng6k8dqwiipnvwb"; + version = "5.3.5"; + sha256 = "0x6whnn53grfkjqybn91kfsr69w3r9mk9r39yzwx35skwkqj3vb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167001,11 +167282,7 @@ self: { filepath hashable hslogger IfElse mtl network process split stm text time transformers unix unix-compat ]; - executableHaskellDepends = [ - ansi-terminal async base bytestring containers directory exceptions - filepath hashable hslogger IfElse mtl network process split stm - text time transformers unix unix-compat - ]; + executableHaskellDepends = [ base ]; homepage = "https://propellor.branchable.com/"; description = "property-based host configuration management in haskell"; license = stdenv.lib.licenses.bsd2; @@ -170744,31 +171021,6 @@ self: { }) {}; "rakuten" = 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.0"; - sha256 = "13m8rg805aw5rj2a5j16yj06k5ws99ssl89r5s62xlq6lbzhc84c"; - 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; - }) {}; - - "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 @@ -170791,7 +171043,6 @@ self: { 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 @@ -172293,6 +172544,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reactive-banana-automation" = callPackage + ({ mkDerivation, base, doctest, reactive-banana, stm, time }: + mkDerivation { + pname = "reactive-banana-automation"; + version = "0.1.1"; + sha256 = "0fn3frv0idgdg9faysri7x5nzrxrzhpy41s5nm6v8ckqcnzq7vvv"; + libraryHaskellDepends = [ base reactive-banana stm time ]; + testHaskellDepends = [ base doctest ]; + description = "home (etc) automation using reactive-banana"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "reactive-banana-bunch" = callPackage ({ mkDerivation, base, non-empty, reactive-banana, transformers , utility-ht @@ -173198,8 +173461,8 @@ self: { ({ mkDerivation, base, deepseq, raptor2, redland }: mkDerivation { pname = "redland"; - version = "0.2.0.1"; - sha256 = "080bp01x6vlfw116zcl75vr7pb753mn8892rkh7aqgaf8ajkhb2c"; + version = "0.2.0.2"; + sha256 = "0wfmv87d9vxah1s519457zs4436lri7ypn2069r8wdpvaariiim5"; libraryHaskellDepends = [ base deepseq ]; libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; @@ -179217,8 +179480,8 @@ self: { }: mkDerivation { pname = "safe-money"; - version = "0.5"; - sha256 = "09ia4sf98ggl2y8xl0gn1vjapvwbbqq3ibfrci2p2akkyykg2vk8"; + version = "0.6"; + sha256 = "1l8gn9vscng92s1dkfj2fa55k63jnzcnw590r5a8n7dqwaycpz7r"; libraryHaskellDepends = [ aeson base binary cereal constraints deepseq hashable serialise store text vector-space xmlbf @@ -179694,24 +179957,6 @@ self: { }) {}; "sampling" = callPackage - ({ mkDerivation, base, containers, criterion, foldl, mwc-random - , primitive, vector - }: - mkDerivation { - pname = "sampling"; - version = "0.3.2"; - sha256 = "0kl2d53rp0wi3fb0apm8czzx1wj93ljl3a17w6yibyqgc3j5cqd6"; - 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; - }) {}; - - "sampling_0_3_3" = callPackage ({ mkDerivation, base, containers, criterion, foldl, mwc-random , primitive, vector }: @@ -179727,7 +179972,6 @@ self: { homepage = "https://github.com/jtobin/sampling"; description = "Sample values from collections"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "samtools" = callPackage @@ -180106,33 +180350,6 @@ self: { }) {}; "sbp" = 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, yaml - }: - mkDerivation { - pname = "sbp"; - version = "2.3.13"; - sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9"; - 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 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; - }) {}; - - "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 @@ -180157,7 +180374,6 @@ self: { homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -181345,8 +181561,8 @@ self: { }: mkDerivation { pname = "scroll"; - version = "1.20170122"; - sha256 = "0f4blgfaz69y2i6cj91zq63v5dqv7invjvqv5a4l1rgjixpn7dc9"; + version = "1.20180421"; + sha256 = "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -181633,6 +181849,25 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; + "sdl2-ttf_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf + , template-haskell, text, transformers + }: + mkDerivation { + pname = "sdl2-ttf"; + version = "2.1.0"; + sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring sdl2 template-haskell text transformers + ]; + libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; + description = "Bindings to SDL2_ttf"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; + "sdnv" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -182384,13 +182619,19 @@ self: { }) {}; "semirings" = callPackage - ({ mkDerivation }: + ({ mkDerivation, base, constrictor, containers, hashable + , integer-gmp, unordered-containers, vector + }: mkDerivation { pname = "semirings"; - version = "0.0.0"; - sha256 = "0dc4vi7zlpvz12b9hvq5b6v621aw84hp331rcbn617gpw7dvflcq"; - doHaddock = false; - description = "TBA"; + version = "0.1.1"; + sha256 = "1vrvid3ix80vwmf7qmp5f1f97nyzkq4a01bxf62kpqlbri2m9mz3"; + libraryHaskellDepends = [ + base constrictor containers hashable integer-gmp + unordered-containers vector + ]; + homepage = "http://github.com/chessai/semirings"; + description = "two monoids as one, in holy haskimony"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -183365,8 +183606,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.3.0"; - sha256 = "1fwzsx13lvqaaxh8cfs7zi8l2a0c7kgz8gnnwgssrasnk27jsc20"; + version = "0.5.3.1"; + sha256 = "0mndi1b0sgfik7yij3l65bcsqp820igbf09nnrk8dmznnama56y4"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -185875,8 +186116,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.1"; - sha256 = "0rl0a2d55r55w705jx4si17n403l06jk3d6mrf3gd2ghn93hb13a"; + version = "1.8.0.2"; + sha256 = "16gmyn1rbfx33dxxkyxrswa8cvjpiq3i2vm59hy4y9lag10nq9xn"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats lens shake shake-ext text @@ -185920,8 +186161,7 @@ self: { 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 @@ -193335,19 +193575,6 @@ self: { }) {}; "sql-words" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-simple }: - mkDerivation { - pname = "sql-words"; - version = "0.1.5.1"; - sha256 = "0nr4ld96s3n48ydd15jsxb823kk2682wkjd2h7vqc306891qwwzd"; - 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; - }) {}; - - "sql-words_0_1_6_0" = callPackage ({ mkDerivation, base, QuickCheck, quickcheck-simple }: mkDerivation { pname = "sql-words"; @@ -193358,7 +193585,6 @@ self: { 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 @@ -194602,8 +194828,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.6.1"; - sha256 = "0wqa6lrn2l38grg4h24ihacchavsyglbvlmlsfh4s9h1300dngab"; + version = "0.7.0"; + sha256 = "0g3abhr63jnqw231k6kai9c5gqh15dyxrr78fqw5ga98l3p2b8jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194615,7 +194841,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Cabal hspec pretty shakespeare text yaml + base bytestring Cabal hspec network-uri pretty shakespeare text + yaml ]; homepage = "https://github.com/typeable/stackage2nix#readme"; description = "Convert Stack files into Nix build instructions"; @@ -195247,8 +195474,8 @@ self: { }: mkDerivation { pname = "status-notifier-item"; - version = "0.1.0.0"; - sha256 = "1g1gf3anqrg8mfdyjvymk5wlg0h4pfc0pv4wlw5phk6r93dxah1n"; + version = "0.2.1.0"; + sha256 = "1w81n87x70bqpskcp0nai9l8ry6hk518myn1cymi695x94vv9m6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200564,31 +200791,30 @@ self: { "taffybar" = callPackage ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers , dbus, directory, dyre, either, enclosed-exceptions, filepath - , glib, gtk-traymanager, gtk3, HStringTemplate, HTTP, mtl, multimap + , gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-gtk, glib, gtk-traymanager + , gtk3, haskell-gi-base, HStringTemplate, HTTP, mtl, multimap , network, network-uri, old-locale, parsec, process, rate-limit , safe, split, stm, text, time, time-locale-compat, time-units - , transformers, tuple, unix, utf8-string, X11, xdg-basedir, xml - , xml-helpers, xmonad, xmonad-contrib + , transformers, transformers-base, tuple, unix, utf8-string, X11 + , xdg-basedir, xml, xml-helpers, xmonad, xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "1.0.1"; - sha256 = "1agx7q73h8x53cl8i408yifrr80fbm47pwn46mi6abcp61s92chn"; + version = "1.0.2"; + sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ alsa-mixer base cairo ConfigFile containers dbus directory dyre - either enclosed-exceptions filepath glib gtk-traymanager gtk3 - HStringTemplate HTTP mtl multimap network network-uri old-locale - parsec process rate-limit safe split stm text time - time-locale-compat time-units transformers tuple unix utf8-string - X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib - ]; - executableHaskellDepends = [ - base containers directory dyre filepath glib gtk3 mtl safe split - utf8-string X11 xdg-basedir + either enclosed-exceptions filepath gi-gdk gi-gdkpixbuf gi-gdkx11 + gi-gtk glib gtk-traymanager gtk3 haskell-gi-base HStringTemplate + HTTP mtl multimap network network-uri old-locale parsec process + rate-limit safe split stm text time time-locale-compat time-units + transformers transformers-base tuple unix utf8-string X11 + xdg-basedir xml xml-helpers xmonad xmonad-contrib ]; + executableHaskellDepends = [ base ]; homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; @@ -201278,6 +201504,8 @@ self: { pname = "tar"; version = "0.4.1.0"; sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm"; + revision = "1"; + editedCabalFile = "14ljxvasrda7qafz95gz3m0lpdsh4vvd6j8b3qkr2a2sp7cc0sis"; libraryHaskellDepends = [ base bytestring directory filepath old-time ]; @@ -202806,8 +203034,8 @@ self: { ({ mkDerivation, base, Boolean }: mkDerivation { pname = "temporal-media"; - version = "0.6.2"; - sha256 = "0dsvpag8j2lfn6nz9wbzcbdfrzmq35ww9n8p5db638b11749sc97"; + version = "0.6.3"; + sha256 = "04qbbx32rs6mz5w3j7wj2hx744x858rv60hmpla3zpx2491r0qi9"; libraryHaskellDepends = [ base Boolean ]; homepage = "https://github.com/anton-k/temporal-media"; description = "data types for temporal media"; @@ -204178,6 +204406,8 @@ self: { pname = "text-format"; version = "0.3.1.1"; sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd"; + revision = "1"; + editedCabalFile = "1ap2paddh2q1ifs3nwdj0f1r7fypnsa669l7gdvgyfidz3w5vzic"; libraryHaskellDepends = [ array base double-conversion ghc-prim integer-gmp old-locale text time transformers @@ -204336,27 +204566,6 @@ self: { }) {}; "text-ldap" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, dlist - , memory, QuickCheck, quickcheck-simple, random, transformers - }: - mkDerivation { - pname = "text-ldap"; - version = "0.1.1.11"; - sha256 = "1921cdq9akvcn0hsgs07g2bvbpdvhb1h389yv9703472d0sz7pfs"; - 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; - }) {}; - - "text-ldap_0_1_1_12" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dlist , memory, QuickCheck, quickcheck-simple, random, transformers }: @@ -204375,7 +204584,6 @@ self: { ]; description = "Parser and Printer for LDAP text data stream"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-lens" = callPackage @@ -205224,17 +205432,6 @@ self: { }) {}; "th-data-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-data-compat"; - version = "0.0.2.5"; - sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs"; - libraryHaskellDepends = [ base template-haskell ]; - description = "Compatibility for data definition template of TH"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-data-compat_0_0_2_6" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; @@ -205243,7 +205440,6 @@ self: { 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 @@ -205350,8 +205546,8 @@ self: { }: mkDerivation { pname = "th-format"; - version = "0.1.1.0"; - sha256 = "1axan3icxz9yxkra2kb9r66h9h51v4zbjncd1xsvgiplqmwf6fjl"; + version = "0.1.2.0"; + sha256 = "1wc9ndqv2qxk75b47s44j0lrx5h9hc1r4h1nvl01pbdks6yyi43j"; libraryHaskellDepends = [ base Earley haskell-src-meta template-haskell text ]; @@ -205549,18 +205745,6 @@ self: { }) {}; "th-reify-compat" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-reify-compat"; - version = "0.0.1.3"; - sha256 = "0byl2n0lj55vx2kyka172bwvw8zcyag78cnqs7y9yp4kl8ivwh8z"; - 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; - }) {}; - - "th-reify-compat_0_0_1_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; @@ -205570,7 +205754,6 @@ self: { 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 @@ -206479,25 +206662,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty - , tasty-hunit, text, time, websockets - }: - mkDerivation { - pname = "tidal"; - version = "0.9.8"; - sha256 = "08a8k4kdq6wmhggf3bm4c5a6xck2waf6n6815csms919rhlbkbpb"; - libraryHaskellDepends = [ - base colour containers hashable hosc mersenne-random-pure64 mtl - parsec safe semigroups text time websockets - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://tidalcycles.org/"; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_0_9_9" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty , tasty-hunit, text, time, websockets @@ -206514,7 +206678,6 @@ self: { homepage = "http://tidalcycles.org/"; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -209121,6 +209284,8 @@ self: { pname = "transformers-either"; version = "0.0.2"; sha256 = "1122rgspazl3n9vghlzzg14hv6p0a66lf6r7hkim14p0rcagvx5a"; + revision = "1"; + editedCabalFile = "134big9w9307vjmj6p6m3wgmh4lrvv8dyg0iw2nm54p9kg0c6ga8"; libraryHaskellDepends = [ base text transformers ]; description = "An Either monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -209132,6 +209297,8 @@ self: { pname = "transformers-either"; version = "0.1.0"; sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm"; + revision = "1"; + editedCabalFile = "1bhkkh73irjql1jhxdcrv1igmf0hqpnw2p0w1s6fwhiidx64kvy9"; libraryHaskellDepends = [ base exceptions text transformers ]; homepage = "http://github.com/tmcgilchrist/transformers-either/"; description = "An Either monad transformer"; @@ -210635,8 +210802,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.7"; - sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk"; + version = "1.5.8"; + sha256 = "0vp442byylqki6pabhg8bs27msqsdcwcnql40z003jx1hidccnq4"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -210730,20 +210897,20 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion , data-default, directory, extra, hspec, htoml-megaparsec - , http-client, http-client-tls, http-types, megaparsec, microlens + , http-client, http-client-tls, http-types, lens, megaparsec , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.37"; - sha256 = "14csa7p3z4ywxwybs0y4ylymsqg1m8scp5fhcm3mayy9cdz2g49n"; + version = "1.0.1.38"; + sha256 = "19k1z6wrizym21a29hx31yhv4y5m1w0474iqm8idyxih4fya3k7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring composition-prelude containers data-default extra htoml-megaparsec - http-client http-client-tls http-types megaparsec microlens split - text unordered-containers + http-client http-client-tls http-types lens megaparsec split text + unordered-containers ]; executableHaskellDepends = [ base bytestring directory optparse-applicative @@ -211603,8 +211770,8 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "type-interpreter"; - version = "0.1.3"; - sha256 = "0gv1782vj48v9cybsyc8wqsgndg966gkpnzxaw7s9f2g1c18jj1s"; + version = "0.1.4"; + sha256 = "0743byvz8jry9b5li4wg5qc4nwl5ri0vjvsfdy3l4gkg1v1zh0ng"; libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Interpreter for Template Haskell types"; @@ -211988,18 +212155,17 @@ self: { }) {}; "type-unary" = callPackage - ({ mkDerivation, applicative-numbers, base, constraints, newtype - , ty, vector-space + ({ mkDerivation, applicative-numbers, base, constraints + , newtype-generics, ty, vector-space }: mkDerivation { pname = "type-unary"; - version = "0.3.0"; - sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l"; - revision = "1"; - editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11"; + version = "0.3.2"; + sha256 = "12h20xjqr1abb5mb4fmij9j0vkfn7rwbidm2dr7ssbkk7cb5fv37"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - applicative-numbers base constraints newtype ty vector-space + applicative-numbers base constraints newtype-generics ty + vector-space ]; homepage = "https://github.com/conal/type-unary"; description = "Type-level and typed unary natural numbers, inequality proofs, vectors"; @@ -213883,16 +214049,16 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , doctest, ghc-prim, Glob, hashable, hedgehog, microlens - , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty - , tasty-hedgehog, text, text-format, transformers, type-operators + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, microlens + , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog + , text, text-format, transformers, type-operators , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.1.0"; - sha256 = "0k1gk9dba9f7w852m6y46gq1md3z0w29bgv4qy7xp3pk16h3axhp"; + version = "1.1.1"; + sha256 = "0l49k17f73hkywccvnir79iwlj7j7bb3p89j5kf5hdnk25biw2hq"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text text-format transformers @@ -213903,8 +214069,7 @@ self: { utf8-string ]; benchmarkHaskellDepends = [ - base containers criterion deepseq hashable mtl semigroups text - unordered-containers + base containers gauge unordered-containers ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; @@ -214116,6 +214281,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio_0_2_7_0" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath, hspec + , process, stm, time, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.7.0"; + sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs"; + libraryHaskellDepends = [ + async base deepseq directory filepath process stm time transformers + unix unliftio-core + ]; + testHaskellDepends = [ + async base deepseq directory filepath hspec process stm time + transformers unix unliftio-core + ]; + homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -214136,8 +214323,8 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.1.0.1"; - sha256 = "1z4h20jn3i3582i63vmih2ccr0pljp6whb3h4pbpj36s1q75bmgp"; + version = "0.2.0.0"; + sha256 = "0alwn39ri4npgxfxvnv43bl8vfjhjl4ffcvv8l9nmrmzsh770p59"; libraryHaskellDepends = [ base resource-pool time transformers unliftio-core ]; @@ -215287,6 +215474,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "utf8-validator" = callPackage + ({ mkDerivation, base, bytestring, criterion, tasty, tasty-hunit + , text, utf8-string + }: + mkDerivation { + pname = "utf8-validator"; + version = "0.1.0.0"; + sha256 = "1r4y6gvd4jqfqv4qz01bhq1r17lsi548p6sr1byvkj00nia0cyjk"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text utf8-string + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/edwardgeorge/utf8-validator#readme"; + description = "Constant-space UTF8 validator for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -215975,6 +216180,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_5_0_0" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.5.0.0"; + sha256 = "0hpdj3ckp2r8dklpjdrrbfd02maskxw2vrjnqnxsgi8s3j8avqsv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -215992,6 +216211,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-aeson_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, validity, validity-scientific + , validity-text, validity-unordered-containers, validity-vector + }: + mkDerivation { + pname = "validity-aeson"; + version = "0.2.0.0"; + sha256 = "01ck9kbclrjxbjb7rvr1y95cizbdq5lzdd0xfpbpaf4rfgjd3w56"; + libraryHaskellDepends = [ + aeson base validity validity-scientific validity-text + validity-unordered-containers validity-vector + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-bytestring" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { @@ -216004,6 +216241,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-bytestring_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, validity }: + mkDerivation { + pname = "validity-bytestring"; + version = "0.3.0.0"; + sha256 = "1yxrpwxqn0262262j27sf1nb6iw6fnirypivnmpw0ghml28w7aym"; + libraryHaskellDepends = [ base bytestring validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for bytestring"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-containers" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { @@ -216016,6 +216266,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-containers_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, validity }: + mkDerivation { + pname = "validity-containers"; + version = "0.3.0.0"; + sha256 = "1jh2f46x5gwhb5i5bmqn1vdn27way0nk7q2gphyjb62zrg3d3zq5"; + libraryHaskellDepends = [ base containers validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-path" = callPackage ({ mkDerivation, base, filepath, path, validity }: mkDerivation { @@ -216028,6 +216291,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-path_0_3_0_0" = callPackage + ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path + , validity + }: + mkDerivation { + pname = "validity-path"; + version = "0.3.0.0"; + sha256 = "1ijrzfk9jhlxxcdjqdq4cqz7ir7k7z9zrbamb18zai99hb6gg066"; + libraryHaskellDepends = [ base filepath path validity ]; + testHaskellDepends = [ + base filepath genvalidity-hspec hspec path validity + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for Path"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-scientific" = callPackage ({ mkDerivation, base, scientific, validity }: mkDerivation { @@ -216040,6 +216321,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-scientific_0_2_0_0" = callPackage + ({ mkDerivation, base, scientific, validity }: + mkDerivation { + pname = "validity-scientific"; + version = "0.2.0.0"; + sha256 = "0l4mzrhn6yhqd6kz7rwfvrqxk0dhwvfkh40pfjyzbkg5mvd1drhh"; + libraryHaskellDepends = [ base scientific validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for scientific"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { @@ -216052,6 +216346,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-text_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.3.0.0"; + sha256 = "190gkwa3b4rnhmah9idivvrv0val4crv8y3qy9s0aa44kpcj2b8m"; + libraryHaskellDepends = [ base bytestring text validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -216064,6 +216371,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-time_0_2_0_0" = callPackage + ({ mkDerivation, base, time, validity }: + mkDerivation { + pname = "validity-time"; + version = "0.2.0.0"; + sha256 = "0rp1y2xq3h18ji3vaiv3w76kkdyql5y8xxxz730za6mrf1ffbnk4"; + libraryHaskellDepends = [ base time validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-unordered-containers" = callPackage ({ mkDerivation, base, hashable, unordered-containers, validity }: mkDerivation { @@ -216906,16 +217226,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_1_0_0_0" = callPackage - ({ mkDerivation, base, deepseq, finite-typelits - , indexed-list-literals, primitive, vector + "vector-sized_1_0_1_0" = callPackage + ({ mkDerivation, adjunctions, base, deepseq, distributive + , finite-typelits, indexed-list-literals, primitive, vector }: mkDerivation { pname = "vector-sized"; - version = "1.0.0.0"; - sha256 = "1jn00l5nw2ws4j6z8fd2h312003vpi8a4ygakmrdg4580cwnjmls"; + version = "1.0.1.0"; + sha256 = "0p3bwqdz3k1a3ya7bj80d6crpbsk62wcvl6rkpkr0snqh4zq87zl"; libraryHaskellDepends = [ - base deepseq finite-typelits indexed-list-literals primitive vector + adjunctions base deepseq distributive finite-typelits + indexed-list-literals primitive vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -218086,12 +218407,12 @@ self: { }) {}; "vulkan" = callPackage - ({ mkDerivation, base, vector-sized, vulkan }: + ({ mkDerivation, base, cpphs, vector-sized, vulkan }: mkDerivation { pname = "vulkan"; - version = "2.0.0.0"; - sha256 = "1lm92sgv1nbc4h4znyilyp3hqlj5xl6i9zcrax0fxx69a9q2jg2l"; - libraryHaskellDepends = [ base vector-sized ]; + version = "2.1.0.0"; + sha256 = "1w19ip6qc5qbscp06a2b58x9yhjc98naaq1gxymk7gs3iagylrzq"; + libraryHaskellDepends = [ base cpphs vector-sized ]; librarySystemDepends = [ vulkan ]; homepage = "http://github.com/expipiplus1/vulkan#readme"; description = "Bindings to the Vulkan graphics API"; @@ -219988,8 +220309,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.18.2"; - sha256 = "01jmwq9a5xxig14qh30w2fspjv4rhprv6q6i6bsv1qy9m9n2mczb"; + version = "3.2.19"; + sha256 = "0laggqs2bjf4vn58fjpippbwd1i2z82ssmnyn6l0qb3q54d2fyqb"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -220054,23 +220375,6 @@ self: { }) {}; "warp-tls" = 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.2"; - sha256 = "08g74490mpaghrvkb5z6pa6b6bby1a83js52pg5jlm9b5zfwcj2w"; - 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; - }) {}; - - "warp-tls_3_2_4_3" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, wai, warp }: @@ -220085,7 +220389,6 @@ self: { 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 @@ -221761,6 +222064,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_3" = 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.3"; + sha256 = "0naqmgkqqq83mnrp4ic97i6f6ak3h862jk6pa77c83qmz4ahh4ld"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wilton-ffi" = callPackage ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { @@ -222057,10 +222381,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "wl-pprint"; - version = "1.2"; - sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r"; - revision = "1"; - editedCabalFile = "04w1mm6c0k39x3aglrz5rgqjxszxb6jld0s7qrl4zhndl92nzi5c"; + version = "1.2.1"; + sha256 = "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; license = stdenv.lib.licenses.bsd3; @@ -225266,8 +225588,8 @@ self: { }: mkDerivation { pname = "xmonad-extras"; - version = "0.13.2"; - sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx"; + version = "0.13.3"; + sha256 = "15gxkkni3d6mr7zlzyp6nvzv0jy3vfhjkd8zrdin2nxb5pwwbsp0"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; @@ -226977,19 +227299,18 @@ self: { "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec , http-client, http-conduit, http-types, microlens, random - , safe-exceptions, text, transformers, uri-bytestring, yesod-auth - , yesod-core + , safe-exceptions, text, uri-bytestring, yesod-auth, yesod-core }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.4.1.0"; - sha256 = "1p0sxgi7cl6lqzkx478zva2byzanna6jicdrgdns2p91cnw5hlh9"; + version = "0.5.0.0"; + sha256 = "03qqaxwpdz15krnl8rnm6m3rlmpgfn1i41x1w7c4rhl701hy0vda"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring errors hoauth2 http-client http-conduit - http-types microlens random safe-exceptions text transformers - uri-bytestring yesod-auth yesod-core + http-types microlens random safe-exceptions text uri-bytestring + yesod-auth yesod-core ]; testHaskellDepends = [ base hspec uri-bytestring ]; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; @@ -227780,8 +228101,8 @@ self: { }: mkDerivation { pname = "yesod-media-simple"; - version = "0.2.0.0"; - sha256 = "1sfz1iczsqhg8vasc4zyfwpw48hjlslfwf8r60a1c7kgrpa9yj6k"; + version = "0.2.0.1"; + sha256 = "1687c46qqdpzvalfi4dajsxaml1ljipysbvz9j1jargl3jrsdfqi"; libraryHaskellDepends = [ base bytestring diagrams-cairo diagrams-core diagrams-lib directory JuicyPixels vector yesod @@ -229857,8 +230178,8 @@ self: { }: mkDerivation { pname = "zifter"; - version = "0.0.1.6"; - sha256 = "0bswk4z26v020qkcm09cjkjkvwxsx1mrzrf3kajhwwzpb8vzxbdh"; + version = "0.0.1.7"; + sha256 = "1gdrnxa23lk885ldbn72n136acjfv8l0bnpf5v0lnypzl1hwp4rk"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions filepath optparse-applicative path path-io process safe stm validity From 93b324093025c5c9235d7514a544323b8f1c088b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Apr 2018 11:42:58 +0200 Subject: [PATCH 2560/2743] all-cabal-hashes: update to latest version --- 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 e7dbf947815b..38f8030cc272 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/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz"; - sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9cd032898a8fd11b69827ff02d2f295cac0907d9.tar.gz"; + sha256 = "1xxg3dcp5jgin978sa9510ji10p2j47x7b2n0xz00wrs9yjn5zvg"; } From a49dca6821855e3572e7a1d236fb96c3223ff02f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:39:43 +0200 Subject: [PATCH 2561/2743] haskell-monad-logger: drop obsolete override --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1e993524b5ce..600670c9140b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -866,9 +866,6 @@ 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 7724ead286392d37b3f11813a5c79b6720236b25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:41:18 +0200 Subject: [PATCH 2562/2743] haskell-{hlint,hoogle}: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 600670c9140b..eb419957561e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1027,9 +1027,6 @@ self: super: { 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 33e046271af4c3a532a86fb7a8114dad6f94275e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:52:25 +0200 Subject: [PATCH 2563/2743] haskell-vector-sized: update override --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eb419957561e..785f38be3d0f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1023,7 +1023,8 @@ 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 { + # Builds only with the latest version of indexed-list-literals. + vector-sized_1_0_1_0 = super.vector-sized_1_0_1_0.override { indexed-list-literals = self.indexed-list-literals_0_2_0_0; }; From 1d0a71879dac0226272212df7a2463d8eeb8f75b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Apr 2018 12:03:33 +0200 Subject: [PATCH 2564/2743] haskell-brick: update override for ghc 8.4.x --- 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 43c869feff12..fe6bc699fb98 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -578,7 +578,7 @@ self: super: { }); # Older versions don't compile. - brick = doJailbreak super.brick_0_36; # https://github.com/jtdaugherty/brick/issues/171 + brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_1_3; From ca7d98399976be0dd562d1f8ecd62ed3e5cd5656 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 25 Apr 2018 13:47:26 +0100 Subject: [PATCH 2565/2743] buildkite-agent3: init at 3.0.1 (#39471) New stable release. Version 2.6 is kept for backwards compatibility. https://github.com/buildkite/agent/releases/tag/v3.0.0 https://github.com/buildkite/agent/releases/tag/v3.0.1 --- .../buildkite-agent/2.x.nix | 12 ++++++++++ .../buildkite-agent/3.x.nix | 12 ++++++++++ .../{default.nix => generic.nix} | 22 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix rename pkgs/development/tools/continuous-integration/buildkite-agent/{default.nix => generic.nix} (73%) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix new file mode 100644 index 000000000000..6a73e2581822 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + src = fetchFromGitHub { + owner = "buildkite"; + repo = "agent"; + rev = "v${version}"; + sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg"; + }; + version = "2.6.10"; + hasBootstrapScript = true; +}) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix new file mode 100644 index 000000000000..2ceaee5650b2 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + src = fetchFromGitHub { + owner = "buildkite"; + repo = "agent"; + rev = "v${version}"; + sha256 = "09smyrzp1xkczlmh8vqb7bmjb2b5d6yf9birjgaw36c6m44bpfvs"; + }; + version = "3.0.1"; + hasBootstrapScript = false; +}) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix similarity index 73% rename from pkgs/development/tools/continuous-integration/buildkite-agent/default.nix rename to pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 7a5f2f44823b..8aa02ac307dd 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -1,19 +1,13 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: +{ stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep +, src, version, hasBootstrapScript +, ... }: let - version = "2.6.10"; goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { name = "buildkite-agent-${version}"; - inherit goPackagePath; - - src = fetchFromGitHub { - owner = "buildkite"; - repo = "agent"; - rev = "v${version}"; - sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg"; - }; + inherit goPackagePath src; nativeBuildInputs = [ makeWrapper ]; @@ -22,18 +16,20 @@ buildGoPackage { noAuditTmpdir = stdenv.isLinux; postInstall = '' + ${stdenv.lib.optionalString hasBootstrapScript '' # Install bootstrap.sh mkdir -p $bin/libexec/buildkite-agent cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh + ''} # Fix binary name mv $bin/bin/{agent,buildkite-agent} # These are runtime dependencies wrapProgram $bin/bin/buildkite-agent \ - --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' \ - --set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh + ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \ + --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; meta = with stdenv.lib; { @@ -47,7 +43,7 @@ buildGoPackage { ''; homepage = https://buildkite.com/docs/agent; license = licenses.mit; - maintainers = with maintainers; [ pawelpacana zimbatm ]; + maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5e8b16e017c..6e66f1ead518 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7592,7 +7592,9 @@ with pkgs; buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent = buildkite-agent2; + buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; + buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; byacc = callPackage ../development/tools/parsing/byacc { }; From ac61ae50b7b47dfae92ff921dab0774554e7df9e Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 25 Apr 2018 14:54:59 +0200 Subject: [PATCH 2566/2743] gn: Switch to fetchzip for apple_apsl directory The tarball from upstream seems to be generated on the fly, so the output is not deterministic and using fetchzip makes this more reliable as we have a recursively hashed output path without any of the non-determinisms in tarballs. Unfortunately, the build still fails on NixOS systems, because we need a few more stuff in the build tree. Signed-off-by: aszlig Cc: @matthewbauer, @stesie --- pkgs/development/tools/build-managers/gn/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index bfbb2b4e3308..a9930d258c2c 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchurl, fetchpatch +{ stdenv, lib, fetchgit, fetchzip, fetchpatch , libevent, ninja, python, darwin }: let @@ -28,9 +28,10 @@ let rev = "585ec31ea716f08233a815e680fc0d4699843938"; sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; }; - "third_party/apple_apsl" = fetchurl { + "third_party/apple_apsl" = fetchzip { url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz"; - sha256 = "0sc7b7zdw7f9piyyijl7xq3v1fzflqlck1apwm8kvgdhkyz3l63k"; + sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8"; + stripRoot = false; }; }; From a3502ba765ed5634b62d2440d342f81f68a67a8b Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 25 Apr 2018 14:58:54 +0200 Subject: [PATCH 2567/2743] gn: Add libc++ and libc++abi from third_party On GNU/Linux the build references these files, so let's fetch them from the Chromium repository. I haven't checked whether they are heavily patched or whether we can use the version from LLVM, but when looking at the changes, they do seem to divert a bit from upstream LLVM. Signed-off-by: aszlig Cc: @matthewbauer, @stesie --- pkgs/development/tools/build-managers/gn/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index a9930d258c2c..35f54369abd9 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -33,6 +33,16 @@ let sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8"; stripRoot = false; }; + "buildtools/third_party/libc++/trunk" = fetchgit { + url = "https://chromium.googlesource.com/chromium/llvm-project/libcxx"; + rev = "ece1de8658d749e19c12cacd4458cc330eca94e3"; + sha256 = "1nlyvfkzhchwv9b18bh82jcamqv3acj26ah9ajs31f2dql05amhg"; + }; + "buildtools/third_party/libc++abi/trunk" = fetchgit { + url = "https://chromium.googlesource.com/chromium/llvm-project/libcxxabi"; + rev = "52c7a3760aef1df328a9bc957f686410872f0dc0"; + sha256 = "1aam539j01381q27b7xhij18pz3h0lhw08hglvqq4hgvlqx5cn2s"; + }; }; in stdenv.mkDerivation { From 97698b0d6d644cc6d59495e339f6fbf44ff8ac64 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:08:47 -0500 Subject: [PATCH 2568/2743] musl-stdenv: don't add special allowance for libiconv --- pkgs/stdenv/linux/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2eb55ae439b5..92da0d7873d0 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -362,7 +362,6 @@ in ++ [ /*propagated from .dev*/ linuxHeaders binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params ] - ++ lib.optional (localSystem.libc == "musl") libiconv ++ lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; From 4340a1582ffbd90f19e42f1480d36e17c0b515c7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 1 Mar 2018 05:32:36 +0100 Subject: [PATCH 2569/2743] =?UTF-8?q?pitivi:=200.96=20=E2=86=92=200.99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/pitivi/default.nix | 61 ++++++++++++------- .../prevent-closure-contamination.patch | 23 +++++++ 2 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/video/pitivi/prevent-closure-contamination.patch diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 48074a86b552..6c92b9aeed6b 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,61 +1,80 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook , python3Packages, gst, gtk3, hicolor-icon-theme , gobjectIntrospection, librsvg, gnome3, libnotify -# for gst-transcoder: -, which, meson, ninja +, meson, ninja }: let - version = "0.96"; + version = "0.99"; # gst-transcoder will eventually be merged with gstreamer (according to # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we # don't bother exposing the package to all of nixpkgs. gst-transcoder = stdenv.mkDerivation rec { - name = "gst-transcoder-1.8.0"; + version = "1.12.2"; + name = "gst-transcoder-${version}"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz"; - sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6"; + url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz"; + sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which meson ninja gobjectIntrospection ] - ++ (with gst; [ gstreamer gst-plugins-base ]); + nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ]; + buildInputs = with gst; [ gstreamer gst-plugins-base ]; }; -in stdenv.mkDerivation rec { +in python3Packages.buildPythonApplication rec { name = "pitivi-${version}"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; - sha256 = "115d37mvi32yds8gqj2yidkk6pap7szavhjf2hw0388ynydlc2zs"; + url = "mirror://gnome/sources/pitivi/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + format = "other"; + + patches = [ + # By default, the build picks up environment variables like PYTHONPATH + # and saves them to the generated binary. This would make the build-time + # dependencies part of the closure so we remove it. + ./prevent-closure-contamination.patch + ]; + + postPatch = '' + patchShebangs ./getenvvar.py + ''; + + nativeBuildInputs = [ meson ninja pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst; [ gstreamer gst-editing-services - gst-plugins-base gst-plugins-good + gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad gst-plugins-ugly gst-libav gst-validate - ]) ++ (with python3Packages; [ - python pygobject3 gst-python pyxdg numpy pycairo matplotlib - dbus-python ]); + pythonPath = with python3Packages; [ pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "pitivi"; + versionPolicy = "none"; # we are using dev version, since the stable one is too old + }; + }; + meta = with stdenv.lib; { description = "Non-Linear video editor utilizing the power of GStreamer"; - homepage = "http://pitivi.org/"; + homepage = http://pitivi.org/; longDescription = '' Pitivi is a video editor built upon the GStreamer Editing Services. It aims to be an intuitive and flexible application that can appeal to newbies and professionals alike. ''; - license = licenses.lgpl21Plus; - platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = with maintainers; []; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch new file mode 100644 index 000000000000..0025ecd0a4cf --- /dev/null +++ b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch @@ -0,0 +1,23 @@ +--- a/meson.build ++++ b/meson.build +@@ -26,15 +26,15 @@ + geteenvvar = find_program('getenvvar.py') + cdata = configuration_data() + cdata.set('CONFIGURED_PYTHONPATH', +- run_command(geteenvvar, 'PYTHONPATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GI_TYPELIB_PATH', +- run_command(geteenvvar, 'GI_TYPELIB_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_LD_LIBRARY_PATH', +- run_command(geteenvvar, 'LD_LIBRARY_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GST_PLUGIN_PATH', +- run_command(geteenvvar, 'GST_PLUGIN_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GST_PLUGIN_SYSTEM_PATH', +- run_command(geteenvvar, 'GST_PLUGIN_SYSTEM_PATH').stdout().strip()) ++ '') + cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) + cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))) + cdata.set('PACKAGE_NAME', 'Pitivi') From 2d54f8f915166dbdc93ed9497f622799e930bf9b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:09:56 -0500 Subject: [PATCH 2570/2743] musl: build iconv using just-built pieces This is a bit unusual for a package, but not libc's as they should stand alone. --- pkgs/os-specific/linux/musl/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 0912f427430b..cd102cca00f1 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -68,6 +68,8 @@ stdenv.mkDerivation rec { dontDisableStatic = true; separateDebugInfo = true; + NIX_DONT_SET_RPATH = true; + postInstall = '' # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. # Apparently glibc provides scsi itself? @@ -88,8 +90,13 @@ stdenv.mkDerivation rec { substituteInPlace $dev/bin/musl-gcc \ --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs - # provide 'iconv' utility - $CC ${iconv_c} -o $out/bin/iconv + # provide 'iconv' utility, using just-built headers, libc/ldso + $CC ${iconv_c} -o $out/bin/iconv \ + -I$dev/include \ + -L$out/lib -Wl,-rpath=$out/lib \ + -lc \ + -B $out/lib \ + -Wl,-dynamic-linker=$(ls $out/lib/ld-*) '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h From 558f7424f26076e1bb2260f13c04a9eb88127f97 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 11 Mar 2018 21:00:19 -0500 Subject: [PATCH 2571/2743] musl: make libc -> {ldso,ldd} symlinks relative Minor touchup while rebuilding things anyway. --- pkgs/os-specific/linux/musl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index cd102cca00f1..3d515f7b762f 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { --replace -fno-asynchronous-unwind-tables "" ''; + patches = [ + # Minor touchup to build system making dynamic linker symlink relative + (fetchurl { + url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch; + sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; + }) + ]; preConfigure = '' configureFlagsArray+=("--syslibdir=$out/lib") ''; @@ -80,7 +87,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin # Create 'ldd' symlink, builtin - ln -s $out/lib/libc.so $out/bin/ldd + ln -rs $out/lib/libc.so $out/bin/ldd # (impure) cc wrapper around musl for interactive usuage for i in musl-gcc musl-clang ld.musl-clang; do From c84dad316a8d1eb0b5c2af0bd037c169096683ca Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 25 Apr 2018 15:04:30 +0200 Subject: [PATCH 2572/2743] lib/generators: print paths without quotes & move function down --- lib/generators.nix | 26 +++++++++++++++----------- lib/tests/misc.nix | 8 +++++--- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index d1a8f6bf8dcd..c09384c00f57 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -143,18 +143,13 @@ rec { (This means fn is type Val -> String.) */ allowPrettyValues ? false }@args: v: with builtins; - if isInt v then toString v + let isPath = v: typeOf v == "path"; + in if isInt v then toString v else if isString v then ''"${libStr.escape [''"''] v}"'' else if true == v then "true" else if false == v then "false" - else if null == v then "null" - else if isFunction v then - let fna = lib.functionArgs v; - showFnas = concatStringsSep "," (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then "(${name})" else name) - fna); - in if fna == {} then "<λ>" - else "<λ:{${showFnas}}>" + else if null == v then "null" + else if isPath v then toString v else if isList v then "[ " + libStr.concatMapStringsSep " " (toPretty args) v + " ]" @@ -163,12 +158,21 @@ rec { if attrNames v == [ "__pretty" "val" ] && allowPrettyValues then v.__pretty v.val # TODO: there is probably a better representation? - else if v ? type && v.type == "derivation" then "<δ>" + else if v ? type && v.type == "derivation" then + "<δ:${v.name}>" + # "<δ:${concatStringsSep "," (builtins.attrNames v)}>" else "{ " + libStr.concatStringsSep " " (libAttr.mapAttrsToList (name: value: "${toPretty args name} = ${toPretty args value};") v) + " }" - else abort "generators.toPretty: should never happen (v = ${v})"; + else if isFunction v then + let fna = lib.functionArgs v; + showFnas = concatStringsSep "," (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then "(${name})" else name) + fna); + in if fna == {} then "<λ>" + else "<λ:{${showFnas}}>" + else abort "toPretty: should never happen (v = ${v})"; } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 5f19dd63f2d8..c683df7d7ca3 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -317,7 +317,8 @@ runTests { expr = mapAttrs (const (generators.toPretty {})) rec { int = 42; bool = true; - string = "fnord"; + string = ''fno"rd''; + path = /. + "/foo"; # toPath returns a string null_ = null; function = x: x; functionArgs = { arg ? 4, foo }: arg; @@ -328,13 +329,14 @@ runTests { expected = rec { int = "42"; bool = "true"; - string = "\"fnord\""; + string = ''"fno\"rd"''; + path = "/foo"; null_ = "null"; function = "<λ>"; functionArgs = "<λ:{(arg),foo}>"; list = "[ 3 4 ${function} [ false ] ]"; attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; - drv = "<δ>"; + drv = "<δ:test>"; }; }; From 4f16b36fedb9157bff36984d88338b3e80bee2e0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:32:49 -0500 Subject: [PATCH 2573/2743] radiotray-ng: 0.2.1 -> 0.2.2 https://github.com/ebruck/radiotray-ng/releases/tag/v0.2.2 --- pkgs/applications/audio/radiotray-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 60c8f90b6d15..695a5b36dbf0 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr"; + sha256 = "0q8k7nsjm6m0r0zs1br60niaqlwvd3myqalb5sqijzanx41aq2l6"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; From 4d40adb86d03b856e12984048ced8902e3f73fd3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 4 Apr 2018 21:47:56 -0400 Subject: [PATCH 2574/2743] nginx: allow basic auth passwords to be specified in a file --- .../services/web-servers/nginx/default.nix | 20 +++++++++---------- .../web-servers/nginx/vhost-options.nix | 8 ++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 938a8a1fe334..815c3147e647 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -218,7 +218,10 @@ let ssl_certificate_key ${vhost.sslCertificateKey}; ''} - ${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)} + ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) '' + auth_basic secured; + auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth}; + ''} ${mkLocations vhost.locations} @@ -248,16 +251,11 @@ let ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} } '') locations); - mkBasicAuth = vhostName: authDef: let - htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" ( - concatStringsSep "\n" (mapAttrsToList (user: password: '' - ${user}:{PLAIN}${password} - '') authDef) - ); - in '' - auth_basic secured; - auth_basic_user_file ${htpasswdFile}; - ''; + mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" ( + concatStringsSep "\n" (mapAttrsToList (user: password: '' + ${user}:{PLAIN}${password} + '') authDef) + ); in { diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index bf18108a1a3c..f014d817e80e 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -193,6 +193,14 @@ with lib; ''; }; + basicAuthFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Basic Auth password file for a vhost. + ''; + }; + locations = mkOption { type = types.attrsOf (types.submodule (import ./location-options.nix { inherit lib; From 2236f418f5b6a1b04871b96b37959fb5e22fea86 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 08:38:36 -0500 Subject: [PATCH 2575/2743] radiotray-ng: disable tests, they now want to download unconditionally --- pkgs/applications/audio/radiotray-ng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 695a5b36dbf0..2ce82eb6a0a0 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -78,7 +78,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # XXX: as of 0.2.2, tries to download gmock instead of checking for provided + doCheck = false; checkPhase = "ctest"; From 42ecb0dd949cac7040878882904dfb07db3e7894 Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Wed, 25 Apr 2018 18:10:17 +0800 Subject: [PATCH 2576/2743] inziu-iosevka: init at 1.13.2 --- pkgs/data/fonts/inziu-iosevka/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/data/fonts/inziu-iosevka/default.nix diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix new file mode 100644 index 000000000000..536f5cb0c61d --- /dev/null +++ b/pkgs/data/fonts/inziu-iosevka/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, p7zip }: + +stdenv.mkDerivation rec { + version = "1.13.2"; + name = "inziu-iosevka-${version}"; + + package = fetchurl { + url = "http://7xpdnl.dl1.z0.glb.clouddn.com/inziu-iosevka-ttfs-${version}.7z"; + sha256 = "1i7qqcv1x6s1xkp687wq79zqg9ly6a7l5mnmg1iqgfgcbglgjbaw"; + }; + + nativeBuildInputs = [ p7zip ]; + + unpackPhase = '' + 7z x $package + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Inziu Iosevka font"; + homepage = https://be5invis.github.io/Iosevka/inziu; + # license is clarified here: https://github.com/be5invis/Iosevka/issues/265 + license = licenses.ofl; + maintainers = [ maintainers.ChengCat ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bbbbf396c5..7518ed65a7a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14365,6 +14365,8 @@ with pkgs; input-fonts = callPackage ../data/fonts/input-fonts { }; + inziu-iosevka = callPackage ../data/fonts/inziu-iosevka { }; + iosevka = callPackage ../data/fonts/iosevka { nodejs = nodejs-8_x; }; From cbbcd2920d4bb715f239fe3aeda6e7e2dca7887f Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Wed, 25 Apr 2018 17:34:53 +0800 Subject: [PATCH 2577/2743] sarasa-gothic: init at 0.5.2 --- pkgs/data/fonts/sarasa-gothic/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/data/fonts/sarasa-gothic/default.nix diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix new file mode 100644 index 000000000000..8d2afbcf80dd --- /dev/null +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, p7zip }: + +stdenv.mkDerivation rec { + version = "0.5.2"; + name = "sarasa-gothic-${version}"; + + package = fetchurl { + url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttf-${version}.7z"; + sha256 = "18ycw57k7yhrbb8njzhzk6x32xnjal61wr48qxkqy4lh9zfy0p22"; + }; + + nativeBuildInputs = [ p7zip ]; + + unpackPhase = '' + 7z x $package + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "SARASA GOTHIC is a Chinese & Japanese programming font based on Iosevka and Source Han Sans"; + homepage = https://github.com/be5invis/Sarasa-Gothic; + license = licenses.ofl; + maintainers = [ maintainers.ChengCat ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7518ed65a7a9..4d5bedfa7917 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14524,6 +14524,8 @@ with pkgs; sampradaya = callPackage ../data/fonts/sampradaya { }; + sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; + scowl = callPackage ../data/misc/scowl { }; shaderc = callPackage ../development/compilers/shaderc { }; From 0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Apr 2018 15:52:09 +0200 Subject: [PATCH 2578/2743] rarian: merge gnome{2,3}.rarian --- pkgs/desktops/gnome-2/default.nix | 6 ++---- pkgs/desktops/gnome-2/desktop/rarian/default.nix | 12 ------------ pkgs/desktops/gnome-3/default.nix | 4 +--- .../libraries}/rarian/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/rarian/default.nix rename pkgs/{desktops/gnome-3/desktop => development/libraries}/rarian/default.nix (100%) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index cc4536785251..80f2c9ce70d7 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -1,4 +1,4 @@ -{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2 +{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian , libstartup_notification, overrides ? {} }: let overridden = set // overrides; set = with overridden; { @@ -14,6 +14,7 @@ let overridden = set // overrides; set = with overridden; { gnome_desktop = gnome-desktop; gnome_settings_daemon = gnome-settings-daemon; gnome_control_center = gnome-control-center; + inherit rarian; #### PLATFORM @@ -93,9 +94,6 @@ let overridden = set // overrides; set = with overridden; { # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - zenity = callPackage ./desktop/zenity { }; metacity = callPackage ./desktop/metacity { }; diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix deleted file mode 100644 index d2bcaa7c5e10..000000000000 --- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f35688888997..422dedbce853 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -311,9 +311,6 @@ let polari = callPackage ./apps/polari { }; - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - seahorse = callPackage ./apps/seahorse { }; vinagre = callPackage ./apps/vinagre { }; @@ -427,6 +424,7 @@ let libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libgames-support = libgnome-games-support; # added 2018-03-14 libgnome_keyring = libgnome-keyring; # added 2018-02-25 + inherit (pkgs) rarian; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/desktop/rarian/default.nix rename to pkgs/development/libraries/rarian/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e66f1ead518..eaa458529e3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4560,6 +4560,8 @@ with pkgs; rarcrack = callPackage ../tools/security/rarcrack { }; + rarian = callPackage ../development/libraries/rarian { }; + ratools = callPackage ../tools/networking/ratools { }; rawdog = callPackage ../applications/networking/feedreaders/rawdog { }; From ec371a5d98f1d1dd9ccf06cd923050b2afe976b3 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 25 Apr 2018 16:07:16 +0200 Subject: [PATCH 2579/2743] ipmicfg: fix patchelf args --- pkgs/applications/misc/ipmicfg/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 2efd0ee969f1..af7d257eed6e 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/opt/ipmicfg" cp Linux/64bit/* "$out/opt/ipmicfg" - patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \ + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \ + "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" ''; From 6c748ae749faae3ff989a800ffa5095f634a6050 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 25 Apr 2018 16:42:28 +0200 Subject: [PATCH 2580/2743] inkscape: Fix build on NixOS The first problem that was introduced in a276d5160cc4b307d97261b419e183f was a linking error: ld: cannot find -licui18n ld: cannot find -licuuc ld: cannot find -licudata So I added icu to the buildInputs. The second problem was that the interpreter wasn't patched in share/filters, apparently this is only needed when building with autotools: make[3]: Entering directory '/build/inkscape-0.92.3/share/filters' ./i18n.py ./filters.svg > ./filters.svg.h ./i18n.py: /usr/bin/env: bad interpreter: No such file or directory A similar error also occurs for share/palettes, share/patterns, share/symbols and share/templates, so I added patching the interpreter there as well. Switching to autotools in Inkscape is a very bad idea, because upstream currently still has their own autotools files in the 0.92.x tree but master already has them removed, see this commit: https://gitlab.com/inkscape/inkscape/commit/e471a664f923f517b68071f2e33fbb6ce070f8b7 However for the sake of trying to not break Inkscape on Darwin again, I tried to keep the fixes minimal and not went back to CMake. I did however mark the stuff that's unneeded for CMake, so that we can avoid forgetting to remove that crap once we get back to CMake. Signed-off-by: aszlig Cc: @matthewbauer --- pkgs/applications/graphics/inkscape/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 9a8ef6bd7744..37af9f6b86c7 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,6 +4,7 @@ , gsl, python2, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, potrace, autoreconfHook , intltool +, icu # Not needed for building with CMake , lib }: @@ -27,6 +28,13 @@ stdenv.mkDerivation rec { patchShebangs share/extensions patchShebangs fix-roff-punct + # XXX: Not needed for CMake: + patchShebangs share/filters + patchShebangs share/palettes + patchShebangs share/patterns + patchShebangs share/symbols + patchShebangs share/templates + # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. substituteInPlace src/extension/implementation/script.cpp \ @@ -38,7 +46,7 @@ stdenv.mkDerivation rec { perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace python2Env + libvisio libcdr libexif potrace python2Env icu ]; enableParallelBuilding = true; From ac0fd5a90968e4820aa8bbc4c5c5cc6ddcba58a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Wed, 25 Apr 2018 18:03:31 +0200 Subject: [PATCH 2581/2743] kitty: 0.8.2 -> 0.9.0 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 52f1c9fb1a1d..496353325255 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.8.2"; + version = "0.9.0"; name = "kitty-${version}"; format = "other"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c"; + sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8"; }; buildInputs = [ From c19eeccc64c2be30a030859f9edaa03c132e812d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Wed, 25 Apr 2018 18:16:20 +0200 Subject: [PATCH 2582/2743] clojure: 1.9.0.358 -> 1.9.0.375 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index b35f6032d5aa..4340b68d8f74 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "clojure-${version}"; - version = "1.9.0.358"; + version = "1.9.0.375"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "0fi5kni6rdqjy6qgklf4xf7p1pgbsrdwd17iy6lrlg2vb8n8nksp"; + sha256 = "17a82dw5akhzlz4az9bh6s8rnz6nfgq50d8si0lwg212niq3c599"; }; buildInputs = [ makeWrapper ]; From c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 19 Apr 2018 05:28:16 +0000 Subject: [PATCH 2583/2743] ocamlPackages.findlib: 1.7.3 -> 1.8.0 --- .../tools/ocaml/findlib/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 6f136a7ef289..e25b94714b68 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,22 +1,33 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: +let param = + if stdenv.lib.versionAtLeast ocaml.version "4" + then { + version = "1.8.0"; + sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb"; + } else { + version = "1.7.3"; + sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; + sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; + }) ]; + }; +in + stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - version = "1.7.3"; + inherit (param) version; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + inherit (param) sha256; }; buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; - sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; - }) - ]; + patches = [ ./ldconf.patch ./install_topfind.patch ] + ++ (param.patches or []); dontAddPrefix=true; From 5c4ee2a3ab9f278b12d9196e59307e65f5fed88c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Apr 2018 12:47:27 +0000 Subject: [PATCH 2584/2743] ocaml: init at 4.07.0+beta2 --- pkgs/development/compilers/ocaml/4.07.nix | 9 +++++++++ pkgs/development/compilers/ocaml/generic.nix | 3 ++- pkgs/top-level/ocaml-packages.nix | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ocaml/4.07.nix diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix new file mode 100644 index 000000000000..b39d57cc092b --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "07"; + patch_version = "0+beta2"; + sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n"; + + # If the executable is stripped it does not work + dontStrip = true; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 03ae6e518d0b..d8af0722c941 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation (args // rec { ; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; + buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses + ++ optionals useX11 [ libX11 xproto ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f095ccb34ab5..741a58ce588a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1042,6 +1042,8 @@ in rec ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); + ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { }); + ocamlPackages_latest = ocamlPackages_4_06; ocamlPackages = ocamlPackages_4_05; From e609551090c02c5c31ec39c090f96df9dcb7f12e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Apr 2018 18:48:16 +0200 Subject: [PATCH 2585/2743] vim-nix: 2018-04-15 -> 2018-04-24 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a48f9943779a..0134d5fae48a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -280,11 +280,11 @@ rec { }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-04-15"; + name = "vim-nix-2018-04-24"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "bf5779180bf0e3cb6c967f87d6262a976e055e32"; - sha256 = "023c932vybycj8zasvgvp7xhp42i2iy26msjgjsgzfwmdf5w877y"; + rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d"; + sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78"; }; dependencies = []; From 00528006cfc998db81abb77d5aebe7115bbd664f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 25 Apr 2018 19:20:57 +0200 Subject: [PATCH 2586/2743] guitarix: 0.36.1 -> 0.37.0 --- pkgs/applications/audio/guitarix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index bcb301687089..62bc2fa6f36f 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.36.1"; + version = "0.37.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0"; + sha256 = "17dsd32yd92l7xq1x0b8jsws5yif2pk4zbfjbc560hgarym6r8x6"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; From 30357e203ad73748a2fc81735d3660e403d5161c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 25 Apr 2018 12:49:51 -0500 Subject: [PATCH 2587/2743] lsof: 4.90 -> 4.91 --- pkgs/development/tools/misc/lsof/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ae62c8c7aaef..005fb09fba09 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -4,13 +4,13 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in stdenv.mkDerivation rec { name = "lsof-${version}"; - version = "4.90"; + version = "4.91"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; src = fetchurl { - urls = ["https://fossies.org/linux/misc/lsof_4.90.tar.bz2"] ++ # Mirrors seem to be down... + urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down... ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] ++ map ( # the tarball is moved after new version is released @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" ) [ false true ] ; - sha256 = "1xhn3amvl5mmwji5g90nkw7lfmh2494v18qbv1f729hrg468853g"; + sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; From 0009ae3d5e1ad620215c2b8409eeec668de60552 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Apr 2018 19:55:29 +0200 Subject: [PATCH 2588/2743] onboard: fix missing typelibs --- pkgs/applications/misc/onboard/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index d4847e4ce493..de64705d832b 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -88,6 +88,7 @@ in python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ glibcLocales + gobjectIntrospection # populate GI_TYPELIB_PATH intltool pkgconfig ]; From c1f45f76ad0c84f4e5a3f968de08f97c2150f9ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 25 Apr 2018 14:58:23 -0400 Subject: [PATCH 2589/2743] sacrifice: fix runtime on darwin --- pkgs/applications/science/physics/sacrifice/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index d6aeeedc086d..99d6df77f853 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { "--with-pythia=${pythia}" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia + ''; + enableParallelBuilding = true; meta = { From 524b29471bc3683650005ebffec042fb15e0937c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 12 Apr 2018 21:29:58 -0300 Subject: [PATCH 2590/2743] onestepback: init at 0.98 --- pkgs/misc/themes/onestepback/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/misc/themes/onestepback/default.nix diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix new file mode 100644 index 000000000000..609e027d9eba --- /dev/null +++ b/pkgs/misc/themes/onestepback/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "0.98"; + +in fetchzip { + name = "onestepback-${version}"; + + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; + + postFetch = '' + mkdir -p $out/share/themes + unzip $downloadedFile -x OneStepBack/LICENSE -d $out/share/themes + ''; + + sha256 = "0sjacvx7020lzc89r5310w83wclw96gzzczy3mss54ldkgmnd0mr"; + + meta = with stdenv.lib; { + description = "Gtk theme inspired by the NextStep look"; + homepage = https://www.opendesktop.org/p/1013663/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f8c3e0765cd..85212825a0e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19609,6 +19609,8 @@ with pkgs; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + onestepback = callPackage ../misc/themes/onestepback { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { From ba52ae50488de85a9cf60a3a04f1c9ca7122ec74 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 19 Mar 2018 22:41:06 -0400 Subject: [PATCH 2591/2743] treewide: isArm -> isAarch32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile --- lib/systems/doubles.nix | 2 +- lib/systems/for-meta.nix | 2 +- lib/systems/inspect.nix | 7 +++++-- lib/systems/parse.nix | 2 +- nixos/lib/qemu-flags.nix | 2 +- nixos/modules/config/gnu.nix | 4 ++-- nixos/modules/virtualisation/qemu-vm.nix | 2 +- pkgs/applications/audio/sunvox/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- pkgs/applications/virtualization/qemu/default.nix | 6 +++--- pkgs/build-support/bintools-wrapper/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- .../development/compilers/gcc/snapshot/default.nix | 2 +- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 6 +++--- pkgs/development/compilers/ghc/8.4.1.nix | 4 ++-- pkgs/development/compilers/ghc/8.4.2.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/development/compilers/go/1.10.nix | 4 ++-- pkgs/development/compilers/go/1.4.nix | 2 +- pkgs/development/compilers/go/1.9.nix | 4 ++-- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/generic.nix | 4 ++-- pkgs/development/compilers/sbcl/bootstrap.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/generic-builder.nix | 2 +- pkgs/development/interpreters/perl/default.nix | 2 +- pkgs/development/interpreters/picolisp/default.nix | 2 +- .../interpreters/spidermonkey/1.8.5.nix | 8 ++++---- pkgs/development/libraries/ffmpeg/generic.nix | 14 +++++++------- pkgs/development/libraries/freetype/default.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/gnu-efi/default.nix | 2 +- pkgs/development/libraries/icu/base.nix | 2 +- pkgs/development/libraries/jemalloc/common.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- pkgs/development/libraries/libtoxcore/default.nix | 2 +- pkgs/development/libraries/libtoxcore/new-api.nix | 4 ++-- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libvpx/git.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 6 +++--- pkgs/development/libraries/pixman/default.nix | 2 +- pkgs/development/libraries/pth/default.nix | 2 +- pkgs/development/libraries/v8/3.16.14.nix | 4 ++-- pkgs/development/libraries/v8/6_x.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- .../libraries/webrtc-audio-processing/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/development/tools/misc/uhd/default.nix | 4 ++-- .../apple-source-releases/system_cmds/default.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/uclibc/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- pkgs/tools/networking/cjdns/default.nix | 2 +- pkgs/tools/networking/filegive/default.nix | 2 +- pkgs/tools/system/storebrowse/default.nix | 2 +- pkgs/top-level/all-packages.nix | 14 +++++++------- 69 files changed, 110 insertions(+), 107 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 012a1786a3cc..c6618083ce72 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ in rec { none = []; - arm = filterDoubles predicates.isArm; + arm = filterDoubles predicates.isAarch32; aarch64 = filterDoubles predicates.isAarch64; x86 = filterDoubles predicates.isx86; i686 = filterDoubles predicates.isi686; diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 43c0195c3f18..9e85cea3ad11 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -7,7 +7,7 @@ in rec { all = [ {} ]; # `{}` matches anything none = []; - arm = [ patterns.isArm ]; + arm = [ patterns.isAarch32 ]; aarch64 = [ patterns.isAarch64 ]; x86 = [ patterns.isx86 ]; i686 = [ patterns.isi686 ]; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index d7fabf684b72..b87320594cab 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -9,8 +9,8 @@ rec { isx86_64 = { cpu = cpuTypes.x86_64; }; isPowerPC = { cpu = cpuTypes.powerpc; }; isx86 = { cpu = { family = "x86"; }; }; - isArm = { cpu = { family = "arm"; }; }; - isAarch64 = { cpu = { family = "aarch64"; }; }; + isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; + isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isWasm = { cpu = { family = "wasm"; }; }; @@ -41,6 +41,9 @@ rec { isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; + + # Deprecated + isArm = isAarch32; }; matchAnyAttrs = patterns: diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 381108d76fe2..018fd172e687 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -72,7 +72,7 @@ rec { armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "aarch64"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index fcdcbf1b0077..e4c95ebdfb0d 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -9,7 +9,7 @@ ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; qemuBinary = qemuPkg: { diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix index ef48ccb7b4fe..93d130970190 100644 --- a/nixos/modules/config/gnu.nix +++ b/nixos/modules/config/gnu.nix @@ -26,11 +26,11 @@ with lib; nano zile texinfo # for the stand-alone Info reader ] - ++ stdenv.lib.optional (!stdenv.isArm) grub2; + ++ stdenv.lib.optional (!stdenv.isAarch32) grub2; # GNU GRUB, where available. - boot.loader.grub.enable = !pkgs.stdenv.isArm; + boot.loader.grub.enable = !pkgs.stdenv.isAarch32; boot.loader.grub.version = 2; # GNU lsh. diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 45325c6b0d8d..2b78276fcdea 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -437,7 +437,7 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]) - (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) + (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) ]; # Mount the host filesystem via 9P, and bind-mount the Nix store diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2f..47b0bf2e736c 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f23..4934a7374058 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a10687141615..9839aadc9c1f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 @@ -29,7 +29,7 @@ let hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" else if stdenv.isi686 then "i386-softmmu" - else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch32 then "arm-softmmu" else if stdenv.isAarch64 then "aarch64-softmmu" else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5c0436b73ddf..47301bbdde69 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -57,7 +57,7 @@ let else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". - else if (with targetPlatform; isArm && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" + else if (with targetPlatform; isAarch32 && isLinux) then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" @@ -176,7 +176,7 @@ stdenv.mkDerivation { sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" - else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isAarch32 then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isi686 then "i386" else if targetPlatform.isMips then { diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0a6ea59e5ac4..532c56d52573 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -289,7 +289,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5dfdbd02cbfd..fb82eee4ab85 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -298,7 +298,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e42bb736676d..dee798eb09b1 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -318,7 +318,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index cf71f51627c9..b99ab8fce7fb 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -322,7 +322,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 0b19aa95effe..493e50d9f327 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -327,7 +327,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index e41e8789c9ed..d37cfac3fa85 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -290,7 +290,7 @@ stdenv.mkDerivation ({ # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index c56798e31ae4..cb9f78aa0813 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ]; + buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index 5cb3f2ea5ced..c88d2a8685a6 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 6520daa4d42c..192ff1ba207d 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -26,7 +26,7 @@ enableShared ? !(targetPlatform.isDarwin # On iOS, dynamic linking is not supported - && (targetPlatform.isAarch64 || targetPlatform.isArm)) + && (targetPlatform.isAarch64 || targetPlatform.isAarch32)) , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index df23f660147a..8f398458fd53 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index 296c10b9346c..cf4e57727198 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index bc3ccbdcdf51..51497e0d9cee 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isArm) [ + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 7ba547552907..69184744307d 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b8c283fef07e..32eb0d98d188 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 829309f94268..6a92775e0c25 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' + '' + optionalString stdenv.isAarch32 '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index c69554e633a9..8cfe2bb7bcfe 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 648ef0d91f9e..8bad5494e8b9 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper }: let - useX11 = !stdenv.isArm && !stdenv.isMips; + useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d8af0722c941..1ee6fee613c9 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -7,7 +7,7 @@ let real_url = if url == null then "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" else url; - safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); + safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in { stdenv, fetchurl, ncurses, buildEnv @@ -15,7 +15,7 @@ in , flambdaSupport ? false }: -assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 707f7966dd9b..529123398a57 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) '' + postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 0da3e9f0fd1d..29a192fcff24 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (setf features (remove x features)))) '' + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)") - + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)" + '' )) " > customize-target-features.lisp diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 785f38be3d0f..e4f2d6728640 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -932,11 +932,11 @@ self: super: { JuicyPixels = dontHaddock super.JuicyPixels; # aarch64 and armv7l fixes. - happy = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs; - servant-swagger = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; + happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 52d596da701a..3ab77c42cbba 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -136,7 +136,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 0fd55bd8d71b..3541c92fd9d6 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -86,7 +86,7 @@ let preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString (stdenv.isArm || stdenv.isMips) '' + '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 4618d0da9dd3..6f7f2df96bff 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; - patchPhase = optionalString stdenv.isArm '' + patchPhase = optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile < libGLU_combined != null; @@ -153,8 +153,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport libGLU_combined - ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM - ++ optional ((isLinux || isFreeBSD) && !isArm) libva + ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 3fccce02def4..4d2455d4872b 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; # The asm for armel is written with the 'asm' keyword. - CFLAGS = optionalString stdenv.isArm "-std=gnu99"; + CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 31567f0049dd..37e0a20a957d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation ({ (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp") ] ++ lib.optionals (cross != null) [ "--with-__thread" - ] ++ lib.optionals (cross == null && stdenv.isArm) [ + ] ++ lib.optionals (cross == null && stdenv.isAarch32) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b65a8ee5fc1c..57204776decd 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 5973c89cef79..551e7e5e1f6b 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -38,7 +38,7 @@ let self = stdenv.mkDerivation rec { # The config.guess in GMP tries to runtime-detect various # ARM optimization flags via /proc/cpuinfo (and is also # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isArm '' + preConfigure = optionalString stdenv.isAarch32 '' configureFlagsArray+=("--build=$(./configfsf.guess)") ''; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 940b4e2aee4e..1f8a518d69e4 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm" ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 87551ee6ee03..ee868d371ce5 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -31,7 +31,7 @@ let # $(includedir) is different from $(prefix)/include due to multiple outputs sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isArm '' + '' + stdenv.lib.optionalString stdenv.isAarch32 '' # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 1a26bd13d41c..d8866ae3ff89 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { # jemalloc is unable to correctly detect transparent hugepage support on # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; + ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp"; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 82307e9ab163..ccae6ce50142 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-install-test-programs" ] - ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) + ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 16fca9ce3d39..9af8718dc5fe 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 8d0a467c82a8..785bc6f3c843 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ autoreconfHook libsodium ncurses check libconfig - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus ]; - propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ]; # Some tests fail randomly due to timeout. This kind of problem is well known # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 1e96ff9bb1ad..272761cc6af3 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -41,7 +41,7 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index ef499f238d63..e2b94dda28e7 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -43,11 +43,11 @@ }: let - inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin; inherit (stdenv.lib) enableFeature optional optionals; in -assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support +assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a3c03c4f2e53..2beb7e600804 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,17 +33,17 @@ else let defaultGalliumDrivers = - if stdenv.isArm + if stdenv.isAarch32 then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["nouveau" "vc4" ] else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]; defaultVulkanDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if (stdenv.isAarch32 || stdenv.isAarch64) then [] else ["intel"] ++ lib.optional enableRadv "radeon"; in diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index e70ffc3eb2f1..2987c67ae757 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck libpng; - configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; + configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; doCheck = true; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index b7b09caed9b3..6118d9c41d6f 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; - preConfigure = stdenv.lib.optionalString stdenv.isArm '' + preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") ''; diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index 73f5febb6685..e1a9336e3a56 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -3,10 +3,10 @@ assert readline != null; let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then (if stdenv.is64bit then "arm64" else "arm") else (if stdenv.is64bit then "x64" else "ia32"); - armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard"; + armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index 4095ff20c2bc..adebedbf2ac1 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -4,7 +4,7 @@ }: let - arch = if stdenv.isArm + arch = if stdenv.isAarch32 then if stdenv.is64bit then"arm64" else "arm" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index f14ec4fc6084..099794f6623d 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -10,7 +10,7 @@ let arch = if stdenv.isx86_64 then "x64" else if stdenv.isi686 then "ia32" else if stdenv.isAarch64 then "arm64" - else if stdenv.isArm then "arm" + else if stdenv.isAarch32 then "arm" else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b5a3aed91d90..529091518eb6 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # Avoid this error: # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode - patchPhase = stdenv.lib.optionalString stdenv.isArm '' + patchPhase = stdenv.lib.optionalString stdenv.isAarch32 '' substituteInPlace configure --replace 'armv7*|armv8*' 'disabled' '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 123f679d779d..e65736a3e887 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 2ea87fe6d7f1..011d0b3e80b9 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -38,14 +38,14 @@ in stdenv.mkDerivation { # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ - [ (stdenv.lib.optionalString stdenv.isArm "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; + [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; # Build only the host software preConfigure = "cd host"; - patches = if stdenv.isArm then ./neon.patch else null; + patches = if stdenv.isAarch32 then ./neon.patch else null; postPhases = [ "installFirmware" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 2579b0b6a0a6..1bbda6ab7add 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -11,7 +11,7 @@ appleDerivation rec { apple_sdk.frameworks.IOKit openbsm ]; # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" - # + lib.optionalString hostPlatform.isArm "-D__arm__"; + # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" "-DDAEMON_GID=1" "-DDEFAULT_AT_QUEUE=\'a\'" diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index d1e40371e370..bfade509fcac 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) '' + ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4d9ec389f44e..4af5889fd1cd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -355,7 +355,7 @@ with stdenv.lib; SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default SECURITY_YAMA? y # Prevent processes from ptracing non-children processes DEVKMEM n # Disable /dev/kmem - ${optionalString (! stdenv.hostPlatform.isArm) + ${optionalString (! stdenv.hostPlatform.isAarch32) (if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack '' else '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7c9514883093..615e4f867c4d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + (if stdenv.isAarch32 || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index c4d2bf04d7a0..180aabc94cc6 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -43,7 +43,7 @@ let UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" - '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) '' + '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 60462f83d108..a9de5508371a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -123,7 +123,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl; + ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 42288e6245e4..190fc500068c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -117,7 +117,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian; + isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index d16e730b5abf..817da08c05e3 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { stdenv.lib.optional stdenv.isLinux utillinux; buildPhase = - stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 " + stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d20cb3c37859..3dfd136ad060 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); let diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 40332f7b0d44..179b4cb1a4c0 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32); stdenv.mkDerivation rec { name = "storebrowse-20130318212204"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaa458529e3c..d446a0127212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6471,12 +6471,12 @@ with pkgs; openjdk = openjdk8; - jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else if stdenv.isDarwin then jre8 @@ -6485,12 +6485,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; - jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" + jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; + jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk10.jre // { outputs = [ "jre" ]; })); jre10_headless = - if stdenv.isArm || stdenv.isAarch64 then + if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else if stdenv.isDarwin then jre10 @@ -9247,7 +9247,7 @@ with pkgs; cairo = callPackage ../development/libraries/cairo { glSupport = config.cairo.gl or (stdenv.isLinux && - !stdenv.isArm && !stdenv.isMips); + !stdenv.isAarch32 && !stdenv.isMips); }; From c3e137e7cbf513d51415f619cc3c17ea35b370ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 25 Apr 2018 22:14:41 +0100 Subject: [PATCH 2592/2743] rubycop: 0.47.0 -> 0.55.0 --- pkgs/development/tools/rubocop/Gemfile.lock | 24 ++++++------ pkgs/development/tools/rubocop/gemset.nix | 41 ++++++++++++--------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index abc782465ccc..d6185d79f1d1 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -1,20 +1,22 @@ GEM remote: https://rubygems.org/ specs: - ast (2.3.0) - parser (2.3.3.1) - ast (~> 2.2) + ast (2.4.0) + parallel (1.12.1) + parser (2.5.1.0) + ast (~> 2.4.0) powerpack (0.1.1) - rainbow (2.2.1) - rake (12.0.0) - rubocop (0.47.0) - parser (>= 2.3.3.1, < 3.0) + rainbow (3.0.0) + rake (12.3.1) + rubocop (0.55.0) + parallel (~> 1.10) + parser (>= 2.5) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - unicode-display_width (1.1.3) + ruby-progressbar (1.9.0) + unicode-display_width (1.3.2) PLATFORMS ruby @@ -24,4 +26,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.13.7 + 1.14.6 diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 908b5b76dd38..a2585a6e4f66 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -2,19 +2,27 @@ ast = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + type = "gem"; + }; + version = "1.12.1"; }; parser = { dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nply96nqrkgx8d3jay31sfy5p4q74dg8ymln0mdazxx5cz2n8bq"; + sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9"; type = "gem"; }; - version = "2.3.3.1"; + version = "2.5.1.0"; }; powerpack = { source = { @@ -25,45 +33,44 @@ version = "0.1.1"; }; rainbow = { - dependencies = ["rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri"; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; type = "gem"; }; - version = "2.2.1"; + version = "3.0.0"; }; rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; type = "gem"; }; - version = "12.0.0"; + version = "12.3.1"; }; rubocop = { - dependencies = ["parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsv3zbjl14nqyqqvcwciz15nq76l7vg97nydrdsrxs2bc5jrlsm"; + sha256 = "17qnk66q4diny1bvzbwsl1d5a26nj0mjzc2425h6nyp3xqjipz11"; type = "gem"; }; - version = "0.47.0"; + version = "0.55.0"; }; ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx"; + sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n"; type = "gem"; }; - version = "1.1.3"; + version = "1.3.2"; }; -} +} \ No newline at end of file From 189a4f3656d0a13e86091654a615c21b1e9031ec Mon Sep 17 00:00:00 2001 From: Michiel Derhaeg Date: Wed, 25 Apr 2018 23:54:57 +0200 Subject: [PATCH 2593/2743] verifast: 14.5 -> 18.02 (#39480) --- .../science/logic/verifast/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index ada586fc4e6d..8229af9649f8 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -2,25 +2,30 @@ , fontconfig, libxml2, gnome2 }: assert stdenv.isLinux; - let + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; patchExe = x: '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; + + patchLib = x: '' + patchelf --set-rpath ${libPath} ${x} + ''; + in stdenv.mkDerivation rec { name = "verifast-${version}"; - version = "14.5"; + version = "18.02"; src = fetchurl { - url = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/${name}-x64.tar.gz"; - sha256 = "03y1s6s2j9vqgiad0vbxriipsypxaylxxd3q36n9rvrc3lf9xra9"; + url = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz"; + sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e"; }; dontStrip = true; @@ -29,10 +34,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -R bin $out/libexec - ${patchExe "$out/libexec/verifast-core"} - ${patchExe "$out/libexec/vfide-core"} - ln -s $out/libexec/verifast-core $out/bin/verifast - ln -s $out/libexec/vfide-core $out/bin/vfide + ${patchExe "$out/libexec/verifast"} + ${patchExe "$out/libexec/vfide"} + ${patchLib "$out/libexec/libz3.so"} + ln -s $out/libexec/verifast $out/bin/verifast + ln -s $out/libexec/vfide $out/bin/vfide ''; meta = { From 59ad9933ff5065bbc14231d7a66c87bedfa0bad7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:55:12 +0200 Subject: [PATCH 2594/2743] gitaly: 0.81.0 -> 0.95.0 --- .../version-management/gitaly/Gemfile | 12 ++++-- .../version-management/gitaly/Gemfile.lock | 31 ++++++++------ .../version-management/gitaly/default.nix | 4 +- .../version-management/gitaly/gemset.nix | 42 +++++++++++++------ 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 2b95446161b8..b300f27918c5 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,13 +1,19 @@ source 'https://rubygems.org' -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'rugged', '~> 0.27.0' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.2' -gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.95.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false -gem 'grpc', '~> 1.8.0' +gem 'grpc', '~> 1.10.0' +gem 'sentry-raven', '~> 2.7.2', require: false + +# Detects the open source license the repository includes +# This version needs to be in sync with GitLab CE/EE +gem 'licensee', '~> 8.7.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index cb53bb10122a..2687952c805b 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -9,7 +9,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) ast (2.3.0) - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) concurrent-ruby (1.0.5) diff-lcs (1.3) escape_utils (1.1.1) @@ -17,14 +17,14 @@ GEM multipart-post (>= 1.2, < 3) gemojione (3.3.0) json - gitaly-proto (0.83.0) + gitaly-proto (0.95.0) google-protobuf (~> 3.1) - grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + grpc (~> 1.10) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) @@ -60,13 +60,15 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.8.7) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) i18n (0.8.1) json (2.1.0) jwt (2.1.0) + licensee (8.7.0) + rugged (~> 0.24) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -87,7 +89,7 @@ GEM ast (~> 2.2) posix-spawn (0.3.13) powerpack (0.1.1) - public_suffix (3.0.1) + public_suffix (3.0.2) rainbow (2.2.2) rake rake (12.1.0) @@ -118,9 +120,11 @@ GEM rubocop-rspec (1.17.0) rubocop (>= 0.50.0) ruby-progressbar (1.8.3) - rugged (0.26.0) + rugged (0.27.0) sanitize (2.1.0) nokogiri (>= 1.4.4) + sentry-raven (2.7.2) + faraday (>= 0.7.6, < 1.0) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -137,16 +141,19 @@ PLATFORMS DEPENDENCIES activesupport (~> 5.0.2) - gitaly-proto (~> 0.83.0) - github-linguist (~> 4.7.0) + gitaly-proto (~> 0.95.0) + github-linguist (~> 5.3.3) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) google-protobuf (= 3.5.1) - grpc (~> 1.8.0) + grpc (~> 1.10.0) + licensee (~> 8.7.0) rdoc (~> 4.2) rspec + rugged (~> 0.27.0) + sentry-raven (~> 2.7.2) BUNDLED WITH 1.16.1 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 7a8ba0fda744..32884d0a1cc5 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.81.0"; + version = "0.95.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y"; + sha256 = "0kadld8372vj0nm692mcn8j4ngph5gzzrzp8dmb4g26h10nq9k6a"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index efe786216628..9e6f01e3679d 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -28,10 +28,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; concurrent-ruby = { source = { @@ -79,19 +79,19 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv"; + sha256 = "0xwgi3902c89kx0fa176wz289nh67qm9bmx0yykrg5xx1lwk8a2j"; type = "gem"; }; - version = "0.83.0"; + version = "0.95.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; type = "gem"; }; - version = "4.7.6"; + version = "5.3.3"; }; github-markup = { source = { @@ -184,10 +184,10 @@ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b"; + sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82"; type = "gem"; }; - version = "1.8.7"; + version = "1.10.0"; }; i18n = { source = { @@ -213,6 +213,15 @@ }; version = "2.1.0"; }; + licensee = { + dependencies = ["rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2"; + type = "gem"; + }; + version = "8.7.0"; + }; little-plugger = { source = { remotes = ["https://rubygems.org"]; @@ -340,10 +349,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; rainbow = { dependencies = ["rake"]; @@ -460,10 +469,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy"; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; type = "gem"; }; - version = "0.26.0"; + version = "0.27.0"; }; sanitize = { dependencies = ["nokogiri"]; @@ -474,6 +483,15 @@ }; version = "2.1.0"; }; + sentry-raven = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + type = "gem"; + }; + version = "2.7.2"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { From ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:55:58 +0200 Subject: [PATCH 2595/2743] gitlab-shell: 6.0.3 -> 7.1.2 --- .../version-management/gitlab-shell/default.nix | 6 +++--- .../version-management/gitlab-shell/fixes.patch | 4 ++-- .../gitlab-shell/remove-hardcoded-locations.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ca5b8a84fbf9..09c1cd13d440 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "6.0.3"; + version = "7.1.2"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; + sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni"; }; buildInputs = [ ruby bundler go ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch index b0ee31cf39dd..29e4dccb26c7 100644 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch @@ -5,8 +5,8 @@ index 30a6b71..46b4dfa 100644 @@ -26,8 +26,8 @@ module GoBuild raise "env must be a hash" unless env.is_a?(Hash) raise "cmd must be an array" unless cmd.is_a?(Array) - -- if !system(env, *cmd) + +- unless system(env, *cmd) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end + puts "Starting #{env.inspect} #{cmd.join(' ')}" diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index bc1aa8583867..38181399eec8 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -19,9 +19,9 @@ index 1452f95..2b40327 100644 end # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. -- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) +- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) + # Except we don't, because we're already in the right directory on nixos! -+ Kernel::exec(env, *args, unsetenv_others: true) ++ Kernel.exec(env, *args, unsetenv_others: true) end def api From 775bbc2d574560134b9bffbe06c5703e0d68cd4c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:56:45 +0200 Subject: [PATCH 2596/2743] gitlab-workhorse: 3.6.0 -> 4.1.0 --- .../version-management/gitlab-workhorse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 6bb696406c9d..05cf33d408a5 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "4.1.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz"; + sha256 = "1yqmkpszcan5cawkl9cxjngcyqlqg061ihk31isar9ifbhpv9yfv"; }; buildInputs = [ git go ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.mit; }; } From 04ab1ed623fb1f3d02339c789452020771d73c06 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:57:10 +0200 Subject: [PATCH 2597/2743] gitlab: 10.5.6 -> 10.7.0 --- .../version-management/gitlab/Gemfile | 99 +++-- .../version-management/gitlab/Gemfile.lock | 293 +++++++------- .../version-management/gitlab/default.nix | 19 +- .../version-management/gitlab/gemset.nix | 367 ++++++++++-------- 4 files changed, 409 insertions(+), 369 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 97d40857e117..d85ee9886443 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -1,6 +1,18 @@ +# --- Special code for migrating to Rails 5.0 --- +def rails5? + %w[1 true].include?(ENV["RAILS5"]) +end + +gem_versions = {} +gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' +gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' +gem_versions['rails'] = rails5? ? '5.0.6' : '4.2.10' +gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' +# --- The end of special code for migrating to Rails 5.0 --- + source 'https://rubygems.org' -gem 'rails', '4.2.10' +gem 'rails', gem_versions['rails'] gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with @@ -9,36 +21,37 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'default_value_for', '~> 3.0.0' +gem 'default_value_for', gem_versions['default_value_for'] # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres -gem 'rugged', '~> 0.26.0' +gem 'rugged', '~> 0.27' gem 'grape-route-helpers', '~> 2.1.0' gem 'faraday', '~> 0.12' # Authentication libraries gem 'devise', '~> 4.2' -gem 'doorkeeper', '~> 4.2.0' -gem 'doorkeeper-openid_connect', '~> 1.2.0' -gem 'omniauth', '~> 1.4.2' +gem 'doorkeeper', '~> 4.3' +gem 'doorkeeper-openid_connect', '~> 1.3' +gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.2' +gem 'omniauth-google-oauth2', '~> 0.5.3' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 1.7.0' +gem 'omniauth-saml', '~> 1.10' gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' +gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.1' +gem 'omniauth-jwt', '~> 0.0.2' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt', '~> 1.5.6' @@ -81,7 +94,7 @@ gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API gem 'grape', '~> 1.0' @@ -104,16 +117,16 @@ gem 'carrierwave', '~> 1.2' gem 'dropzonejs-rails', '~> 0.7.1' # for backups -gem 'fog-aws', '~> 1.4' +gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 0.5' +gem 'fog-google', '~> 1.3.3' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage -gem 'google-api-client', '~> 0.13.6' +gem 'google-api-client', '~> 0.19.8' # for aws storage gem 'unf', '~> 0.1.4' @@ -122,17 +135,18 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing -gem 'html-pipeline', '~> 1.11.0' +gem 'html-pipeline', '~> 2.7.1' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.2' gem 'redcarpet', '~> 3.4' +gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' -gem 'asciidoctor-plantuml', '0.0.7' +gem 'asciidoctor', '~> 1.5.6' +gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' @@ -148,10 +162,10 @@ group :unicorn do end # State machine -gem 'state_machines-activerecord', '~> 0.4.0' +gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 4.0' +gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.0' @@ -207,7 +221,7 @@ gem 'asana', '~> 0.6.0' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 2.2.0' +gem 'kubeclient', '~> 3.0' # d3 gem 'd3_rails', '~> 3.5.0' @@ -217,10 +231,10 @@ gem 'sanitize', '~> 2.0' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -gem 'loofah', '~> 2.0.3' +gem 'loofah', '~> 2.2' # Working with license -gem 'licensee', '~> 8.7.0' +gem 'licensee', '~> 8.9' # Protect against bruteforcing gem 'rack-attack', '~> 4.4.1' @@ -234,9 +248,6 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.5' -# Faster JSON -gem 'oj', '~> 2.17.4' - # Faster blank gem 'fast_blank' @@ -256,22 +267,21 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.3.1' gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.5.3' +gem 'sentry-raven', '~> 2.7' gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', '~> 4.0.9' +gem 'rails-i18n', gem_versions['rails-i18n'] gem 'gettext_i18n_rails', '~> 1.8.0' -gem 'gettext_i18n_rails_js', '~> 1.2.0' +gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.2.1' @@ -279,7 +289,6 @@ gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-host', '~> 1.0.0' gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-performance_bar', '~> 1.3.0' gem 'peek-pg', '~> 1.3.0', group: :postgres @@ -299,8 +308,8 @@ group :metrics do end group :development do - gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.6.0', require: false + gem 'foreman', '~> 0.84.0' + gem 'brakeman', '~> 4.2', require: false gem 'letter_opener_web', '~> 1.3.0' gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false @@ -359,13 +368,15 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false gem 'license_finder', '~> 3.1', require: false - gem 'knapsack', '~> 1.11.0' + gem 'knapsack', '~> 1.16' - gem 'activerecord_sane_schema_dumper', '0.2' + gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] gem 'stackprof', '~> 0.2.10', require: false gem 'simple_po_parser', '~> 1.1.2', require: false + + gem 'timecop', '~> 0.8.0' end group :test do @@ -373,21 +384,20 @@ group :test do gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'test_after_commit', '~> 1.1' + gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. gem 'sham_rack', '~> 1.3.6' - gem 'timecop', '~> 0.8.0' gem 'concurrent-ruby', '~> 1.0.5' gem 'test-prof', '~> 0.2.5' end -gem 'octokit', '~> 4.6.2' +gem 'octokit', '~> 4.8' gem 'mail_room', '~> 0.9.1' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 0.16.2' +gem 'ruby-prof', '~> 0.17.0' # OAuth gem 'oauth2', '~> 1.4' @@ -400,7 +410,8 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 4.1.0' +gem 'net-ssh', '~> 4.2.0' +gem 'sshkey', '~> 1.9.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -410,16 +421,18 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.94.0', require: 'gitaly' +gem 'grpc', '~> 1.10.0' + # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' -gem 'toml-rb', '~> 0.3.15', require: false +gem 'toml-rb', '~> 1.0.0', require: false # Feature toggles -gem 'flipper', '~> 0.11.0' -gem 'flipper-active_record', '~> 0.11.0' -gem 'flipper-active_support_cache_store', '~> 0.11.0' +gem 'flipper', '~> 0.13.0' +gem 'flipper-active_record', '~> 0.13.0' +gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 4022e2896116..a1150dfccdd2 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -40,13 +40,14 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts-as-taggable-on (4.0.0) - activerecord (>= 4.0) + acts-as-taggable-on (5.0.0) + activerecord (>= 4.2.8) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + aes_key_wrap (1.0.1) akismet (2.0.0) allocations (1.0.5) arel (6.0.4) @@ -55,15 +56,15 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - asciidoctor-plantuml (0.0.7) + asciidoctor (1.5.6.2) + asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) asset_sync (2.2.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) unf - ast (2.3.0) + ast (2.4.0) atomic (1.1.99) attr_encrypted (3.0.3) encryptor (~> 3.0.0) @@ -86,7 +87,7 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - bindata (2.4.1) + bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) blankslate (2.1.2.4) @@ -94,7 +95,7 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.7.0) - brakeman (3.6.1) + brakeman (4.2.1) browser (2.2.0) builder (3.2.3) bullet (5.5.1) @@ -119,7 +120,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) childprocess (0.7.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) @@ -131,6 +132,8 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colorize (0.7.7) + commonmarker (0.17.8) + ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) @@ -140,6 +143,7 @@ GEM connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) + crass (1.0.3) creole (0.5.0) css_parser (1.5.0) addressable @@ -172,12 +176,12 @@ GEM diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) - domain_name (0.5.20161021) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.6) + doorkeeper (4.3.1) railties (>= 4.2) - doorkeeper-openid_connect (1.2.0) - doorkeeper (~> 4.0) + doorkeeper-openid_connect (1.3.0) + doorkeeper (~> 4.3) json-jwt (~> 1.6) dropzonejs-rails (0.7.2) rails (> 3.1) @@ -192,7 +196,7 @@ GEM et-orbi (1.0.3) tzinfo eventmachine (1.0.8) - excon (0.57.1) + excon (0.60.0) execjs (2.6.0) expression_parser (0.9.0) factory_bot (4.8.2) @@ -208,7 +212,7 @@ GEM faraday_middleware multi_json fast_blank (1.0.0) - fast_gettext (1.4.0) + fast_gettext (1.6.0) ffaker (2.4.0) ffi (1.9.18) flay (2.10.0) @@ -216,13 +220,13 @@ GEM path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flipper (0.11.0) - flipper-active_record (0.11.0) + flipper (0.13.0) + flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) - flipper (~> 0.11.0) - flipper-active_support_cache_store (0.11.0) + flipper (~> 0.13.0) + flipper-active_support_cache_store (0.13.0) activesupport (>= 3.2, < 6) - flipper (~> 0.11.0) + flipper (~> 0.13.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -231,19 +235,20 @@ GEM fog-json (~> 1.0) ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (1.4.0) + fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.44.3) + fog-core (1.45.0) builder - excon (~> 0.49) + excon (~> 0.58) formatador (~> 0.2) - fog-google (0.5.3) + fog-google (1.3.3) fog-core fog-json fog-xml + google-api-client (~> 0.19.1) fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) @@ -263,7 +268,7 @@ GEM nokogiri (>= 1.5.11, < 2.0.0) font-awesome-rails (4.7.0.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.2.0) @@ -274,25 +279,25 @@ GEM gemojione (3.3.0) json get_process_mem (0.2.0) - gettext (3.2.2) + gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) fast_gettext (>= 0.9.0) - gettext_i18n_rails_js (1.2.0) + gettext_i18n_rails_js (1.3.0) gettext (>= 3.0.2) gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.84.0) + gitaly-proto (0.94.0) google-protobuf (~> 3.1) grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-flowdock-git-hook (1.0.1) flowdock (~> 0.7) @@ -333,9 +338,9 @@ GEM json multi_json request_store (>= 1.0) - google-api-client (0.13.6) + google-api-client (0.19.8) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.5) + googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) @@ -343,9 +348,9 @@ GEM google-protobuf (3.5.1) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) - googleauth (0.5.3) + googleauth (0.6.2) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) @@ -353,7 +358,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.0) + grape (1.0.2) activesupport builder mustermann-grape (~> 1.0.0) @@ -369,7 +374,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.8.3) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -386,7 +391,7 @@ GEM thor tilt hashdiff (0.3.4) - hashie (3.5.6) + hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) @@ -394,26 +399,26 @@ GEM hipchat (1.5.2) httparty mimemagic - html-pipeline (1.11.0) + html-pipeline (2.7.1) activesupport (>= 2) - nokogiri (~> 1.4) + nokogiri (>= 1.4) html2text (0.2.0) nokogiri (~> 1.6) htmlentities (4.3.4) - http (0.9.8) + http (2.2.2) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.1) + http-form_data (1.0.3) http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.2) - i18n (0.9.1) + httpclient (2.8.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) influxdb (0.2.3) @@ -425,15 +430,11 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - jquery-rails (4.3.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) json (1.8.6) - json-jwt (1.7.2) + json-jwt (1.9.2) activesupport + aes_key_wrap bindata - multi_json (>= 1.3) securecompare url_safe_base64 json-schema (2.8.0) @@ -452,13 +453,13 @@ GEM kaminari-core (= 1.0.1) kaminari-core (1.0.1) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.16.0) rake timecop (>= 0.1.0) - kubeclient (2.2.0) - http (= 0.9.8) - recursive-open-struct (= 1.0.0) - rest-client + kubeclient (3.0.0) + http (~> 2.2.2) + recursive-open-struct (~> 1.0.4) + rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) @@ -475,7 +476,7 @@ GEM toml (= 0.1.2) with_env (> 1.0) xml-simple - licensee (8.7.0) + licensee (8.9.2) rugged (~> 0.24) little-plugger (1.1.4) locale (2.1.2) @@ -486,7 +487,8 @@ GEM actionpack (>= 4, < 5.2) activesupport (>= 4, < 5.2) railties (>= 4, < 5.2) - loofah (2.0.3) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) @@ -499,36 +501,35 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.0) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.12.2) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.0) + mustermann (1.0.2) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) net-ldap (0.16.0) - net-ssh (4.1.0) + net-ssh (4.2.0) netrc (0.11.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) numerizer (0.1.1) - oauth (0.5.1) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.6.2) + octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - oj (2.17.5) - omniauth (1.4.2) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.1) @@ -549,11 +550,13 @@ GEM omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) + omniauth-jwt (0.0.2) + jwt + omniauth (~> 1.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -562,19 +565,19 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) - omniauth-saml (1.7.0) - omniauth (~> 1.3) - ruby-saml (~> 1.4) + omniauth-saml (1.10.0) + omniauth (~> 1.3, >= 1.3.2) + ruby-saml (~> 1.7) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) + omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) + rack omniauth_crowd (2.2.3) activesupport nokogiri (>= 1.4.4) @@ -584,8 +587,8 @@ GEM orm_adapter (0.5.0) os (0.9.6) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.5) + ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) path_expander (1.0.2) @@ -595,13 +598,11 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-host (1.0.0) - peek peek-mysql2 (1.1.0) atomic (>= 1.0.0) mysql2 peek - peek-performance_bar (1.3.0) + peek-performance_bar (1.3.1) peek (>= 0.1.0) peek-pg (1.3.0) concurrent-ruby @@ -646,9 +647,9 @@ GEM pry (~> 0.10) pry-rails (0.3.5) pry (>= 0.9.10) - public_suffix (3.0.0) + public_suffix (3.0.2) pyu-ruby-sasl (0.0.3.3) - rack (1.6.8) + rack (1.6.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) @@ -660,7 +661,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (2.0.1) rack rack-proxy (0.6.0) rack @@ -679,12 +680,12 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) @@ -711,7 +712,7 @@ GEM re2 (1.1.1) recaptcha (3.0.0) json - recursive-open-struct (1.0.0) + recursive-open-struct (1.0.5) redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) @@ -739,7 +740,7 @@ GEM request_store (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) - rest-client (2.0.0) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) @@ -797,11 +798,13 @@ GEM rubocop (>= 0.51) rubocop-rspec (1.22.1) rubocop (>= 0.52.1) + ruby-enum (0.7.2) + i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.16.2) + ruby-prof (0.17.0) ruby-progressbar (1.9.0) - ruby-saml (1.4.1) + ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby_parser (3.9.0) sexp_processor (~> 4.1) @@ -810,7 +813,7 @@ GEM rubyzip (1.2.1) rufus-scheduler (3.4.0) et-orbi (~> 1.0) - rugged (0.26.0) + rugged (0.27.0) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -840,7 +843,7 @@ GEM selenium-webdriver (3.5.0) childprocess (~> 0.5) rubyzip (~> 1.0) - sentry-raven (2.5.3) + sentry-raven (2.7.2) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.9.0) @@ -858,10 +861,10 @@ GEM sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) sidekiq (>= 4) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) simplecov (0.14.1) @@ -895,14 +898,15 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) + sshkey (1.9.0) stackprof (0.2.10) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) + state_machines (0.5.0) + state_machines-activemodel (0.5.1) + activemodel (>= 4.1, < 6.0) + state_machines (>= 0.5.0) + state_machines-activerecord (0.5.1) + activerecord (>= 4.1, < 6.0) + state_machines-activemodel (>= 0.5.0) stringex (2.7.1) sys-filesystem (1.1.6) ffi @@ -923,12 +927,12 @@ GEM timfel-krb5-auth (0.8.3) toml (0.1.2) parslet (~> 1.5.0) - toml-rb (0.3.15) + toml-rb (1.0.0) citrus (~> 3.0, > 3.0) truncato (0.7.10) htmlentities (~> 4.3.1) nokogiri (~> 1.8.0, >= 1.7.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -937,7 +941,7 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.5) unicode-display_width (1.3.0) unicorn (5.1.0) kgio (~> 2.6) @@ -946,13 +950,13 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - unparser (0.2.6) + unparser (0.2.7) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.5) + parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) url_safe_base64 (0.2.2) validates_hostname (1.0.6) @@ -989,13 +993,13 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 0.2) - acts-as-taggable-on (~> 4.0) + acts-as-taggable-on (~> 5.0) addressable (~> 2.5.2) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) - asciidoctor (~> 1.5.2) - asciidoctor-plantuml (= 0.0.7) + asciidoctor (~> 1.5.6) + asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) @@ -1008,7 +1012,7 @@ DEPENDENCIES binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) bootstrap_form (~> 2.7.0) - brakeman (~> 3.6.0) + brakeman (~> 4.2) browser (~> 2.2) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) @@ -1018,6 +1022,7 @@ DEPENDENCIES charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) + commonmarker (~> 0.17) concurrent-ruby (~> 1.0.5) connection_pool (~> 2.0) creole (~> 0.5.0) @@ -1028,8 +1033,8 @@ DEPENDENCIES devise (~> 4.2) devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) - doorkeeper (~> 4.2.0) - doorkeeper-openid_connect (~> 1.2.0) + doorkeeper (~> 4.3) + doorkeeper-openid_connect (~> 1.3) dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) @@ -1038,26 +1043,26 @@ DEPENDENCIES fast_blank ffaker (~> 2.4) flay (~> 2.10.0) - flipper (~> 0.11.0) - flipper-active_record (~> 0.11.0) - flipper-active_support_cache_store (~> 0.11.0) + flipper (~> 0.13.0) + flipper-active_record (~> 0.13.0) + flipper-active_support_cache_store (~> 0.13.0) fog-aliyun (~> 0.2.0) - fog-aws (~> 1.4) + fog-aws (~> 2.0.1) fog-core (~> 1.44) - fog-google (~> 0.5) + fog-google (~> 1.3.3) fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) - foreman (~> 0.78.0) + foreman (~> 0.84.0) fuubar (~> 2.2.0) gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) - gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.84.0) - github-linguist (~> 4.7.0) + gettext_i18n_rails_js (~> 1.3) + gitaly-proto (~> 0.94.0) + github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.3) @@ -1065,47 +1070,46 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) - google-api-client (~> 0.13.6) + google-api-client (~> 0.19.8) google-protobuf (= 3.5.1) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) + grpc (~> 1.10.0) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) + html-pipeline (~> 2.7.1) html2text httparty (~> 0.13.3) influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.3.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) - knapsack (~> 1.11.0) - kubeclient (~> 2.2.0) + knapsack (~> 1.16) + kubeclient (~> 3.0) letter_opener_web (~> 1.3.0) license_finder (~> 3.1) - licensee (~> 8.7.0) + licensee (~> 8.9) lograge (~> 0.5) - loofah (~> 2.0.3) + loofah (~> 2.2) mail_room (~> 0.9.1) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap - net-ssh (~> 4.1.0) + net-ssh (~> 4.2.0) nokogiri (~> 1.8.2) oauth2 (~> 1.4) - octokit (~> 4.6.2) - oj (~> 2.17.4) - omniauth (~> 1.4.2) + octokit (~> 4.8) + omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) @@ -1113,17 +1117,17 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.2) + omniauth-google-oauth2 (~> 0.5.3) + omniauth-jwt (~> 0.0.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) - omniauth-saml (~> 1.7.0) + omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) + omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-host (~> 1.0.0) peek-mysql2 (~> 1.1.0) peek-performance_bar (~> 1.3.0) peek-pg (~> 1.3.0) @@ -1166,17 +1170,17 @@ DEPENDENCIES rubocop (~> 0.52.1) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.16.2) + ruby-prof (~> 0.17.0) ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) - rugged (~> 0.26.0) + rugged (~> 0.27) sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) select2-rails (~> 3.5.9) selenium-webdriver (~> 3.5) - sentry-raven (~> 2.5.3) + sentry-raven (~> 2.7) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) @@ -1192,14 +1196,15 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) sprockets (~> 3.7.0) + sshkey (~> 1.9.0) stackprof (~> 0.2.10) - state_machines-activerecord (~> 0.4.0) + state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) test-prof (~> 0.2.5) test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) - toml-rb (~> 0.3.15) + toml-rb (~> 1.0.0) truncato (~> 0.7.9) u2f (~> 0.2.1) uglifier (~> 2.7.2) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 7cfaeff33827..8564e4af91b1 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,15 +1,13 @@ { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv -, ruby, tzdata, git, ps, dpkg, nettools +, ruby, tzdata, git, procps, nettools }: -/* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` - to allow building the assets without a database */ - let rubyEnv = bundlerEnv { name = "gitlab-env-${version}"; inherit ruby; gemdir = ./.; + groups = [ "default" "unicorn" "ed25519" "metrics" ]; meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; @@ -18,11 +16,11 @@ let }; }; - version = "10.5.6"; + version = "10.7.0"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0"; + sha256 = "0dngh6gj8kkfcxn6ki9i96jg4x1x0vq3zzdimxz31g3j2zpd0ryz"; }; in @@ -34,16 +32,15 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0"; + sha256 = "010xhzrp6svp2a4xzmzwl4x3hk9wc1frqr66lp8x58nfmvr8hdrg"; }; buildInputs = [ - rubyEnv ruby bundler tzdata git ps dpkg nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools ]; patches = [ ./remove-hardcoded-locations.patch - ./fix-36783.patch ]; postPatch = '' @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${ps}/bin/ps -U" + --replace "ps -U" "${procps}/bin/ps -U" sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake @@ -105,6 +102,6 @@ stdenv.mkDerivation rec { passthru = { inherit rubyEnv; - inherit ruby; + ruby = rubyEnv.wrappedRuby; }; } diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 4a021f5f2d97..d14a963a8c07 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -91,10 +91,10 @@ dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h2y2zh4vrjf6bzdgvyq5a53a4gpr8xvq4a5rvq7fy1w43z4753s"; + sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; type = "gem"; }; - version = "4.0.0"; + version = "5.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -114,6 +114,14 @@ }; version = "2.5.2"; }; + aes_key_wrap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07"; + type = "gem"; + }; + version = "1.0.1"; + }; akismet = { source = { remotes = ["https://rubygems.org"]; @@ -150,19 +158,19 @@ asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0q9yhan2mkk1lh15zcfd9g2fn6faix9yrf5skg23dp1y77jv7vm0"; + sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.6.2"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88"; + sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.8"; }; asset_sync = { dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; @@ -176,10 +184,10 @@ ast = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; atomic = { source = { @@ -292,10 +300,10 @@ bindata = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z"; + sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.3"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -334,10 +342,10 @@ brakeman = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxv3cgmjh6rimz2jcslj3qnh1vqqz1grrjnp6m3nywbznlv441w"; + sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v"; type = "gem"; }; - version = "3.6.1"; + version = "4.2.1"; }; browser = { source = { @@ -419,10 +427,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; childprocess = { dependencies = ["ffi"]; @@ -491,6 +499,15 @@ }; version = "0.7.7"; }; + commonmarker = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02iz27421qk6lnn0xwlz95w5l65dc4rnfqlwyal0h6mnawwy3b5i"; + type = "gem"; + }; + version = "0.17.8"; + }; concord = { dependencies = ["adamantium" "equalizer"]; source = { @@ -534,6 +551,14 @@ }; version = "0.4.3"; }; + crass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czijxlagzpzwchr2ldrgfi7kywg08idjpq37ndcmwh4fmz72c4l"; + type = "gem"; + }; + version = "1.0.3"; + }; creole = { source = { remotes = ["https://rubygems.org"]; @@ -681,28 +706,28 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5c96gzyh6z4nrnkisljqngfvljdba36dww657ka0x7khzvx7jl"; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; type = "gem"; }; - version = "0.5.20161021"; + version = "0.5.20170404"; }; doorkeeper = { dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah"; + sha256 = "1yjbmkhpj25h6n5hi382gxna1303crr4v57w1ic23n0w8ll6jh0z"; type = "gem"; }; - version = "4.2.6"; + version = "4.3.1"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827"; + sha256 = "1sknjc7gdyswvyh6bry3l4l57hjcab0bmkyz88i9k7qbb4p1fwck"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; dropzonejs-rails = { dependencies = ["rails"]; @@ -782,10 +807,10 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kc2l7kqrj8lhmrz3v21xhsl2laps4y2xmf952m2qrgzffy1pacg"; + sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc"; type = "gem"; }; - version = "0.57.1"; + version = "0.60.0"; }; execjs = { source = { @@ -859,10 +884,10 @@ fast_gettext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8snpgxrri8jc0c35s6h3n92j8bfahh1knj94mw6i4zqhnpv40z"; + sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; ffaker = { source = { @@ -892,28 +917,28 @@ flipper = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87"; + sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91"; + sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb"; + sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flowdock = { dependencies = ["httparty" "multi_json"]; @@ -937,28 +962,28 @@ dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z5zkz7998l0bcxdp0cz4wg4ds4mhdzxd90xxqd50f52cqy85fjg"; + sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.1"; }; fog-core = { dependencies = ["builder" "excon" "formatador"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8ph79x0jp810qdzr5a73hpf39v27y0an23j7ifyk5zsq0j3maw"; + sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; type = "gem"; }; - version = "1.44.3"; + version = "1.45.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; + dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "179kk6mr84wsybm2afjckm8y95z3b5hg84xlgv8l2cv46wdql2ii"; + sha256 = "09q0khxyaqckgz2d44sp4zkw61gbmhjdww0wsqjy5mwj041bwn3i"; type = "gem"; }; - version = "0.5.3"; + version = "1.3.3"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1018,10 +1043,10 @@ dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; + sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; type = "gem"; }; - version = "0.78.0"; + version = "0.84.0"; }; formatador = { source = { @@ -1070,10 +1095,10 @@ dependencies = ["locale" "text"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2i1zfqvaxqi01g9vvkfkf5r85c5nfj2zwpd2ib9vvkjavhn9cx"; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.9"; }; gettext_i18n_rails = { dependencies = ["fast_gettext"]; @@ -1088,10 +1113,10 @@ dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04lkmy6mgxdnpl4icddg00nj0ay0ylacfxrm723npzaqviml7c2x"; + sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gherkin-ruby = { source = { @@ -1105,19 +1130,19 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8"; + sha256 = "1rnfswh0jpsiyzvsac7kwk9rpbpf4fcz9p2i8pamqamm3skgd4i6"; type = "gem"; }; - version = "0.84.0"; + version = "0.94.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; type = "gem"; }; - version = "4.7.6"; + version = "5.3.3"; }; github-markup = { source = { @@ -1220,10 +1245,10 @@ dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; + sha256 = "1gk6c21na1sizgsi71c6l6gpyjgib863jg991ycmrdnpr12mvs0q"; type = "gem"; }; - version = "0.13.6"; + version = "0.19.8"; }; google-protobuf = { source = { @@ -1246,10 +1271,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.2"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1264,10 +1289,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz5lx56z9hwx6ifyc7qpdwd020xb3ynv3vahvlcgm01qi7ykdhv"; + sha256 = "1nv7ijyr20can779cfgna76dwrckmscpc7nxj699lrwarr9as17v"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1300,10 +1325,10 @@ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j"; + sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82"; type = "gem"; }; - version = "1.8.3"; + version = "1.10.0"; }; haml = { dependencies = ["tilt"]; @@ -1343,10 +1368,10 @@ hashie = { source = { remotes = ["https://rubygems.org"]; - sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7"; + sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb"; type = "gem"; }; - version = "3.5.6"; + version = "3.5.7"; }; hashie-forbidden_attributes = { dependencies = ["hashie"]; @@ -1379,10 +1404,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l"; + sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; type = "gem"; }; - version = "1.11.0"; + version = "2.7.1"; }; html2text = { dependencies = ["nokogiri"]; @@ -1405,10 +1430,10 @@ dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll9x8qjp97l8gj0jx23nj7xvm0rsxj5pb3d19f7bhmdb70r0xsi"; + sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r"; type = "gem"; }; - version = "0.9.8"; + version = "2.2.2"; }; http-cookie = { dependencies = ["domain_name"]; @@ -1422,10 +1447,10 @@ http-form_data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10r6hy8wcf8n4nbdmdz9hrm8mg45lncfc7anaycpzrhfp3949xh9"; + sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.3"; }; "http_parser.rb" = { source = { @@ -1447,19 +1472,19 @@ httpclient = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg15svk9lv5r7w1hxd87di6apsr9y009af3mm01xcaccvqj4j2d"; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; i18n = { dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s"; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; type = "gem"; }; - version = "0.9.1"; + version = "0.9.5"; }; ice_nine = { source = { @@ -1503,15 +1528,6 @@ }; version = "1.3.2"; }; - jquery-rails = { - dependencies = ["rails-dom-testing" "railties" "thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki"; - type = "gem"; - }; - version = "4.3.1"; - }; json = { source = { remotes = ["https://rubygems.org"]; @@ -1521,13 +1537,13 @@ version = "1.8.6"; }; json-jwt = { - dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata" "securecompare" "url_safe_base64"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2"; + sha256 = "08sisbiz851ny0bgikfqdqjn1hqpgrzsfzddpm7s5a8ln51s9x78"; type = "gem"; }; - version = "1.7.2"; + version = "1.9.2"; }; json-schema = { dependencies = ["addressable"]; @@ -1593,19 +1609,19 @@ dependencies = ["rake" "timecop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z0bp5al0b8wyzw8ff99jwr6qsh5n52xqryvzvy2nbrma9qr7dam"; + sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di"; type = "gem"; }; - version = "1.11.0"; + version = "1.16.0"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09hr5cb6rzf9876wa0c8pv3kxjj4s8hcjpf7jjdg2n9prb7hhmgi"; + sha256 = "14kmip7zprb7q6rp4lj011ikv33x193sy1642l2gmf8yv320h0sw"; type = "gem"; }; - version = "2.2.0"; + version = "3.0.0"; }; launchy = { dependencies = ["addressable"]; @@ -1647,10 +1663,10 @@ dependencies = ["rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2"; + sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; type = "gem"; }; - version = "8.7.0"; + version = "8.9.2"; }; little-plugger = { source = { @@ -1687,13 +1703,13 @@ version = "0.5.1"; }; loofah = { - dependencies = ["nokogiri"]; + dependencies = ["crass" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; + sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.2"; }; mail = { dependencies = ["mini_mime"]; @@ -1765,10 +1781,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0kzf2zx1arhjhw9c6mns0jqbmzdkd1vw25v940lvw63fzkbfv6dg"; + sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; type = "gem"; }; - version = "0.1.4"; + version = "1.0.0"; }; mini_portile2 = { source = { @@ -1797,10 +1813,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; multi_xml = { source = { @@ -1821,10 +1837,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0npddl1kf72i3m72vs72a24z2rpgspis3hbzyni9fsds96zf0zyl"; + sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -1854,10 +1870,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"; type = "gem"; }; - version = "4.1.0"; + version = "4.2.0"; }; netrc = { source = { @@ -1887,10 +1903,10 @@ oauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.4"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1905,27 +1921,19 @@ dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bppfc0q8mflbcdsb66dly3skx42vad30q0fkzwx4za908qwvjpd"; + sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg"; type = "gem"; }; - version = "4.6.2"; - }; - oj = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17c50q2ygi8jlw8dq3ghzha774ln1swbvmvai2ar7qb3bwcfgc8b"; - type = "gem"; - }; - version = "2.17.5"; + version = "4.8.0"; }; omniauth = { dependencies = ["hashie" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kvr0g12fawf491jmdaxzzr6qyd1r8ixzkcdr0zscs42fqsxv79i"; + sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; type = "gem"; }; - version = "1.4.2"; + version = "1.8.1"; }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; @@ -1991,13 +1999,22 @@ version = "1.0.2"; }; omniauth-google-oauth2 = { - dependencies = ["jwt" "multi_json" "omniauth" "omniauth-oauth2"]; + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sri7pn9pm7nr93zj7j1g4gqd3rpibqw7v09s1c6fihh5cmjz3fz"; + sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.3"; + }; + omniauth-jwt = { + dependencies = ["jwt" "omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qxr95z5p7fs13mg04zp76ldplgk6n8fkwbn17mlzlry1ihcrgxr"; + type = "gem"; + }; + version = "0.0.2"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2030,10 +2047,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5"; + sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2048,10 +2065,10 @@ dependencies = ["omniauth" "ruby-saml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1garppa83v53yr9bwfx51v4hqwfr5h4aq3d39gn2fmysnfav7c1x"; + sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p"; type = "gem"; }; - version = "1.7.0"; + version = "1.10.0"; }; omniauth-shibboleth = { dependencies = ["omniauth"]; @@ -2063,13 +2080,13 @@ version = "1.2.1"; }; omniauth-twitter = { - dependencies = ["json" "omniauth-oauth"]; + dependencies = ["omniauth-oauth" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833"; + sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; type = "gem"; }; - version = "1.2.1"; + version = "1.4.0"; }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; @@ -2117,10 +2134,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3"; + sha256 = "1sj8dlqs5l2pa5y2412r4d5fi7qvf26n8vpciz7k9fy0ch327gdc"; type = "gem"; }; - version = "2.4.0.2"; + version = "2.5.0.5"; }; parslet = { dependencies = ["blankslate"]; @@ -2157,15 +2174,6 @@ }; version = "0.0.2"; }; - peek-host = { - dependencies = ["peek"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11ra0hzdkdywp3cmaizcisliy26jwz7k0r9nkgm87y7amqk1wh8b"; - type = "gem"; - }; - version = "1.0.0"; - }; peek-mysql2 = { dependencies = ["atomic" "mysql2" "peek"]; source = { @@ -2179,10 +2187,10 @@ dependencies = ["peek"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08i2gvn59hsbysbmnakxdcpm0jvhh6rl00pr5i3zqf2f5dd0sjz6"; + sha256 = "1a0ly4p8xnrb3pnf273qq2d5bm2w19p829n4n2730rijd42pa2n4"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; peek-pg = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; @@ -2326,10 +2334,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.2"; }; pyu-ruby-sasl = { source = { @@ -2342,10 +2350,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.9"; }; rack-accept = { dependencies = ["rack"]; @@ -2386,10 +2394,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; type = "gem"; }; - version = "1.5.3"; + version = "2.0.1"; }; rack-proxy = { dependencies = ["rack"]; @@ -2431,19 +2439,19 @@ dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r"; + sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; rails-html-sanitizer = { dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -2561,10 +2569,10 @@ recursive-open-struct = { source = { remotes = ["https://rubygems.org"]; - sha256 = "102bgpfkjsaghpb1qs1ah5s89100dchpimzah2wxdy9rv9318rqw"; + sha256 = "0p8x9w9zzv56ka6czdmzl5sbsqjhnb9lkchvw55rf5lp8h0z3r6z"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.5"; }; redcarpet = { source = { @@ -2674,10 +2682,10 @@ dependencies = ["http-cookie" "mime-types" "netrc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v2jp2ilpb2rm97yknxcnay9lfagcm4k82pfsmmcm9v290xm1ib7"; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.2"; }; retriable = { source = { @@ -2844,6 +2852,15 @@ }; version = "1.22.1"; }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; + }; ruby-fogbugz = { dependencies = ["crack"]; source = { @@ -2856,10 +2873,10 @@ ruby-prof = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; + sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; ruby-progressbar = { source = { @@ -2873,10 +2890,10 @@ dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1abhf16vbyzck4pv06qd5c59780glaf682ssjzpjwd9h9d7nqvl5"; + sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3"; type = "gem"; }; - version = "1.4.1"; + version = "1.7.2"; }; ruby_parser = { dependencies = ["sexp_processor"]; @@ -2923,10 +2940,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy"; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; type = "gem"; }; - version = "0.26.0"; + version = "0.27.0"; }; safe_yaml = { source = { @@ -3029,10 +3046,10 @@ dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19qqb7whayd170y45asc3cr3mbxfd46fv6s4jbs5xx1wphy4q80i"; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; type = "gem"; }; - version = "2.5.3"; + version = "2.7.2"; }; settingslogic = { source = { @@ -3099,10 +3116,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.1"; }; simple_po_parser = { source = { @@ -3225,6 +3242,14 @@ }; version = "1.3.13"; }; + sshkey = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + type = "gem"; + }; + version = "1.9.0"; + }; stackprof = { source = { remotes = ["https://rubygems.org"]; @@ -3236,28 +3261,28 @@ state_machines = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1xg84kdglz0k1pshf2q604zybjpribzcz2b651sc1j27kd86w787"; + sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; state_machines-activemodel = { dependencies = ["activemodel" "state_machines"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p6560jsb4flapd1vbc50bqjk6dzykkwbmyivchyjh5ncynsdb8v"; + sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5wx1s2i3qc4p2knkf2n9h8b49pla9rjidkwxqzi781qm40wdxx"; + sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; stringex = { source = { @@ -3379,10 +3404,10 @@ dependencies = ["citrus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03sr3k193i1r5bh9g4zc7iq9jklapmwj0rndcvhr9q7v5xm7x4rf"; + sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d"; type = "gem"; }; - version = "0.3.15"; + version = "1.0.0"; }; truncato = { dependencies = ["htmlentities" "nokogiri"]; @@ -3397,10 +3422,10 @@ dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.5"; }; u2f = { source = { @@ -3439,10 +3464,10 @@ unf_ext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.5"; }; unicode-display_width = { source = { @@ -3482,10 +3507,10 @@ dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jhpgvghn764myi5iwlys98f71yspwgrzimzz11108jnhl5rcx7l"; + sha256 = "0k2asbk9k5kzq8jidy3frqcmn58i9cvaizn8f6g5xlx1pn70bx1w"; type = "gem"; }; - version = "0.2.6"; + version = "0.2.7"; }; url_safe_base64 = { source = { From 783fb86de498769dd4c14fd0f3a59c746cec5f95 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:58:05 +0200 Subject: [PATCH 2598/2743] gitlab module: update to gitlab 10.7 --- nixos/modules/services/misc/gitlab.nix | 29 +++++++++----------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 20d7ec90dcc9..be13fed860bd 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -8,9 +8,6 @@ let cfg = config.services.gitlab; ruby = cfg.packages.gitlab.ruby; - bundler = pkgs.bundler; - - gemHome = "${cfg.packages.gitlab.rubyEnv}/${ruby.gemPath}"; gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; @@ -137,8 +134,6 @@ let gitlabEnv = { HOME = "${cfg.statePath}/home"; - GEM_HOME = gemHome; - BUNDLE_GEMFILE = "${cfg.packages.gitlab}/share/gitlab/Gemfile"; UNICORN_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; GITLAB_STATE_PATH = "${cfg.statePath}"; @@ -158,19 +153,17 @@ let gitlab-rake = pkgs.stdenv.mkDerivation rec { name = "gitlab-rake"; - buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.rubyEnv pkgs.makeWrapper ]; - phases = "installPhase fixupPhase"; - buildPhase = ""; + buildInputs = [ pkgs.makeWrapper ]; + dontBuild = true; + unpackPhase = ":"; installPhase = '' mkdir -p $out/bin - makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/bundle $out/bin/gitlab-bundle \ + makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' - makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \ - --add-flags "exec rake" ''; }; @@ -482,10 +475,10 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; + ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid"; }; }; @@ -493,11 +486,9 @@ in { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment.HOME = gitlabEnv.HOME; - environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}"; environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; - path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ]; + path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ]; serviceConfig = { - #PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; User = cfg.user; Group = cfg.group; @@ -529,7 +520,7 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = @@ -658,10 +649,10 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\""; + ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/unicorn -c ${cfg.statePath}/config/unicorn.rb -E production"; }; }; From 94f5e5ad14e99700e82576167515ba784dbfe98b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 20:01:07 +0200 Subject: [PATCH 2599/2743] Revert "gitlab: disable" This reverts commit 68c4605f1a251b97cb0fcde251ce52d498e2cef8. Gitlab has been fixed --- nixos/modules/module-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1261fe950928..8ef76b9d81ed 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -327,7 +327,7 @@ ./services/misc/geoip-updater.nix ./services/misc/gitea.nix #./services/misc/gitit.nix - #./services/misc/gitlab.nix + ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gitweb.nix ./services/misc/gogs.nix From 7673593c85623fa7065ea7ef56bcd0a50f2fbea1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 26 Apr 2018 00:14:38 +0200 Subject: [PATCH 2600/2743] gem-config.grpc: disable format hardening --- pkgs/development/ruby-modules/gem-config/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a447cd1a1032..83ab5e0d86ff 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -145,6 +145,7 @@ in grpc = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; + hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; }; From ca52152a9198ae42e894829f8f192d39ac173356 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 25 Apr 2018 21:36:13 -0400 Subject: [PATCH 2601/2743] boto{3,core}: {1.6.0,1.9.3} -> {1.7.9,1.10.9} Yeah yeah, I want parallel glob expansion but you get what I mean. These two packages like getting upgraded together so to minimize incompatibilities I'm upgrading them both in the same commit. --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index ccada6dd1404..042ad9cf7932 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.6.0"; + version = "1.7.9"; src = fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "14d60wc5kff2gjkrm0yfz0179s0qg3f1qqldv8hnf37ny6yvfwn3"; + sha256 = "0yqym19nlayjm1qlh6vvinmk5xw0zskil971n2v9s65ray7sn5lv"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 5276fdb9329d..cd9c5729611c 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.9.3"; + version = "1.10.9"; src = fetchPypi { inherit pname version; - sha256 = "d5b892ab86cd3e8d6cb570dd5275bf1c600cbbf9f07a40a22bcdd9023c0e844f"; + sha256 = "19vlf2w05h9818hrhx8al4r9ngfhvhf2pxcwka9s7bc51qnhx4xh"; }; propagatedBuildInputs = [ From 7e1db6b41d00032652032ca3bedaaac4a2f0b8e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 20:36:43 -0700 Subject: [PATCH 2602/2743] xmrig: 2.5.2 -> 2.5.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/xmrig/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.5.3 with grep in /nix/store/csidwxna34qv298smf6sflwaj93xr9p0-xmrig-2.5.3 - directory tree listing: https://gist.github.com/5aaeee0849eb7acb740cae01310a19f9 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 42d9e448991a..88adbfff3b9a 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c"; + sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp"; }; nativeBuildInputs = [ cmake ]; From 3a8fb11949826e7730f3a11cecd4dd0e86069491 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 20:40:14 -0700 Subject: [PATCH 2603/2743] yubikey-personalization: 1.18.1 -> 1.19.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/yubikey-personalization/versions. These checks were done: - built on NixOS - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize -h’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize --help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize -V’ and found version 1.19.0 - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp -h’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp --help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp -V’ and found version 1.19.0 - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo -h’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo --help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo help’ got 0 exit code - ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo -V’ and found version 1.19.0 - found 1.19.0 with grep in /nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0 - directory tree listing: https://gist.github.com/6592e44c4a66c1b7cf2c9f4c2a75c3ab --- pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 462f8d8e99a2..48827ec0aae4 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "0mjjkk6p8d0kblj6vzld4v188y40ynprvd2hnfh7m1hs28wbkzcz"; + sha256 = "104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b"; }; nativeBuildInputs = [ pkgconfig ]; From 7cbf00847ca66dbb474c734a5051ebc7e526a0e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 21:44:13 -0700 Subject: [PATCH 2604/2743] thefuck: 3.25 -> 3.26 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/thefuck/versions. These checks were done: - built on NixOS - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/.thefuck-wrapped -h’ got 0 exit code - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/.thefuck-wrapped --help’ got 0 exit code - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/thefuck -h’ got 0 exit code - ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/thefuck --help’ got 0 exit code - found 3.26 with grep in /nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26 - directory tree listing: https://gist.github.com/7fd81df3f197603f76bdf8c0ae663dcb --- pkgs/tools/misc/thefuck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 788529125da5..7befd344a4d8 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "thefuck"; - version = "3.25"; + version = "3.26"; src = fetchFromGitHub { owner = "nvbn"; repo = "${pname}"; rev = version; - sha256 = "090mg809aac932lgqmjxm4za53lg3bjprj562sp189k47xs4wijv"; + sha256 = "0iyihbp94z38xajy8yfbn3ky7irnam1zwyswg34cw4kkfgggrwhz"; }; propagatedBuildInputs = [ colorama decorator psutil pyte six ]; From 518eca82567b69349f987f8b0a015ade0a974aff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 21:45:09 -0700 Subject: [PATCH 2605/2743] tini: 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/tini/versions. These checks were done: - built on NixOS - ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini -h’ got 0 exit code - ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini --version’ and found version 0.18.0 - found 0.18.0 with grep in /nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0 - directory tree listing: https://gist.github.com/c992fd0a24dfc0365d6b62ac567d395c --- pkgs/applications/virtualization/tini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index c027541c01c1..25c19cd79c7f 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.17.0"; + version = "0.18.0"; name = "tini-${version}"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0"; + sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; From 28440ed27697bbd592a6fea7c4556c919d362688 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 22:04:55 -0700 Subject: [PATCH 2606/2743] smplayer: 18.3.0 -> 18.4.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/smplayer/versions. These checks were done: - built on NixOS - ran ‘/nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0/bin/smplayer -h’ got 0 exit code - ran ‘/nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0/bin/smplayer --help’ got 0 exit code - found 18.4.0 with grep in /nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0 - directory tree listing: https://gist.github.com/25ca7c094ad35c4c5ed4c2c33dfb9be2 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index ef614d41d00d..49444e350de4 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.3.0"; + name = "smplayer-18.4.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46"; + sha256 = "0q2fbg41djyxsy6jinlnidpcqxvs9bi91ga3fwlgnfh6kxsw2ldd"; }; buildInputs = [ qtscript ]; From d97d463d190936da38e6be5f842fa160a878ba7e Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 23 Apr 2018 00:46:22 -0700 Subject: [PATCH 2607/2743] perlPackages.ListMoreUtilsXS: Fix build on Darwin --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e9d6cd97bc8c..3278311f25c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8592,6 +8592,9 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz; sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; }; + preConfigure = '' + export LD=$CC + ''; propagatedBuildInputs = [ XSLoader ]; meta = { description = "Provide the stuff missing in List::Util in XS"; From 566d7531e55af3b5c8659e2a2850a275f8ddd09f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 23:12:48 -0700 Subject: [PATCH 2608/2743] radicale: 2.1.8 -> 2.1.9 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/radicale/versions. These checks were done: - built on NixOS - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped -h’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped --help’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped --version’ and found version 2.1.9 - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale -h’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale --help’ got 0 exit code - ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale --version’ and found version 2.1.9 - found 2.1.9 with grep in /nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9 - directory tree listing: https://gist.github.com/e41acc1e5d5f2db9d8498cf5a989eb7f --- pkgs/servers/radicale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 937bf327995f..171fcc887d21 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, python3Packages }: let - version = "2.1.8"; - sha256 = "0fnsk61s328dg16iv0chqxayni8ahkbcb84z012w0d9417i806lc"; + version = "2.1.9"; + sha256 = "1sywxn7j9bq39qwq74h327crc44j9049cykai1alv44agx8s1nhz"; in python3Packages.buildPythonApplication { From 1ec8160f8ca9b05fc19d23bac5b6d8c87a19ad39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Apr 2018 23:57:03 -0700 Subject: [PATCH 2609/2743] php: 7.2.4 -> 7.2.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/php/versions. These checks were done: - built on NixOS - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar.phar help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phpdbg help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl --help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl help’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm -h’ got 0 exit code - ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm --help’ got 0 exit code - found 7.2.5 with grep in /nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5 - directory tree listing: https://gist.github.com/c9aa24f676de9bcd4cc434c086932362 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7cb9b4dea7f6..301aa99637d0 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.4"; - sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i"; + version = "7.2.5"; + sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk"; }; } From 769093b867c79608b52e415086617bc907f8c38b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 00:52:29 -0700 Subject: [PATCH 2610/2743] ott: 0.27 -> 0.28 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/ott/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28/bin/ott --help’ got 0 exit code - ran ‘/nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28/bin/ott.opt --help’ got 0 exit code - found 0.28 with grep in /nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28 - directory tree listing: https://gist.github.com/177f63b8c23bae6301ced29fb0e617c4 --- pkgs/applications/science/logic/ott/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 6fcc8f9c111f..d21487ef92fa 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ott-${version}"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb"; + sha256 = "0mzbrvqayqpns9zzg4m1scxx24dv9askhn51dawyb9pisvlyvai0"; }; nativeBuildInputs = [ pkgconfig ]; From 8898063828e5813682bf2c8aa751e0e48d989296 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 01:20:56 -0700 Subject: [PATCH 2611/2743] openvpn: 2.4.5 -> 2.4.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/openvpn/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.4.6 with grep in /nix/store/5hj70y409c0b01zmx4rddiicgq7jajb2-openvpn-2.4.6 - directory tree listing: https://gist.github.com/ce0bc5e31d7d26ead341febdc7bdc6ee --- pkgs/tools/networking/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 31fccbffa790..d96652e456df 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23"; + sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"; }; nativeBuildInputs = [ pkgconfig ]; From 4176d58331e9a1781725bd14bde26b3d09a56704 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 01:22:20 -0700 Subject: [PATCH 2612/2743] packagekit: 1.1.9 -> 1.1.10 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/packagekit/versions. These checks were done: - built on NixOS - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkcon -h’ got 0 exit code - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkcon --help’ got 0 exit code - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkmon -h’ got 0 exit code - ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkmon --help’ got 0 exit code - found 1.1.10 with grep in /nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10 - directory tree listing: https://gist.github.com/1d641323594032d2e935bd1e088bf409 --- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index b40c8ea26aa2..5eb20169412d 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1zs7xkk3b2izdnis7ir5h93p8f2i9513663h2xhxb0sh6i2h18y4"; + sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs"; }; buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] From 8440100b4f88e3ac9e1816a72f7f2e6a4c9719d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Apr 2018 10:10:47 +0100 Subject: [PATCH 2613/2743] inziu-iosevka: disable hydra build due its size Build is i/o bound --- pkgs/data/fonts/inziu-iosevka/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix index 536f5cb0c61d..f76e4cb61df0 100644 --- a/pkgs/data/fonts/inziu-iosevka/default.nix +++ b/pkgs/data/fonts/inziu-iosevka/default.nix @@ -27,5 +27,7 @@ stdenv.mkDerivation rec { license = licenses.ofl; maintainers = [ maintainers.ChengCat ]; platforms = platforms.all; + # large package, mainly i/o bound + hydraPlatforms = []; }; } From 0c02d1539465b263e16b1f946c03e3f023e2159e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Apr 2018 10:15:12 +0100 Subject: [PATCH 2614/2743] sarasa-gothic: disable hydra build due its size Build is i/o bound --- pkgs/data/fonts/sarasa-gothic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 8d2afbcf80dd..0d0ff700a303 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -26,5 +26,7 @@ stdenv.mkDerivation rec { license = licenses.ofl; maintainers = [ maintainers.ChengCat ]; platforms = platforms.all; + # large package, mainly i/o bound + hydraPlatforms = []; }; } From 89fb95b93fd4710755bcbb062f383cca63144925 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 02:54:03 -0700 Subject: [PATCH 2615/2743] libwps: 0.4.8 -> 0.4.9 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/libwps/versions. These checks were done: - built on NixOS - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2html -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw --version’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2text -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2csv -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw -v’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw --version’ and found version 0.4.9 - ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2text -v’ and found version 0.4.9 - found 0.4.9 with grep in /nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9 - directory tree listing: https://gist.github.com/a3fdf5973402ddf0aa6d1a0ecd058d41 --- pkgs/development/libraries/libwps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 84748d601a64..2f89c0abdfc6 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwps-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { url = "mirror://sourceforge/libwps/${name}.tar.bz2"; - sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q"; + sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6"; }; nativeBuildInputs = [ pkgconfig ]; From 7ebebcb3259e1e4e6de259f8d86af90f5dda2e6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:01:35 -0700 Subject: [PATCH 2616/2743] libmwaw: 0.3.13 -> 0.3.14 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/libmwaw/versions. These checks were done: - built on NixOS - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwawFile -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwawZip -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2csv -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2html -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2raw -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2raw --version’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2svg -v’ and found version 0.3.14 - ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2text -v’ and found version 0.3.14 - found 0.3.14 with grep in /nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14 - directory tree listing: https://gist.github.com/e6bf3abafc8b9634a51796eb8969b268 --- pkgs/development/libraries/libmwaw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 35137a09cd9c..79718b47745c 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.13"; + version="0.3.14"; name="${baseName}-${version}"; - hash="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.13/libmwaw-0.3.13.tar.xz"; - sha256="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; + hash="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.14/libmwaw-0.3.14.tar.xz"; + sha256="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"; }; nativeBuildInputs = [ pkgconfig ]; From 96fddac69122ab50fe04975cb4f85dff99d7b9f5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 26 Apr 2018 18:36:42 +0800 Subject: [PATCH 2617/2743] wp-cli: 1.5.0 -> 1.5.1 --- pkgs/development/tools/wp-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e35bdd22e2d7..9dbdcfaa8aab 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "17dgbcalvz5gw6xqgcywh6jrybj0qlglm16cgbshjsp6axwxa5gn"; + sha256 = "1lnjbl6rcv32g6akj4552ncyqmbsawmx1dnbmxr0rjj7wr8484f1"; }; completion = fetchurl { From f8bd1b18686e50c5b43d59fe357bd2c184ec0558 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:42:34 -0700 Subject: [PATCH 2618/2743] libsass: 3.5.2 -> 3.5.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/libsass/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.5.3 with grep in /nix/store/mp09kp6kk1mnb0m6szp8r8cjswpky236-libsass-3.5.3 - directory tree listing: https://gist.github.com/693ae2149cf8d174efe563ad97396c0a --- pkgs/development/libraries/libsass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index ec4fa6b7427a..3afe0e905e74 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1qjpicbjsj9gf8s00ma0d6kw6qfnc29fhrqdkvq8427wfffj654r"; + sha256 = "1lfdq2ahskf9yd0m71jlx3r4n6a0dhg4wxpnwbrvj2a23k7db7zi"; }; patchPhase = '' From fb4f737b87fd384a33d1786eb38c59e51f05cdc5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 03:55:58 -0700 Subject: [PATCH 2619/2743] jruby: 9.1.16.0 -> 9.1.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/jruby/versions. These checks were done: - built on NixOS - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby -h’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby --help’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby.bash -h’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby.bash --help’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/ruby -h’ got 0 exit code - ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/ruby --help’ got 0 exit code - found 9.1.17.0 with grep in /nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0 - directory tree listing: https://gist.github.com/20468ca63db765e0d42a1c93191f0901 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index b9cc38ee68a3..050d5accd2cb 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.16.0"; + version = "9.1.17.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r"; + sha256 = "1mfzs3mcpx8gmzidilzhpsxhgbblsflq35ww199m46pgiyzzf8ka"; }; buildInputs = [ makeWrapper ]; From 52fff3955318c7a7c92088ca9a123d7db888f071 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 26 Apr 2018 18:56:21 +0800 Subject: [PATCH 2620/2743] dbus-broker: 11 -> 13 --- pkgs/os-specific/linux/dbus-broker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 67e4df3d6f9d..c57650e0806f 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "11"; + version = "13"; src = fetchFromGitHub { - owner = "bus1"; - repo = "dbus-broker"; - rev = "v${version}"; - sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; + owner = "bus1"; + repo = "dbus-broker"; + rev = "v${version}"; + sha256 = "1yjkxpnl54pky6ha3y8dsds57lnk10lmriyzpzy0ha2npng2614x"; fetchSubmodules = true; }; From 2821265dfd15ba39e1873cd035720f3343df5791 Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Wed, 11 Apr 2018 15:43:36 +0200 Subject: [PATCH 2621/2743] Swap incorrect TheanoWithoutCuda with TheanoWithCuda --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b78cb40656d..7748120cd49c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13056,13 +13056,13 @@ in { }; TheanoWithoutCuda = self.Theano.override { - cudaSupport = true; - cudnnSupport = true; + cudaSupport = false; + cudnnSupport = false; }; TheanoWithCuda = self.Theano.override { - cudaSupport = false; - cudnnSupport = false; + cudaSupport = true; + cudnnSupport = true; }; thespian = callPackage ../development/python-modules/thespian { }; From 1f1124859d9cbb705b60d8c012a7af61ab4abf94 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:11:23 +0300 Subject: [PATCH 2622/2743] dante: add extra build inputs Add PAM, SASL and UPnP support. --- pkgs/servers/dante/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index ee139ea2652c..1c093facde5c 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "dante-${version}"; version = "1.4.2"; @@ -9,15 +9,17 @@ stdenv.mkDerivation (rec { sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms"; }; + buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ]; + configureFlags = [ "--with-libc=libc.so.6" ]; - meta = { + meta = with stdenv.lib; { description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity."; homepage = "https://www.inet.no/dante/"; - maintainers = [ stdenv.lib.maintainers.arobyn ]; - license = stdenv.lib.licenses.bsdOriginal; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.arobyn ]; + license = licenses.bsdOriginal; + platforms = platforms.linux; }; -}) +} From bd140fb41d5123a06568a98589271a23b6f0c398 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:14:13 +0300 Subject: [PATCH 2623/2743] dante service: restart only on failure Normal exit code shouldn't result in a restart. --- nixos/modules/services/networking/dante.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index 32acce51e692..67da28308e9a 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -54,7 +54,8 @@ in Type = "simple"; ExecStart = "${pkgs.dante}/bin/sockd -f ${confFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "always"; + # Can crash sometimes; see https://github.com/NixOS/nixpkgs/pull/39005#issuecomment-381828708 + Restart = "on-failure"; }; }; }; From b827307c52215c1ef4696e6d7d3c307892ec5231 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Apr 2018 15:15:09 +0300 Subject: [PATCH 2624/2743] dante service: default for logoutput Log to journald via syslog by default; also improve option type. --- nixos/modules/services/networking/dante.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix index 67da28308e9a..20d4faa1cdb1 100644 --- a/nixos/modules/services/networking/dante.nix +++ b/nixos/modules/services/networking/dante.nix @@ -6,6 +6,7 @@ let confFile = pkgs.writeText "dante-sockd.conf" '' user.privileged: root user.unprivileged: dante + logoutput: syslog ${cfg.config} ''; @@ -21,11 +22,10 @@ in enable = mkEnableOption "Dante SOCKS proxy"; config = mkOption { - default = null; - type = types.nullOr types.str; + type = types.lines; description = '' - Contents of Dante's configuration file - NOTE: user.privileged/user.unprivileged are set by the service + Contents of Dante's configuration file. + NOTE: user.privileged, user.unprivileged and logoutput are set by the service. ''; }; }; @@ -33,7 +33,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.config != null; + { assertion = cfg.config != ""; message = "please provide Dante configuration file contents"; } ]; From 29c66d9f09a25b0c6a61ff84b57cbded68d11193 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 04:30:01 -0700 Subject: [PATCH 2625/2743] kid3: 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/kid3/versions. These checks were done: - built on NixOS - ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli -h’ got 0 exit code - ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli --help’ got 0 exit code - ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli help’ got 0 exit code - found 3.6.1 with grep in /nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1 - directory tree listing: https://gist.github.com/b9be08ae08dde4714bfceaebaf277eab --- pkgs/applications/audio/kid3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 680542dc405b..4c9540607eb6 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p"; + sha256 = "1bbnd6jgahdiqmsbw6c3x4h517m50db592fnq1w0v4k5aaav4i26"; }; buildInputs = with stdenv.lib; From 50a4977252f231d5b8f533ef5d81e9be7c24ded8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 04:43:51 -0700 Subject: [PATCH 2626/2743] hwinfo: 21.52 -> 21.53 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/hwinfo/versions. These checks were done: - built on NixOS - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo -h’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo --help’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo --version’ and found version 21.53 - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/check_hd help’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo -h’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo --help’ got 0 exit code - ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo help’ got 0 exit code - found 21.53 with grep in /nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53 - directory tree listing: https://gist.github.com/c3f6d76aa5a198a4ded2f2598380a0ef --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 67258399d8bc..839be268b5b4 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.52"; + version = "21.53"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1kva5bhylxbxgp2lv48av8mzcyybigj45rbwl9736l1kiv58i21r"; + sha256 = "1hrazksr95pxl5p0r0x3cdph1ps98cls2v9avg0qs0qf9y18hady"; }; patchPhase = '' From e0ad325cd46db4d8763cd3417aeb479835cc6290 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 26 Apr 2018 08:02:21 -0400 Subject: [PATCH 2627/2743] docker: 18.03.0 -> 18.03.1 --- pkgs/applications/virtualization/docker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 61899d12974f..2a271a96ecd4 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -198,13 +198,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_03 = dockerGen rec { - version = "18.03.0-ce"; - rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit - sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g"; + version = "18.03.1-ce"; + rev = "9ee9f402cd1eba817c5591a64f1d770c87c421a4"; # git commit + sha256 = "1jm3jmcbkvvy3s8pi3xcpir6mwxjfbad46lbif4bnpjfd2r5irrx"; runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; - containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"; - containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; + containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; + containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; From 14ebf244feb78f191a48a7f8cda26b6e36a218ca Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 26 Apr 2018 08:08:53 -0400 Subject: [PATCH 2628/2743] oh-my-zsh: 2018-04-06 -> 2018-04-25 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 5412f4ce8967..1ff9455adece 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-04-06"; + version = "2018-04-25"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f"; - sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs"; + rev = "9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8"; + sha256 = "0pjw5m7wpmcfdhrj322icplw3hsbbdxjgfw12kr2zpzl95xqkkhs"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 70e070afa7685126eef21456682807da0c9f16c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 05:57:09 -0700 Subject: [PATCH 2629/2743] fastjet: 3.3.0 -> 3.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/fastjet/versions. These checks were done: - built on NixOS - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config -h’ got 0 exit code - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --help’ got 0 exit code - ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --version’ and found version 3.3.1 - found 3.3.1 with grep in /nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1 - directory tree listing: https://gist.github.com/aa455f4d0802d2b2b76678ecccfe3eab --- pkgs/development/libraries/physics/fastjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 0ee68415b89c..b4ffccb5360c 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fastjet-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "03x75mmnlw2m0a7669k82rf9a7dgjwygf8wjbk8cdgnb82c5pnp9"; + sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn"; }; buildInputs = [ python2 ]; From 5a62cfe4d3d119a3b7c2708e6f4489b7d9041c03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 06:55:28 -0700 Subject: [PATCH 2630/2743] darktable: 2.4.2 -> 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/darktable/versions. These checks were done: - built on NixOS - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cltest help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest -h’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest --help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped -h’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped --help’ got 0 exit code - ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped help’ got 0 exit code - found 2.4.3 with grep in /nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3 - directory tree listing: https://gist.github.com/70f09e7ec3ef4b1bba88d54f066cf9df --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index d81fea5ea398..4de49524f82f 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r"; + sha256 = "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; From bea11a34fbcefe24a66cf64c7388124db567a17d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 25 Apr 2018 14:47:39 +0300 Subject: [PATCH 2631/2743] haskellPackages.encoding: fix build with Cabal 2.0 --- .../haskell-modules/configuration-common.nix | 3 + .../patches/encoding-Cabal-2.0.patch | 67 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e4f2d6728640..cfa80062e3be 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1028,6 +1028,9 @@ self: super: { indexed-list-literals = self.indexed-list-literals_0_2_0_0; }; + # https://github.com/dmwit/encoding/pull/3 + encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; + } // diff --git a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch new file mode 100644 index 000000000000..510e450945b8 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch @@ -0,0 +1,67 @@ +From 67bb87ceff53f0178c988dd4e15eeb2daee92b84 Mon Sep 17 00:00:00 2001 +From: Gregor Kleen +Date: Tue, 20 Feb 2018 17:46:24 +0100 +Subject: [PATCH] Relax upper version bounds on dependencies + +--- + Setup.hs | 20 ++++++++++++++++---- + encoding.cabal | 4 ++-- + stack.yaml | 4 ++-- + 3 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/Setup.hs b/Setup.hs +index de719e6..fe5b84c 100644 +--- a/Setup.hs ++++ b/Setup.hs +@@ -1,13 +1,25 @@ ++{-# LANGUAGE CPP #-} ++ + module Main where + + import Distribution.Simple + import Data.Encoding.Preprocessor.Mapping + import Data.Encoding.Preprocessor.XMLMappingBuilder + ++#if MIN_VERSION_Cabal(2,0,0) ++main = defaultMainWithHooks (simpleUserHooks ++ {hookedPreProcessors = ( ("mapping" , \_ _ _ -> mappingPreprocessor) ++ : ("mapping2", \_ _ _ -> mappingPreprocessor) ++ : ("xml" , \_ _ _ -> xmlPreprocessor) ++ : (hookedPreProcessors simpleUserHooks) ++ ) ++ }) ++#else + main = defaultMainWithHooks (simpleUserHooks +- {hookedPreProcessors = (("mapping",\_ _ -> mappingPreprocessor) +- :("mapping2",\_ _ -> mappingPreprocessor) +- :("xml",\_ _ -> xmlPreprocessor) +- :(hookedPreProcessors simpleUserHooks) ++ {hookedPreProcessors = ( ("mapping" , \_ _ -> mappingPreprocessor) ++ : ("mapping2", \_ _ -> mappingPreprocessor) ++ : ("xml" , \_ _ -> xmlPreprocessor) ++ : (hookedPreProcessors simpleUserHooks) + ) + }) ++#endif +diff --git a/encoding.cabal b/encoding.cabal +index ec20617..f221715 100644 +--- a/encoding.cabal ++++ b/encoding.cabal +@@ -36,7 +36,7 @@ Source-Repository this + + Custom-Setup + Setup-Depends: base >=3 && <5, +- Cabal >=1.24 && <1.25, ++ Cabal >=1.24 && <2.1, + containers, + filepath, + ghc-prim, +@@ -51,7 +51,7 @@ Library + extensible-exceptions >=0.1 && <0.2, + ghc-prim >=0.3 && <0.6, + mtl >=2.0 && <2.3, +- regex-compat >=0.71 && <0.95 ++ regex-compat >=0.71 && <0.96 + + Extensions: CPP + From 94c6dbbaaa6245d4d13554565d3f1f310d81b84c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:08:01 -0700 Subject: [PATCH 2632/2743] cgal: 4.11.1 -> 4.12 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/cgal/versions. These checks were done: - built on NixOS - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_CMakeLists -h’ got 0 exit code - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_CMakeLists help’ got 0 exit code - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_cmake_script -h’ got 0 exit code - ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_cmake_script --help’ got 0 exit code - found 4.12 with grep in /nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12 - directory tree listing: https://gist.github.com/35067880611978f76a8e3f3adac7f12a --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index cdb37a84c801..23a539491d0e 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.11.1"; + version = "4.12"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "04nn1lzsjdglzjygc72cq09xrvpqwwnbf6l0xz8bfwfp4x9g10jf"; + sha256 = "0n4yvg2rkrlb1bwhykrg4iyqg4whxadcs441k10xx0r75i6220mn"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From 1cbbf3088e8bfe9c09795327d1e81e6a9628e2cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:24:38 -0700 Subject: [PATCH 2633/2743] bdf2psf: 1.178 -> 1.184 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/bdf2psf/versions. These checks were done: - built on NixOS - ran ‘/nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184/bin/bdf2psf -h’ got 0 exit code - ran ‘/nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184/bin/bdf2psf --help’ got 0 exit code - found 1.184 with grep in /nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184 - directory tree listing: https://gist.github.com/8810c5939feee7c4840d8eae52e98832 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index e06c2dee000d..5e4b6994094a 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.178"; + version = "1.184"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc"; + sha256 = "0lyxiwm0586b8gyl13ks2rqqa6abkqaxc4i08hvwyza1k1cqm2jc"; }; buildInputs = [ dpkg ]; From 5164104ef2a7fe37df7721e052c1e30b54df4435 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:48:41 -0700 Subject: [PATCH 2634/2743] accountsservice: 0.6.46 -> 0.6.47 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/accountsservice/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.6.47 with grep in /nix/store/gd55py0d0scns044hqccrihgsv9k8g9r-accountsservice-0.6.47 - directory tree listing: https://gist.github.com/0f7bbf0eb1486bf773f561276689270a --- pkgs/development/libraries/accountsservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index f12dfb4635b2..1d15aafcf935 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.46"; + version = "0.6.47"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q"; + sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From c7a567315f1d14db9bf25aec45553ee9be3812fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Apr 2018 07:51:42 -0700 Subject: [PATCH 2635/2743] batctl: 2018.0 -> 2018.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/batctl/versions. These checks were done: - built on NixOS - ran ‘/nix/store/8djn6psqrxjc66chnig215c5z8il9zaw-batctl-2018.1/bin/batctl -h’ got 0 exit code - found 2018.1 with grep in /nix/store/8djn6psqrxjc66chnig215c5z8il9zaw-batctl-2018.1 - directory tree listing: https://gist.github.com/13f600b1fb0404e8b5b78d0e2e32f5c5 --- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index ef1d51501e85..a1a2cff70a83 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2018.0"; + ver = "2018.1"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1x7gy6agwk68s2cbhc4wfhvhdy2ccrq0vi7jzaj94pn8nqshi5ss"; + sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7"; }; nativeBuildInputs = [ pkgconfig ]; From 1d0625499854b583c57267a744111ba8a1d0cfaf Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 26 Apr 2018 10:14:51 -0500 Subject: [PATCH 2636/2743] release-combined: don't include tests.chromium The chromium package will frequently time out . Note that this is unrelated to the test but a side effect because the test depends on chromium. https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.chromium.x86_64-linux See also #39476 --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index e010b532a688..4d6ff334d347 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -58,7 +58,7 @@ in rec { nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) - nixos.tests.chromium.x86_64-linux or [] + #nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) From 18e4125b8873419308944e7adb805d6ad8b5da95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 17:32:18 +0200 Subject: [PATCH 2637/2743] Revert "checkbashism: 2.0.0.2 -> 2.18.1" This reverts commit c4ac43a20ccf6a53587e3a5b5d6f2c87e4a9de5c. See https://github.com/NixOS/nixpkgs/pull/38102. --- pkgs/development/tools/misc/checkbashisms/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 6f4330ef0a9a..2564b42731b3 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "2.18.1"; + version = "2.0.0.2"; name = "checkbashisms-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "1yaygfzv5jzvcbahz6sdfnzhch9mxgsrlsym2ad62nk0svsnp24n"; + url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms"; + sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; }; buildInputs = [ perl ]; From 38364c0b07b9343e67e331bdcad1891511690c0b Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 26 Apr 2018 10:36:57 -0500 Subject: [PATCH 2638/2743] inkscape: don't patch share/filters This should not be needed because they are using `#!/usr/bin/env python` as the shebang and in fact it will break inkscape.x86_64-darwin. https://hydra.nixos.org/build/73283875/ --- pkgs/applications/graphics/inkscape/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 37af9f6b86c7..eb349e412068 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { patchShebangs fix-roff-punct # XXX: Not needed for CMake: - patchShebangs share/filters patchShebangs share/palettes patchShebangs share/patterns patchShebangs share/symbols From 2a4dc39e1e6f70569ba5664cf3de1c49adf063be Mon Sep 17 00:00:00 2001 From: Mark Karpov Date: Thu, 26 Apr 2018 23:19:52 +0700 Subject: [PATCH 2639/2743] pytaglib: init at 1.4.3 (#39498) --- maintainers/maintainer-list.nix | 5 +++ .../python-modules/pytaglib/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pytaglib/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0f05c363a656..299f4d1c82a8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2521,6 +2521,11 @@ github = "fstamour"; name = "Francis St-Amour"; }; + mrkkrp = { + email = "markkarpov92@gmail.com"; + github = "mrkkrp"; + name = "Mark Karpov"; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix new file mode 100644 index 000000000000..6674a89180af --- /dev/null +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, taglib +, cython +, pytest +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pytaglib"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "44ab26dc4b33962b8db0bb8856e7b166539c0c555bc933a6bbbc96f4ec51c7a2"; + }; + + buildInputs = [ taglib cython ]; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.utf-8 pytest . + ''; + + meta = { + homepage = https://github.com/supermihi/pytaglib; + description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.mrkkrp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7748120cd49c..f24d6ff955bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8220,6 +8220,8 @@ in { }; }; + pytaglib = callPackage ../development/python-modules/pytaglib { }; + pyte = callPackage ../development/python-modules/pyte { }; graphviz = buildPythonPackage rec { From 6ed855289e5910aa2ff5082d03b70fb1fe150a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 26 Apr 2018 20:20:01 +0200 Subject: [PATCH 2640/2743] python.pkgs.pyhomematic: 0.1.41 -> 0.1.42 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 18e477dbd814..0967659a641f 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.41"; + version = "0.1.42"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "01j6y2ypi7a8ffnkqd8j8vnpszza2cxqpiqbnk1dwbg9w9pwwq53"; + sha256 = "0h7bq66q22kzj1xwhxmr7knibsmb4csjwq3jr19fyl9sxxmgqwqy"; }; # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 From f925480215a14420d893021dc2c6f2b78a66f137 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 26 Apr 2018 18:11:05 +0200 Subject: [PATCH 2641/2743] grafana: 5.0.4 -> 5.1.0 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index d2a0d0463895..df89e67bffc1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.0.4"; + version = "5.1.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90"; + sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc"; + sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; From a95a0a932ba7d57e30b19377b90099e439e866d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 26 Apr 2018 20:27:41 +0200 Subject: [PATCH 2642/2743] pspg: 1.0.0 -> 1.1.0 --- pkgs/tools/misc/pspg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index b9543dc143cf..ddd76a344e01 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig }: +{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "1swrg4bg7i4xpdrsg8dsfldbxaffni04x8i1s0g6h691qcin675v"; + sha256 = "10r6jfcqw4wclp84f07g3bda844csgm4sh7cjsnk2smmal7nhybs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gnugrep ncurses ]; + buildInputs = [ gnugrep ncurses readline ]; preBuild = '' makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" From 6c5d860c8b3e0995d01505da86559ebde731a9df Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 26 Apr 2018 20:01:10 +0200 Subject: [PATCH 2643/2743] gst_all_1: fix botched merge 23741692 merged staging incorrectly --- pkgs/development/libraries/gstreamer/bad/default.nix | 10 +--------- pkgs/development/libraries/gstreamer/good/default.nix | 3 ++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 8ebd70921135..de1a3700cc2b 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -13,13 +13,7 @@ assert faacSupport -> faac != null; let - inherit (stdenv.lib) optional optionalString; - - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); - + inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "gst-plugins-bad-1.14.0"; @@ -76,6 +70,4 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin ++ optional (!stdenv.isDarwin) mjpegtools; - - enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 21376ce79c1c..11e0894df3c3 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -12,7 +12,7 @@ assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "gst-plugins-good-1.14.0"; @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { libsoup libshout lame mpg123 twolame libintl ncurses ] + ++ optional gtkSupport gtk3 # for gtksink ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; From 489b0a5f47a6bbf0397111ea0ba222b3b4cdeb6d Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 26 Apr 2018 21:41:30 +0200 Subject: [PATCH 2644/2743] shotcut: 17.11 -> 18.03.06 --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6b1389c97ab0..59c1463577e8 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "17.11"; + version = "18.03.06"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1bw2cjpzycddxi9b21haiaslv0ikia85wwgkfm2xl2m15w5j8510"; + sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash"; }; enableParallelBuilding = true; From c12caf34d256cd717107bde2f5160ec773a15605 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Thu, 26 Apr 2018 21:42:22 +0200 Subject: [PATCH 2645/2743] shotcut: add myself as maintainer --- pkgs/applications/video/shotcut/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 59c1463577e8..0a786312214a 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; homepage = https://shotcut.org; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu woffs ]; platforms = platforms.linux; }; } From 537d14f4e2c8ef908641223bc80fe8e2bca74e90 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt <> Date: Thu, 26 Apr 2018 21:59:33 +0200 Subject: [PATCH 2646/2743] chromium: See if Hydra obeys a 24h meta.timeout --- pkgs/applications/networking/browsers/chromium/browser.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e35d894e0e7e..cca26b541240 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -51,5 +51,6 @@ mkChromiumDerivation (base: rec { license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + timeout = 86400; # 24 hours }; }) From bae15c811f182132c77f3c20b6785c9297e8498f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 26 Apr 2018 22:50:36 +0200 Subject: [PATCH 2647/2743] sympow: don't use placeholder --- pkgs/development/libraries/science/math/sympow/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index fd677f5c0b7b..c83b3d1737cf 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -34,11 +34,13 @@ stdenv.mkDerivation rec { 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" + mkdir -p "$SYMPOW_LOCAL" + cp -r @out@/share/sympow/* "$SYMPOW_LOCAL" chmod -R +xw "$SYMPOW_LOCAL" fi' \ --run 'cd "$SYMPOW_LOCAL"' + substituteInPlace $out/bin/sympow --subst-var out + runHook postInstall ''; From f3ff2b1fa638ba5c32bbf90edeedc00102033139 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 27 Apr 2018 00:37:40 +0300 Subject: [PATCH 2648/2743] handbrake: 1.0.7 -> 1.1.0 & according changes --- pkgs/applications/video/handbrake/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 6ce2ae08eeb4..d13995f6e9bd 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ # # Only tested on Linux -{ stdenv, lib, fetchFromGitHub, +{ stdenv, lib, fetchurl, python2, pkgconfig, yasm, harfbuzz, zlib, autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, @@ -25,16 +25,24 @@ }: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.1.0"; name = "handbrake-${version}"; - src = fetchFromGitHub { - owner = "HandBrake"; - repo = "HandBrake"; - rev = "${version}"; - sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57"; + src = fetchurl { + url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; + sha256 = "1nj0ihflisxcfkmsk7fm3b5cn7cpnpg66dk2lkp2ip6qidppqbm0"; }; + patched_libav_12 = libav_12.overrideAttrs (super: { + # 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream. + patches = (super.patches or []) ++ [( + fetchurl { + url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch''; + sha256 = "14grzyvb1qbb90k31ibabnwmwnrc48ml6h2z0rjamdv83q45jq4g"; + }) + ]; + }); + nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; @@ -48,7 +56,7 @@ stdenv.mkDerivation rec { glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev - ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ]) + ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ]) ++ lib.optional useFdk fdk_aac; dontUseCmakeConfigure = true; @@ -58,11 +66,6 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs scripts - # `configure` errors out when trying to read the current year which is too low - substituteInPlace make/configure.py \ - --replace developer release \ - --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""' - substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 From 1cfc5f1da21b1527bc86e1b368bbda3885f125d1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Apr 2018 18:08:53 -0400 Subject: [PATCH 2649/2743] pythia: 8.226 -> 8.235, enable lhapdf6 plugin --- pkgs/development/libraries/physics/pythia/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index eca2807ce153..3f9f3f8498bd 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.226"; + version = "8.235"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g"; + sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--with-hepmc2=${hepmc}" + "--with-lhapdf6=${lhapdf}" ]; enableParallelBuilding = true; From 2f47c93ec848ae4b9594a13406f71982282ce0d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Apr 2018 18:09:26 -0400 Subject: [PATCH 2650/2743] sacrifice: set LD_LIBRARY_PATH for pythia plugins to work --- pkgs/applications/science/physics/sacrifice/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 99d6df77f853..6c25f720ebf9 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }: +{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost hepmc lhapdf pythia ]; + nativeBuildInputs = [ makeWrapper ]; patches = [ ./compat.patch @@ -27,8 +28,11 @@ stdenv.mkDerivation rec { "--with-pythia=${pythia}" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = if stdenv.isDarwin then '' install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia + '' else '' + wrapProgram $out/bin/run-pythia \ + --prefix LD_LIBRARY_PATH : "${pythia}/lib" ''; enableParallelBuilding = true; From 6ca343103bb8f6a32db5c63c122aad72e0ecbe40 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 27 Apr 2018 00:12:54 +0200 Subject: [PATCH 2651/2743] check-meta.nix: specify meta.timeout --- pkgs/stdenv/generic/check-meta.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 1350e7d37301..a5c8ca705231 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -170,6 +170,8 @@ let isIbusEngine = bool; isGutenprint = bool; badPlatforms = platforms; + # Hydra build timeout + timeout = int; }; checkMetaAttr = k: v: From 9badee01c1540629f6841177d0067682fbc7f437 Mon Sep 17 00:00:00 2001 From: xeji Date: Thu, 26 Apr 2018 14:04:13 +0200 Subject: [PATCH 2652/2743] teamviewer 12.0.90041 -> 13.1.3026 bump, move to qt5, drop i686 support --- .../networking/remote/teamviewer/default.nix | 61 +++++-------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 17 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 260500e9d337..5365228ae657 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,28 +1,13 @@ -{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }: +{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: -let - ld32 = - if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else throw "Unsupported system ${stdenv.system}"; - ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - - mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - - deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); - tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); - tvldpath64 = lib.makeLibraryPath (deps pkgs); -in stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "12.0.90041"; + version = "13.1.3026"; src = fetchurl { - # There is a 64-bit package, but it has no differences apart from Debian dependencies. - # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. - url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb"; - sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg"; + url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb"; + sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik"; }; unpackPhase = '' @@ -30,6 +15,10 @@ stdenv.mkDerivation rec { tar xf data.tar.* ''; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; + propagatedBuildInputs = [ qtquickcontrols ]; + installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications cp -a opt/teamviewer/* $out/share/teamviewer @@ -46,41 +35,23 @@ stdenv.mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils - pushd $out/share/teamviewer/tv_bin + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop - sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config - ${if stdenv.system == "x86_64-linux" then '' - sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config - '' else '' - sed -i "/TV_LD64_PATH=.*/d" script/tvw_config - ''} - - sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop - - for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do - echo "patching $i" - patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do - echo "patching $i" - patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - ${if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 - '' else '' - rm TVGuiSlave.64 - ''} - popd + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \ + --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ + --replace '/var/run/' '/run/' + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" ''; - dontPatchELF = true; dontStrip = true; meta = with stdenv.lib; { homepage = http://www.teamviewer.com; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jagajaga dasuxullebt ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06ee..605ca9bac0e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5107,9 +5107,7 @@ with pkgs; ted = callPackage ../tools/typesetting/ted { }; - teamviewer = callPackage ../applications/networking/remote/teamviewer { - stdenv = stdenv_32bit; - }; + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; telnet = callPackage ../tools/networking/telnet { }; From dc62e8509a793097a8b86b3707f876ba1f5532bf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:03:28 +0200 Subject: [PATCH 2653/2743] nixos/caddy: fix ca api endpoint, now uses v2 --- nixos/modules/services/web-servers/caddy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index d8efa24bc6d5..2124a42f01a1 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -25,8 +25,8 @@ in { }; ca = mkOption { - default = "https://acme-v01.api.letsencrypt.org/directory"; - example = "https://acme-staging.api.letsencrypt.org/directory"; + default = "https://acme-v02.api.letsencrypt.org/directory"; + example = "https://acme-staging-v02.api.letsencrypt.org/directory"; type = types.string; description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people."; }; From 1ae220b689a3dc8cd118a27196391b0e2460043b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:04:08 +0200 Subject: [PATCH 2654/2743] pssh: add explicit references to openssh and rsync --- pkgs/tools/networking/pssh/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index ddaf419e5658..22c359620507 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { name = "pssh-${version}"; @@ -11,6 +11,15 @@ pythonPackages.buildPythonApplication rec { sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq"; }; + postPatch = '' + for f in bin/*; do + substituteInPlace $f \ + --replace "'ssh'" "'${openssh}/bin/ssh'" \ + --replace "'scp'" "'${openssh}/bin/scp'" \ + --replace "'rsync'" "'${rsync}/bin/rsync'" + done + ''; + meta = with stdenv.lib; { description = "Parallel SSH Tools"; longDescription = '' From c208823e2d43b8475273107a7299cceff5d23592 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:07:05 +0200 Subject: [PATCH 2655/2743] youtubeDL: 2018.04.16 -> 2018.04.25 --- 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 1f7d8c549e42..55c785b06da0 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.04.16"; + version = "2018.04.25"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d"; + sha256 = "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw"; }; nativeBuildInputs = [ makeWrapper ]; From 70bcb507986de789614bedbaa84adc525947f13e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:09:30 +0200 Subject: [PATCH 2656/2743] smcroute: fix smcroutectl --- pkgs/servers/smcroute/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index b1d614bc5cf0..40472c59a873 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }: stdenv.mkDerivation rec { name = "smcroute-${version}"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libcap ]; + + configureFlags = [ + "--localstatedir=/var" + "--with-systemd=\$(out)/lib/systemd/system" + ]; meta = with stdenv.lib; { description = "Static multicast routing daemon"; From b5655751a1efef57d90032ae73d3c6676c057ed9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 01:22:35 +0200 Subject: [PATCH 2657/2743] EmptyEpsilon: init at 2018.02.15 --- pkgs/games/empty-epsilon/default.nix | 58 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/games/empty-epsilon/default.nix diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix new file mode 100644 index 000000000000..d7742d316647 --- /dev/null +++ b/pkgs/games/empty-epsilon/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python }: + +let + + version = "2018.02.15"; + + serious-proton = stdenv.mkDerivation rec { + name = "serious-proton-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "daid"; + repo = "SeriousProton"; + rev = "EE-${version}"; + sha256 = "0b4n4pn7x3y63i9y15f8983zlpdvmx7151iph1lcc49j3hmpd0gy"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ sfml libX11 ]; + + meta = with lib; { + description = "C++ game engine coded on top of SFML used for EmptyEpsilon"; + homepage = https://github.com/daid/SeriousProton; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; + }; + +in + + +stdenv.mkDerivation rec { + name = "empty-epsilon-${version}"; + inherit version; + + src = fetchFromGitHub { + owner = "daid"; + repo = "EmptyEpsilon"; + rev = "EE-${version}"; + sha256 = "1by0wrw00frrlcs1kd003zkmfkwa1pnbnva2qn8km3xnl9chf11d"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ serious-proton sfml glew libX11 python ]; + + cmakeFlags = [ + "-DSERIOUS_PROTON_DIR=${serious-proton.src}" + ]; + + meta = with lib; { + description = "Open source bridge simulator based on Artemis"; + homepage = https://daid.github.io/EmptyEpsilon/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31a1acff06ee..0e07f2374482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19017,6 +19017,8 @@ with pkgs; egoboo = callPackage ../games/egoboo { }; + EmptyEpsilon = callPackage ../games/empty-epsilon { }; + endless-sky = callPackage ../games/endless-sky { }; enyo-doom = libsForQt5.callPackage ../games/enyo-doom { }; From b151b050d58a60f2b4db1ac407ed379c24fb71af Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 27 Apr 2018 01:55:27 +0200 Subject: [PATCH 2658/2743] accountsservice: change url to https --- pkgs/development/libraries/accountsservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 1d15aafcf935..289bc45d2037 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.6.47"; src = fetchurl { - url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus interface for user account query and manipulation"; - homepage = http://www.freedesktop.org/wiki/Software/AccountsService; + homepage = https://www.freedesktop.org/wiki/Software/AccountsService; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; From a22b3e91b61d1f27bf326885a89db91531e28e91 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 26 Apr 2018 17:20:08 -0700 Subject: [PATCH 2659/2743] configuration-ghc-8.4.x.nix: Remove reference to non-existent bv_0_5 --- .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 1 file changed, 6 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 fe6bc699fb98..b38b17e34751 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -41,12 +41,6 @@ self: super: { ## Shadowed: - ## Needs bump to a versioned attribute - ## • No instance for (GHC.Base.Semigroup BV) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid BV’ - bv = super.bv_0_5; - ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 doctest = overrideCabal super.doctest_0_15_0 (drv: { From 88695c6e9497c018d0565b4078f4dc1acd280afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 27 Apr 2018 02:42:12 +0200 Subject: [PATCH 2660/2743] Revert "release-combined: don't include tests.chromium" This reverts commit 1d0625499854b583c57267a744111ba8a1d0cfaf. We now get a build and maybe have a workaround #39570; /cc #39476. --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 4d6ff334d347..e010b532a688 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -58,7 +58,7 @@ in rec { nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) - #nixos.tests.chromium.x86_64-linux or [] + nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) From ffe9f0a2bb7ed94eb0461a0947b847a3356d386c Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 27 Apr 2018 10:19:37 +0930 Subject: [PATCH 2661/2743] awsebcli: pin pathspec dependency to 0.5.5 pathspec has been bumped to 0.5.6 in c705acef and awsebcli's setup.py refuses to use that version. --- pkgs/tools/virtualization/awsebcli/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 3b3bda0f22dc..5f847e7eb907 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -19,6 +19,14 @@ let }; }); + pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { + version = "0.5.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3"; + }; + }); + requests = super.requests.overridePythonAttrs (oldAttrs: rec { version = "2.9.1"; src = oldAttrs.src.override { From e8dcf87007cea397304289c723fab1e2898c7a3c Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 27 Apr 2018 10:28:03 +0930 Subject: [PATCH 2662/2743] awsebcli: 3.12.3 -> 3.12.4 --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 5f847e7eb907..b55ac457305b 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -54,11 +54,11 @@ let }; in with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; - version = "3.12.3"; + version = "3.12.4"; src = fetchPypi { inherit pname version; - sha256 = "0jj6xhvsrgvc5pm05zbd95zvx36ssywq70j6q1kzcdv1flfzzyp9"; + sha256 = "128dgxyz2bgl3r4jdkbmjs280004bm0dwzln7p6ly3yjs2x37jl6"; }; checkInputs = [ From 564a6288b89678b5aaaeb4e1ef7d08257ff9cac4 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Fri, 27 Apr 2018 10:35:26 +0930 Subject: [PATCH 2663/2743] maintainers: update email address Trying to move away from .au ccTLD. --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 299f4d1c82a8..30597373fc52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1241,7 +1241,7 @@ name = "Mabry Cervin"; }; eqyiel = { - email = "r@rkm.id.au"; + email = "ruben@maher.fyi"; github = "eqyiel"; name = "Ruben Maher"; }; From 047c9372ab1314d8e3fab13b9f21359fdf3a643c Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 26 Apr 2018 20:47:16 -0500 Subject: [PATCH 2664/2743] inkscape: fix on darwin again I have no idea why but this broke Darwin. So added a conditional for the shebang patching. https://hydra.nixos.org/build/73283875 --- pkgs/applications/graphics/inkscape/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index eb349e412068..5978612fdf33 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -29,10 +29,13 @@ stdenv.mkDerivation rec { patchShebangs fix-roff-punct # XXX: Not needed for CMake: - patchShebangs share/palettes - patchShebangs share/patterns - patchShebangs share/symbols - patchShebangs share/templates + ${lib.optionalString (!stdenv.isDarwin) '' + patchShebangs share/filters + patchShebangs share/palettes + patchShebangs share/patterns + patchShebangs share/symbols + patchShebangs share/templates + ''} # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. From 8efe41dfb226d95f6394475e0f027c0ac14989a3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Apr 2018 01:56:39 +0000 Subject: [PATCH 2665/2743] linux: 4.14.36 -> 4.14.37 --- 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 47784e770127..d9aef3a21930 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.36"; + version = "4.14.37"; # 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 = "0hxwd3kl5g7zrcl3b00nxdv0zjkmmfrk1i5v3hrjm0dmsw249qna"; + sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1"; }; } // (args.argsOverride or {})) From 7f3832bf93fb9c308052d8deec184de95ce0ee92 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Apr 2018 01:56:53 +0000 Subject: [PATCH 2666/2743] linux: 4.16.4 -> 4.16.5 --- 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 d46c95e1a593..3da2cda30e22 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.4"; + version = "4.16.5"; # 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 = "0v494vm1vbyfk8xmvgf27chsjpy9x7q0iwdaana8vnih2ai6vdcs"; + sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r"; }; } // (args.argsOverride or {})) From 4975378b2139f24b1368f44e9e3d44e34c3e48ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Apr 2018 02:04:08 +0000 Subject: [PATCH 2667/2743] linux-copperhead: 4.15.18.a -> 4.14.36.a The 4.15.x series is EOL'd, we should instead follow the LTS kernel --- 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 5685e6dd904d..dfe58119da26 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.18"; + version = "4.14.36"; revision = "a"; - sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6"; + sha256 = "052ck8giy5nxy7871crhx6cdkgzzzpffdm8ilq1ys0rd3vldzl9b"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 19f6fe6e9c616ff64ace9ae2c2a13068732a0bcb Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Wed, 25 Apr 2018 15:39:43 +0800 Subject: [PATCH 2668/2743] fcitx-libpinyin: fix data path --- .../fcitx-engines/fcitx-libpinyin/datapath.patch | 16 ++++++++++++++++ .../fcitx-engines/fcitx-libpinyin/default.nix | 10 ++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch new file mode 100644 index 000000000000..84dd5fc8f462 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch @@ -0,0 +1,16 @@ +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -9,12 +9,7 @@ char* FcitxLibPinyinGetSysPath(LIBPINYIN_LANGUAGE_TYPE type) + #ifdef LIBPINYIN_TOOLS_FOUND + if (type == LPLT_Simplified) { + #endif +- /* portable detect here */ +- if (getenv("FCITXDIR")) { +- syspath = fcitx_utils_get_fcitx_path_with_filename("datadir", "libpinyin/data"); +- } else { +- syspath = strdup(LIBPINYIN_PKGDATADIR "/data"); +- } ++ syspath = strdup(LIBPINYIN_PKGDATADIR "/data"); + #ifdef LIBPINYIN_TOOLS_FOUND + } + else { diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index f2610efd2eb4..4468f1fa263a 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ]; + # With a typical installation via NixOS option i18n.inputMethod.fcitx.engines, + # the FCITXDIR environment variable is set to $out of fcitx-with-plugins, + # which leads to an incorrect path for pinyin data. + # + # It is impossible or difficult to fix this issue without patching. We want + # FCITXDIR to point into libpinyin, which is currently not symlinked within + # fcitx-with-plugins (only fcitx-libpinyin is symlinked). Also, FCITXDIR + # doesn't accept multiple directories. + patches = [ ./datapath.patch ]; + preInstall = '' substituteInPlace src/cmake_install.cmake \ --replace ${fcitx} $out From 2cfda31cff8516512288ccccb9b4489d5239e0e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 26 Apr 2018 22:20:30 -0500 Subject: [PATCH 2669/2743] vale: 0.10.1 -> 0.11.2 --- pkgs/tools/text/vale/default.nix | 10 +- pkgs/tools/text/vale/deps.nix | 519 +++++++++++++++---------------- 2 files changed, 250 insertions(+), 279 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 057f1c48a1f2..84ef164ce248 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,16 +2,16 @@ buildGoPackage rec { name = "vale-${version}"; - version = "0.10.1"; - rev = "${version}"; + version = "0.11.2"; + rev = "v${version}"; - goPackagePath = "github.com/ValeLint/vale"; + goPackagePath = "github.com/errata-ai/vale"; src = fetchFromGitHub { inherit rev; - owner = "ValeLint"; + owner = "errata-ai"; repo = "vale"; - sha256 = "1iyc9mny3nb6j3allj3szkiygc2v3gi7l7syq9ifjrm1wknk8wrf"; + sha256 = "0zs6bdwnc5fpa0skw1xhdwg6jzsc7wcb8lsfj235jc8jd2w13mvm"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix index 7bf61f433cee..e63becb5b4b3 100644 --- a/pkgs/tools/text/vale/deps.nix +++ b/pkgs/tools/text/vale/deps.nix @@ -1,275 +1,246 @@ - - # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) - [ - - { - goPackagePath = "github.com/ValeLint/gospell"; - fetch = { - type = "git"; - url = "https://github.com/ValeLint/gospell"; - rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; - sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; - }; - } - - { - goPackagePath = "github.com/client9/gospell"; - fetch = { - type = "git"; - url = "https://github.com/client9/gospell"; - rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; - sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; - }; - } - - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a"; - sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q"; - }; - } - - { - goPackagePath = "github.com/jdkato/prose"; - fetch = { - type = "git"; - url = "https://github.com/jdkato/prose"; - rev = "4d68d1b77f66e36b6897a79f59f434d558e5e0c2"; - sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj"; - }; - } - - { - goPackagePath = "github.com/jdkato/regexp"; - fetch = { - type = "git"; - url = "https://github.com/jdkato/regexp"; - rev = "38ab2f7842bf2a539528aa7d0014b37421b886e1"; - sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw"; - }; - } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "941b50ebc6efddf4c41c8e4537a5f68a4e686b24"; - sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; - sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; - }; - } - - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } - - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; - }; - } - - { - goPackagePath = "github.com/montanaflynn/stats"; - fetch = { - type = "git"; - url = "https://github.com/montanaflynn/stats"; - rev = "eeaced052adbcfeea372c749c281099ed7fdaa38"; - sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9"; - }; - } - - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "be5337e7b39e64e5f91445ce7e721888dbab7387"; - sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w"; - }; - } - - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - - { - goPackagePath = "github.com/remeh/sizedwaitgroup"; - fetch = { - type = "git"; - url = "https://github.com/remeh/sizedwaitgroup"; - rev = "4b44541c93591ee0e73747d6081e61bd8c58b5c7"; - sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92"; - }; - } - - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "0b647d0506a698cca42caca173e55559b12a69f2"; - sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln"; - }; - } - - { - goPackagePath = "github.com/shogo82148/go-shuffle"; - fetch = { - type = "git"; - url = "https://github.com/shogo82148/go-shuffle"; - rev = "4789c7c401f229b3ae1673acbccca451480660cd"; - sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp"; - }; - } - - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; - sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; - }; - } - - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - - { - goPackagePath = "github.com/xrash/smetrics"; - fetch = { - type = "git"; - url = "https://github.com/xrash/smetrics"; - rev = "a3153f7040e90324c58c6287535e26a0ac5c1cc1"; - sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ab5485076ff3407ad2d02db054635913f017b0ed"; - sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "14ac33bf8474b62c65cae263af2e4d3b543cc699"; - sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3"; - }; - } - - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"; - sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg"; - }; - } - - { - goPackagePath = "gopkg.in/neurosnap/sentences.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/neurosnap/sentences.v1"; - rev = "a7f18ead1433a139742a8b42ce7a059cfb484d60"; - sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; - sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; - }; - } - +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/ValeLint/gospell"; + fetch = { + type = "git"; + url = "https://github.com/ValeLint/gospell"; + rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; + sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; + }; + } + { + goPackagePath = "github.com/client9/gospell"; + fetch = { + type = "git"; + url = "https://github.com/client9/gospell"; + rev = "90dfc71015dfebd3a7274f1ad2756c1dbf09e250"; + sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "507f6050b8568533fb3f5504de8e5205fa62a114"; + sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "f00a7392b43971b2fdb562418faab1f18da2067a"; + sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29"; + }; + } + { + goPackagePath = "github.com/jdkato/prose"; + fetch = { + type = "git"; + url = "https://github.com/jdkato/prose"; + rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; + sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; + }; + } + { + goPackagePath = "github.com/jdkato/regexp"; + fetch = { + type = "git"; + url = "https://github.com/jdkato/regexp"; + rev = "38ab2f7842bf2a539528aa7d0014b37421b886e1"; + sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + }; + } + { + goPackagePath = "github.com/montanaflynn/stats"; + fetch = { + type = "git"; + url = "https://github.com/montanaflynn/stats"; + rev = "1bf9dbcd8cbe1fdb75add3785b1d4a9a646269ab"; + sha256 = "0qnx3hvd3lhwnmxg7nr4nwl5kbsc7ffnjk9ifyk0f05h61l3v9pz"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "d5dd8a50526aadb3d5f2c9b5233277bc2db90e88"; + sha256 = "0l7y3mmwkzpa7p56drw6d6416j9zfapznfyr1dab44d6kk48rvjx"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/remeh/sizedwaitgroup"; + fetch = { + type = "git"; + url = "https://github.com/remeh/sizedwaitgroup"; + rev = "5582a674300c427060d06980c142aeb52ed20040"; + sha256 = "152a1xnaswh9fx6f71llggm513c6ch171gc61jk3b6b0il6npb57"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "16ac584625fae401e2778e7af317dc415844c44b"; + sha256 = "0g0dbqm76aqsc2a43j95i0h5138cmlgnldhkv3blgn0ga6s8ypfg"; + }; + } + { + goPackagePath = "github.com/shogo82148/go-shuffle"; + fetch = { + type = "git"; + url = "https://github.com/shogo82148/go-shuffle"; + rev = "27e6095f230d6c769aafa7232db643a628bd87ad"; + sha256 = "0nig0q0f0v6ay2w0k3r0pqlvjp1yg9s06f00qpizp679vc46gqs1"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; + sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; + sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + }; + } + { + goPackagePath = "github.com/xrash/smetrics"; + fetch = { + type = "git"; + url = "https://github.com/xrash/smetrics"; + rev = "a3153f7040e90324c58c6287535e26a0ac5c1cc1"; + sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "5f9ae10d9af5b1c89ae6904293b14b064d4ada23"; + sha256 = "10vzmdg8z73krbp2qhsqygvqd0f0s98376mrxm614xdcdljn73dn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "bb9c189858d91f42db229b04d45a4c3d23a7662a"; + sha256 = "0z20pql3hzlplcc8ywfq7a1s8mfixmcp84k656fdkmkdjfyvsl0v"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "bda519ae5f4cbc60d391ff8610711627a08b86ae"; + sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs"; + }; + } + { + goPackagePath = "gopkg.in/neurosnap/sentences.v1"; + fetch = { + type = "git"; + url = "https://github.com/neurosnap/sentences"; + rev = "b0f23a5b35b961fe821f49e51235242d2a8193f3"; + sha256 = "0f5lmww1g4frd5avmqw120zzklcxk5z4l20r4d8zix7406ry7zrg"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } ] \ No newline at end of file From 51190e4d8c2f83aeb7da135f179997268ca1184f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 08:41:11 +0200 Subject: [PATCH 2670/2743] php56: 5.6.35 -> 5.6.36 Changelog: http://www.php.net/ChangeLog-5.php#5.6.36 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7cb9b4dea7f6..b128224e6b7a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -338,8 +338,8 @@ let in { php56 = generic { - version = "5.6.35"; - sha256 = "14ivsxdny0s7qm9pf773pafs8xzlzzpmaz039lwymn11rblsfy7f"; + version = "5.6.36"; + sha256 = "0ahp9vk33dpsqgld0gg4npff67v0l39hs3wk5dm6h3lablzhwsk2"; }; php70 = generic { From bd547f6688e75b45278a0d5b28a4dae1762c4728 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 09:00:36 +0200 Subject: [PATCH 2671/2743] php70: 7.0.29 -> 7.0.30 Changelog: http://www.php.net/ChangeLog-7.php#7.0.30 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b128224e6b7a..a5afd5878f56 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -343,8 +343,8 @@ in { }; php70 = generic { - version = "7.0.29"; - sha256 = "1g1z1nhnmq0idsb9rfb46cdddfimaacw3yal291i2ypzqpal54cq"; + version = "7.0.30"; + sha256 = "0l0bhnlgxmfl7mrdykmxfl53simxsksdcnbg5ymqz6r31i03hgr1"; }; php71 = generic { From 707f7ca1d213c0f945b1ed73f702874dd5f6317c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 27 Apr 2018 09:25:58 +0200 Subject: [PATCH 2672/2743] php71: 7.1.16 -> 7.1.17 Changelog: http://www.php.net/ChangeLog-7.php#7.1.17 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a5afd5878f56..d494060c3882 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.16"; - sha256 = "1rg7n12rd2v1p2yar615kqcdxpvphw3p89lpgajjgwy0qzwjm3il"; + version = "7.1.17"; + sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971"; }; php72 = generic { From ee9d0a85d976378c4d54131b000d31b0c014c7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 08:30:57 +0100 Subject: [PATCH 2673/2743] masterpdfeditor: use autoPatchelfHook --- .../misc/masterpdfeditor/default.nix | 86 ++++++++----------- 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 5ea49f28afd8..525be09d9686 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,52 +1,42 @@ -{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: - let - version = "4.3.89"; - in - stdenv.mkDerivation { - name = "masterpdfeditor-${version}"; - src = fetchurl { - url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; - }; - libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc - glibc - sane-backends - qtbase - qtsvg - libXext - libX11 - libXdmcp - libXau - libxcb - ]; - dontStrip = true; - installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps +{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }: +let + version = "4.3.89"; +in stdenv.mkDerivation { + name = "masterpdfeditor-${version}"; + src = fetchurl { + url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + }; - substituteInPlace masterpdfeditor4.desktop \ - --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4.png $out/share/pixmaps/ - cp -v masterpdfeditor4.desktop $out/share/applications + nativeBuildInputs = [ autoPatchelfHook ]; - cp -v masterpdfeditor4 $p/ - ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v -r stamps templates lang fonts $p + buildInputs = [ sane-backends qtbase qtsvg ]; - install -D license.txt $out/share/$name/LICENSE + dontStrip = true; - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $p/masterpdfeditor4 - ''; - meta = with stdenv.lib; { - description = "Master PDF Editor"; - homepage = "https://code-industry.net/free-pdf-editor/"; - license = licenses.unfreeRedistributable; - platforms = with platforms; [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai flokli ]; - }; - } + installPhase = '' + p=$out/opt/masterpdfeditor + mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + cp -v masterpdfeditor4.png $out/share/pixmaps/ + cp -v masterpdfeditor4.desktop $out/share/applications + + cp -v masterpdfeditor4 $p/ + ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $p + + install -D license.txt $out/share/$name/LICENSE + ''; + + meta = with stdenv.lib; { + description = "Master PDF Editor"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; [ "x86_64-linux" ]; + maintainers = with maintainers; [ cmcdragonkai flokli ]; + }; +} From 5f0e6404dca24492a76880e635b5fe7617277e94 Mon Sep 17 00:00:00 2001 From: StillerHarpo Date: Fri, 27 Apr 2018 09:43:07 +0200 Subject: [PATCH 2674/2743] monetdb: init at 11.29.3 (#39306) monetdb: init at 11.29.3 --- pkgs/servers/sql/monetdb/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/sql/monetdb/default.nix diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix new file mode 100644 index 000000000000..5f7e879819e9 --- /dev/null +++ b/pkgs/servers/sql/monetdb/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, bison, openssl }: + +let + version = "11.29.3"; +in stdenv.mkDerivation rec { + + name = "monetdb-${version}"; + + src = fetchurl { + url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; + sha256 = "18l4jkkryki5az5n7gnalfdxz6ibnkg3q2z4cwh1010b313wqi8s"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ bison openssl ]; + + meta = with stdenv.lib; { + description = "An open source database system"; + homepage = https://www.monetdb.org/; + license = licenses.mpl20; + platforms = platforms.unix; + maintainers = [ maintainers.StillerHarpo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be3f27574b5..66eb5866682b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1322,6 +1322,8 @@ with pkgs; metabase = callPackage ../servers/metabase { }; + monetdb = callPackage ../servers/sql/monetdb { }; + mp3blaster = callPackage ../applications/audio/mp3blaster { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; From e5e5dc3377604a8502d2383067798645961a5d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 08:51:43 +0100 Subject: [PATCH 2675/2743] aangifte: remove ancient versions Packages were either absent or the hashes were broken, so I highly doubt somebody is using 4+ years old tax programs. --- .../taxes/aangifte-2006/builder.sh | 17 -------- .../taxes/aangifte-2006/default.nix | 21 ---------- .../taxes/aangifte-2007/builder.sh | 19 --------- .../taxes/aangifte-2007/default.nix | 24 ----------- .../taxes/aangifte-2008/builder.sh | 19 --------- .../taxes/aangifte-2008/default.nix | 25 ----------- .../taxes/aangifte-2009/default.nix | 40 ------------------ .../taxes/aangifte-2010/default.nix | 40 ------------------ .../taxes/aangifte-2011/default.nix | 40 ------------------ .../taxes/aangifte-2012/default.nix | 41 ------------------- .../taxes/aangifte-2013-wa/default.nix | 41 ------------------- .../taxes/aangifte-2013/default.nix | 41 ------------------- .../taxes/aangifte-2014-wa/default.nix | 41 ------------------- .../taxes/aangifte-2014/default.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 22 ---------- 15 files changed, 472 deletions(-) delete mode 100644 pkgs/applications/taxes/aangifte-2006/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2006/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2007/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2007/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2008/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2008/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2010/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2011/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2012/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014/default.nix diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh deleted file mode 100644 index 1b709b613bd4..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix deleted file mode 100644 index 5883e51f712e..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libX11, libXext}: - -stdenv.mkDerivation { - name = "aangifte2006-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2006_linux.tar.gz; - sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc"; - }; - - inherit libX11 libXext; - - meta = { - description = "Elektronische aangifte IB 2006"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix deleted file mode 100644 index 43fb26d811a3..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2007-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2007_linux.tar.gz; - sha256 = "13p3gv086jn95wvmfygdmk9qjn0qxqdv7pp0v5pmw6i5hp8rmjxf"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2007"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix deleted file mode 100644 index b9fad2fa10bd..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2008-1"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2008_linux.tar.gz; - sha256 = "0p46bc1b14hgf07illg3crjgjdflkcknk4nzm7b73cwkni57scx3"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix deleted file mode 100644 index d4230d426ece..000000000000 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2009-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz; - sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix deleted file mode 100644 index 602368d2017b..000000000000 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2010-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz; - sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix deleted file mode 100644 index 80c772705142..000000000000 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2011-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz; - sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix deleted file mode 100644 index 8066c86742c1..000000000000 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2012-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz; - sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix deleted file mode 100644 index 6f8e6d6429d3..000000000000 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz; - sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix deleted file mode 100644 index d75b60c83673..000000000000 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz; - sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix deleted file mode 100644 index 38124677f9a5..000000000000 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz; - sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix deleted file mode 100644 index 33b6f8853aa2..000000000000 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz; - sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be3f27574b5..fd56586e1bea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14671,28 +14671,6 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; - aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; - - aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; - - aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { }; - - aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { }; - - aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { }; - - aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - - aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; - - aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { }; - - aangifte2014 = callPackage_i686 ../applications/taxes/aangifte-2014 { }; - - aangifte2013wa = callPackage_i686 ../applications/taxes/aangifte-2013-wa { }; - - aangifte2014wa = callPackage_i686 ../applications/taxes/aangifte-2014-wa { }; - abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; From f2a15f747a41a457c48761ac4bd27c9d230b7a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 08:51:43 +0100 Subject: [PATCH 2676/2743] aangifte: remove ancient versions Packages were either absent or the hashes were broken, so I highly doubt somebody is using 4+ years old tax programs. --- .../taxes/aangifte-2006/builder.sh | 17 -------- .../taxes/aangifte-2006/default.nix | 21 ---------- .../taxes/aangifte-2007/builder.sh | 19 --------- .../taxes/aangifte-2007/default.nix | 24 ----------- .../taxes/aangifte-2008/builder.sh | 19 --------- .../taxes/aangifte-2008/default.nix | 25 ----------- .../taxes/aangifte-2009/default.nix | 40 ------------------ .../taxes/aangifte-2010/default.nix | 40 ------------------ .../taxes/aangifte-2011/default.nix | 40 ------------------ .../taxes/aangifte-2012/default.nix | 41 ------------------- .../taxes/aangifte-2013-wa/default.nix | 41 ------------------- .../taxes/aangifte-2013/default.nix | 41 ------------------- .../taxes/aangifte-2014-wa/default.nix | 41 ------------------- .../taxes/aangifte-2014/default.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 22 ---------- 15 files changed, 472 deletions(-) delete mode 100644 pkgs/applications/taxes/aangifte-2006/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2006/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2007/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2007/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2008/builder.sh delete mode 100644 pkgs/applications/taxes/aangifte-2008/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2010/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2011/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2012/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014-wa/default.nix delete mode 100644 pkgs/applications/taxes/aangifte-2014/default.nix diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh deleted file mode 100644 index 1b709b613bd4..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix deleted file mode 100644 index 5883e51f712e..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libX11, libXext}: - -stdenv.mkDerivation { - name = "aangifte2006-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2006_linux.tar.gz; - sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc"; - }; - - inherit libX11 libXext; - - meta = { - description = "Elektronische aangifte IB 2006"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix deleted file mode 100644 index 43fb26d811a3..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2007-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2007_linux.tar.gz; - sha256 = "13p3gv086jn95wvmfygdmk9qjn0qxqdv7pp0v5pmw6i5hp8rmjxf"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2007"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix deleted file mode 100644 index b9fad2fa10bd..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2008-1"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2008_linux.tar.gz; - sha256 = "0p46bc1b14hgf07illg3crjgjdflkcknk4nzm7b73cwkni57scx3"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix deleted file mode 100644 index d4230d426ece..000000000000 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2009-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz; - sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix deleted file mode 100644 index 602368d2017b..000000000000 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2010-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz; - sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix deleted file mode 100644 index 80c772705142..000000000000 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2011-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz; - sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix deleted file mode 100644 index 8066c86742c1..000000000000 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2012-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz; - sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix deleted file mode 100644 index 6f8e6d6429d3..000000000000 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz; - sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix deleted file mode 100644 index d75b60c83673..000000000000 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz; - sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix deleted file mode 100644 index 38124677f9a5..000000000000 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz; - sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix deleted file mode 100644 index 33b6f8853aa2..000000000000 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz; - sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66eb5866682b..b4a88cbe5b2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14673,28 +14673,6 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; - aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; - - aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; - - aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { }; - - aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { }; - - aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { }; - - aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - - aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { }; - - aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { }; - - aangifte2014 = callPackage_i686 ../applications/taxes/aangifte-2014 { }; - - aangifte2013wa = callPackage_i686 ../applications/taxes/aangifte-2013-wa { }; - - aangifte2014wa = callPackage_i686 ../applications/taxes/aangifte-2014-wa { }; - abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; From 53e3aa1539049d6e4603e47d7262d7928673ed9e Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Fri, 27 Apr 2018 09:03:18 +0200 Subject: [PATCH 2677/2743] cassandra: 3.11.1 -> 3.11.2 --- pkgs/servers/nosql/cassandra/3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index 4647260b1e28..f18b6256d3f0 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.1"; - sha256 = "1vgh4ysnl4xg8g5v6zm78h3sq308r7s17ppbw0ck4bwyfnbddvkg"; + version = "3.11.2"; + sha256 = "0867i3irsji3qkjpp2s171xmjf2r8yhwzhs24ka8hljxv457f8p9"; }) From c8b9ac9be63cbadd5da62a37670631770e0d74cd Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 25 Apr 2018 09:09:13 +1000 Subject: [PATCH 2678/2743] haskellPackages.base-compat-batteries: fix bad dependency --- pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ef1ebe881f54..acbcb1320e61 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -502,4 +502,9 @@ self: super: builtins.intersectAttrs super { # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 blank-canvas = dontCheck super.blank-canvas; + + # cabal2nix generates a dependency on base-compat, which is the wrong version + base-compat-batteries = super.base-compat-batteries.override { + base-compat = pkgs.haskellPackages.base-compat_0_10_1; + }; } From 12ba3954d7f27f260845663332becc450ddbd010 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Apr 2018 12:20:12 +0200 Subject: [PATCH 2679/2743] multi-ghc-travis: update to latest git version --- pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 781d3b096cfb..454bb5d58817 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "848c2fe5c7d0d95b20312e86b360d5db8c95db75"; - sha256 = "1n4y6j564sxxry19xs4x0ds7fg8h1q0svw9q45477czx82qzavym"; + rev = "105005cde6bde903e477e5b9724d02bdea06bae4"; + sha256 = "1l76782aa29mi88a2brvkyi6k0v33rpihxlskx99mak06bjrmnhh"; }; isLibrary = true; isExecutable = true; From 3e446ecd564611953c75caf97a855285ef30ba38 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 2 Apr 2018 11:30:24 +0100 Subject: [PATCH 2680/2743] nixos/buildkite-agent: fix variable expansion in hook scripts @cleverca found this bug in the declarative hooks config. Any shell variables referenced in a hook script would get expanded by the hooks directory builder. Prevent variable expansion by quoting the here doc limit string. --- .../modules/services/continuous-integration/buildkite-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 03af9a7859ec..d647b7b9fa49 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -17,7 +17,7 @@ let hooksDir = let mkHookEntry = name: value: '' - cat > $out/${name} < $out/${name} <<'EOF' #! ${pkgs.runtimeShell} set -e ${value} From fc7ae1fefee37e2209753323b1ff57a79487dd10 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 27 Apr 2018 13:40:20 +0200 Subject: [PATCH 2681/2743] atom: 1.26.0 -> 1.26.1 --- 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 7b989f8df1f9..ca223803f04d 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.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1gyxys3mwwizc88vlb6j769b6r4ibjnqs6pg5iv336b13f9acyvr"; + sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11"; name = "${name}.deb"; }; From 503c9f8ea4c586cdff82641c9b2e6c76a5444bd8 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 27 Apr 2018 13:42:03 +0200 Subject: [PATCH 2682/2743] insomnia: 5.15.0 -> 5.16.0 --- pkgs/development/web/insomnia/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index df46cf3ab920..9a4aaaad3ced 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -6,7 +6,7 @@ libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, - libudev0-shim, glibc, curl + libudev0-shim, glibc, curl, openssl }: let @@ -15,14 +15,14 @@ let gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libxcb ]; - runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "17pxgxpss5jxzpmcim7hkyyj0fgyxwdiyxb2idpsna2hmhaipyxa"; + sha256 = "1cpw63ibxaa08vms7fbxr5ap2yh4vcl8q3rjfn0ag1zkimz8cg2p"; }; nativeBuildInputs = [ makeWrapper dpkg ]; From ad7bc980d27849f0862ac14cc92f611638bd0916 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 27 Apr 2018 12:54:40 +0100 Subject: [PATCH 2683/2743] terraform: update all plugins --- .../cluster/terraform/providers/data.nix | 75 ++++++++++--------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 0a0b20bfd15d..7aed4b95dd45 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,8 +4,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.9.0"; - sha256 = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv"; + version = "1.9.1"; + sha256 = "11rsvzyc74v14n7g0z1mwyykaz7m6bmvi38jx711b6vpxvm2scva"; }; archive = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.13.0"; - sha256 = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny"; + version = "1.16.0"; + sha256 = "0knivwxdjkxyaqka0vvn0lh2ndbg660dw2g03iw00fx6ska1zn0c"; }; azure-classic = { @@ -46,8 +46,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.3.1"; - sha256 = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4"; + version = "1.4.0"; + sha256 = "0g1i1aasi44zn5bdivzqkk1kshq271x2lydjskyqq7jfx27myibb"; }; bitbucket = { @@ -81,22 +81,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "0.1.0"; - sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq"; + version = "1.0.0"; + sha256 = "1ar9wcgr45f2v6bqjn24zii0qwfppla8ya3gjc546sh1a7m0h9p3"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - version = "1.0.0"; - sha256 = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz"; + version = "1.0.1"; + sha256 = "0lhzwbm1a2s11s0ahb3vxfvshh385fgy1ficvip4rl31dahhwrav"; }; cloudstack = { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.1.4"; - sha256 = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa"; + version = "0.1.5"; + sha256 = "139wq6rr6fczjz496fqkxh6cmscx5hfnv2hvhfwpkhvqipsnlxmq"; }; cobbler = { @@ -193,15 +193,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.8.0"; - sha256 = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh"; + version = "1.10.0"; + sha256 = "08ayi30aqw9lz8qn982vl9m3z4prah60fqq2q9hvscf6qb9g8lr0"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.0.1"; - sha256 = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns"; + version = "1.0.2"; + sha256 = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i"; }; heroku = { @@ -263,8 +263,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-logentries"; - version = "0.1.0"; - sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; + version = "1.0.0"; + sha256 = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq"; }; logicmonitor = { @@ -308,6 +308,13 @@ version = "1.0.0"; sha256 = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5"; }; + nsxt = + { + owner = "terraform-providers"; + repo = "terraform-provider-nsxt"; + version = "1.0.0"; + sha256 = "09yliw59wp9flfgmkznbf4syl510wpxsplzr8sa9m2vw0yc78jnq"; + }; null = { owner = "terraform-providers"; @@ -368,22 +375,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.2.0"; - sha256 = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4"; + version = "1.2.3"; + sha256 = "0vx2pvrxgpy137v3i563w0sdqqrqp6p6sls27fg76cfxrqik5dpk"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.0.0"; - sha256 = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa"; + version = "1.1.0"; + sha256 = "100zxmpgd5qbzivkc2ja75980yrlz0k50x7448wf1kp2inyylxq0"; }; panos = { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.0.0"; - sha256 = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76"; + version = "1.1.0"; + sha256 = "1j3j0bdblw54g2l4xdwm9604n3qfb6zb4b8p081hs5nv004awka4"; }; postgresql = { @@ -424,8 +431,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.1.0"; - sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl"; + version = "1.2.0"; + sha256 = "00gzqav21h2x2spczwcddlwl0llhgy03djvjjq9g9wb5yvcf4yll"; }; rundeck = { @@ -438,8 +445,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.2.0"; - sha256 = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v"; + version = "1.3.0"; + sha256 = "1yd2xdr52z0f3ykfhsfgf57zzhjglci8mvbimdf6z8xmdgfhwjbf"; }; softlayer = { @@ -487,8 +494,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.4.2"; - sha256 = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml"; + version = "0.5.0"; + sha256 = "1cbv4bliswiwbhr9bh2m4faazhj0v89jnwn0fndfjw3rka1b97h7"; }; ultradns = { @@ -501,8 +508,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.0.0"; - sha256 = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw"; + version = "1.1.0"; + sha256 = "1g0cca662glqcz83l1skhj3nb7g386x65kwz95kyp59nvyxywvbq"; }; vcd = { @@ -515,7 +522,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.3.3"; - sha256 = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7"; + version = "1.4.1"; + sha256 = "16dgszmcsfzbflqg053av1v8wgwy8m6f2qlk55fg3ww1a59c0wy1"; }; } From 0963abfb41e48d60315e73223d390c1b4df3ff12 Mon Sep 17 00:00:00 2001 From: xeji Date: Fri, 27 Apr 2018 15:02:24 +0200 Subject: [PATCH 2684/2743] maintainer-list.nix: add real name for xeji --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30597373fc52..18ed73b19324 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4044,7 +4044,7 @@ xeji = { email = "xeji@cat3.de"; github = "xeji"; - name = "xeji"; + name = "Uli Baum"; }; xnaveira = { email = "xnaveira@gmail.com"; From 048c991eb0344c368ba9b29e0168faf8b2aff9f7 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 27 Apr 2018 16:45:38 +0200 Subject: [PATCH 2685/2743] oauth2_proxy: use explicit upstream default for setXauthrequest --- nixos/modules/services/security/oauth2_proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index cf41625d16c8..433d97c2a7d7 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -508,9 +508,9 @@ in setXauthrequest = mkOption { type = types.nullOr types.bool; - default = null; + default = false; description = '' - Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). + Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). Setting this to 'null' means using the upstream default (false). ''; }; From 6c0806bdf0b908ce678b1dcb78a253d0dc61c9ca Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 27 Apr 2018 16:57:47 +0200 Subject: [PATCH 2686/2743] youtrack: init at 2018.1.41051 --- pkgs/servers/jetbrains/youtrack.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/jetbrains/youtrack.nix diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix new file mode 100644 index 000000000000..7e368bf295b6 --- /dev/null +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + name = "youtrack-${version}"; + version = "2018.1.41051"; + + jar = fetchurl { + url = "https://download.jetbrains.com/charisma/${name}.jar"; + sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; + }; + + buildInputs = [ makeWrapper ]; + + unpackPhase = "true"; + + installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = '' + Issue Tracking and Project Management Tool for Developers + ''; + maintainers = with maintainers; [ yorickvp ]; + # https://www.jetbrains.com/youtrack/buy/license.html + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40792a702afa..3946a577cf64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12902,6 +12902,8 @@ with pkgs; erlang = erlangR18; }; + youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; + zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; From f135610acae39770db5413b0602544018f450299 Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Fri, 27 Apr 2018 15:31:02 +0800 Subject: [PATCH 2687/2743] inziu-iosevka: remove --- pkgs/data/fonts/inziu-iosevka/default.nix | 33 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/data/fonts/inziu-iosevka/default.nix diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix deleted file mode 100644 index f76e4cb61df0..000000000000 --- a/pkgs/data/fonts/inziu-iosevka/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, p7zip }: - -stdenv.mkDerivation rec { - version = "1.13.2"; - name = "inziu-iosevka-${version}"; - - package = fetchurl { - url = "http://7xpdnl.dl1.z0.glb.clouddn.com/inziu-iosevka-ttfs-${version}.7z"; - sha256 = "1i7qqcv1x6s1xkp687wq79zqg9ly6a7l5mnmg1iqgfgcbglgjbaw"; - }; - - nativeBuildInputs = [ p7zip ]; - - unpackPhase = '' - 7z x $package - ''; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; - - meta = with stdenv.lib; { - description = "Inziu Iosevka font"; - homepage = https://be5invis.github.io/Iosevka/inziu; - # license is clarified here: https://github.com/be5invis/Iosevka/issues/265 - license = licenses.ofl; - maintainers = [ maintainers.ChengCat ]; - platforms = platforms.all; - # large package, mainly i/o bound - hydraPlatforms = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e07f2374482..b2b766eea59b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14353,8 +14353,6 @@ with pkgs; input-fonts = callPackage ../data/fonts/input-fonts { }; - inziu-iosevka = callPackage ../data/fonts/inziu-iosevka { }; - iosevka = callPackage ../data/fonts/iosevka { nodejs = nodejs-8_x; }; From 000482ffc470f798fb3aa1673b39a38680cbb567 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Fri, 27 Apr 2018 17:20:08 +0200 Subject: [PATCH 2688/2743] youtrack: add service --- nixos/modules/services/web-apps/youtrack.nix | 177 +++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 nixos/modules/services/web-apps/youtrack.nix diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix new file mode 100644 index 000000000000..e057e3025629 --- /dev/null +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -0,0 +1,177 @@ +{ config, lib, pkgs, options, ... }: + +with lib; + +let + cfg = config.services.youtrack; + + extraAttr = concatStringsSep " " (mapAttrsToList (k: v: "-D${k}=${v}") (stdParams // cfg.extraParams)); + mergeAttrList = lib.foldl' lib.mergeAttrs {}; + + stdParams = mergeAttrList [ + (optionalAttrs (cfg.baseUrl != null) { + "jetbrains.youtrack.baseUrl" = cfg.baseUrl; + }) + { + "java.aws.headless" = "true"; + "jetbrains.youtrack.disableBrowser" = "true"; + } + ]; +in +{ + options.services.youtrack = { + + enable = mkEnableOption "YouTrack service"; + + address = mkOption { + description = '' + The interface youtrack will listen on. + ''; + default = "127.0.0.1"; + type = types.string; + }; + + baseUrl = mkOption { + description = '' + Base URL for youtrack. Will be auto-detected and stored in database. + ''; + type = types.nullOr types.string; + default = null; + }; + + extraParams = mkOption { + default = {}; + description = '' + Extra parameters to pass to youtrack. See + https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html + for more information. + ''; + example = { + "jetbrains.youtrack.overrideRootPassword" = "tortuga"; + }; + type = types.attrsOf types.string; + }; + + package = mkOption { + description = '' + Package to use. + ''; + type = types.package; + default = pkgs.youtrack; + defaultText = "pkgs.youtrack"; + }; + + port = mkOption { + description = '' + The port youtrack will listen on. + ''; + default = 8080; + type = types.int; + }; + + statePath = mkOption { + description = '' + Where to keep the youtrack database. + ''; + type = types.string; + default = "/var/lib/youtrack"; + }; + + virtualHost = mkOption { + description = '' + Name of the nginx virtual host to use and setup. + If null, do not setup anything. + ''; + default = null; + type = types.nullOr types.string; + }; + + jvmOpts = mkOption { + description = '' + Extra options to pass to the JVM. + See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html + for more information. + ''; + type = types.string; + example = "-XX:MetaspaceSize=250m"; + default = ""; + }; + + maxMemory = mkOption { + description = '' + Maximum Java heap size + ''; + type = types.string; + default = "1g"; + }; + + maxMetaspaceSize = mkOption { + description = '' + Maximum java Metaspace memory. + ''; + type = types.string; + default = "350m"; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.youtrack = { + environment.HOME = cfg.statePath; + environment.YOUTRACK_JVM_OPTS = "-Xmx${cfg.maxMemory} -XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${extraAttr}"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + User = "youtrack"; + Group = "youtrack"; + ExecStart = ''${cfg.package}/bin/youtrack ${cfg.address}:${toString cfg.port}''; + }; + }; + + users.users.youtrack = { + description = "Youtrack service user"; + isSystemUser = true; + home = cfg.statePath; + createHome = true; + group = "youtrack"; + }; + + users.groups.youtrack = {}; + + services.nginx = mkIf (cfg.virtualHost != null) { + upstreams.youtrack.servers."${cfg.address}:${toString cfg.port}" = {}; + virtualHosts.${cfg.virtualHost}.locations = { + "/" = { + proxyPass = "http://youtrack"; + extraConfig = '' + client_max_body_size 10m; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; + + "/api/eventSourceBus" = { + proxyPass = "http://youtrack"; + extraConfig = '' + proxy_cache off; + proxy_buffering off; + proxy_read_timeout 86400s; + proxy_send_timeout 86400s; + proxy_set_header Connection ""; + chunked_transfer_encoding off; + client_max_body_size 10m; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + ''; + }; + + }; + }; + + }; +} From a0076a4fb6c2a95fe33edfe99b4acc1dbee63f10 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 27 Apr 2018 17:53:58 +0200 Subject: [PATCH 2689/2743] rubiks: fix build --- pkgs/development/libraries/science/math/rubiks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 5b20948686b4..fe448106b15d 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installFlags = [ - "PREFIX=$out" + "PREFIX=$(out)" ]; patches = [ From e7e2df17da4080c54073c897040ae03f3b6fc669 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:10:59 +0200 Subject: [PATCH 2690/2743] gwenhywfar: 4.17.0 -> 4.20.0 Upstream changes in 4.20.0: * Update bank information files for German banks because the format of ZKA files has changed in the meantime. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=208 Upstream changes in 4.19.0: * Add frontend for GTK3. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=207 Upstream changes in 4.18.0: * Show hashes for MD5, SHA1 and SHA512 in SSL certificates because some bank servers display different hashing variants. * Let GNUTLS handle the localisation of TrustStore certificates. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=206 The updater script (update.sh) actually didn't get the right file to download, so I temporarily modified it to download file number 2 because file number 1 is the GPG signature. The reason why I didn't fix the updater is because the upstream site will have different URLs in the next upcoming version, so our updater is basically end-of-life for now. I also changed the package expression to use the version from sources.nix instead of a hardcoded value. Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/gwenhywfar.nix | 9 +++++---- pkgs/development/libraries/aqbanking/sources.nix | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 28039cc01686..77a5a09da432 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -6,13 +6,14 @@ ] }: -stdenv.mkDerivation rec { +let + inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version; +in stdenv.mkDerivation rec { name = "gwenhywfar-${version}"; - version = "4.15.3"; + inherit version; src = let - inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId; - qstring = "package=01&release=${releaseId}&file=01"; + qstring = "package=01&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { name = "${name}.tar.gz"; diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index 1638c72e95f5..ab69240f6214 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -1,8 +1,8 @@ # This file is autogenerated from update.sh in the same directory. { - gwenhywfar.version = "4.17.0"; - gwenhywfar.sha256 = "1z9bm2r407x8vxk2nk6pndx0zhlk32j65z472ljkgjbh56mgzz8i"; - gwenhywfar.releaseId = "205"; + gwenhywfar.version = "4.20.0"; + gwenhywfar.sha256 = "1c0g3f8jk6j693774ifslx2ds4ksabgbbalhhm9gk20kpamxm22s"; + gwenhywfar.releaseId = "208"; libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.releaseId = "200"; From 191f4c210a87b2eddeabd098cd57a85fadfa0ee2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:24:21 +0200 Subject: [PATCH 2691/2743] aqbanking: 5.6.12 -> 5.7.8 Upstream changes in 5.7.8: * Update bank information files for German banks because the format of ZKA files has changed in the meantime. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=03&release=217 Upstream changes in 5.7.7: * Fix of manually adding new HBCI accounts (for example using KMyMoney). * Fix wrong truncation of account numbers in some turnovers of the SWIFT parser. * Simplified code for inserting new account data while fetching HBCI accounts. * Update information for German banks. Upstream release notes in German: https://www.aquamaniac.de/sites/download/releasenote.php?package=03&release=216 As with the gwenhywfar update, the updater script (update.sh) actually didn't get the right file to download, so I temporarily modified it to download file number 2 because file number 1 is the GPG signature. The reason why I didn't fix the updater is because the upstream site will have different URLs in the next upcoming version, so our updater is basically end-of-life for now. I also changed the package expression to use the version from sources.nix instead of a hardcoded value. Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/default.nix | 9 +++++---- pkgs/development/libraries/aqbanking/sources.nix | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index ad930a705c57..b26291469e75 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -2,13 +2,14 @@ , pkgconfig, gettext, xmlsec, zlib }: -stdenv.mkDerivation rec { +let + inherit ((import ./sources.nix).aqbanking) sha256 releaseId version; +in stdenv.mkDerivation rec { name = "aqbanking-${version}"; - version = "5.6.10"; + inherit version; src = let - inherit ((import ./sources.nix).aqbanking) sha256 releaseId; - qstring = "package=03&release=${releaseId}&file=01"; + qstring = "package=03&release=${releaseId}&file=02"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { name = "${name}.tar.gz"; diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index ab69240f6214..884543d282a7 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -6,7 +6,7 @@ libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.releaseId = "200"; - aqbanking.version = "5.6.12"; - aqbanking.sha256 = "08jbwmiv6f3v8iqdr44x4szna496fqcjfi6mlx04cnbx91m70lh6"; - aqbanking.releaseId = "208"; + aqbanking.version = "5.7.8"; + aqbanking.sha256 = "0s67mysskbiw1h1p0np4ph4351r7wq3nc873vylam7lsqi66xy0n"; + aqbanking.releaseId = "217"; } From cc909ff4dd02bcd7e632b7174d2599fa8f00dd7f Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:32:27 +0200 Subject: [PATCH 2692/2743] libchipcard: Don't hardcode version This is to make sure that we don't get a disparity between the version in sources.nix and the version in the package expression and it's mostly to get the package expression in par with aqbanking and gwenhywfar. Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/libchipcard.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix index 1ac00c3fe882..9a0b70e0d97f 100644 --- a/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }: -stdenv.mkDerivation rec { +let + inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; +in stdenv.mkDerivation rec { name = "libchipcard-${version}"; - version = "5.0.4"; + inherit version; src = let - inherit ((import ./sources.nix).libchipcard) sha256 releaseId; qstring = "package=02&release=${releaseId}&file=01"; mkURLs = map (base: "${base}/sites/download/download.php?${qstring}"); in fetchurl { From 3dba79e6898c78fde29908ad698a41420bd7c9d8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 17:41:34 +0200 Subject: [PATCH 2693/2743] gwenhywfar: Support Gtk 2, Gtk 3 and Qt 5 GUIs So far we used only the defaults, which are gtk2 and qt5. However nowadays most applications have already switched to Qt 5 and Gtk 3, so let's aim for that instead. The reason Gtk 2 is still there is because GnuCash in nixpkgs is using the Gtk 2 interface, so we can drop it as soon as a newer GnuCash has landed in nixpkgs. Right now the only package that depends on this is GnuCash (and aqbanking of course), so I've tested this by not only building gwenhywfar and aqbanking but also GnuCash. I did however not test whether HBCI functionality works, only whether GnuCash starts up. Signed-off-by: aszlig Cc: @goibhniu, @peti, @domenkozar --- pkgs/development/libraries/aqbanking/gwenhywfar.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 77a5a09da432..ae402f884159 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, gtk2, libgcrypt, pkgconfig, gettext, qt4 +{ stdenv, fetchurl, gnutls, gtk2, gtk3, libgcrypt, pkgconfig, gettext, which, qt5 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -21,6 +21,10 @@ in stdenv.mkDerivation rec { inherit sha256; }; + preConfigure = '' + configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5") + ''; + postPatch = let isRelative = path: builtins.substring 0 1 path != "/"; mkSearchPath = path: '' @@ -44,11 +48,9 @@ in stdenv.mkDerivation rec { configure ''; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig gettext which ]; - buildInputs = [ gtk2 qt4 gnutls libgcrypt ]; - - QTDIR = qt4; + buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls libgcrypt ]; meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; From f13873f35aaff640e8cf16f3dd9dce01f6661687 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 18:23:11 +0200 Subject: [PATCH 2694/2743] gwenhywfar: Add OpenSSL and libgpgerror OpenSSL is needed for gct-tool and libgpgerror for RSA key utilities (src/crypt3/cryptkeyrsa.c). Signed-off-by: aszlig Cc: @goibhniu --- pkgs/development/libraries/aqbanking/gwenhywfar.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index ae402f884159..bb337e471cfc 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, gnutls, gtk2, gtk3, libgcrypt, pkgconfig, gettext, which, qt5 +{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext +, which + +# GUI support +, gtk2, gtk3, qt5 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -21,6 +25,11 @@ in stdenv.mkDerivation rec { inherit sha256; }; + configureFlags = [ + "--with-openssl-includes=${openssl.dev}/include" + "--with-openssl-libs=${openssl.out}/lib" + ]; + preConfigure = '' configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5") ''; @@ -50,7 +59,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext which ]; - buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls libgcrypt ]; + buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; From 65c1cfce3f72436a3a9fcba8053f6a7a5c6e078e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 16:39:45 +0000 Subject: [PATCH 2695/2743] nixos/networkd: Allow RequiredForOnline field in [Link] section This was previously missing. --- nixos/modules/system/boot/networkd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index eea10613ea58..e95ca27914ec 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -146,12 +146,13 @@ let # .network files have a [Link] section with different options than in .netlink files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "MACAddress" "MTUBytes" "ARP" "Unmanaged" + "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) (assertValueOneOf "Unmanaged" boolValues) + (assertValueOneOf "RquiredForOnline" boolValues) ]; From 192352ff2f9a736f959a569a74cd42fcdb29021c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Apr 2018 16:34:02 +0000 Subject: [PATCH 2696/2743] nixos/cupsd: Introduce services.printing.logLevel option Previously we indirectly suggested that the user use services.printing.extraConf to set this, but this doesn't work with the default merge ordering. Fix this by making it an independent option. Fixes #39611. --- nixos/modules/services/printing/cupsd.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ecab8cfc7df9..c4147986439c 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -83,6 +83,8 @@ let WebInterface ${if cfg.webInterface then "Yes" else "No"} + LogLevel ${cfg.logLevel} + ${cfg.extraConf} ''; @@ -165,6 +167,15 @@ in ''; }; + logLevel = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = '' + Specifies the cupsd logging verbosity. + ''; + }; + extraFilesConf = mkOption { type = types.lines; default = ""; @@ -180,7 +191,7 @@ in example = '' BrowsePoll cups.example.com - LogLevel debug + MaxCopies 42 ''; description = '' Extra contents of the configuration file of the CUPS daemon @@ -345,8 +356,6 @@ in services.printing.extraConf = '' - LogLevel info - DefaultAuthType Basic From a5f6cdfd7ef36c0ee3c8bda8b487d1292838862f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 17:21:35 +0200 Subject: [PATCH 2697/2743] lib/debug: add traceValFn, traceValSeqFn, traceValSeqNFn Being able to modify the value on-the-fly before printing is very useful in practice. --- lib/debug.nix | 9 ++++++--- lib/default.nix | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index d163e60b6957..d5e9473ff773 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -17,7 +17,8 @@ rec { traceIf = p: msg: x: if p then trace msg x else x; - traceVal = x: trace x x; + traceValFn = f: x: trace (f x) x; + traceVal = traceValFn id; traceXMLVal = x: trace (builtins.toXML x) x; traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; @@ -44,9 +45,11 @@ rec { (modify depth snip x)) y; /* `traceSeq`, but the same value is traced and returned */ - traceValSeq = v: traceVal (builtins.deepSeq v v); + traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v); + traceValSeq = traceValSeqFn id; /* `traceValSeq` but with fixed depth */ - traceValSeqN = depth: v: traceSeqN depth v v; + traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v; + traceValSeqN = traceValSeqNFn id; # this can help debug your code as well - designed to not produce thousands of lines diff --git a/lib/default.nix b/lib/default.nix index c292ed33e1da..23e276732db6 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -115,11 +115,12 @@ let unknownModule mkOption; inherit (types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; - inherit (debug) addErrorContextToAttrs traceIf traceVal + inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq - traceValSeqN traceShowVal traceShowValMarked - showVal traceCall traceCall2 traceCall3 traceValIfNot runTests - testAllTrue strict traceCallXml attrNamesToStr; + traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal + traceShowValMarked showVal traceCall traceCall2 traceCall3 + traceValIfNot runTests testAllTrue strict traceCallXml + attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs defaultOverridableDelayableArgs composedArgsAndFun maybeAttrNullable maybeAttr ifEnable checkFlag getValue From a455637d28fb209a4677f55d887aa91ca05ed44e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 17:25:03 +0200 Subject: [PATCH 2698/2743] lib/debug: remove the deprecated strict function The grace period was long enough. --- lib/debug.nix | 8 ++------ lib/default.nix | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index d5e9473ff773..7eaa1bd9c8b1 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -102,10 +102,6 @@ rec { # usage: { testX = allTrue [ true ]; } testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; - strict = v: - trace "Warning: strict is deprecated and will be removed in the next release" - (builtins.seq v v); - # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 # this forces deep evaluation of all arguments and the result! @@ -119,10 +115,10 @@ rec { in (str: expr: if isFunction expr then (arg: - traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (strict arg)}" (expr arg) + traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg) ) else - let r = strict expr; + let r = builtins.seq expr expr; in trace "${str}\n result:\n${builtins.toXML r}" r ); } diff --git a/lib/default.nix b/lib/default.nix index 23e276732db6..b3c4fdc0e59a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -119,7 +119,7 @@ let traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal traceShowValMarked showVal traceCall traceCall2 traceCall3 - traceValIfNot runTests testAllTrue strict traceCallXml + traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs defaultOverridableDelayableArgs composedArgsAndFun From a7fdd10bf321f2db45c7fcdb79a39d7bc75bb828 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 18:30:21 +0200 Subject: [PATCH 2699/2743] lib/debug: deprecate & modernize showVal The code is re-implemented in terms of `generators.toPretty`, but is strictly less general than `traceValSeqN`, so we deprecate it. --- lib/debug.nix | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 7eaa1bd9c8b1..2e052ba31d85 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -56,19 +56,25 @@ rec { traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)); - showVal = x: - if isAttrs x then - if x ? outPath then "x is a derivation, name ${if x ? name then x.name else ""}, { ${attrNamesToStr x} }" - else "x is attr set { ${attrNamesToStr x} }" - else if isFunction x then "x is a function" - else if x == [] then "x is an empty list" - else if isList x then "x is a list, first element is: ${showVal (head x)}" - else if x == true then "x is boolean true" - else if x == false then "x is boolean false" - else if x == null then "x is null" - else if isInt x then "x is an integer `${toString x}'" - else if isString x then "x is a string `${substring 0 50 x}...'" - else "x is probably a path `${substring 0 50 (toString x)}...'"; + showVal = with lib; + trace ( "Warning: `showVal` is deprecated " + + "and will be removed in the next release, " + + "please use `traceSeqN`" ) + (let + modify = v: + let pr = f: { __pretty = f; val = v; }; + in if isDerivation v then pr + (drv: "<δ:${drv.name}:${concatStringsSep "," + (attrNames drv)}>") + else if [] == v then pr (const "[]") + else if isList v then pr (l: "[ ${go (head l)}, … ]") + else if isAttrs v then pr + (a: "{ ${ concatStringsSep ", " (attrNames a)} }") + else v; + go = x: generators.toPretty + { allowPrettyValues = true; } + (modify x); + in go); # trace the arguments passed to function and its result # maybe rewrite these functions in a traceCallXml like style. Then one function is enough From 7365671fb23861d59ece8d85de407c3127128ad8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 19:13:51 +0200 Subject: [PATCH 2700/2743] lib/debug: deprecate attrNamesToStr, traceXMLVal(Marked) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `attrNamesToStr` is very specific (and pretty trivial), so it doesn’t make sense to have it in the library. `traceXMLVal(Marked)` are just a builtin and `trace` and not very useful in general (trace output should not be parsed anyway). --- lib/debug.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 2e052ba31d85..fad6b769b39f 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -19,9 +19,6 @@ rec { traceValFn = f: x: trace (f x) x; traceVal = traceValFn id; - traceXMLVal = x: trace (builtins.toXML x) x; - traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; - # strict trace functions (traced structure is fully evaluated and printed) /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ @@ -55,7 +52,12 @@ rec { # this can help debug your code as well - designed to not produce thousands of lines traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; - attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)); + + attrNamesToStr = a: + trace ( "Warning: `attrNamesToStr` is deprecated " + + "and will be removed in the next release." ) + (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a))); + showVal = with lib; trace ( "Warning: `showVal` is deprecated " + "and will be removed in the next release, " @@ -76,6 +78,15 @@ rec { (modify x); in go); + traceXMLVal = x: + trace ( "Warning: `traceXMLVal` is deprecated " + + "and will be removed in the next release." ) + (trace (builtins.toXML x) x); + traceXMLValMarked = str: x: + trace ( "Warning: `traceXMLValMarked` is deprecated " + + "and will be removed in the next release." ) + (trace (str + builtins.toXML x) x); + # trace the arguments passed to function and its result # maybe rewrite these functions in a traceCallXml like style. Then one function is enough traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); From 562286aa560aea85448adbc0e50e636e8d3cf8d0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 20:41:59 +0200 Subject: [PATCH 2701/2743] lib/debug: deprecate `traceValIfNot` The function is only used in exactly one module and overly specific (`c` must be a true predicate for `x`, if not, a specific trace is called). --- lib/debug.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index fad6b769b39f..16e8710168c3 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -93,9 +93,10 @@ rec { traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); - # FIXME: rename this? traceValIfNot = c: x: - if c x then true else trace (showVal x) false; + trace ( "Warning: `traceValIfNot` is deprecated " + + "and will be removed in the next release." ) + (if c x then true else traceSeq (showVal x) false); /* Evaluate a set of tests. A test is an attribute set {expr, expected}, denoting an expression and its expected result. The From b90104ea0edc6763505458e4143e034f1d92bc2a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 20:45:12 +0200 Subject: [PATCH 2702/2743] lib/debug: fix use-sites of deprecated debug functions --- nixos/modules/misc/nixpkgs.nix | 6 +++++- pkgs/misc/vim-plugins/vim-utils.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index b8a55a24394e..8fbe218b232a 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -33,7 +33,11 @@ let configType = mkOptionType { name = "nixpkgs-config"; description = "nixpkgs config"; - check = traceValIfNot isConfig; + check = x: + let traceXIfNot = c: + if c x then true + else lib.traceSeqN 1 x false; + in traceXIfNot isConfig; merge = args: fold (def: mergeConfig def.value) {}; }; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index e11419846aeb..514c1daed629 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -224,7 +224,7 @@ let else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" - else throw "turning ${lib.showVal x} into a VimL thing not implemented yet"; + else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; in assert builtins.hasAttr "vim-addon-manager" knownPlugins; '' From fd54a946ca6d42b53df8d9040263fa43f6e426e9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 2 Apr 2018 21:00:47 +0200 Subject: [PATCH 2703/2743] lib/debug: deprecate `addErrorContextToAttrs` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function isn’t used anywhere and `addErrorContext` is an undocumented builtin. The builtin is explicitely qualified at its two uses in the module system. --- lib/debug.nix | 10 ++++++---- lib/modules.nix | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 16e8710168c3..a792806fa79e 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -11,10 +11,6 @@ in rec { - inherit (builtins) addErrorContext; - - addErrorContextToAttrs = lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v); - traceIf = p: msg: x: if p then trace msg x else x; traceValFn = f: x: trace (f x) x; @@ -98,6 +94,12 @@ rec { + "and will be removed in the next release." ) (if c x then true else traceSeq (showVal x) false); + + addErrorContextToAttrs = attrs: + trace ( "Warning: `addErrorContextToAttrs` is deprecated " + + "and will be removed in the next release." ) + (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); + /* Evaluate a set of tests. A test is an attribute set {expr, expected}, denoting an expression and its expected result. The result is a list of failed tests, each represented as {name, diff --git a/lib/modules.nix b/lib/modules.nix index 4ef982c7ec96..6c8033322a54 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -159,7 +159,7 @@ rec { context = name: ''while evaluating the module argument `${name}' in "${key}":''; extraArgs = builtins.listToAttrs (map (name: { inherit name; - value = addErrorContext (context name) + value = builtins.addErrorContext (context name) (args.${name} or config._module.args.${name}); }) requiredArgs); @@ -309,7 +309,7 @@ rec { res.mergedValue; in opt // - { value = addErrorContext "while evaluating the option `${showOption loc}':" value; + { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; definitions = map (def: def.value) res.defsFinal; files = map (def: def.file) res.defsFinal; inherit (res) isDefined; From e49f40e1caad0827096927f1a3c631209859496a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 08:00:02 +0200 Subject: [PATCH 2704/2743] lib/debug: deprecate `traceCallXml` Incompletely documented, and a FIXME/bug that has been there for years. --- lib/debug.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index a792806fa79e..36f8c30353a4 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -128,7 +128,9 @@ rec { # note: if result doesn't evaluate you'll get no trace at all (FIXME) # args should be printed in any case traceCallXml = a: - if !isInt a then + trace ( "Warning: `traceCallXml` is deprecated " + + "and will be removed in the next release." ) + (if !isInt a then traceCallXml 1 "calling ${a}\n" else let nr = a; @@ -140,5 +142,5 @@ rec { else let r = builtins.seq expr expr; in trace "${str}\n result:\n${builtins.toXML r}" r - ); + )); } From 5012c49fc0c2c0e5b07c308a84dd5181a40969ca Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 08:48:04 +0200 Subject: [PATCH 2705/2743] lib/debug: document module & functions, prune imports --- lib/debug.nix | 120 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 38 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 36f8c30353a4..f4b261b824fd 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -1,28 +1,67 @@ +/* Collection of functions useful for debugging + broken nix expressions. + + * `trace`-like functions take two values, print + the first to stderr and return the second. + * `traceVal`-like functions take one argument + which both printed and returned. + * `traceSeq`-like functions fully evaluate their + traced value before printing (not just to “weak + head normal form” like trace does by default). + * Functions that end in `-Fn` take an additional + function as their first argument, which is applied + to the traced value before it is printed. +*/ { lib }: - let - -inherit (builtins) trace attrNamesToStr isAttrs isList isInt - isString isBool head substring attrNames; - -inherit (lib) all id mapAttrsFlatten elem isFunction; - + inherit (builtins) trace isAttrs isList isInt + head substring attrNames; + inherit (lib) id elem isFunction; in rec { - traceIf = p: msg: x: if p then trace msg x else x; + # -- TRACING -- + /* Trace msg, but only if pred is true. + + Example: + traceIf true "hello" 3 + trace: hello + => 3 + */ + traceIf = pred: msg: x: if pred then trace msg x else x; + + /* Trace the value and also return it. + + Example: + traceValFn (v: "mystring ${v}") "foo" + trace: mystring foo + => "foo" + */ traceValFn = f: x: trace (f x) x; traceVal = traceValFn id; - # strict trace functions (traced structure is fully evaluated and printed) - /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ + /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. + + Example: + trace { a.b.c = 3; } null + trace: { a = ; } + => null + traceSeq { a.b.c = 3; } null + trace: { a = { b = { c = 3; }; }; } + => null + */ traceSeq = x: y: trace (builtins.deepSeq x x) y; - /* Like `traceSeq`, but only down to depth n. - * This is very useful because lots of `traceSeq` usages - * lead to an infinite recursion. + /* Like `traceSeq`, but only evaluate down to depth n. + This is very useful because lots of `traceSeq` usages + lead to an infinite recursion. + + Example: + traceSeqN 2 { a.b.c = 3; } null + trace: { a = { b = {…}; }; } + => null */ traceSeqN = depth: x: y: with lib; let snip = v: if isList v then noQuotes "[…]" v @@ -37,15 +76,42 @@ rec { in trace (generators.toPretty { allowPrettyValues = true; } (modify depth snip x)) y; - /* `traceSeq`, but the same value is traced and returned */ + /* A combination of `traceVal` and `traceSeq` */ traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v); traceValSeq = traceValSeqFn id; - /* `traceValSeq` but with fixed depth */ + + /* A combination of `traceVal` and `traceSeqN`. */ traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v; traceValSeqN = traceValSeqNFn id; - # this can help debug your code as well - designed to not produce thousands of lines + # -- TESTING -- + + /* Evaluate a set of tests. A test is an attribute set {expr, + expected}, denoting an expression and its expected result. The + result is a list of failed tests, each represented as {name, + expected, actual}, denoting the attribute name of the failing + test and its expected and actual results. Used for regression + testing of the functions in lib; see tests.nix for an example. + Only tests having names starting with "test" are run. + Add attr { tests = ["testName"]; } to run these test only + */ + runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: + let testsToRun = if tests ? tests then tests.tests else []; + in if (substring 0 4 name == "test" || elem name testsToRun) + && ((testsToRun == []) || elem name tests.tests) + && (test.expr != test.expected) + + then [ { inherit name; expected = test.expected; result = test.expr; } ] + else [] ) tests)); + + # create a test assuming that list elements are true + # usage: { testX = allTrue [ true ]; } + testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; + + + # -- DEPRECATED -- + traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; @@ -100,28 +166,6 @@ rec { + "and will be removed in the next release." ) (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); - /* Evaluate a set of tests. A test is an attribute set {expr, - expected}, denoting an expression and its expected result. The - result is a list of failed tests, each represented as {name, - expected, actual}, denoting the attribute name of the failing - test and its expected and actual results. Used for regression - testing of the functions in lib; see tests.nix for an example. - Only tests having names starting with "test" are run. - Add attr { tests = ["testName"]; } to run these test only - */ - runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: - let testsToRun = if tests ? tests then tests.tests else []; - in if (substring 0 4 name == "test" || elem name testsToRun) - && ((testsToRun == []) || elem name tests.tests) - && (test.expr != test.expected) - - then [ { inherit name; expected = test.expected; result = test.expr; } ] - else [] ) tests)); - - # create a test assuming that list elements are true - # usage: { testX = allTrue [ true ]; } - testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; - # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 # this forces deep evaluation of all arguments and the result! From 06156610f139dbbba43b6610f2528ad33e746529 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 08:52:54 +0200 Subject: [PATCH 2706/2743] CODEOWNERS: add Profpatsch to lib/debug.nix Reason: has overhauled the module quite substantially. --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4e508d739e6a..3d4855c5cf40 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,6 +14,7 @@ /lib @edolstra @nbp /lib/systems @nbp @ericson2314 /lib/generators.nix @edolstra @nbp @Profpatsch +/lib/debug.nix @edolstra @nbp @Profpatsch # Nixpkgs Internals /default.nix @nbp From 21b87a7bdb31f19812e0f989cc9e0304a9972e32 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 13:06:39 +0200 Subject: [PATCH 2707/2743] docs: initial manual entry for `lib/debug.nix` It is more of a stub for now, but at least points to the right file. --- doc/functions.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/functions.xml b/doc/functions.xml index f790512e7db1..b2e450972947 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -294,6 +294,22 @@ merge:"diff3"
+
+ Debugging Nix Expressions + + Nix is a unityped, dynamic language, this means every value can + potentially appear anywhere. Since it is also non-strict, evaluation order + and what ultimately is evaluated might surprise you. Therefore it is important + to be able to debug nix expressions. + + + In the lib/debug.nix file you will find a number of + functions that help (pretty-)printing values while evaluation is runnnig. You + can even specify how deep these values should be printed recursively, and + transform them on the fly. Please consult the docstrings in + lib/debug.nix for usage information. +
+
buildFHSUserEnv From 900cec79a0aaf0628f855ec71d0ecf3145a67d3e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 3 Apr 2018 14:04:05 +0200 Subject: [PATCH 2708/2743] lib/debug: add replacement instructions & release notes for every deprecated function. --- lib/debug.nix | 19 ++++++--- nixos/doc/manual/release-notes/rl-1809.xml | 45 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index f4b261b824fd..91a9265a6b5e 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -117,7 +117,9 @@ rec { attrNamesToStr = a: trace ( "Warning: `attrNamesToStr` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use more specific concatenation " + + "for your uses (`lib.concat(Map)StringsSep`)." ) (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a))); showVal = with lib; @@ -142,11 +144,13 @@ rec { traceXMLVal = x: trace ( "Warning: `traceXMLVal` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `traceValFn builtins.toXML`." ) (trace (builtins.toXML x) x); traceXMLValMarked = str: x: trace ( "Warning: `traceXMLValMarked` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `traceValFn (x: str + builtins.toXML x)`." ) (trace (str + builtins.toXML x) x); # trace the arguments passed to function and its result @@ -157,13 +161,15 @@ rec { traceValIfNot = c: x: trace ( "Warning: `traceValIfNot` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `if/then/else` and `traceValSeq 1`.") (if c x then true else traceSeq (showVal x) false); addErrorContextToAttrs = attrs: trace ( "Warning: `addErrorContextToAttrs` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please use `builtins.addErrorContext` directly." ) (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); # example: (traceCallXml "myfun" id 3) will output something like @@ -173,7 +179,8 @@ rec { # args should be printed in any case traceCallXml = a: trace ( "Warning: `traceCallXml` is deprecated " - + "and will be removed in the next release." ) + + "and will be removed in the next release. " + + "Please complain if you use the function regularly." ) (if !isInt a then traceCallXml 1 "calling ${a}\n" else diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 61f9ec8ba995..2e53f0563baf 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -56,6 +56,11 @@ has the following highlights: following incompatible changes: + + + lib.strict is removed. Use builtins.seq instead. + + The clementine package points now to the free derivation. @@ -77,6 +82,46 @@ following incompatible changes: + lib.attrNamesToStr has been deprecated. Use + more specific concatenation (lib.concat(Map)StringsSep) + instead. + + + + + lib.addErrorContextToAttrs has been deprecated. Use + builtins.addErrorContext directly. + + + + + lib.showVal has been deprecated. Use + lib.traceSeqN instead. + + + + + lib.traceXMLVal has been deprecated. Use + lib.traceValFn builtins.toXml instead. + + + + + lib.traceXMLValMarked has been deprecated. Use + lib.traceValFn (x: str + builtins.toXML x) instead. + + + + + lib.traceValIfNot has been deprecated. Use + if/then/else and lib.traceValSeq + instead. + + + + + lib.traceCallXml has been deprecated. Please complain + if you use the function regularly. From 12707b88106ff0a09676aebf0a25d733fd5aac89 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 27 Apr 2018 18:44:28 +0200 Subject: [PATCH 2709/2743] pythonPackages.cysignals: 1.6.9 -> 1.7.1 --- pkgs/development/python-modules/cysignals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index c1fedecbff34..56d997c6b325 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cysignals"; - version = "1.6.9"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "003invnixqy1h4lb358vwrxykxzp15csaddkgq3pqqmswnva5908"; + sha256 = "15nky8siwlc7s8v23vv4m0mnxa1z6jcs2qfr26m2mkw9j9g2na2j"; }; hardeningDisable = [ From 5ec94de03c86fe12e2570c6fa870260bbfe710e8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 07:11:49 +0000 Subject: [PATCH 2710/2743] nixos: alsa: better docstring --- nixos/modules/services/audio/alsa.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index e3e8bb28c58b..376aad66e236 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -54,6 +54,11 @@ in description = '' Whether to enable volume and capture control with keyboard media keys. + You want to leave this disabled if you run a desktop environment + like KDE, Gnome, Xfce, etc, as those handle such things themselves. + You might want to enable this if you run a minimalistic desktop + environment or work from bare linux ttys/framebuffers. + Enabling this will turn on . ''; }; From 92265e807e60fac8bbf3c08a82715b575b5e4e7e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 25 Apr 2018 07:12:04 +0000 Subject: [PATCH 2711/2743] nixos: xserver: add related packages --- nixos/modules/services/x11/xserver.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 5f0a0f278452..29d1f17d28c8 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -240,7 +240,10 @@ in type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; - example = [ "vesa" ]; + example = [ + "ati_unfree" "amdgpu" "amdgpu-pro" + "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" "nvidiaLegacy173" + ]; description = '' The names of the video drivers the configuration supports. They will be tried in order until one that From e8d5070e23203163afb6450a6d82fc59e0012580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 18:19:05 +0100 Subject: [PATCH 2712/2743] nixos/nixos-generate-config: update search command --- nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 14c611e18bc3..74b61a64667e 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -577,8 +577,8 @@ $bootLoaderConfig # Set your time zone. # time.timeZone = "Europe/Amsterdam"; - # List packages installed in system profile. To search by name, run: - # \$ nix-env -qaP | grep wget + # List packages installed in system profile. To search, run: + # \$ nix search wget # environment.systemPackages = with pkgs; [ # wget vim # ]; From 555d2db62008fb156d37b5cfa13df3e062527fa2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Apr 2018 20:04:00 +0200 Subject: [PATCH 2713/2743] selfoss: 2016-07-31 -> 2.18 Fixes PHP7 compatibility. --- pkgs/servers/web-apps/selfoss/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 14f1dffee64c..4ed9d96510c8 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "selfoss-unstable-${version}"; - version = "2016-07-31"; + name = "selfoss-${version}"; + version = "2.18"; - src = fetchFromGitHub { - owner = "SSilence"; - repo = "selfoss"; - rev = "ceb431ad9208e2c5e31dafe593c75e5eb8b65cf7"; - sha256 = "00vrpw7sb95x6lwpaxrlzxyj98k98xblqcrjr236ykv0ha97xv30"; + src = fetchurl { + url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip"; + sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b"; }; + sourceRoot = "."; + nativeBuildInputs = [ unzip ]; + installPhase = '' mkdir $out cp -ra * $out/ From 53722f25adeaf41c4af5d4b7ddab6f13cc0b435e Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Fri, 27 Apr 2018 20:20:21 +0200 Subject: [PATCH 2714/2743] terraform-provider-ibm: init at 0.8.0 --- .../terraform-provider-ibm/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix new file mode 100644 index 000000000000..9764e029d277 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +# +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) +# +# examples: +# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples +# + +buildGoPackage rec { + name = "terraform-provider-ibm-${version}"; + version = "0.8.0"; + + goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; + subPackages = [ "./" ]; + + src = fetchFromGitHub { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + sha256 = "1jc1g2jadh02z4lfqnvgqk5cqrzk8pnn3cj3cwsm3ksa8pccf6w4"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; + description = "Terraform provider is used to manage IBM Cloud resources."; + platforms = platforms.all; + license = licenses.mpl20; + maintainers = with maintainers; [ jensbin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4a88cbe5b2b..6a6de6370e3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20944,6 +20944,8 @@ with pkgs; terraform = terraform_0_11; terraform-full = terraform_0_11-full; + terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {}; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {}; From 89df48e9db6a75641b6a9932e0c741c8ba2c7037 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 27 Apr 2018 20:35:23 +0200 Subject: [PATCH 2715/2743] weboob: Disable doctests requiring networking Unfortunately I haven't found a way for nose to disable doctests and the -e/--exclude flag only works on unit tests. So I'm using sed in postPatch to remove the doctests without mangling the whole docstring. I've built weboob and it now succeeds. Signed-off-by: aszlig --- pkgs/development/python-modules/weboob/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index a4b1b9c467a4..73a70a65c380 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -16,6 +16,19 @@ buildPythonPackage rec { sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9"; }; + postPatch = '' + # Disable doctests that require networking: + sed -i -n -e '/^ *def \+pagination *(.*: *$/ { + p; n; p; /"""\|'\'\'\'''/!b + + :loop + n; /^ *\(>>>\|\.\.\.\)/ { h; bloop } + x; /^ *\(>>>\|\.\.\.\)/bloop; x + p; /"""\|'\'\'\'''/b + bloop + }; p' weboob/browser/browsers.py weboob/browser/pages.py + ''; + setupPyBuildFlags = ["--qt" "--xdg"]; checkInputs = [ nose ]; @@ -33,7 +46,6 @@ 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 06c7d4d40dc77c79e50b54282345c1d71a1ac058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 19:55:35 +0200 Subject: [PATCH 2716/2743] opam: propagate `curl` and `unzip` dependencies These are required for `opam init` to succeed. Closes #14466 Cc @henrytill --- pkgs/development/tools/ocaml/opam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 63f79981e1b2..469e97e19de5 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { name = "opam-${version}"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; src = srcs.opam; @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/opam \ - --suffix PATH : ${aspcud}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin ''; doCheck = false; From 876bbce48081a84c233a2d3da7dfbe659b136bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 22:14:16 +0200 Subject: [PATCH 2717/2743] doc: fix typo in cross-compilation docs --- doc/cross-compilation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 10e4706b0590..0b2b85aeeef6 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -75,7 +75,7 @@ An example of such a tool is LLVM. - Although the existance of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. + Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the mistake where possible. Still, because the concept of a target platform is so ingrained, it is best to support it as is. From be0b3e3cd0d784333c151d1c7cc7e45b6af189ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 22:22:26 +0200 Subject: [PATCH 2718/2743] kcov: 34 -> 35 As the maintainer currently in `meta.maintainers` appears to not have touched the package since 2015, I've also added myself there. --- pkgs/development/tools/analysis/kcov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 3c3665e72200..ce391b938cae 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1i4pn5na8m308pssk8585nmqi8kwd63a9h2rkjrn4w78ibmxvj01"; + sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://simonkagstrom.github.io/kcov/index.html; license = licenses.gpl2; - maintainers = [ maintainers.gal_bolle ]; + maintainers = with maintainers; [ gal_bolle ekleog ]; platforms = platforms.linux; }; } From df85ddd229adcdd75f67e78eb4513d7df0cea947 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 27 Apr 2018 19:04:31 +0200 Subject: [PATCH 2719/2743] bspwm: 0.9.4 -> 0.9.5 --- pkgs/applications/window-managers/bspwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index c494ee266be3..49af25e4bc2f 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l"; + sha256 = "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; From 1a244d9a3572b5cb7e62224a265007d00c81fdd8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 27 Apr 2018 22:54:07 +0200 Subject: [PATCH 2720/2743] bspwm: add rvolosatovs to maintainers --- pkgs/applications/window-managers/bspwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 49af25e4bc2f..0538228d4b4e 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; homepage = https://github.com/baskerville/bspwm; - maintainers = with maintainers; [ meisternu epitrochoid ]; + maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; license = licenses.bsd2; platforms = platforms.linux; }; From 5c7b7c360be8083cfcc57f7e377b01d8135f32c2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 27 Apr 2018 20:21:20 +0200 Subject: [PATCH 2721/2743] pythonPackages.opentimestamps: 0.2.1 -> 0.3.0 --- .../python-modules/opentimestamps/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index 1271a46f047d..370378f097a4 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -2,15 +2,17 @@ , bitcoinlib, GitPython, pysha3 }: buildPythonPackage rec { - name = "opentimestamps-${version}"; - version = "0.2.1"; + pname = "opentimestamps"; + version = "0.3.0"; disabled = (!isPy3k); + # We can't use the pypi source because it doesn't include README.md which is + # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "python-opentimestamps"; - rev = "python-opentimestamps-v0.2.1"; - sha256 = "1cilv1ls9mdqk8zriqfkz7xcl8i1ncm0f89n4c8k4s82kf5y56rm"; + rev = "python-opentimestamps-v${version}"; + sha256 = "1i843mbz4h9vqc3y2x09ix6bv9wc0gzq36zhbnmf5by08iaiydks"; }; # Remove a failing test which expects the test source file to reside in the From 4e79f2fb42e54711b864a1f02cb54a2b2e653be2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 27 Apr 2018 20:21:50 +0200 Subject: [PATCH 2722/2743] opentimestamps-client: 0.5.1 -> 0.6.0 --- pkgs/tools/misc/opentimestamps-client/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index a062aa992be6..3fbd874503de 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -1,19 +1,21 @@ { lib, buildPythonApplication, fetchFromGitHub, isPy3k -, opentimestamps, GitPython, pysocks }: +, opentimestamps, appdirs, GitPython, pysocks }: buildPythonApplication rec { - name = "opentimestamps-client-${version}"; - version = "0.5.1"; + pname = "opentimestamps-client"; + version = "0.6.0"; disabled = (!isPy3k); + # We can't use the pypi source because it doesn't include README.md which is + # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "opentimestamps-client"; - rev = "opentimestamps-client-v0.5.1"; - sha256 = "0s549xkb75r5wyvjlfmac8a1df6w0y55l98f492zsihdns1d6rzq"; + rev = "opentimestamps-client-v${version}"; + sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp"; }; - propagatedBuildInputs = [ opentimestamps GitPython pysocks ]; + propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; From 468f3ce0edfc753110e70ad82589acc7487c640a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Apr 2018 23:02:09 +0100 Subject: [PATCH 2723/2743] nixos/xserver: remove nvidiaLegacy173 from videoDrivers.examples see https://github.com/NixOS/nixpkgs/commit/92265e807e60fac8bbf3c08a82715b575b5e4e7e#commitcomment-28773179 --- nixos/modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 29d1f17d28c8..1404231f837e 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -242,7 +242,7 @@ in default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" - "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" "nvidiaLegacy173" + "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" ]; description = '' The names of the video drivers the configuration From 4317f7ab26942b4fad23f616932a1df1611bd44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Fri, 27 Apr 2018 23:52:50 +0200 Subject: [PATCH 2724/2743] kcov: fix build on aarch64 Apparently, without this patch `NT_PRSTATUS` is not found. So the patch adds the include apparently necessary. `NT_PRSTATUS` is also defined in ``, which would likely have been a better name, were it not in the `linux/` directory, which is a priori not stable. The need to do that is kind of weird (the change was introduced in [1], and fedora apparently didn't need this additional import), but I'll try to upstream it. [1] https://github.com/SimonKagstrom/kcov/pull/239 --- .../tools/analysis/kcov/aarch64_nt_prstatus.patch | 12 ++++++++++++ pkgs/development/tools/analysis/kcov/default.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch new file mode 100644 index 000000000000..d5c3662e9abf --- /dev/null +++ b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch @@ -0,0 +1,12 @@ +diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc +index 59b615f..e02cddf 100644 +--- a/src/engines/ptrace.cc ++++ b/src/engines/ptrace.cc +@@ -21,6 +21,7 @@ + + #if defined(__aarch64__) + # include ++# include + #endif + + #include diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index ce391b938cae..7d75d9a34e1a 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; + patches = [ ./aarch64_nt_prstatus.patch ]; + enableParallelBuilding = true; meta = with stdenv.lib; { From 14568ddaabd23a96ffa537728888e1d8e8ee687a Mon Sep 17 00:00:00 2001 From: Sander Hollaar Date: Sat, 28 Apr 2018 00:19:05 +0200 Subject: [PATCH 2725/2743] netcat-openbsd: 1.187 -> 1.190: (#39605) http://metadata.ftp-master.debian.org/changelogs/main/n/netcat-openbsd/netcat-openbsd_1.190-1_changelog --- pkgs/tools/networking/netcat-openbsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 2d9776abfcfc..1a79e17c6598 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: stdenv.mkDerivation rec { - version = "1.187"; + version = "1.190"; deb-version = "${version}-1"; name = "netcat-openbsd-${version}"; srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw"; + sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q"; + sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv"; }) ]; From df3566c9560b3305bd33faf4bc7580dc55f4f71e Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Sun, 25 Mar 2018 16:49:54 -0400 Subject: [PATCH 2726/2743] unifi, nixos/unifi: support LTS (5.6.36) and release (5.7.20) Ubiquiti has both a LTS and current version of their Unifi controller software. The latter adds new features, but may drop support for some devices. This adds the capability to use either for the unifi module but defaults to the LTS version, which was the previous behavior. --- nixos/modules/services/networking/unifi.nix | 37 ++++++++++++++++++--- pkgs/servers/unifi/default.nix | 28 ++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 55 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8e5f0bfc070d..94958bfdd83e 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -4,22 +4,22 @@ let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; cmd = '' - @${pkgs.jre}/bin/java java \ + @${cfg.jrePackage}/bin/java java \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ -jar ${stateDir}/lib/ace.jar ''; mountPoints = [ { - what = "${pkgs.unifi}/dl"; + what = "${cfg.unifiPackage}/dl"; where = "${stateDir}/dl"; } { - what = "${pkgs.unifi}/lib"; + what = "${cfg.unifiPackage}/lib"; where = "${stateDir}/lib"; } { - what = "${pkgs.mongodb}/bin"; + what = "${cfg.mongodbPackage}/bin"; where = "${stateDir}/bin"; } { @@ -41,6 +41,33 @@ in ''; }; + services.unifi.jrePackage = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = "pkgs.jre8"; + description = '' + The JRE package to use. Check the release notes to ensure it is supported. + ''; + }; + + services.unifi.unifiPackage = mkOption { + type = types.package; + default = pkgs.unifiLTS; + defaultText = "pkgs.unifiLTS"; + description = '' + The unifi package to use. + ''; + }; + + services.unifi.mongodbPackage = mkOption { + type = types.package; + default = pkgs.mongodb; + defaultText = "pkgs.mongodb"; + description = '' + The mongodb package to use. + ''; + }; + services.unifi.dataDir = mkOption { type = types.str; default = "${stateDir}/data"; @@ -137,7 +164,7 @@ in rm -rf "${stateDir}/webapps" mkdir -p "${stateDir}/webapps" chown unifi "${stateDir}/webapps" - ln -s "${pkgs.unifi}/webapps/ROOT" "${stateDir}/webapps/ROOT" + ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT" ''; postStop = '' diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index e9d2fd07dc56..dac4bf6899a1 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,21 +2,37 @@ , dpkg , fetchurl , unzip +, useLTS ? false }: -stdenv.mkDerivation rec { - name = "unifi-controller-${version}"; - version = "5.6.36"; - src = fetchurl { +let + versions = { + stable = { + version = "5.7.20"; + sha256 = "1ylj4i5mcv6z9n32275ccdf1rqk74zilqsih3r6xzhm30pxrd8dd"; + }; + lts = { + version = "5.6.36"; + sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi"; + }; + }; + selectedVersion = + let attr = if useLTS then "lts" else "stable"; + in versions."${attr}"; +in + +stdenv.mkDerivation { + name = "unifi-controller-${selectedVersion.version}"; + src = with selectedVersion; fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi"; + inherit sha256; }; buildInputs = [ dpkg ]; unpackPhase = '' - dpkg-deb -x ${src} ./ + dpkg-deb -x $src ./ ''; doConfigure = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bd29155a977..ef5a7c1d8ba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12909,6 +12909,7 @@ with pkgs; axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; + unifiLTS = callPackage ../servers/unifi { useLTS=true; }; virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; From e421c427d2c9cca60567b6057dfb1ff71e07278b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Apr 2018 18:33:42 -0400 Subject: [PATCH 2727/2743] fastjet: add veprbl to maintainers --- pkgs/development/libraries/physics/fastjet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 0ee68415b89c..2f3dfea9a51a 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; homepage = http://fastjet.fr/; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; } From 92808e667fd909ecd2a1502b20d9dd163986aec8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Sat, 28 Apr 2018 00:58:40 +0200 Subject: [PATCH 2728/2743] blobfuse: init at 1.0.1-RC-Preview (#39073) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/filesystems/blobfuse/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/tools/filesystems/blobfuse/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18ed73b19324..aec6f67a9191 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1726,6 +1726,11 @@ github = "jbedo"; name = "Justin Bedő"; }; + jbgi = { + email = "jb@giraudeau.info"; + github = "jbgi"; + name = "Jean-Baptiste Giraudeau"; + }; jcumming = { email = "jack@mudshark.org"; name = "Jack Cummings"; diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix new file mode 100644 index 000000000000..f847cde98a9e --- /dev/null +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: + +stdenv.mkDerivation rec { + name = "blobfuse-${version}"; + version = "1.0.1-RC-Preview"; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-storage-fuse"; + rev = "v${version}"; + sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs"; + }; + + buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "Mount an Azure Blob storage as filesystem through FUSE"; + license = licenses.mit; + maintainers = with maintainers; [ jbgi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef5a7c1d8ba9..31e091b810eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -838,6 +838,8 @@ with pkgs; boost = boost160; }; + blobfuse = callPackage ../tools/filesystems/blobfuse { }; + blockdiag = pythonPackages.blockdiag; blsd = callPackage ../tools/misc/blsd { From b1950f081dcb1906ee20babf08c6377167a85f2d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 27 Apr 2018 19:16:32 -0400 Subject: [PATCH 2729/2743] fastjet: update license in meta Fixes: 70e070 ('fastjet: 3.3.0 -> 3.3.1') --- pkgs/development/libraries/physics/fastjet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 2f3dfea9a51a..812d741fec96 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://fastjet.fr/; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; From 2f893ff53db6e812230e3fe8bf4b1c10f34ccdde Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 28 Apr 2018 07:20:40 +0200 Subject: [PATCH 2730/2743] autoPatchelfHook: Provide a better derivation name Thanks to @Ericson2314 for the suggestion to provide a name for the hook script. Comment was posted here: https://github.com/NixOS/nixpkgs/pull/34506#discussion_r167421856 Very useful if you use some other hooks and autoPatchelfHook so you don't just get a bunch of "hook" derivations. Tested by quickly building (not running) teamviewer and masterpdfeditor. Signed-off-by: aszlig Reported-by: John Ericson --- 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 8c060c588e8c..3795cce452a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -80,7 +80,7 @@ with pkgs; ../build-support/setup-hooks/autoreconf.sh; autoPatchelfHook = makeSetupHook - { deps = [ file ]; } + { name = "auto-patchelf-hook"; deps = [ file ]; } ../build-support/setup-hooks/auto-patchelf.sh; ensureNewerSourcesHook = { year }: makeSetupHook {} From 1c235abda6446eb787d33feb5eb329d72531ce9c Mon Sep 17 00:00:00 2001 From: davidak Date: Sat, 28 Apr 2018 07:58:52 +0200 Subject: [PATCH 2731/2743] elementary-xfce-icon-theme: 2017-11-28 -> 0.11 --- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 724f3a066cc8..8a831a630d86 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "elementary-xfce-icon-theme-${version}"; - version = "2017-11-28"; + version = "0.11"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; - rev = "b5cc6f044ed24e388ed2fffed1d02f43ce76f5e6"; - sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; + rev = "elementary-xfce-${version}"; + sha256 = "1hgbw9wwsgrbrs8lgdhba2m8m1cvqbcy27b87kjws6jsa00f5hx6"; }; nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; From bf325f1bd7f148a6043add54446f983700dd2c64 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 28 Apr 2018 11:08:42 +0200 Subject: [PATCH 2732/2743] quassel: 0.12.4 -> 0.12.5 (fixes RCE & remote crash) It was found that Quassel could be remotely crashed and had an unauthenticated RCE vulnerability. The public annoucement can be found on the oss-sec archive [1]. The bump to 0.12.5 is supposed fixe both issues. [1] http://seclists.org/oss-sec/2018/q2/77 --- pkgs/applications/networking/irc/quassel/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/source.nix b/pkgs/applications/networking/irc/quassel/source.nix index f3941ee976e4..20daba788997 100644 --- a/pkgs/applications/networking/irc/quassel/source.nix +++ b/pkgs/applications/networking/irc/quassel/source.nix @@ -1,9 +1,9 @@ { fetchurl }: rec { - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { url = "https://github.com/quassel/quassel/archive/${version}.tar.gz"; - sha256 = "0q2qlhy1d6glw9pwxgcgwvspd1mkk3yi6m21dx9gnj86bxas2qs2"; + sha256 = "04f42x87a4wkj3va3wnmj2jl7ikqqa7d7nmypqpqwalzpzk7kxwv"; }; } From dda74d9e50dbd8a412de743a53e9cfd585407342 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Apr 2018 12:48:06 +0300 Subject: [PATCH 2733/2743] nixos/qemu-vm: Always add a virtio RNG device to the quest mke2fs has this annoying property that it uses getrandom() to get random numbers (for whatever purposes) which blocks until the kernel's secure RNG has sufficient entropy, which it usually doesn't in the early boot (except if your CPU supports RDRAND) where we may need to create the root disk. So let's give the VM a virtio RNG to avoid the boot getting stuck at mke2fs. --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 2b78276fcdea..3d4bd315f812 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -77,6 +77,7 @@ let -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ + -device virtio-rng-pci \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ From 1f34893553398a9c83140958fbe6e656acd785db Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 28 Apr 2018 13:08:52 +0100 Subject: [PATCH 2734/2743] hyena: fix hyena & pdfmod builds on higher versions of mono Helps with #36711 --- pkgs/development/libraries/hyena/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index edd35bd27e44..f99aa0b6f0cf 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build/dll-map-makefile-verifier patchShebangs build/private-icon-theme-installer + substituteInPlace configure --replace lib/mono/2.0/ lib/mono/2.0-api/ find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i ''; From f8d0c9e3c3b92f8af058b742eb7553d53c3502a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Apr 2018 02:31:07 +0200 Subject: [PATCH 2735/2743] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/bb8ed19628062fa0afd844771b20ee50a49a1721. --- .../haskell-modules/hackage-packages.nix | 1269 +++++++++++++---- 1 file changed, 1019 insertions(+), 250 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8d25c173d75a..8b035359730b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6110,14 +6110,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "GLFW-b_1_4_8_4" = callPackage + "GLFW-b_3_2_1_0" = callPackage ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit , test-framework, test-framework-hunit }: mkDerivation { pname = "GLFW-b"; - version = "1.4.8.4"; - sha256 = "1xww650q80ii9f80v9kpz56lwgd1cirvhqjdca1vq9xs8k30hfd0"; + version = "3.2.1.0"; + sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i"; libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ base bindings-GLFW deepseq HUnit test-framework @@ -9534,16 +9534,18 @@ self: { }) {}; "Hastodon" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, http-conduit - , http-types, mime-types, MissingH, text + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , exceptions, http-client, http-conduit, http-types, mime-types + , MissingH, resourcet, text, transformers }: mkDerivation { pname = "Hastodon"; - version = "0.3.2"; - sha256 = "0qdq23mg1nszsf3ldbdawdkcmbv18cmny6529k9kwlfq9fhdm83x"; + version = "0.4.0"; + sha256 = "00zq3kzzazqlgbh45xc6py3m23x448af34d4y3z903by79fid79f"; libraryHaskellDepends = [ - aeson base bytestring http-client http-conduit http-types - mime-types MissingH text + aeson attoparsec base bytestring conduit exceptions http-client + http-conduit http-types mime-types MissingH resourcet text + transformers ]; homepage = "https://github.com/syucream/hastodon"; description = "mastodon client module for Haskell"; @@ -14039,14 +14041,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; - "OpenGLRaw_3_3_0_0" = callPackage + "OpenGLRaw_3_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, libGL , text, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.0.0"; - sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p"; + version = "3.3.0.1"; + sha256 = "0jzipa8avnrsw2via8ks012illwg2in27l01y1bp35ci0w2f92fq"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -16596,7 +16598,7 @@ self: { description = "A .NET Bridge for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + }) {inherit (pkgs) glib; mono = null;}; "Saturnin" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, either @@ -21062,6 +21064,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "access-token-provider" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring + , bytestring, containers, exceptions, filepath, http-client + , http-client-tls, http-types, katip, lens, lens-aeson, mtl, random + , safe-exceptions, stm, tasty, tasty-hunit, text, th-format + , transformers, unliftio, unliftio-core, uuid + }: + mkDerivation { + pname = "access-token-provider"; + version = "0.1.0.0"; + sha256 = "03832v0aab3imqim8f6g1r0jj2pfrrca45qnvpkw7ry7krbq5z7q"; + libraryHaskellDepends = [ + aeson aeson-casing base base64-bytestring bytestring containers + exceptions filepath http-client http-client-tls http-types katip + lens lens-aeson mtl random safe-exceptions stm text th-format + transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions http-client http-types + katip lens mtl random safe-exceptions tasty tasty-hunit text + th-format unliftio unliftio-core uuid + ]; + homepage = "https://github.com/mtesseract/access-token-provider#readme"; + description = "Provides Access Token for Services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "accuerr" = callPackage ({ mkDerivation, base, bifunctors, lens, semigroups }: mkDerivation { @@ -30397,8 +30426,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.25"; - sha256 = "0p5pg2ix0ppan0cz4b0pk16ihfcnvqwb8g93k4bh7d304ca5xdk4"; + version = "0.2.0.26"; + sha256 = "14s8bic1kvsigmi5nmjdca6pkh223axygr74nmygjbvwmryfxcxn"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -32479,6 +32508,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_1_5_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, criterion, deepseq + , directory, hmatrix, lens, microlens, mnist-idx, mwc-random + , primitive, random, reflection, time, transformers + , type-combinators, vector + }: + mkDerivation { + pname = "backprop"; + version = "0.1.5.2"; + sha256 = "1mb99dwpng07vsaa3vhl6b0kn8ym6qz7i9a0gyj8hafxawbrznfh"; + libraryHaskellDepends = [ + base binary deepseq microlens primitive random 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -33510,8 +33563,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.1"; - sha256 = "1zjjmz36lxxrxgx449212q878mzavjpwx5jad0lk9ninpas16h5v"; + version = "0.1.0.2"; + sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -33790,6 +33843,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core_0_7_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.7.2.1"; + sha256 = "0v9mspr3r7g5n73pgdwipgx2z23cd5g537g8afd1hj22p7d993jw"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri tagged text time vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + homepage = "http://travis.athougies.net/projects/beam.html"; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -37079,10 +37154,8 @@ self: { ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { pname = "bitwise"; - version = "0.1.1.1"; - sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d"; - revision = "2"; - editedCabalFile = "1dqddxjf4kpb16k51z40qlnl0shw6gmpf1c1ckdn4q8jm61bmlgn"; + version = "1.0.0.1"; + sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -40244,6 +40317,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-little_0_1_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp + , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "bv-little"; + version = "0.1.1"; + sha256 = "153bd5y55scp6qd9q7vnkhp8zwj3qssyr4qy8wpfj8k9xp8xdrk8"; + libraryHaskellDepends = [ + base deepseq hashable integer-gmp mono-traversable primitive + QuickCheck + ]; + testHaskellDepends = [ + base deepseq hashable mono-traversable QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq hashable ]; + homepage = "https://github.com/recursion-ninja/bv-little"; + description = "Efficient little-endian bit vector library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils , prettyclass, QuickCheck, random @@ -43950,11 +44047,11 @@ self: { }: mkDerivation { pname = "cautious"; - version = "0.0.0.0"; - sha256 = "0kr9aipbi95hz97lbidifsfm51rsjlpjgkbvnyiwrh1cckh6q0zw"; + version = "0.1.0.0"; + sha256 = "054n9vy4h4qs208gfi7ryvb40y50pmaxcrslxplk95vg0pvg4k1w"; libraryHaskellDepends = [ - aeson base genvalidity-hspec-aeson hspec hspec-discover QuickCheck - transformers validity + aeson base genvalidity genvalidity-hspec-aeson hspec hspec-discover + QuickCheck transformers validity ]; testHaskellDepends = [ aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson @@ -46113,6 +46210,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cisco-spark-api_0_1_0_3" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp + }: + mkDerivation { + pname = "cisco-spark-api"; + version = "0.1.0.3"; + sha256 = "1fi8cadjszb92yih5ilagay8c9fj4aiwdx2qx1pwdc756jgjm5ky"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring conduit data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring conduit data-default hspec + http-conduit http-types network-uri text wai warp + ]; + homepage = "https://github.com/nshimaza/webex-teams-api#readme"; + description = "A Haskell bindings for Webex Teams API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "citation-resolve" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers , curl, data-default, directory, doctest, download-curl, either @@ -47279,8 +47406,8 @@ self: { }: mkDerivation { pname = "clifm"; - version = "0.3.1.0"; - sha256 = "17kd2cfxc9dswlqv141f2anc0g19xhj9w5mk3xicx7vyr6j43y0y"; + version = "0.4.1.0"; + sha256 = "0q0m662sg4n2k9lgx82d72gi16widm74a7j08psnjmwhk55ir3cb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47681,7 +47808,7 @@ self: { homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host"; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; + }) {inherit (pkgs) glib; mono = null;}; "clr-inline" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive @@ -50120,12 +50247,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "composition-prelude_1_4_0_1" = callPackage + "composition-prelude_1_4_0_3" = callPackage ({ mkDerivation, base, cpphs }: mkDerivation { pname = "composition-prelude"; - version = "1.4.0.1"; - sha256 = "172fnixh4jgmwfsaxg0fyji0i745pbjwk00l3yh5pwng9swzi6ik"; + version = "1.4.0.3"; + sha256 = "0vzd71yqnbx5pk4yvan1sbjdgg3b7k476jiyr36pjyi1ysdm13qj"; libraryHaskellDepends = [ base ]; libraryToolDepends = [ cpphs ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; @@ -54102,8 +54229,8 @@ self: { }: mkDerivation { pname = "crc"; - version = "0.0.1.1"; - sha256 = "1swn00ksnqkqfjh1q9ck8zd5y9vb2yaf7rsxyy9i47d8p93m5g74"; + version = "0.1.0.0"; + sha256 = "0cvyzw1c63s1cbs9ypa5xxj7kjl57v0ggkxsxncnl7sqlkpn6s74"; libraryHaskellDepends = [ base bytestring vector ]; testHaskellDepends = [ base bytestring conduit conduit-extra resourcet tasty tasty-golden @@ -54806,6 +54933,8 @@ self: { pname = "crypto-enigma"; version = "0.0.2.11"; sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1"; + revision = "1"; + editedCabalFile = "1wh09ma0xr8lgj0a2ybp6kxisi36cl2kiqz2akhy915v6gpkjkyz"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -54813,6 +54942,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma_0_0_2_12" = callPackage + ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck + , split + }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.2.12"; + sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b"; + libraryHaskellDepends = [ base containers MissingH mtl split ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + homepage = "https://github.com/orome/crypto-enigma-hs"; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "crypto-multihash" = callPackage ({ mkDerivation, base, base58-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck, string-conversions @@ -55473,8 +55618,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.1"; - sha256 = "117ih5cssflaa7mvg4a4vz5sfsylivb8n0ri90211pml3d5idwpf"; + version = "0.7.2"; + sha256 = "0c16h2m8zkpyjbclvqpd8kq46ciw6qwc94d6v2d66c3g0ixx53vx"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -55491,8 +55636,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.3.1"; - sha256 = "0fwzsmb9syk144d445cw1d9pjx3vn18pxi161yafv2q7q4m57i3g"; + version = "5.3.2"; + sha256 = "1v3ssy2rfgwz9wwv8kmaifyrphyl5w66p9zmrg1bi0vbzwxnr57q"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -55509,8 +55654,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.2"; - sha256 = "1h827ijkwa5fyg1jphaa19fr4wxs5l76m89xl44989jnb7blbkcd"; + version = "0.3.3"; + sha256 = "0k4pk96cx2f6rhz18mrdkkz7ic2fdzpqkxf1x596990az7pjg7g3"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -55543,8 +55688,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.1.0"; - sha256 = "0w591ij97i1kkv2z5fix8zlvw9shagxq6lpkic71ldpvv1a4cf8q"; + version = "0.2.2.0"; + sha256 = "19cplqpyd7vhn28z0k8mxmscja05w9xb8q4bbvq5qd0h8liqxsqg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -55560,8 +55705,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.8.1"; - sha256 = "15k5in43w4ivkzi6qs5z19fh3pd2fg5ih1dyd1vk736lawlivx20"; + version = "0.0.9.0"; + sha256 = "0vvsqbnd1yjwijz4g0y9av6d20m73b5swln4v7gna3jd16mrg2k1"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -66066,8 +66211,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.0.0.1"; - sha256 = "0sg0pf8nsy4fdx8gqpqv6k29v01gz4bq5y1id28v9j8rj0mgv5nn"; + version = "1.1"; + sha256 = "18h4876saf2f8k052qf76j5w89x7nay12nlf7hc5dkwf4c9y5hq9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66077,7 +66222,7 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -66376,6 +66521,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "duration" = callPackage + ({ mkDerivation, base, doctest, hspec, parsec, template-haskell + , time + }: + mkDerivation { + pname = "duration"; + version = "0.1.0.0"; + sha256 = "18qjn97njhra7brps58rl44vyc0hmfc83prgm519q7dyf3159cd0"; + libraryHaskellDepends = [ base parsec template-haskell time ]; + testHaskellDepends = [ + base doctest hspec parsec template-haskell time + ]; + homepage = "https://github.com/ryota-ka/duration#readme"; + description = "A tiny compile-time time utility library inspired by zeit/ms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dustme" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, async, attoparsec , base, bytestring, containers, deepseq, extra, hashable, hspec @@ -69658,6 +69820,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eq_4_2" = callPackage + ({ mkDerivation, base, semigroupoids }: + mkDerivation { + pname = "eq"; + version = "4.2"; + sha256 = "1s3h77i0h4z3dg97sqqjl027rz0k82h48cpzp0c7a75g0qx70q21"; + libraryHaskellDepends = [ base semigroupoids ]; + homepage = "http://github.com/ekmett/eq/"; + description = "Leibnizian equality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equal-files" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, filemanip , transformers, utility-ht @@ -70263,8 +70438,8 @@ self: { }: mkDerivation { pname = "etc"; - version = "0.3.1.0"; - sha256 = "0l938jhlx1jgb46b9ykdc741r0v7wkklrc1ga5v81r3b52civb1c"; + version = "0.3.2.0"; + sha256 = "1j4qjw1hqw5q9i47ixiwcr3zpcs1x39l46mh5yii5xkqmwlw9gk0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base hashable rio text typed-process unliftio @@ -71803,8 +71978,8 @@ self: { }: mkDerivation { pname = "expiring-containers"; - version = "0.1.0.2"; - sha256 = "006n6zwdgrdh0717wd85kwxrbpv3fl5srbc77acglms41pcn72yz"; + version = "0.1.1.1"; + sha256 = "0v35m5bl6y5l4m8gfs6wrcs0pqmgk52aaa261jg92jkvhji21ki5"; libraryHaskellDepends = [ base containers hashable int-multimap time timestamp unordered-containers @@ -72539,8 +72714,8 @@ self: { }: mkDerivation { pname = "fake"; - version = "0.1.1"; - sha256 = "0xp737s8067bynh03d6zhi8w71pl1q8mrk5si80mykn401dzw7ir"; + version = "0.1.1.1"; + sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -77645,6 +77820,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_0_2" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers + , distributive, exceptions, mtl, profunctors, semigroupoids + , semigroups, template-haskell, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "free"; + version = "5.0.2"; + sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg"; + libraryHaskellDepends = [ + base bifunctors comonad containers distributive exceptions mtl + profunctors semigroupoids semigroups template-haskell transformers + transformers-base transformers-compat + ]; + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-concurrent" = callPackage ({ mkDerivation, base, type-aligned }: mkDerivation { @@ -78221,6 +78417,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "friendly" = callPackage + ({ mkDerivation, base, bifunctors, lens, optparse-applicative }: + mkDerivation { + pname = "friendly"; + version = "0.1.0.0"; + sha256 = "0ikbfki5yvagc3xjbqwmzzp29idfviaylnan6cr39kna6fc8ajgx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bifunctors lens optparse-applicative + ]; + description = "Attempt to pretty-print any input"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "friendly-time" = callPackage ({ mkDerivation, base, hspec, old-locale, time }: mkDerivation { @@ -84458,8 +84669,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180409"; - sha256 = "05cwyh3x432k3czrd59py0jsvl3qjg8ky7nc0rxkw6pbzwpgcb8c"; + version = "6.20180427"; + sha256 = "0pjdb0mk5hmjl0sra37ap3cr5xp9pa7fyikqmz4156hzk925rrds"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -85488,6 +85699,8 @@ self: { pname = "gl"; version = "0.8.0"; sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; + revision = "1"; + editedCabalFile = "17m5vagiq1v7zg6409f56qqy28jd0xp13yk44s661rcwj0f4pd14"; setupHaskellDepends = [ base Cabal containers directory filepath hxt transformers ]; @@ -86421,8 +86634,8 @@ self: { ({ mkDerivation, base, gmp, recursion-schemes }: mkDerivation { pname = "gmpint"; - version = "0.1.0.11"; - sha256 = "00sml2d5jbfc0qy0nvrmk9xv31zk66anzz5r4d7h049asq0zh20n"; + version = "0.1.0.12"; + sha256 = "0l3qd8hps55am4ddj4x83f0vyi1rwhh7gj36k465n4m1pz7ndxrx"; libraryHaskellDepends = [ base recursion-schemes ]; librarySystemDepends = [ gmp ]; description = "GMP integer conversions"; @@ -88350,19 +88563,22 @@ self: { }) {}; "google-oauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, http-conduit - , http-types, load-env + ({ mkDerivation, base, bytestring, hoauth2, hspec, http-client-tls + , http-conduit, load-env, safe-exceptions, text, transformers + , uri-bytestring }: mkDerivation { pname = "google-oauth2"; - version = "0.2.2"; - sha256 = "0n408kh48d7ky09j9zw9ad4mhbv1v7gq6i3ya4f6fhkjqqgw8c1j"; + version = "0.3.0.0"; + sha256 = "119p792prspir2vxk53jzkr90rava2qnixr1jkbmx5si63h9l01z"; libraryHaskellDepends = [ - aeson base bytestring HTTP http-conduit + base bytestring hoauth2 http-client-tls safe-exceptions text + transformers uri-bytestring ]; testHaskellDepends = [ - base bytestring hspec http-conduit http-types load-env + base bytestring hoauth2 hspec http-conduit load-env text ]; + homepage = "https://github.com/pbrisbin/google-oauth2#readme"; description = "Google OAuth2 token negotiation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -90710,19 +90926,19 @@ self: { "gtk-sni-tray" = callPackage ({ mkDerivation, base, bytestring, containers, dbus, directory , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut - , gtk3, hslogger, optparse-applicative, status-notifier-item, text - , transformers, unix + , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative + , status-notifier-item, text, transformers, unix }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.0.0"; - sha256 = "0a9yxhir33zg1bkv9nyazkrjawv2w9qr43n4prrifib7r976b7pj"; + version = "0.1.1.0"; + sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk - gi-gdkpixbuf gi-glib gi-gtk hslogger status-notifier-item text - transformers unix + gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base + hslogger status-notifier-item text transformers unix ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ @@ -91539,6 +91755,58 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOpenPGP_2_6_1" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-conduit, bytestring, bzlib, conduit, conduit-extra + , containers, criterion, crypto-cipher-types, cryptonite + , data-default-class, errors, hashable, incremental-parser + , ixset-typed, lens, memory, monad-loops, nettle, network + , network-uri, newtype, openpgp-asciiarmor, QuickCheck + , quickcheck-instances, resourcet, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers + , wl-pprint-extras, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.6.1"; + sha256 = "1al531lrsgfsqjc21117l420pcd7ymv4vdzywka189lkd8p5yzj7"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-conduit bytestring bzlib + conduit conduit-extra containers crypto-cipher-types cryptonite + data-default-class errors hashable incremental-parser ixset-typed + lens memory monad-loops nettle network-uri newtype + openpgp-asciiarmor resourcet semigroups split text time + time-locale-compat transformers unliftio-core unordered-containers + wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype QuickCheck quickcheck-instances + resourcet semigroups split tasty tasty-hunit tasty-quickcheck text + time time-locale-compat transformers unliftio-core + unordered-containers wl-pprint-extras zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bifunctors binary + binary-conduit bytestring bzlib conduit conduit-extra containers + criterion crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers wl-pprint-extras zlib + ]; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel @@ -96896,8 +97164,8 @@ self: { }: mkDerivation { pname = "haskell-igraph"; - version = "0.4.0"; - sha256 = "19bhfcrfj4jxd6znqzslax6sd4w1icwp4rn3h0w31qpjv54x171f"; + version = "0.5.0"; + sha256 = "1hil0zl4pnvkh0ingp0bgi0m7mhmvf1pqr7qskjxm6pa9kqybrw9"; libraryHaskellDepends = [ base bytestring bytestring-lexing cereal cereal-conduit colour conduit data-default-class hashable hxt primitive split @@ -96920,8 +97188,8 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.3"; - sha256 = "1fh3nn4hqcj6lc3m1zlxykxk2dbchh3cdz63k8zfpl7dr2d91132"; + version = "1.0.4"; + sha256 = "17ac5k98aqx77lq398kgvyiylpmkvxdmxzqbh7wk1fl9kphwsdm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106808,8 +107076,8 @@ self: { pname = "hoist-error"; version = "0.1.0.2"; sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; - revision = "2"; - editedCabalFile = "0yg8w9cy4qff8hkv0057qqwiapfhh2sxx43j64wgdp8vb8jar97w"; + revision = "3"; + editedCabalFile = "1f2znb9x4f4m8h3d66pdyi7fqjr6v120mjqswj40dy7p2wmd6dm6"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -108425,18 +108693,20 @@ self: { }) {}; "hpc-threshold" = callPackage - ({ mkDerivation, base, bytestring, interpolate, pcre-heavy }: + ({ mkDerivation, base, bytestring, deepseq, hspec, interpolate + , pcre-heavy + }: mkDerivation { pname = "hpc-threshold"; - version = "0.1.0.0"; - sha256 = "113m7fpm4zffvzwnqjzd45mbc18acgj5c1b9z5hqwklygjjjpx4a"; + version = "0.1.0.3"; + sha256 = "0f16iq5d6d865ifg9lwbli16p5svzy3hjp05fkivqnl3p7hmd297"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq hspec ]; homepage = "https://github.com/eckyputrady/hpc-threshold#readme"; - description = "Small utility for validating whether HPC result is above defined thresholds"; + description = "Ensure the code coverage is above configured thresholds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109376,23 +109646,24 @@ self: { "hs-multiaddr" = callPackage ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap - , filepath, hspec, iproute, multihash, sandi + , filepath, hs-multihash, hspec, iproute, sandi }: mkDerivation { pname = "hs-multiaddr"; - version = "0.1.0.1"; - sha256 = "0bac505a3fvz46zbh60vl0m6jj5snjbmj925vxhv6bpdydidi8hw"; + version = "0.1.4"; + sha256 = "0vmyqrgrw1fqm26mgb1bwdivv5iwgypb5186awva665gvp8p30ib"; libraryHaskellDepends = [ - base bytes bytestring cereal filepath iproute multihash sandi + base bytes bytestring cereal filepath hs-multihash iproute sandi ]; testHaskellDepends = [ - base bytestring either-unwrap hspec iproute multihash sandi + base bytestring either-unwrap hs-multihash hspec iproute sandi ]; - homepage = "https://github.com/MatrixAI/haskell-multiaddr#readme"; - description = "Multiaddr Library for LibP2P"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/MatrixAI/hs-multiaddr#readme"; + description = "Multiaddr library"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {hs-multihash = null;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -113682,8 +113953,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.1.0.3"; - sha256 = "0bzja2n7hxj530d3pfh58zn29vapl341fy7x6ggvp5sfgsysg7ll"; + version = "1.1.0.4"; + sha256 = "03ffmff09k6aqpd9rv41bfi566pr6hk4vdjm0my2wfypbn2mrgb0"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -114591,6 +114862,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-reverse-proxy_0_6_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , conduit, conduit-extra, containers, hspec, http-client + , http-conduit, http-types, network, resourcet, streaming-commons + , text, transformers, unliftio, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.6.0"; + sha256 = "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive conduit + conduit-extra containers http-client http-types network resourcet + streaming-commons text transformers unliftio wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types network resourcet streaming-commons + transformers unliftio wai warp + ]; + homepage = "https://github.com/fpco/http-reverse-proxy"; + description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -115502,6 +115799,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hvega" = callPackage + ({ mkDerivation, aeson, base, text, vector }: + mkDerivation { + pname = "hvega"; + version = "0.1.0.0"; + sha256 = "14czd3qhji2aq4x23v0a1fhschnq1azd8spiar9pw5z12z4n9j1l"; + libraryHaskellDepends = [ aeson base text vector ]; + homepage = "https://github.com/DougBurke/hvega"; + description = "Create Vega and Vega-Lite visualizations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-balancedparens" = callPackage ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector @@ -115812,17 +116121,16 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, temporary, transformers - , unix + , either, hspec, monad-loops, rdkafka, transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.4.3"; - sha256 = "18pyayl0xyb045db5584cfbbvzvmkwm3zkpvks30vrz9sb5jx1qd"; + version = "2.4.4"; + sha256 = "1zw35ikrp0r07rvnm3fah3p9xj8h8bw2h4nwv94ih1ff2ab2glhf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bytestring containers temporary transformers unix + base bifunctors bytestring containers transformers unix ]; librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; @@ -118320,6 +118628,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell-hvega" = callPackage + ({ mkDerivation, aeson, base, hvega, ihaskell, text }: + mkDerivation { + pname = "ihaskell-hvega"; + version = "0.1.0.0"; + sha256 = "0fwn0c7v5g67gkrzq7k3myy3cxk5b176svzcgaidfs7ckl3hbsnm"; + libraryHaskellDepends = [ aeson base hvega ihaskell text ]; + homepage = "https://github.com/githubuser/ihaskell-hvega#readme"; + description = "IHaskell display instance for hvega types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ihaskell-inline-r" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , filepath, ihaskell, ihaskell-blaze, inline-r, template-haskell @@ -119279,6 +119599,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "incremental-parser_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.3.1"; + sha256 = "1nygr5hs547innw9f5wx8ifpkiq01ckbhx34266ds6rmnjsqxzby"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -120305,8 +120646,8 @@ self: { }: mkDerivation { pname = "int-multimap"; - version = "0.1.0.1"; - sha256 = "0xi0n9hhra6pzqnxahf109qgifxnsgvc9v9jl0qmnxzz5yki1pvg"; + version = "0.2"; + sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -120525,8 +120866,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.30"; - sha256 = "0axjmswi9jgyd9kkhyjwbviqbh693vvki4hvwcg7rq6dsgl0lgk8"; + version = "0.1.31"; + sha256 = "0d6pc7mza12889wbzxy7gb5fb86v3b5pm2cdvcvnh6gd6x4ii336"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -125661,6 +126002,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-kafka" = callPackage + ({ mkDerivation, aeson, base, bytestring, hw-kafka-client, katip }: + mkDerivation { + pname = "katip-kafka"; + version = "0.0.1"; + sha256 = "1w5w3sccvh1rl0zd69k0nya0bbf9jwi9ahb7q1c761jq5333gv8q"; + libraryHaskellDepends = [ + aeson base bytestring hw-kafka-client katip + ]; + homepage = "https://github.com/s9gf4ult/katip-kafka"; + description = "Katip scribe to send logs to Kafka"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "katip-rollbar" = callPackage ({ mkDerivation, aeson, async, base, hostname, http-client, katip , rollbar-hs, stm-chans, text, time @@ -128154,8 +128509,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.8"; - sha256 = "0609xpjcq294ypjq4blw1cb3a6jnjzm9gwzr54dnp3afhindbq3m"; + version = "1.2.0.9"; + sha256 = "0narp1zhvyannd627bafh6yhk8y5lfw6f5nqr9wi1qvbynmlmhmg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -130767,8 +131122,8 @@ self: { }: mkDerivation { pname = "lens-utils"; - version = "1.4.4"; - sha256 = "0ry04ghvbyxa236s150hfs5fa0fsip312ivflg70j49n02ypxr91"; + version = "1.4.5"; + sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g"; libraryHaskellDepends = [ aeson base containers data-default lens monoid split template-haskell @@ -137885,6 +138240,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mapalgebra" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, deepseq, hmatrix, HUnit-approx, massiv, massiv-io + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "mapalgebra"; + version = "0.1.0"; + sha256 = "1d4cdwkrbvkh53h3vkzghikmbnba3x1j84r0wgsc90cnr2im5san"; + libraryHaskellDepends = [ + base bytestring containers data-default deepseq hmatrix massiv + massiv-io vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq hmatrix + HUnit-approx massiv massiv-io QuickCheck tasty tasty-hunit + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default deepseq hmatrix + massiv massiv-io vector + ]; + homepage = "https://github.com/fosskers/mapalgebra"; + description = "Efficient, polymorphic Map Algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mappy" = callPackage ({ mkDerivation, ansi-terminal, base, containers, directory , haskeline, hspec, parsec, QuickCheck @@ -137930,10 +138312,11 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "marihana"; - version = "0.2.1.0"; - sha256 = "03aw0chicgmyj3ix7nz0dc5mpck0409bv1d7lfs5wn9z4mmynqiv"; + version = "0.2.2.0"; + sha256 = "0xg2ldcm01b352zjv9rh0vvdbhxbcwfvi8464ymh4ms8nh3x4hb6"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath process ]; executableHaskellDepends = [ base directory filepath process ]; testHaskellDepends = [ base directory filepath process ]; @@ -138759,26 +139142,27 @@ self: { , config-ini, connection, containers, directory, filepath, gitrev , hashable, Hclip, mattermost-api, mattermost-api-qc , microlens-platform, mtl, process, quickcheck-text, semigroups - , skylighting, stm, stm-delay, strict, string-conversions, tasty - , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time - , timezone-olson, timezone-series, transformers, Unique, unix - , unordered-containers, utf8-string, vector, vty, word-wrap - , xdg-basedir + , skylighting-core, stm, stm-delay, strict, string-conversions + , tasty, tasty-hunit, tasty-quickcheck, temporary, text + , text-zipper, time, timezone-olson, timezone-series, transformers + , Unique, unix, unordered-containers, utf8-string, vector, vty + , word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40800.0.2"; - sha256 = "0fgk0my3r0vcw545xqjcda8ikj5cbfzgg9vxfs3jzdcnsa0rgcyf"; + version = "40900.0.1"; + sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers directory filepath gitrev hashable Hclip mattermost-api microlens-platform - mtl process semigroups skylighting stm stm-delay strict temporary - text text-zipper time timezone-olson timezone-series transformers - unix unordered-containers utf8-string vector vty word-wrap - xdg-basedir + mtl process semigroups skylighting-core stm stm-delay strict + temporary text text-zipper time timezone-olson timezone-series + transformers unix unordered-containers utf8-string vector vty + word-wrap xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -138803,8 +139187,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40800.0.2"; - sha256 = "1l2yb9nvy2haw5kyjjij465g45w8xm8vm97jbkx5jb3p4cs44xl8"; + version = "40900.1.0"; + sha256 = "1ngpinpal50s8bizwvnpafx6zh8zqb7m0yc21lcp7ybh4yhwikad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138828,8 +139212,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40800.0.2"; - sha256 = "04whpcbcd5cqnwfrskk3r2gjmyvap2m7d8xsjdry56kil6iqznk5"; + version = "40900.1.0"; + sha256 = "0mdwi6130hz508bxbhriyg7fr6rqpbalmjwwizvj9nb7cz1dmrsl"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -141043,26 +141427,25 @@ self: { }) {}; "mighttpd2" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , byteorder, bytestring, case-insensitive, conduit, conduit-extra - , directory, filepath, hspec, http-client, http-date, http-types - , io-choice, network, old-locale, parsec, resourcet - , streaming-commons, time, transformers, unix, unix-time - , unordered-containers, wai, wai-app-file-cgi, wai-http2-extra - , wai-logger, warp + ({ mkDerivation, array, async, auto-update, base, byteorder + , bytestring, case-insensitive, conduit, conduit-extra, directory + , filepath, hspec, http-client, http-date, http-types, io-choice + , network, old-locale, parsec, resourcet, streaming-commons, time + , transformers, unix, unix-time, unordered-containers, wai + , wai-app-file-cgi, wai-http2-extra, wai-logger, warp }: mkDerivation { pname = "mighttpd2"; - version = "3.4.2"; - sha256 = "0a5i9cs0rjap7i4gyda6dgglckn3ys0ldl0qkvnxvm87bcyyfc3k"; + version = "3.4.3"; + sha256 = "0afa25kaagdznfg1kbm5hbmlfk75p7rws0x9fjb505wrr12jipbh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async auto-update base blaze-builder byteorder bytestring - case-insensitive conduit conduit-extra directory filepath http-date - http-types io-choice network parsec resourcet streaming-commons - unix unix-time unordered-containers wai wai-app-file-cgi warp + array async auto-update base byteorder bytestring case-insensitive + conduit conduit-extra directory filepath http-date http-types + io-choice network parsec resourcet streaming-commons unix unix-time + unordered-containers wai wai-app-file-cgi warp ]; executableHaskellDepends = [ base bytestring conduit-extra directory filepath http-client @@ -151074,8 +151457,8 @@ self: { pname = "np-extras"; version = "0.3.1.1"; sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; - revision = "1"; - editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3"; + revision = "2"; + editedCabalFile = "01jp7y4lsdxlfrbi5vqsc5iyjzzc996w7g88amkkfg5k6amlxb9r"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -155493,7 +155876,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_1_3" = callPackage + "pandoc_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , Cabal, case-insensitive, cmark-gfm, containers, criterion @@ -155508,8 +155891,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.1.3"; - sha256 = "023h0jdn996q37p8b5wdi1hifq17drrwbfq92c6imxwk2a4rl3jf"; + version = "2.2"; + sha256 = "0sc51sw7g9jni9jamj7rcdn9fqf5476gzp7cahhkjj29xak88a8g"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -155579,6 +155962,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_14_3_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat + , bytestring, Cabal, containers, data-default, directory, filepath + , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec + , process, rfc5051, setenv, split, syb, tagsoup, temporary, text + , time, unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.14.3.1"; + sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers data-default directory + filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec + rfc5051 setenv split syb tagsoup text time unordered-containers + vector xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base base-compat bytestring filepath + pandoc pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base base-compat bytestring containers directory filepath mtl + pandoc pandoc-types process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -157554,8 +157973,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.6.1.0"; - sha256 = "1i6vql76j5439bwdd1z7haphgm4x82rh08s22fc70hmfzkrln733"; + version = "0.6.1.1"; + sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158556,8 +158975,8 @@ self: { }: mkDerivation { pname = "pedersen-commitment"; - version = "0.1.0"; - sha256 = "10flwinxxs1vg2giqqyazcgxrykqsj6m0kgd62b8f4wzmygws4r1"; + version = "0.2.0"; + sha256 = "1dxh20abilyf29jg6dbl9al300v7wzd1avv36p4hf8x2xwvwr4v7"; libraryHaskellDepends = [ base bytestring containers cryptonite memory mtl protolude text ]; @@ -158567,7 +158986,7 @@ self: { ]; homepage = "https://github.com/adjoint-io/pedersen-commitment#readme"; description = "An implementation of Pedersen commitment schemes"; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.mit; }) {}; "peg" = callPackage @@ -158946,6 +159365,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perhaps" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, mtl + , transformers, transformers-compat + }: + mkDerivation { + pname = "perhaps"; + version = "0"; + sha256 = "16bm069pqrdsbscyp9m1r7cciqppkvlmgn4xgzp3yyfh69z095gn"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/perhaps/"; + description = "Perhaps, a monad"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "period" = callPackage ({ mkDerivation, base, hspec, HUnit, old-locale , optparse-applicative, parsec, text, text-show, time @@ -159077,6 +159514,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-types-HDBC-pg_0_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, convertible, dlist, HDBC + , persistable-record, relational-query, relational-query-HDBC + , text-postgresql + }: + mkDerivation { + pname = "persistable-types-HDBC-pg"; + version = "0.0.3.1"; + sha256 = "1dmvwr21q5g15v50b5ycnyvqbrfg75pw5kdvmi4sp03yldk0fsdc"; + libraryHaskellDepends = [ + base bytestring convertible dlist HDBC persistable-record + relational-query relational-query-HDBC text-postgresql + ]; + testHaskellDepends = [ + base relational-query relational-query-HDBC text-postgresql + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -165616,6 +166075,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-relative-time" = callPackage + ({ mkDerivation, base, genvalidity-hspec, genvalidity-time, hspec + , QuickCheck, time, validity, validity-time + }: + mkDerivation { + pname = "pretty-relative-time"; + version = "0.0.0.0"; + sha256 = "0k28jh5mw5qfw4d1hfdj2f53qwmn3apy1yxwyxjbr50m2924j8f2"; + libraryHaskellDepends = [ base time validity validity-time ]; + testHaskellDepends = [ + base genvalidity-hspec genvalidity-time hspec QuickCheck time + validity validity-time + ]; + homepage = "https://github.com/NorfairKing/pretty-relative-time#readme"; + description = "Pretty relative time"; + license = stdenv.lib.licenses.mit; + }) {}; + "pretty-show" = callPackage ({ mkDerivation, array, base, filepath, ghc-prim, happy , haskell-lexer, pretty @@ -168063,6 +168540,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20180426" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20180426"; + sha256 = "0pfxsh2ds3dwm6mq6g85vhq8rdgc93bn84pq1b4lk3sf71sqs2ii"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -171981,8 +172475,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "4.0.8"; - sha256 = "05rad5dckya26mai39623n5bvhvk13yjxikrc6r7yc6nvlkkh8zb"; + version = "4.0.9"; + sha256 = "0wz36zclpckkm8w7mmdzbklrr08ggyqsk7j4wfxbh4gxa0ry7yj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179148,16 +179642,16 @@ self: { }: mkDerivation { pname = "runmany"; - version = "0.1.2"; - sha256 = "1c672mxmgw3d7r3fbnjm9i7b74v00xrf95riwl2a52a1lpkmb0ip"; + version = "0.1.3"; + sha256 = "19pgmq009f5kpsilixbnsx5frl9c12v6in0blifandr9q3n9is9c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ async base bytestring optparse-applicative process stm ]; - homepage = "https://github.com/jwiegley/runmany"; + homepage = "https://github.com/jwiegley/runmany#readme"; description = "Run multiple commands, interleaving output and errors"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -185009,8 +185503,8 @@ self: { }: mkDerivation { pname = "servant-tracing"; - version = "0.1.0.1"; - sha256 = "0dff51fywa1z1png1hhwpn4f8av2jxdsplin8h80aad459czaid2"; + version = "0.1.0.2"; + sha256 = "0qpamaf3ydfb8197iz2prjh9nxwxi03cdfsp3jl28rhbqrc2xpry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188224,16 +188718,16 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-discover + ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.1"; - sha256 = "17nvwph2g5xzi8lqgyrsbskdm9flwr7h3ch7yf4rnbx3bg37bvsh"; + version = "0.4.0.2"; + sha256 = "0zqy3ffndyvz97wfs0ha0d5j6045gfdh0p6rmz6dv87j9mqmfpl0"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ - base doctest doctest-discover tasty tasty-quickcheck + base doctest doctest-driver-gen tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion vector ]; homepage = "https://github.com/dzhus/simple-vec3#readme"; @@ -188931,6 +189425,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skeletal-set" = callPackage + ({ mkDerivation, base, containers, mtl, smallcheck, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "skeletal-set"; + version = "0.1.0.0"; + sha256 = "0f8mc705bk6nc6l95y65fvcxi772fwvqy3cgm0sb3rv13h4rn468"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers mtl smallcheck tasty tasty-discover tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + description = "Skeletal set - a set with equivalence relation different from equality"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "skeleton" = callPackage ({ mkDerivation, argparser, attoparsec, base, bytestring, filepath , hex, posix-escape, process, time @@ -192105,6 +192616,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sorted-list_0_2_1_0" = callPackage + ({ mkDerivation, base, criterion, deepseq }: + mkDerivation { + pname = "sorted-list"; + version = "0.2.1.0"; + sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l"; + libraryHaskellDepends = [ base deepseq ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; + description = "Type-enforced sorted lists and related functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sorting" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192779,6 +193304,8 @@ self: { pname = "species"; version = "0.4.0.1"; sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; + revision = "1"; + editedCabalFile = "1pvk34n7lsbpng9b6m6nrhhr44z1pilh292j3lfnx69hvxhvaq93"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -194223,86 +194750,82 @@ self: { "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base64-bytestring, bindings-uname - , blaze-builder, bytestring, Cabal, clock, conduit, conduit-extra - , containers, cryptonite, cryptonite-conduit, deepseq, directory - , echo, exceptions, extra, fast-logger, file-embed, filelock - , filepath, fsnotify, generic-deriving, gitrev, hackage-security - , hashable, hastache, hpack, hpc, hspec, http-client - , http-client-tls, http-conduit, http-types, memory, microlens - , microlens-mtl, mintty, monad-logger, mono-traversable, mtl + , attoparsec, base, base64-bytestring, bindings-uname, bytestring + , Cabal, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, deepseq, directory, echo, exceptions, extra + , file-embed, filelock, filepath, fsnotify, generic-deriving + , gitrev, hackage-security, hashable, hpack, hpc, hspec + , http-client, http-client-tls, http-conduit, http-types, memory + , microlens, mintty, monad-logger, mono-traversable, mtl, mustache , neat-interpolation, network-uri, open-browser , optparse-applicative, optparse-simple, path, path-io, persistent - , persistent-sqlite, persistent-template, pid1, pretty, primitive + , persistent-sqlite, persistent-template, pretty, primitive , process, project-template, QuickCheck, regex-applicative-text - , resourcet, retry, semigroups, smallcheck, split, stm, store + , resourcet, retry, rio, semigroups, smallcheck, split, stm, store , store-core, streaming-commons, tar, template-haskell, temporary , text, text-metrics, th-reify-many, time, tls, transformers - , unicode-transforms, unix, unix-compat, unliftio + , typed-process, unicode-transforms, unix, unix-compat, unliftio , unordered-containers, vector, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.6.5"; - sha256 = "0f5a0znxwmib03vhqkw0yiv89a82z43wlm7zwfyx30gfz6iqqp7f"; + version = "1.7.1"; + sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; revision = "1"; - editedCabalFile = "11bmzlf3gxbz2gij0l2999a296z4c12l27f7jfyfka8l1k15d6b1"; + editedCabalFile = "12ym80mwlvg3zwbjhmby4k467hxa0yip0314w658ivn0sq6vgycw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - hackage-security hashable hastache hpack hpc http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving hackage-security hashable hpack hpc + http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template pid1 + path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template regex-applicative-text - resourcet retry semigroups split stm store store-core + resourcet retry rio semigroups split stm store store-core streaming-commons tar template-haskell temporary text text-metrics - th-reify-many time tls transformers unicode-transforms unix - unix-compat unliftio unordered-containers vector yaml zip-archive - zlib + th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; executableHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - gitrev hackage-security hashable hastache hpack hpc http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving gitrev hackage-security hashable hpack + hpc http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative optparse-simple path path-io persistent persistent-sqlite - persistent-template pid1 pretty primitive process project-template - regex-applicative-text resourcet retry semigroups split stm store - store-core streaming-commons tar template-haskell temporary text - text-metrics th-reify-many time tls transformers unicode-transforms - unix unix-compat unliftio unordered-containers vector yaml - zip-archive zlib + persistent-template pretty primitive process project-template + regex-applicative-text resourcet retry rio semigroups split stm + store store-core streaming-commons tar template-haskell temporary + text text-metrics th-reify-many time tls transformers typed-process + unicode-transforms unix unix-compat unliftio unordered-containers + vector yaml zip-archive zlib ]; testHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base64-bytestring bindings-uname blaze-builder bytestring Cabal - clock conduit conduit-extra containers cryptonite - cryptonite-conduit deepseq directory echo exceptions extra - fast-logger file-embed filelock filepath fsnotify generic-deriving - hackage-security hashable hastache hpack hpc hspec http-client - http-client-tls http-conduit http-types memory microlens - microlens-mtl mintty monad-logger mono-traversable mtl + base64-bytestring bindings-uname bytestring Cabal conduit + conduit-extra containers cryptonite cryptonite-conduit deepseq + directory echo exceptions extra file-embed filelock filepath + fsnotify generic-deriving hackage-security hashable hpack hpc hspec + http-client http-client-tls http-conduit http-types memory + microlens mintty monad-logger mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - path path-io persistent persistent-sqlite persistent-template pid1 + path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template QuickCheck - regex-applicative-text resourcet retry semigroups smallcheck split - stm store store-core streaming-commons tar template-haskell + regex-applicative-text resourcet retry rio semigroups smallcheck + split stm store store-core streaming-commons tar template-haskell temporary text text-metrics th-reify-many time tls transformers - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -194386,6 +194909,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stack-network" = callPackage + ({ mkDerivation, ansi-terminal, async, base, binary, bytestring + , Cabal, clock, configurator, directory, dirstream + , distributed-process-lifted, distributed-process-simplelocalnet + , exceptions, filepath, hspec, lifted-base, mtl + , optparse-applicative, pipes, pipes-safe, process, raw-strings-qq + , system-fileio, system-filepath, temporary, text, transformers + , yaml + }: + mkDerivation { + pname = "stack-network"; + version = "0.1.0.0"; + sha256 = "0l2r6r89lj1197ybsfgjxikhpgravw12zjpaz62gcsvdhdcflsak"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath lifted-base + mtl optparse-applicative pipes pipes-safe process system-fileio + system-filepath temporary text transformers + ]; + executableHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath lifted-base + mtl optparse-applicative pipes pipes-safe process system-fileio + system-filepath temporary text transformers + ]; + testHaskellDepends = [ + ansi-terminal async base binary bytestring Cabal clock configurator + directory dirstream distributed-process-lifted + distributed-process-simplelocalnet exceptions filepath hspec + lifted-base mtl optparse-applicative pipes pipes-safe process + raw-strings-qq system-fileio system-filepath temporary text + transformers yaml + ]; + homepage = "https://github.com/McGizzle/stack-network#readme"; + description = "A program for extending Stack to add distributed capabilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-prism" = callPackage ({ mkDerivation, base, profunctors, tagged, template-haskell , transformers @@ -198072,18 +198637,18 @@ self: { "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , file-embed, filepath, haskell-src-exts, HUnit, mtl - , optparse-applicative, strict, syb, test-framework + , optparse-applicative, semigroups, strict, syb, test-framework , test-framework-hunit, yaml }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.0.2"; - sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr"; + version = "0.9.1.1"; + sha256 = "0qvaxivxvgaz4zpgc6275j9psdipj2p7y3msv9py11z1y6r5izss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath - haskell-src-exts mtl syb yaml + haskell-src-exts mtl semigroups syb yaml ]; executableHaskellDepends = [ aeson base bytestring containers directory file-embed filepath @@ -200802,6 +201367,8 @@ self: { pname = "taffybar"; version = "1.0.2"; sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9"; + revision = "1"; + editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -200988,16 +201555,14 @@ self: { }: mkDerivation { pname = "tagged-transformer"; - version = "0.8"; - sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7"; - revision = "1"; - editedCabalFile = "06h1v2q35dzc69vfshzvwcpai176dd3bp89hvgcm5r6dyii6bqlg"; + version = "0.8.1"; + sha256 = "1ffwxr312vi3fqhgnad5b6gqkgz3j27c30z551j8zisjx0hn3zx0"; libraryHaskellDepends = [ base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged ]; homepage = "http://github.com/ekmett/tagged-transformer"; - description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; + description = "Monad transformer carrying an extra phantom type tag"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -202610,14 +203175,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "teardown_0_4_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, rio, tasty + "teardown_0_4_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty , tasty-hunit, typed-process, unliftio }: mkDerivation { pname = "teardown"; - version = "0.4.0.0"; - sha256 = "0y2ihw74fnnygzp22nyy7285d3rcp6kw2gjkzys82blwrbdwdlsk"; + version = "0.4.1.0"; + sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0"; libraryHaskellDepends = [ ansi-wl-pprint base rio typed-process unliftio ]; @@ -202625,10 +203190,10 @@ self: { base rio tasty tasty-hunit typed-process unliftio ]; benchmarkHaskellDepends = [ - base criterion rio typed-process unliftio + base gauge rio typed-process unliftio ]; homepage = "https://github.com/roman/Haskell-teardown#readme"; - description = "Build composable components for your application with clear teardown semantics"; + description = "Build safe and composable teardown sub-routines for resources"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204230,6 +204795,30 @@ self: { license = "GPL"; }) {}; + "texmath_0_10_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.10.1.2"; + sha256 = "08fqlnl7r2izsl3rasa27ybnnijmn8ypvi0lbzsb3vs8rsq318px"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, temporary, test-framework @@ -210650,8 +211239,8 @@ self: { ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "tuple-sop"; - version = "0.1.0.0"; - sha256 = "08g0jzqngw1bkrn212rj6d5h7ppfar7q1p8b79049ivrich6zspj"; + version = "0.2.0.1"; + sha256 = "1l2llpn3b3v5hly3bpzyhzagnrrs830xgpqaab8w1rcbhkmqby12"; libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme"; @@ -210902,8 +211491,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.38"; - sha256 = "19k1z6wrizym21a29hx31yhv4y5m1w0474iqm8idyxih4fya3k7s"; + version = "1.0.1.39"; + sha256 = "148lan5d4mzngkfq5l5rsz20s9dcgn71y145d1y59pr7nnlg3ipw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211951,8 +212540,8 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.8.0.1"; - sha256 = "0ybcivp219h8xw9k31f5cimlnj63y5s2br3rahxgdacvhdb678zg"; + version = "0.8.1.0"; + sha256 = "0gp0bkcc3zx2mi8pi0j6vqigif6sy2w54pkb2qv7dlmvvijm6ra2"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger singletons template-haskell @@ -213661,8 +214250,8 @@ self: { }: mkDerivation { pname = "uniprot-kb"; - version = "0.1.1.2"; - sha256 = "15mlmappp5k8lamgmpkmyahi5vimxk3a1821c6cabs28r4d9rywy"; + version = "0.1.2.0"; + sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -218424,8 +219013,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.1.0"; - sha256 = "17209hslyqfx3lyh1a8sii3gn1ygsb5a81nampx1ym6f6gx9g3lh"; + version = "1.1.2.0"; + sha256 = "0l52494zi9r3fq3nx21r8pkbb7zkynz1gbrn58k8pramx7nhksb1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/achirkin/vulkan#readme"; description = "Low-level low-overhead vulkan api bindings"; @@ -218545,20 +219134,19 @@ self: { "wai-app-file-cgi" = callPackage ({ mkDerivation, array, attoparsec, attoparsec-conduit, base - , blaze-builder, blaze-html, bytestring, case-insensitive, conduit - , conduit-extra, containers, data-default-class, directory, doctest - , filepath, hspec, HTTP, http-client, http-conduit, http-date - , http-types, io-choice, lifted-base, mime-types, network, process - , sockaddr, static-hash, text, transformers, unix, wai, wai-conduit - , warp, word8 + , bytestring, case-insensitive, conduit, conduit-extra, containers + , data-default-class, directory, doctest, filepath, hspec, HTTP + , http-client, http-conduit, http-date, http-types, io-choice + , lifted-base, mime-types, network, process, sockaddr, static-hash + , text, transformers, unix, wai, wai-conduit, warp, word8 }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.4"; - sha256 = "1gcrfcvll4lpd8qrpcai00cn2zs8ql46z1chlqkbi7jk31r14qy0"; + version = "3.1.6"; + sha256 = "1w2hmy0q8dvg575sxmc69f9x7pcf1fx6lypzxsaxyfyazvhi4krc"; libraryHaskellDepends = [ - array attoparsec attoparsec-conduit base blaze-builder blaze-html - bytestring case-insensitive conduit conduit-extra containers + array attoparsec attoparsec-conduit base bytestring + case-insensitive conduit conduit-extra containers data-default-class directory filepath http-client http-conduit http-date http-types io-choice lifted-base mime-types network process sockaddr static-hash text transformers unix wai wai-conduit @@ -219700,6 +220288,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-throttle_0_2_2_1" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, containers + , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm + , text, token-bucket, transformers, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-throttle"; + version = "0.2.2.1"; + sha256 = "1z4n7ja5kq7cl2117w8wx0kz3fjdzr3mlvx6m76jbgp0504vjgja"; + libraryHaskellDepends = [ + base bytestring bytestring-builder containers hashable http-types + mtl network stm text token-bucket transformers wai + ]; + testHaskellDepends = [ + base bytestring hspec http-types HUnit QuickCheck stm transformers + wai wai-extra + ]; + description = "WAI Middleware for Request Throttling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-verbs" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, http-types , mmorph, monad-control, monad-control-aligned, monad-logger, mtl @@ -220334,6 +220944,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_22" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.22"; + sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -220971,20 +221617,26 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, cryptonite, http-client, http-client-tls, memory - , template-haskell, text, transformers, vector + ({ mkDerivation, aeson, async, base, basement, bytestring, cereal + , cryptonite, data-default, exceptions, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations, http-client + , http-client-tls, machines, memory, mtl, parsec, split, stm + , tagged, template-haskell, text, time, transformers }: mkDerivation { pname = "web3"; - version = "0.6.0.0"; - sha256 = "1dwwxvh11867f18lw9g2rjqsjawqa92p6063x64izdl1qj5qnwv9"; + version = "0.7.0.0"; + sha256 = "0mlrscl6f6l2jcsgw4x97p2qcd26d73wy8m13gbnhrh04d4kmd9h"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring cryptonite - http-client http-client-tls memory template-haskell text - transformers vector + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop http-client http-client-tls machines memory + mtl parsec tagged template-haskell text transformers + ]; + testHaskellDepends = [ + async base bytestring data-default generics-sop hspec hspec-contrib + hspec-discover hspec-expectations memory split stm tagged text time + transformers ]; - testHaskellDepends = [ base memory text ]; homepage = "https://github.com/airalab/hs-web3#readme"; description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -227406,6 +228058,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-bin_1_6_0_2" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, Cabal, conduit, conduit-extra, containers + , data-default-class, directory, file-embed, filepath, fsnotify + , http-client, http-client-tls, http-reverse-proxy, http-types + , network, optparse-applicative, parsec, process, project-template + , resourcet, say, shakespeare, split, stm, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp + , warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0.2"; + sha256 = "0x1lr6xm4h3x1ld42xs946aq4sn0g5x147bxqjxr5bfswj7vjk5k"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base base64-bytestring blaze-builder bytestring Cabal + conduit conduit-extra containers data-default-class directory + file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types network optparse-applicative parsec + process project-template resourcet say shakespeare split stm + streaming-commons tar template-haskell text time transformers + transformers-compat unix-compat unliftio unordered-containers wai + wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -227588,6 +228273,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_4" = 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.4"; + sha256 = "09r714ibpml8mqbqhnckync5a0kb7fyz079m9lapmvhq1yvl4zld"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -227888,6 +228614,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-bootstrap4_1_0_0" = callPackage + ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "1.0.0"; + sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq"; + libraryHaskellDepends = [ + base shakespeare text yesod-core yesod-form + ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -228821,6 +229562,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_3" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , network, persistent, pretty-show, semigroups, text, time + , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.3"; + sha256 = "0mxjkk6bkxgjpdifvz7qlqg0ms1xh19b8r7f96lp0pcnfksnil4d"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network persistent pretty-show semigroups text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit text + unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test From e39a75cd350f03d13b3bded2bb605629f5031330 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:16:17 +0200 Subject: [PATCH 2736/2743] haskell-pandoc: update override for ghc-8.4.x --- 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 b38b17e34751..09de2116098d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -575,7 +575,7 @@ self: super: { brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; matrix = self.matrix_0_3_6_1; - pandoc = self.pandoc_2_1_3; + pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; # https://github.com/xmonad/xmonad/issues/155 From 99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:27:21 +0200 Subject: [PATCH 2737/2743] haskell-hpack: use latest version for ghc-8.4.x to fix the build --- .../configuration-ghc-8.4.x.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 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 09de2116098d..2440e3b7a9dc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -293,23 +293,6 @@ self: super: { }; }); - ## Unmerged. PR: https://github.com/sol/hpack/pull/277 - ## Issue: https://github.com/sol/hpack/issues/276 - hpack = overrideCabal super.hpack (drv: { - ## • No instance for (Semigroup Dependencies) - ## arising from the 'deriving' clause of a data type declaration - ## Possible fix: - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "hpack"; - rev = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6"; - sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y"; - }; - ## Setup: Encountered missing dependencies: - ## http-client -any, http-client-tls -any, http-types -any - libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ http-client http-client-tls http-types ]); - }); - ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { ## • No instance for (Semigroup (Partial a b)) @@ -574,6 +557,7 @@ self: super: { # Older versions don't compile. brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; + hpack = self.hpack_0_28_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; From c60c6a2443ab45169996aba33ae883622bbc1026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:30:57 +0200 Subject: [PATCH 2738/2743] git-annex: update sha256 hash for new 6.2018042 version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cfa80062e3be..82ac96d2c85d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -82,7 +82,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd"; + sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); From f0549be090185a07da2be4b26f654a487c45243f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:32:01 +0200 Subject: [PATCH 2739/2743] haskell-stack: update overrides for the new 1.7.1 version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82ac96d2c85d..ec8e7a1bc2b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -863,8 +863,8 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); - # https://github.com/fpco/stackage/issues/3126 - stack = doJailbreak super.stack; + # Needs newer versions than what we have in LTS-11.x at the moment. + stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; }); # These packages depend on each other, forming an infinite loop. scalendar = markBroken (super.scalendar.override { SCalendar = null; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index b6fdb75e5506..d1bb60e83958 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -84,10 +84,11 @@ self: super: { purescript = doJailbreak (super.purescript); # These packages need Cabal 2.2.x, which is not the default. - distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); From 8564e93d2d695c08b1cfd8f5df9e6ca3928ead4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:43:19 +0200 Subject: [PATCH 2740/2743] haskell-c2hs: drop hacky override and try the current version again --- .../haskell-modules/configuration-common.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec8e7a1bc2b7..8c7ef561f171 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -845,17 +845,8 @@ self: super: { # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4 stack2nix = doJailbreak super.stack2nix; - # Hacks to work around https://github.com/haskell/c2hs/issues/192. - c2hs = (overrideCabal super.c2hs { - version = "0.26.2-28-g8b79823"; - doCheck = false; - src = pkgs.fetchFromGitHub { - owner = "deech"; - repo = "c2hs"; - rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; - sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; - }; - }); + # Work around https://github.com/haskell/c2hs/issues/192. + c2hs = dontCheck super.c2hs; # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { From 9f144e857870d706e85c6655d563258a291c3963 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Apr 2018 12:45:52 +0200 Subject: [PATCH 2741/2743] haskell-hspec-smallcheck: use latest version for ghc-8.4.x to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 + 1 file changed, 1 insertion(+) 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 2440e3b7a9dc..da65c2698228 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -558,6 +558,7 @@ self: super: { brick = self.brick_0_36_2; HaTeX = self.HaTeX_3_19_0_0; hpack = self.hpack_0_28_2; + hspec-smallcheck = self.hspec-smallcheck_0_5_2; matrix = self.matrix_0_3_6_1; pandoc = self.pandoc_2_2; pandoc-types = self.pandoc-types_1_17_4_2; From 65adfc73ad6226c01d80ed2a19aefd02225e453d Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 28 Apr 2018 14:19:15 +0100 Subject: [PATCH 2742/2743] zerotierone: 1.2.4 -> 1.2.8 --- pkgs/tools/networking/zerotierone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 77df8cbf6f7d..ec6c9c196788 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.8"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0n035f2qslw1srxjlm0szrnvb3va3sspbpxqqhng08dp68vmn9wz"; + sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8"; }; preConfigure = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.gpl3; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ]; + maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; platforms = platforms.x86_64 ++ platforms.aarch64; }; } From 75cfbdf33b0423c2bd8f9fb20393267ef02bbf9d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 15 Apr 2018 13:43:42 +0100 Subject: [PATCH 2743/2743] buildFHSUserEnv: change to root directory after chroot Fixes #38525 --- pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index c03a1710f451..7e49e9e78d78 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -118,6 +118,7 @@ int main(gint argc, gchar **argv) { bind("/", prefix); fail_if(chroot(prefix)); + fail_if(chdir("/")); fail_if(execvp(*argv, argv)); }